Index: denali.pro
===================================================================
diff -u -r4a6abe765f03feae8100ec660aa04aa218d4dfa3 -r595ed1fbe8066960afd4c8fea168208e81b173d9
--- denali.pro	(.../denali.pro)	(revision 4a6abe765f03feae8100ec660aa04aa218d4dfa3)
+++ denali.pro	(.../denali.pro)	(revision 595ed1fbe8066960afd4c8fea168208e81b173d9)
@@ -28,14 +28,17 @@
 INCLUDEPATH += \
     sources \
     sources/model \
+    sources/view \
     sources/storage \
     sources/gui \
-    sources/gui/view \
     sources/canbus \
     sources/utility \
     sources/abstract
 
 HEADERS += \
+    sources/main.h \
+    sources/maintimer.h \
+    sources/threads.h \
     sources/applicationcontroller.h \
     sources/applicationpost.h \
     sources/canbus/caninterface.h \
@@ -50,25 +53,32 @@
     sources/gui/guiglobals.h \
     sources/gui/guiview.h \
     sources/gui/guicontroller.h \
-    sources/gui/view/valarmstatus.h \
-    sources/gui/view/vtreatmentflows.h \
-    sources/gui/view/vtreatmenttime.h \
-    sources/gui/view/vtreatmentultrafiltration.h \
-    sources/main.h \
-    sources/maintimer.h \
-    sources/model/model.h \
+    sources/model/malarmstatus.h \
+    sources/model/mmodel.h \
+    sources/model/mpoweroff.h \
+    sources/model/mtreatmentflows.h \
+    sources/model/mtreatmentoutletflow.h \
+    sources/model/mtreatmenttime.h \
+    sources/view/vview.h \
+    sources/view/vpoweroff.h \
+    sources/view/vtreatmentbloodflow.h \
+    sources/view/vtreatmentdialysateflow.h \
+    sources/view/vtreatmenttime.h \
+    sources/view/vtreatmentultrafiltration.h \
+    sources/view/valarmstatus.h \
     sources/storage/filehandler.h \
     sources/storage/logger.h \
-#    sources/storage/settings.h \
     sources/storage/storageglobals.h \
     sources/storage/usbwatcher.h \
-    sources/threads.h \
+#    sources/storage/settings.h \
     sources/utility/crc.h \
     sources/utility/format.h \
     sources/utility/types.h
 
 SOURCES += \
     main.cpp \
+    sources/maintimer.cpp \
+    sources/threads.cpp \
     sources/applicationcontroller.cpp \
     sources/applicationpost.cpp \
     sources/canbus/caninterface.cpp \
@@ -82,18 +92,22 @@
     sources/gui/guiglobals.cpp \
     sources/gui/guiview.cpp \
     sources/gui/guicontroller.cpp \
-    sources/gui/view/valarmstatus.cpp \
-    sources/gui/view/vtreatmentflows.cpp \
-    sources/gui/view/vtreatmenttime.cpp \
-    sources/gui/view/vtreatmentultrafiltration.cpp \
-    sources/maintimer.cpp \
-    sources/model/model.cpp \
+    sources/model/mpoweroff.cpp \
+    sources/model/mtreatmentflows.cpp \
+    sources/model/mtreatmentoutletflow.cpp \
+    sources/model/mtreatmenttime.cpp \
+    sources/model/malarmstatus.cpp \
+    sources/view/vpoweroff.cpp \
+    sources/view/vtreatmentbloodflow.cpp \
+    sources/view/vtreatmentdialysateflow.cpp \
+    sources/view/vtreatmentultrafiltration.cpp \
+    sources/view/vtreatmenttime.cpp \
+    sources/view/valarmstatus.cpp \
     sources/storage/filehandler.cpp \
     sources/storage/logger.cpp \
-#    sources/storage/settings.cpp \
     sources/storage/storageglobals.cpp \
     sources/storage/usbwatcher.cpp \
-    sources/threads.cpp \
+#    sources/storage/settings.cpp \
     sources/utility/crc.cpp \
     sources/utility/format.cpp \
     sources/utility/types.cpp