diff --git a/utils/themeeditor/codeeditor.cpp b/utils/themeeditor/gui/codeeditor.cpp
similarity index 100%
rename from utils/themeeditor/codeeditor.cpp
rename to utils/themeeditor/gui/codeeditor.cpp
diff --git a/utils/themeeditor/codeeditor.h b/utils/themeeditor/gui/codeeditor.h
similarity index 100%
rename from utils/themeeditor/codeeditor.h
rename to utils/themeeditor/gui/codeeditor.h
diff --git a/utils/themeeditor/configdocument.cpp b/utils/themeeditor/gui/configdocument.cpp
similarity index 100%
rename from utils/themeeditor/configdocument.cpp
rename to utils/themeeditor/gui/configdocument.cpp
diff --git a/utils/themeeditor/configdocument.h b/utils/themeeditor/gui/configdocument.h
similarity index 100%
rename from utils/themeeditor/configdocument.h
rename to utils/themeeditor/gui/configdocument.h
diff --git a/utils/themeeditor/configdocument.ui b/utils/themeeditor/gui/configdocument.ui
similarity index 100%
rename from utils/themeeditor/configdocument.ui
rename to utils/themeeditor/gui/configdocument.ui
diff --git a/utils/themeeditor/editorwindow.cpp b/utils/themeeditor/gui/editorwindow.cpp
similarity index 100%
rename from utils/themeeditor/editorwindow.cpp
rename to utils/themeeditor/gui/editorwindow.cpp
diff --git a/utils/themeeditor/editorwindow.h b/utils/themeeditor/gui/editorwindow.h
similarity index 100%
rename from utils/themeeditor/editorwindow.h
rename to utils/themeeditor/gui/editorwindow.h
diff --git a/utils/themeeditor/editorwindow.ui b/utils/themeeditor/gui/editorwindow.ui
similarity index 100%
rename from utils/themeeditor/editorwindow.ui
rename to utils/themeeditor/gui/editorwindow.ui
diff --git a/utils/themeeditor/preferencesdialog.cpp b/utils/themeeditor/gui/preferencesdialog.cpp
similarity index 100%
rename from utils/themeeditor/preferencesdialog.cpp
rename to utils/themeeditor/gui/preferencesdialog.cpp
diff --git a/utils/themeeditor/preferencesdialog.h b/utils/themeeditor/gui/preferencesdialog.h
similarity index 100%
rename from utils/themeeditor/preferencesdialog.h
rename to utils/themeeditor/gui/preferencesdialog.h
diff --git a/utils/themeeditor/preferencesdialog.ui b/utils/themeeditor/gui/preferencesdialog.ui
similarity index 100%
rename from utils/themeeditor/preferencesdialog.ui
rename to utils/themeeditor/gui/preferencesdialog.ui
diff --git a/utils/themeeditor/skindocument.cpp b/utils/themeeditor/gui/skindocument.cpp
similarity index 100%
rename from utils/themeeditor/skindocument.cpp
rename to utils/themeeditor/gui/skindocument.cpp
diff --git a/utils/themeeditor/skindocument.h b/utils/themeeditor/gui/skindocument.h
similarity index 100%
rename from utils/themeeditor/skindocument.h
rename to utils/themeeditor/gui/skindocument.h
diff --git a/utils/themeeditor/skinhighlighter.cpp b/utils/themeeditor/gui/skinhighlighter.cpp
similarity index 100%
rename from utils/themeeditor/skinhighlighter.cpp
rename to utils/themeeditor/gui/skinhighlighter.cpp
diff --git a/utils/themeeditor/skinhighlighter.h b/utils/themeeditor/gui/skinhighlighter.h
similarity index 100%
rename from utils/themeeditor/skinhighlighter.h
rename to utils/themeeditor/gui/skinhighlighter.h
diff --git a/utils/themeeditor/skinviewer.cpp b/utils/themeeditor/gui/skinviewer.cpp
similarity index 100%
rename from utils/themeeditor/skinviewer.cpp
rename to utils/themeeditor/gui/skinviewer.cpp
diff --git a/utils/themeeditor/skinviewer.h b/utils/themeeditor/gui/skinviewer.h
similarity index 100%
rename from utils/themeeditor/skinviewer.h
rename to utils/themeeditor/gui/skinviewer.h
diff --git a/utils/themeeditor/skinviewer.ui b/utils/themeeditor/gui/skinviewer.ui
similarity index 100%
rename from utils/themeeditor/skinviewer.ui
rename to utils/themeeditor/gui/skinviewer.ui
diff --git a/utils/themeeditor/tabcontent.h b/utils/themeeditor/gui/tabcontent.h
similarity index 100%
rename from utils/themeeditor/tabcontent.h
rename to utils/themeeditor/gui/tabcontent.h
diff --git a/utils/themeeditor/parsetreemodel.cpp b/utils/themeeditor/models/parsetreemodel.cpp
similarity index 100%
rename from utils/themeeditor/parsetreemodel.cpp
rename to utils/themeeditor/models/parsetreemodel.cpp
diff --git a/utils/themeeditor/parsetreemodel.h b/utils/themeeditor/models/parsetreemodel.h
similarity index 100%
rename from utils/themeeditor/parsetreemodel.h
rename to utils/themeeditor/models/parsetreemodel.h
diff --git a/utils/themeeditor/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp
similarity index 100%
rename from utils/themeeditor/parsetreenode.cpp
rename to utils/themeeditor/models/parsetreenode.cpp
diff --git a/utils/themeeditor/parsetreenode.h b/utils/themeeditor/models/parsetreenode.h
similarity index 100%
rename from utils/themeeditor/parsetreenode.h
rename to utils/themeeditor/models/parsetreenode.h
diff --git a/utils/themeeditor/projectmodel.cpp b/utils/themeeditor/models/projectmodel.cpp
similarity index 100%
rename from utils/themeeditor/projectmodel.cpp
rename to utils/themeeditor/models/projectmodel.cpp
diff --git a/utils/themeeditor/projectmodel.h b/utils/themeeditor/models/projectmodel.h
similarity index 100%
rename from utils/themeeditor/projectmodel.h
rename to utils/themeeditor/models/projectmodel.h
diff --git a/utils/themeeditor/skin_debug.c b/utils/themeeditor/parser/skin_debug.c
similarity index 100%
rename from utils/themeeditor/skin_debug.c
rename to utils/themeeditor/parser/skin_debug.c
diff --git a/utils/themeeditor/skin_debug.h b/utils/themeeditor/parser/skin_debug.h
similarity index 100%
rename from utils/themeeditor/skin_debug.h
rename to utils/themeeditor/parser/skin_debug.h
diff --git a/utils/themeeditor/skin_parser.c b/utils/themeeditor/parser/skin_parser.c
similarity index 100%
rename from utils/themeeditor/skin_parser.c
rename to utils/themeeditor/parser/skin_parser.c
diff --git a/utils/themeeditor/skin_parser.h b/utils/themeeditor/parser/skin_parser.h
similarity index 100%
rename from utils/themeeditor/skin_parser.h
rename to utils/themeeditor/parser/skin_parser.h
diff --git a/utils/themeeditor/skin_scan.c b/utils/themeeditor/parser/skin_scan.c
similarity index 100%
rename from utils/themeeditor/skin_scan.c
rename to utils/themeeditor/parser/skin_scan.c
diff --git a/utils/themeeditor/skin_scan.h b/utils/themeeditor/parser/skin_scan.h
similarity index 100%
rename from utils/themeeditor/skin_scan.h
rename to utils/themeeditor/parser/skin_scan.h
diff --git a/utils/themeeditor/symbols.h b/utils/themeeditor/parser/symbols.h
similarity index 100%
rename from utils/themeeditor/symbols.h
rename to utils/themeeditor/parser/symbols.h
diff --git a/utils/themeeditor/tag_table.c b/utils/themeeditor/parser/tag_table.c
similarity index 100%
rename from utils/themeeditor/tag_table.c
rename to utils/themeeditor/parser/tag_table.c
diff --git a/utils/themeeditor/tag_table.h b/utils/themeeditor/parser/tag_table.h
similarity index 100%
rename from utils/themeeditor/tag_table.h
rename to utils/themeeditor/parser/tag_table.h
diff --git a/utils/themeeditor/themeeditor.pro b/utils/themeeditor/themeeditor.pro
index ef3f4995ff..213bcd82d3 100644
--- a/utils/themeeditor/themeeditor.pro
+++ b/utils/themeeditor/themeeditor.pro
@@ -4,37 +4,43 @@ OBJECTS_DIR = $$MYBUILDDIR/o
 UI_DIR = $$MYBUILDDIR/ui
 MOC_DIR = $$MYBUILDDIR/moc
 RCC_DIR = $$MYBUILDDIR/rcc
-HEADERS += tag_table.h \
-    symbols.h \
-    skin_parser.h \
-    skin_scan.h \
-    skin_debug.h \
-    parsetreemodel.h \
-    parsetreenode.h \
-    editorwindow.h \
-    skinhighlighter.h \
-    skindocument.h \
-    preferencesdialog.h \
-    codeeditor.h \
-    projectmodel.h \
-    tabcontent.h \
-    configdocument.h \
-    skinviewer.h
-SOURCES += tag_table.c \
-    skin_parser.c \
-    skin_scan.c \
-    skin_debug.c \
+
+#Include directories
+INCLUDEPATH += gui
+INCLUDEPATH += parser
+INCLUDEPATH += models
+
+HEADERS += parser/tag_table.h \
+    parser/symbols.h \
+    parser/skin_parser.h \
+    parser/skin_scan.h \
+    parser/skin_debug.h \
+    models/parsetreemodel.h \
+    models/parsetreenode.h \
+    gui/editorwindow.h \
+    gui/skinhighlighter.h \
+    gui/skindocument.h \
+    gui/preferencesdialog.h \
+    gui/codeeditor.h \
+    models/projectmodel.h \
+    gui/tabcontent.h \
+    gui/configdocument.h \
+    gui/skinviewer.h
+SOURCES += parser/tag_table.c \
+    parser/skin_parser.c \
+    parser/skin_scan.c \
+    parser/skin_debug.c \
     main.cpp \
-    parsetreemodel.cpp \
-    parsetreenode.cpp \
-    editorwindow.cpp \
-    skinhighlighter.cpp \
-    skindocument.cpp \
-    preferencesdialog.cpp \
-    codeeditor.cpp \
-    projectmodel.cpp \
-    configdocument.cpp \
-    skinviewer.cpp
+    models/parsetreemodel.cpp \
+    models/parsetreenode.cpp \
+    gui/editorwindow.cpp \
+    gui/skinhighlighter.cpp \
+    gui/skindocument.cpp \
+    gui/preferencesdialog.cpp \
+    gui/codeeditor.cpp \
+    models/projectmodel.cpp \
+    gui/configdocument.cpp \
+    gui/skinviewer.cpp
 OTHER_FILES += README \
     resources/windowicon.png \
     resources/appicon.xcf \
@@ -42,8 +48,8 @@ OTHER_FILES += README \
     resources/document-save.png \
     resources/document-open.png \
     resources/document-new.png
-FORMS += editorwindow.ui \
-    preferencesdialog.ui \
-    configdocument.ui \
-    skinviewer.ui
+FORMS += gui/editorwindow.ui \
+    gui/preferencesdialog.ui \
+    gui/configdocument.ui \
+    gui/skinviewer.ui
 RESOURCES += resources.qrc