35 files changed, 40 insertions, 34 deletions
diff --git a/utils/themeeditor/codeeditor.cpp b/utils/themeeditor/gui/codeeditor.cpp
index 49f4410..49f4410 100644
--- a/utils/themeeditor/codeeditor.cpp
+++ b/utils/themeeditor/gui/codeeditor.cpp
diff --git a/utils/themeeditor/codeeditor.h b/utils/themeeditor/gui/codeeditor.h
index 1771e31..1771e31 100644
--- a/utils/themeeditor/codeeditor.h
+++ b/utils/themeeditor/gui/codeeditor.h
diff --git a/utils/themeeditor/configdocument.cpp b/utils/themeeditor/gui/configdocument.cpp
index a897d3b..a897d3b 100644
--- a/utils/themeeditor/configdocument.cpp
+++ b/utils/themeeditor/gui/configdocument.cpp
diff --git a/utils/themeeditor/configdocument.h b/utils/themeeditor/gui/configdocument.h
index 8493c7a..8493c7a 100644
--- a/utils/themeeditor/configdocument.h
+++ b/utils/themeeditor/gui/configdocument.h
diff --git a/utils/themeeditor/configdocument.ui b/utils/themeeditor/gui/configdocument.ui
index e2f9e7f..e2f9e7f 100644
--- a/utils/themeeditor/configdocument.ui
+++ b/utils/themeeditor/gui/configdocument.ui
diff --git a/utils/themeeditor/editorwindow.cpp b/utils/themeeditor/gui/editorwindow.cpp
index 675520d..675520d 100644
--- a/utils/themeeditor/editorwindow.cpp
+++ b/utils/themeeditor/gui/editorwindow.cpp
diff --git a/utils/themeeditor/editorwindow.h b/utils/themeeditor/gui/editorwindow.h
index 6f73735..6f73735 100644
--- a/utils/themeeditor/editorwindow.h
+++ b/utils/themeeditor/gui/editorwindow.h
diff --git a/utils/themeeditor/editorwindow.ui b/utils/themeeditor/gui/editorwindow.ui
index 10e2c52..10e2c52 100644
--- a/utils/themeeditor/editorwindow.ui
+++ b/utils/themeeditor/gui/editorwindow.ui
diff --git a/utils/themeeditor/preferencesdialog.cpp b/utils/themeeditor/gui/preferencesdialog.cpp
index 8cd9665..8cd9665 100644
--- a/utils/themeeditor/preferencesdialog.cpp
+++ b/utils/themeeditor/gui/preferencesdialog.cpp
diff --git a/utils/themeeditor/preferencesdialog.h b/utils/themeeditor/gui/preferencesdialog.h
index e28a830..e28a830 100644
--- a/utils/themeeditor/preferencesdialog.h
+++ b/utils/themeeditor/gui/preferencesdialog.h
diff --git a/utils/themeeditor/preferencesdialog.ui b/utils/themeeditor/gui/preferencesdialog.ui
index 1da7811..1da7811 100644
--- a/utils/themeeditor/preferencesdialog.ui
+++ b/utils/themeeditor/gui/preferencesdialog.ui
diff --git a/utils/themeeditor/skindocument.cpp b/utils/themeeditor/gui/skindocument.cpp
index 82c7106..82c7106 100644
--- a/utils/themeeditor/skindocument.cpp
+++ b/utils/themeeditor/gui/skindocument.cpp
diff --git a/utils/themeeditor/skindocument.h b/utils/themeeditor/gui/skindocument.h
index c6449ca..c6449ca 100644
--- a/utils/themeeditor/skindocument.h
+++ b/utils/themeeditor/gui/skindocument.h
diff --git a/utils/themeeditor/skinhighlighter.cpp b/utils/themeeditor/gui/skinhighlighter.cpp
index 25a479f..25a479f 100644
--- a/utils/themeeditor/skinhighlighter.cpp
+++ b/utils/themeeditor/gui/skinhighlighter.cpp
diff --git a/utils/themeeditor/skinhighlighter.h b/utils/themeeditor/gui/skinhighlighter.h
index 4d5c68b..4d5c68b 100644
--- a/utils/themeeditor/skinhighlighter.h
+++ b/utils/themeeditor/gui/skinhighlighter.h
diff --git a/utils/themeeditor/skinviewer.cpp b/utils/themeeditor/gui/skinviewer.cpp
index 152450e..152450e 100644
--- a/utils/themeeditor/skinviewer.cpp
+++ b/utils/themeeditor/gui/skinviewer.cpp
diff --git a/utils/themeeditor/skinviewer.h b/utils/themeeditor/gui/skinviewer.h
index 599a204..599a204 100644
--- a/utils/themeeditor/skinviewer.h
+++ b/utils/themeeditor/gui/skinviewer.h
diff --git a/utils/themeeditor/skinviewer.ui b/utils/themeeditor/gui/skinviewer.ui
index ed260d0..ed260d0 100644
--- a/utils/themeeditor/skinviewer.ui
+++ b/utils/themeeditor/gui/skinviewer.ui
diff --git a/utils/themeeditor/tabcontent.h b/utils/themeeditor/gui/tabcontent.h
index 1b153f7..1b153f7 100644
--- a/utils/themeeditor/tabcontent.h
+++ b/utils/themeeditor/gui/tabcontent.h
diff --git a/utils/themeeditor/parsetreemodel.cpp b/utils/themeeditor/models/parsetreemodel.cpp
index a709ea7..a709ea7 100644
--- a/utils/themeeditor/parsetreemodel.cpp
+++ b/utils/themeeditor/models/parsetreemodel.cpp
diff --git a/utils/themeeditor/parsetreemodel.h b/utils/themeeditor/models/parsetreemodel.h
index 55af549..55af549 100644
--- a/utils/themeeditor/parsetreemodel.h
+++ b/utils/themeeditor/models/parsetreemodel.h
diff --git a/utils/themeeditor/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp
index 397031a..397031a 100644
--- a/utils/themeeditor/parsetreenode.cpp
+++ b/utils/themeeditor/models/parsetreenode.cpp
diff --git a/utils/themeeditor/parsetreenode.h b/utils/themeeditor/models/parsetreenode.h
index 7a0807b..7a0807b 100644
--- a/utils/themeeditor/parsetreenode.h
+++ b/utils/themeeditor/models/parsetreenode.h
diff --git a/utils/themeeditor/projectmodel.cpp b/utils/themeeditor/models/projectmodel.cpp
index 632e0aa..632e0aa 100644
--- a/utils/themeeditor/projectmodel.cpp
+++ b/utils/themeeditor/models/projectmodel.cpp
diff --git a/utils/themeeditor/projectmodel.h b/utils/themeeditor/models/projectmodel.h
index 6623917..6623917 100644
--- a/utils/themeeditor/projectmodel.h
+++ b/utils/themeeditor/models/projectmodel.h
diff --git a/utils/themeeditor/skin_debug.c b/utils/themeeditor/parser/skin_debug.c
index 549f7b9..549f7b9 100644
--- a/utils/themeeditor/skin_debug.c
+++ b/utils/themeeditor/parser/skin_debug.c
diff --git a/utils/themeeditor/skin_debug.h b/utils/themeeditor/parser/skin_debug.h
index a550dc4..a550dc4 100644
--- a/utils/themeeditor/skin_debug.h
+++ b/utils/themeeditor/parser/skin_debug.h
diff --git a/utils/themeeditor/skin_parser.c b/utils/themeeditor/parser/skin_parser.c
index 93a7191..93a7191 100644
--- a/utils/themeeditor/skin_parser.c
+++ b/utils/themeeditor/parser/skin_parser.c
diff --git a/utils/themeeditor/skin_parser.h b/utils/themeeditor/parser/skin_parser.h
index 1fc4a7a..1fc4a7a 100644
--- a/utils/themeeditor/skin_parser.h
+++ b/utils/themeeditor/parser/skin_parser.h
diff --git a/utils/themeeditor/skin_scan.c b/utils/themeeditor/parser/skin_scan.c
index 79f7162..79f7162 100644
--- a/utils/themeeditor/skin_scan.c
+++ b/utils/themeeditor/parser/skin_scan.c
diff --git a/utils/themeeditor/skin_scan.h b/utils/themeeditor/parser/skin_scan.h
index b1d04a6..b1d04a6 100644
--- a/utils/themeeditor/skin_scan.h
+++ b/utils/themeeditor/parser/skin_scan.h
diff --git a/utils/themeeditor/symbols.h b/utils/themeeditor/parser/symbols.h
index b4f3128..b4f3128 100644
--- a/utils/themeeditor/symbols.h
+++ b/utils/themeeditor/parser/symbols.h
diff --git a/utils/themeeditor/tag_table.c b/utils/themeeditor/parser/tag_table.c
index 6d82b47..6d82b47 100644
--- a/utils/themeeditor/tag_table.c
+++ b/utils/themeeditor/parser/tag_table.c
diff --git a/utils/themeeditor/tag_table.h b/utils/themeeditor/parser/tag_table.h
index ec9a102..ec9a102 100644
--- a/utils/themeeditor/tag_table.h
+++ b/utils/themeeditor/parser/tag_table.h
diff --git a/utils/themeeditor/themeeditor.pro b/utils/themeeditor/themeeditor.pro
index ef3f499..213bcd8 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