Index: denali.pro
===================================================================
diff -u -r376859852f4d1a07263c44524aec347db29e0133 -r61f16c988a159401c92730b4cbfca5085c77222f
--- denali.pro	(.../denali.pro)	(revision 376859852f4d1a07263c44524aec347db29e0133)
+++ denali.pro	(.../denali.pro)	(revision 61f16c988a159401c92730b4cbfca5085c77222f)
@@ -44,6 +44,7 @@
 INCLUDEPATH += \
     common \
     sources \
+    sources/device \
     sources/storage \
     sources/gui \
     sources/canbus \
@@ -97,15 +98,18 @@
     sources/Threads.h \
     sources/MainTimer.h \
     sources/AlarmGenerator.h \
+    sources/device/DeviceGlobals.h \
     sources/ApplicationPost.h \
     \ # Controllers
     sources/ApplicationController.h \
+    sources/device/DeviceController.h \
     sources/storage/Settings.h \
     sources/storage/TreatmentLog.h \
     sources/wifi/WifiInterface.h \
     \ # ---------- Models ----------
     sources/model/MModel.h \
     sources/model/MAbstract.h \
+    sources/device/DeviceModels.h \
     \ # ---------- Models - settings
     sources/model/settings/MSettings.h \
     sources/model/settings/MWifiNetwork.h \
@@ -223,6 +227,7 @@
     sources/view/VEventSpy.h \
     sources/view/VView.h \
     sources/view/VPowerOff.h \
+    sources/device/DeviceView.h \
     \ # ---------- Views - Settings
     sources/view/settings/VDateTime.h \
     sources/view/settings/VSettings.h \
@@ -306,8 +311,6 @@
     sources/storage/StorageGlobals.h \
     sources/storage/Logger.h \
     sources/storage/FileHandler.h \
-    sources/storage/FileSaver.h \
-    sources/storage/DriveWatcher.h \
     \ # Utility
     sources/utility/crc.h \
     sources/utility/format.h \
@@ -323,11 +326,13 @@
     sources/ApplicationPost.cpp \
     \ # Controllers
     sources/ApplicationController.cpp \
+    sources/device/DeviceController.cpp \
     sources/storage/Settings.cpp \
     sources/storage/TreatmentLog.cpp \
     sources/wifi/WifiInterface.cpp \
     \ # ---------- Models ----------
     sources/model/MAbstract.cpp \
+    sources/device/DeviceModels.cpp \
     \ # ---------- Models - settings
     sources/model/settings/MSettings.cpp \
     \ # ---------- Models - Alarm
@@ -436,6 +441,7 @@
     sources/view/VTreatmentCreate.cpp \
     sources/view/VEventSpy.cpp \
     sources/view/VPowerOff.cpp \
+    sources/device/DeviceView.cpp \
     \ # ---------- Views - Alarm
     sources/view/hd/alarm/VAlarmStatus.cpp \
     sources/view/hd/alarm/VAlarmActiveList.cpp \
@@ -521,8 +527,6 @@
     sources/storage/StorageGlobals.cpp \
     sources/storage/FileHandler.cpp \
     sources/storage/Logger.cpp \
-    sources/storage/DriveWatcher.cpp \
-    sources/storage/FileSaver.cpp \
     \ # Utility
     sources/utility/crc.cpp \
     sources/utility/format.cpp \