diff --git a/applications-system.svg b/images/applications-system.svg
similarity index 100%
rename from applications-system.svg
rename to images/applications-system.svg
diff --git a/dialog-information.svg b/images/dialog-information.svg
similarity index 100%
rename from dialog-information.svg
rename to images/dialog-information.svg
diff --git a/dialog-warning.svg b/images/dialog-warning.svg
similarity index 100%
rename from dialog-warning.svg
rename to images/dialog-warning.svg
diff --git a/help-browser.svg b/images/help-browser.svg
similarity index 100%
rename from help-browser.svg
rename to images/help-browser.svg
diff --git a/mail-attachment.svg b/images/mail-attachment.svg
similarity index 100%
rename from mail-attachment.svg
rename to images/mail-attachment.svg
diff --git a/qtmindmap.qrc b/images/qtmindmap.qrc
similarity index 100%
rename from qtmindmap.qrc
rename to images/qtmindmap.qrc
diff --git a/qtmindmap.svg b/images/qtmindmap.svg
similarity index 100%
rename from qtmindmap.svg
rename to images/qtmindmap.svg
diff --git a/system-users.svg b/images/system-users.svg
similarity index 100%
rename from system-users.svg
rename to images/system-users.svg
diff --git a/user-trash-full.svg b/images/user-trash-full.svg
similarity index 100%
rename from user-trash-full.svg
rename to images/user-trash-full.svg
diff --git a/x-office-calendar.svg b/images/x-office-calendar.svg
similarity index 100%
rename from x-office-calendar.svg
rename to images/x-office-calendar.svg
diff --git a/argumentparser.h b/include/argumentparser.h
similarity index 100%
rename from argumentparser.h
rename to include/argumentparser.h
diff --git a/edge.h b/include/edge.h
similarity index 100%
rename from edge.h
rename to include/edge.h
diff --git a/graphwidget.h b/include/graphwidget.h
similarity index 100%
rename from graphwidget.h
rename to include/graphwidget.h
diff --git a/mainwindow.h b/include/mainwindow.h
similarity index 100%
rename from mainwindow.h
rename to include/mainwindow.h
diff --git a/node.h b/include/node.h
similarity index 100%
rename from node.h
rename to include/node.h
diff --git a/systemtray.h b/include/systemtray.h
similarity index 100%
rename from systemtray.h
rename to include/systemtray.h
diff --git a/qtmindmap_hu.ts b/lang/qtmindmap_hu.ts
similarity index 100%
rename from qtmindmap_hu.ts
rename to lang/qtmindmap_hu.ts
diff --git a/qtmindmap_nb_NO.ts b/lang/qtmindmap_nb_NO.ts
similarity index 100%
rename from qtmindmap_nb_NO.ts
rename to lang/qtmindmap_nb_NO.ts
diff --git a/Qt47supp.txt b/other/Qt47supp.txt
similarity index 100%
rename from Qt47supp.txt
rename to other/Qt47supp.txt
diff --git a/qtmindmap-0.2.ebuild b/other/qtmindmap-0.2.ebuild
similarity index 100%
rename from qtmindmap-0.2.ebuild
rename to other/qtmindmap-0.2.ebuild
diff --git a/qtmindmap.pro b/qtmindmap.pro
index f9ef012..90b2492 100644
--- a/qtmindmap.pro
+++ b/qtmindmap.pro
@@ -13,26 +13,26 @@ TARGET = qtmindmap
 TEMPLATE = app
 
 
-SOURCES += main.cpp \
-        mainwindow.cpp \
-    graphwidget.cpp \
-    node.cpp \
-    edge.cpp \
-    systemtray.cpp \
-    argumentparser.cpp
-
-HEADERS  += mainwindow.h \
-    graphwidget.h \
-    node.h \
-    edge.h \
-    systemtray.h \
-    argumentparser.h
-
-FORMS    += mainwindow.ui
-
-RESOURCES = qtmindmap.qrc
-
-TRANSLATIONS += qtmindmap_hu.ts \
-                qtmindmap_nb_NO.ts
+SOURCES += src/main.cpp \
+           src/mainwindow.cpp \
+           src/graphwidget.cpp \
+           src/node.cpp \
+           src/edge.cpp \
+           src/systemtray.cpp \
+           src/argumentparser.cpp
+
+HEADERS  += include/mainwindow.h \
+            include/graphwidget.h \
+            include/node.h \
+            include/edge.h \
+            include/systemtray.h \
+            include/argumentparser.h
+
+FORMS    += ui/mainwindow.ui
+
+RESOURCES = images/qtmindmap.qrc
+
+TRANSLATIONS += lang/qtmindmap_hu.ts \
+                lang/qtmindmap_nb_NO.ts
 
 CODECFORTR = UTF-8
diff --git a/scrollarea.ui b/scrollarea.ui
deleted file mode 100644
index a3c87cd..0000000
--- a/scrollarea.ui
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<ui version="4.0">
- <class>ScrollArea</class>
- <widget class="QScrollArea" name="ScrollArea">
-  <property name="widgetResizable">
-   <bool>true</bool>
-  </property>
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>ScrollArea</string>
-  </property>
-  <widget class="QWidget" name="scrollAreaWidgetContents"/>
- </widget>
-</ui>
diff --git a/argumentparser.cpp b/src/argumentparser.cpp
similarity index 98%
rename from argumentparser.cpp
rename to src/argumentparser.cpp
index fe2117b..52a37fd 100644
--- a/argumentparser.cpp
+++ b/src/argumentparser.cpp
@@ -1,4 +1,4 @@
-#include "argumentparser.h"
+#include "include/argumentparser.h"
 
 #include <QApplication>
 #include <QStringList>
diff --git a/edge.cpp b/src/edge.cpp
similarity index 98%
rename from edge.cpp
rename to src/edge.cpp
index 6361dbe..4e3b139 100644
--- a/edge.cpp
+++ b/src/edge.cpp
@@ -2,8 +2,8 @@
 #include <QDebug>
 
 
-#include "edge.h"
-#include "node.h"
+#include "include/edge.h"
+#include "include/node.h"
 
 #include <math.h>
 
diff --git a/graphwidget.cpp b/src/graphwidget.cpp
similarity index 99%
rename from graphwidget.cpp
rename to src/graphwidget.cpp
index 782d576..5c9b619 100644
--- a/graphwidget.cpp
+++ b/src/graphwidget.cpp
@@ -1,4 +1,4 @@
-#include "graphwidget.h"
+#include "include/graphwidget.h"
 
 #include <QDebug>
 #include <QStatusBar>
@@ -8,10 +8,11 @@
 #include <QColorDialog>
 #include <QApplication>
 
-#include "node.h"
-#include "edge.h"
-#include "math.h"
-#include "mainwindow.h"
+#include "include/node.h"
+#include "include/edge.h"
+#include "include/mainwindow.h"
+
+#include <math.h>
 
 const QColor GraphWidget::m_paper(255,255,153);
 
diff --git a/main.cpp b/src/main.cpp
similarity index 93%
rename from main.cpp
rename to src/main.cpp
index 0093094..95e5d4c 100644
--- a/main.cpp
+++ b/src/main.cpp
@@ -5,9 +5,9 @@
 #include <QRegExp>
 #include <QTranslator>
 
-#include "mainwindow.h"
-#include "systemtray.h"
-#include "argumentparser.h"
+#include "include/mainwindow.h"
+#include "include/systemtray.h"
+#include "include/argumentparser.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/mainwindow.cpp b/src/mainwindow.cpp
similarity index 99%
rename from mainwindow.cpp
rename to src/mainwindow.cpp
index 1377fc9..4b4b363 100644
--- a/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,4 +1,4 @@
-#include "mainwindow.h"
+#include "include/mainwindow.h"
 #include "ui_mainwindow.h"
 
 #include <QDebug>
diff --git a/node.cpp b/src/node.cpp
similarity index 99%
rename from node.cpp
rename to src/node.cpp
index ccfbb60..9d93d54 100644
--- a/node.cpp
+++ b/src/node.cpp
@@ -1,4 +1,4 @@
-#include "node.h"
+#include "include/node.h"
 
 #include <QPainter>
 #include <QStyleOption>
diff --git a/systemtray.cpp b/src/systemtray.cpp
similarity index 97%
rename from systemtray.cpp
rename to src/systemtray.cpp
index dfc07e1..4968880 100644
--- a/systemtray.cpp
+++ b/src/systemtray.cpp
@@ -1,4 +1,4 @@
-#include "systemtray.h"
+#include "include/systemtray.h"
 
 #include <QApplication>
 
diff --git a/algorithmtests.cpp b/test/algorithmtests.cpp
similarity index 100%
rename from algorithmtests.cpp
rename to test/algorithmtests.cpp
diff --git a/algorithmtests.h b/test/algorithmtests.h
similarity index 100%
rename from algorithmtests.h
rename to test/algorithmtests.h
diff --git a/mainwindow.ui b/ui/mainwindow.ui
similarity index 100%
rename from mainwindow.ui
rename to ui/mainwindow.ui