Index: drydemo.pro
===================================================================
diff -u -rc8da96049610870d3a8c9c00edc04f80ae62085f -r584874a724b2d3e8c98247d3b0e42d6a34ce9478
--- drydemo.pro	(.../drydemo.pro)	(revision c8da96049610870d3a8c9c00edc04f80ae62085f)
+++ drydemo.pro	(.../drydemo.pro)	(revision 584874a724b2d3e8c98247d3b0e42d6a34ce9478)
@@ -60,7 +60,6 @@
     sources/model/settings \
 
 HEADERS += \
-    \ # common
     \ # Main
     sources/main.h \
     sources/Threads.h \
@@ -69,34 +68,10 @@
     \ # Controllers
     sources/ApplicationController.h \
     sources/storage/Settings.h \
-    \  # sources/storage/TreatmentLog.h # TODO is this needed?
-    \ # ---------- Models ----------
     \ # ---------- States ----------
-    sources/DryDemoStates.h \
-    \        # sources/model/MModel.h # TODO is this needed?
+    sources/StateController.h \
     sources/model/MAbstract.h \     # TODO is this needed?
-    \  # sources/model/MAbstractDynamic.h # TODO is this needed?
-    \ # ---------- Models - confirm
-    \ # ---------- Models - POST
-    \ # ---------- Models - settings
     sources/model/settings/MSettings.h \
-    \ # ---------- Models - Alarm
-    \ # ---------- Models - States Data
-    \ # ---------- Models - HD - Adjustment
-    \ # ---------- Models - HD - Adjustment - Settings
-    \ # ---------- Models - HD - Adjustment - Pre-Treatment
-    \ # ---------- Models - HD - Adjustment - In-Treatment
-    \ # ---------- Models - HD - Adjustment - End-Treatment
-    \ # ---------- Models - HD - Adjustment - Post-Treatment
-    \ # ---------- Models - HD - Adjustment - Disinfeection
-    \ # ---------- Models - HD - Data - Pre-Treatment - Progress
-    \ # ---------- Models - HD - Data
-    \ # ---------- Models - HD - Data - Treatment Log
-    \ # ---------- Models - DG - Adjustment
-    \ # ---------- Models - DG - Adjustment - Settings
-    \ # ---------- Models - DG - Data - Pre-Treatment - Progress
-    \ # ---------- Models - DG - Data - Disinfect - Progress
-    \ # ---------- Models - DG - Data
     \ # CANBus
     sources/canbus/CanInterface.h \
     sources/canbus/FrameInterface.h \
@@ -106,26 +81,6 @@
     sources/canbus/MessageBuilder.h \
     sources/canbus/MessageInterpreter.h \
     sources/canbus/MessageDispatcher.h \
-    \ # Gui
-    \ # ---------- Views ----------
-    \ # ---------- Views - CONFIRM
-    \ # ---------- Views - POST
-    \ # ---------- Views - Settings
-    \ # ---------- Views - Alarm
-    \ # ---------- Views - HD - Adjustment
-    \ # ---------- Views - HD - Adjustment - common
-    \ # ---------- Views - HD - Adjustment - Pre-Treatment
-    \ # ---------- Views - HD - Adjustment - In-Treatment
-    \ # ---------- Views - HD - Adjustment - End-Treatment
-    \ # ---------- Views - HD - Adjustment - Post-Treatment
-    \ # ---------- Views - HD - Adjustment - Disinfection
-    \ # ---------- Views - HD - Data - States
-    \ # ---------- Views - HD - Data - Pre-Treatment - Progress
-    \ # ---------- Views - HD - Data
-    \ # ---------- Views - DG - Data - Pre-Treatment - Progress
-    \ # ---------- Views - DG - Data - Disinfection - Progress
-    \ # ---------- Views - DG - States
-    \ # ---------- Views - DG - Data
     \ # Storage
     sources/storage/StorageGlobals.h \
     sources/storage/Logger.h \
@@ -138,7 +93,6 @@
     sources/utility/qrcodegen.h
 
 SOURCES += \
-    \ # common
     \ # Main
     main.cpp \
     sources/Threads.cpp \
@@ -148,30 +102,11 @@
     sources/ApplicationController.cpp \
     sources/storage/Settings.cpp \
     \ # ---------- States ----------
+    sources/StateController.cpp \
     \ # ---------- Models ----------
-    sources/DryDemoStates.cpp \
     sources/model/MAbstract.cpp \
-    \ # ---------- Models - CONFIRM
-    \ # ---------- Models - POST
     \ # ---------- Models - settings
     sources/model/settings/MSettings.cpp \
-    \ # ---------- Models - Alarm
-    \ # ---------- Models - Data - States
-    \ # ---------- Models - HD - Adjustment
-    \ # ---------- Models - HD - Adjustment - Settings
-    \ # ---------- Models - HD - Adjustment - Pre-Treatment
-    \ # ---------- Models - HD - Adjustment - In-Treatment
-    \ # ---------- Models - HD - Adjustment - End-Treatment
-    \ # ---------- Models - HD - Adjustment - Post-Treatment
-    \ # ---------- Models - HD - Adjustment - Disinfection
-    \ # ---------- Models - HD - Data
-    \ # ---------- Models - HD - Data - Pre-Treatment
-    \ # ---------- Models - HD - Data - Treatment Log
-    \ # ---------- Models - DG - Adjustment
-    \ # ---------- Models - DG - Adjustment - Settings
-    \ # ---------- Models - DG - Data - Pre-Treatment - Progress
-    \ # ---------- Models - DG - Data - Disinfection - Progress
-    \ # ---------- Models - DG - Data
     \ # CANBus
     sources/canbus/CanInterface.cpp \
     sources/canbus/FrameInterface.cpp \
@@ -180,28 +115,6 @@
     sources/canbus/MessageBuilder.cpp \
     sources/canbus/MessageDispatcher.cpp \
     sources/canbus/MessageInterpreter.cpp \
-    \ # Gui
-    \ # ---------- Views ----------
-    \ # ---------- Views - CONFIRM
-    \ # ---------- Views - POST
-    \ # ---------- Views - Alarm
-    \ # ---------- Views - Settings
-    \ # ---------- Views - HD - Adjustment
-    \ # ---------- Views - HD - Adjustment - common
-    \ # ---------- Views - HD - Adjustment - Pre-Treatment
-    \ # ---------- Views - HD - Adjustment - In-Treatment
-    \ # ---------- Views - HD - Adjustment - End-Treatment
-    \ # ---------- Views - HD - Adjustment - Post-Treatment
-    \ # ---------- Views - HD - Adjustment - Disinfection
-    \ # ---------- Views - HD - States Data
-    \ # ---------- Views - HD - Data
-    \ # ---------- Views - HD - Data - Pre-Treatment
-    \ # ---------- Views - HD - Data - In-Treatment
-    \ # ---------- Views - HD - Data - End-Treatment
-    \ # ---------- Views - DG - Data - Pre-Treatment - Progress
-    \ # ---------- Views - DG - Data - Disinfect - Progress
-    \ # ---------- Views - DG - States
-    \ # ---------- Views - DG - Data
     \ # Storage
     sources/storage/StorageGlobals.cpp \
     sources/storage/FileHandler.cpp \