Index: drydemo.pro
===================================================================
diff -u -rbec9c9856c333399aa5abaf18d2799f6fbc95da3 -r61e26e538aae580369385eb78a966e74240d79c4
--- drydemo.pro	(.../drydemo.pro)	(revision bec9c9856c333399aa5abaf18d2799f6fbc95da3)
+++ drydemo.pro	(.../drydemo.pro)	(revision 61e26e538aae580369385eb78a966e74240d79c4)
@@ -54,21 +54,21 @@
     sources/utility \
     sources/abstract \
     sources/model \
+    sources/drydemo \
     sources/model/settings \
 
 HEADERS += \
     \ # Main
+    \ # ---------- States ----------
+    sources/drydemo/StateController.h \
     sources/main.h \
     sources/Threads.h \
     sources/MainTimer.h \
     sources/ApplicationPost.h \         # TODO clean up
     sources/MessageGlobals.h \
     \ # Controllers
     sources/ApplicationController.h \
-    sources/model/MessageDefines.h \
     sources/storage/Settings.h \
-    \ # ---------- States ----------
-    sources/StateController.h \
     sources/model/MAbstract.h \     # TODO is this needed?
     sources/model/settings/MSettings.h \
     \ # CANBus
@@ -98,10 +98,10 @@
     sources/ApplicationPost.cpp \
     \ # Controllers
     sources/ApplicationController.cpp \
-    sources/model/MessageDefines.cpp \
-    sources/storage/Settings.cpp \
     \ # ---------- States ----------
-    sources/StateController.cpp \
+    sources/drydemo/StateController.cpp \
+    sources/drydemo/StateControllerTreatment.cpp \
+    sources/storage/Settings.cpp \
     \ # ---------- Models ----------
     sources/model/MAbstract.cpp \
     \ # ---------- Models - settings