Index: denali.pro
===================================================================
diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a
--- denali.pro	(.../denali.pro)	(revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f)
+++ denali.pro	(.../denali.pro)	(revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a)
@@ -52,6 +52,7 @@
     sources/model \
     sources/model/settings \
     sources/model/hd/adjustment \
+    sources/model/hd/adjustment/disinfect \
     sources/model/hd/adjustment/settings \
     sources/model/hd/adjustment/pretreatment \
     sources/model/hd/adjustment/treatment \
@@ -62,20 +63,26 @@
     sources/model/hd/data/treatment \
     sources/model/hd/data/posttreatment \
     sources/model/dg/data \
+    sources/model/dg/data/pretreatment \
+    sources/model/dg/data/disinfect \
     sources/model/dg/adjustment \
     sources/model/dg/adjustment/settings \
     sources/view \
     sources/view/settings \
+    sources/view/pretreatment \
     sources/view/hd/adjustment \
     sources/view/hd/adjustment/pretreatment \
     sources/view/hd/adjustment/treatment \
     sources/view/hd/adjustment/posttreatment \
+    sources/view/hd/adjustment/disinfect \
     sources/view/hd/alarm \
     sources/view/hd/data \
     sources/view/hd/data/pretreatment \
     sources/view/hd/data/treatment \
     sources/view/hd/data/posttreatment \
-    sources/view/dg/data
+    sources/view/dg/data \
+    sources/view/dg/data/pretreatment \
+    sources/view/dg/data/disinfect
 
 HEADERS += \
     \ # common
@@ -90,8 +97,6 @@
     sources/AlarmGenerator.h \
     sources/ApplicationPost.h \
     \ # Controllers
-    sources/model/dg/adjustment/settings/MAdjustDGRequests.h \
-    sources/model/hd/adjustment/settings/MAdjustHDRequests.h \
     sources/storage/Settings.h \
     sources/ApplicationController.h \
     \ # ---------- Models ----------
@@ -107,6 +112,7 @@
     \ # ---------- Models - HD - Adjustment
     sources/model/hd/adjustment/MAdjustRequestsBase.h \
     sources/model/hd/adjustment/MAdjustPowerOff.h \
+    sources/model/hd/adjustment/settings/MAdjustHDRequests.h \
     \ # ---------- Models - HD - Adjustment - Settings
     sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h \
     sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h \
@@ -138,6 +144,9 @@
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h \
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h \
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h \
+    \ # ---------- Models - HD - Adjustment - Disinfeection
+    sources/model/hd/adjustment/disinfect/MDisinfectAdjustRequests.h \
+    sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.h \
     \ # ---------- Models - HD - States Data
     sources/model/hd/data/MHDOperationModeData.h \
     sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \
@@ -161,11 +170,18 @@
     sources/model/hd/data/treatment/MTreatmentRecirculateData.h \
     sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h \
     \ # ---------- Models - DG - Adjustment
+    sources/model/dg/adjustment/settings/MAdjustDGRequests.h \
     \ # ---------- Models - DG - Adjustment - Settings
     sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h \
     sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h \
     \ # ---------- Models - DG - Data - Pre-Treatment - Progress
-    sources/model/dg/data/MDGFilterFlushData.h \
+    sources/model/dg/data/pretreatment/MDGFilterFlushData.h \
+    \ # ---------- Models - DG - Data - Disinfect - Progress
+    sources/model/dg/data/disinfect/MDisinfectDGFlushData.h \
+    sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.h \
+    sources/model/dg/data/disinfect/MDisinfectDGHeatTemperatureData.h \
+    sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.h \
+    sources/model/dg/data/disinfect/MDisinfectDGChemicalTBDData.h \
     \ # ---------- Models - DG - Data
     sources/model/dg/data/MDGDebugText.h \
     sources/model/dg/data/MDGDrainPumpData.h \
@@ -231,6 +247,8 @@
     sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h \
     sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h \
     sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h \
+    \ # ---------- Views - HD - Adjustment - Disinfection
+    sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \
     \ # ---------- Views - HD - Data - States
     sources/view/hd/data/VHDOperationModeData.h \
     sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \
@@ -254,7 +272,9 @@
     sources/view/hd/data/treatment/VTreatmentRecirculateData.h \
     sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h \
     \ # ---------- Views - DG - Data - Pre-Treatment - Progress
-    sources/view/dg/data/VDGFilterFlushData.h \
+    sources/view/dg/data/pretreatment/VDGFilterFlushData.h \
+    \ # ---------- Views - DG - Data - Disinfection - Progress
+    sources/view/dg/data/disinfect/VDisinfectDGData.h \
     \ # ---------- Views - DG - Data
     sources/view/dg/data/VDGOperationModeData.h \
     sources/view/dg/data/VDGDrainPumpData.h \
@@ -327,6 +347,8 @@
     \ # ---------- Models - HD - Adjustment - Post-Treatment
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp \
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp \
+    \ # ---------- Models - HD - Adjustment - Disinfection
+    sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.cpp \
     \ # ---------- Models - HD - Data
     \ # ---------- Models - HD - Data - Pre-Treatment
     sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \
@@ -355,7 +377,13 @@
     sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp \
     sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp \
     \ # ---------- Models - DG - Data - Pre-Treatment - Progress
-    sources/model/dg/data/MDGFilterFlushData.cpp \
+    sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp \
+    \ # ---------- Models - DG - Data - Disinfection - Progress
+    sources/model/dg/data/disinfect/MDisinfectDGFlushData.cpp \
+    sources/model/dg/data/disinfect/MDisinfectDGHeatTimeData.cpp \
+    sources/model/dg/data/disinfect/MDisinfectDGHeatTemperatureData.cpp \
+    sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.cpp \
+    sources/model/dg/data/disinfect/MDisinfectDGChemicalTBDData.cpp \
     \ # ---------- Models - DG - Data
     sources/model/dg/data/MDGDebugText.cpp \
     sources/model/dg/data/MDGDrainPumpData.cpp \
@@ -419,6 +447,8 @@
     sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp \
     sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp \
     sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp \
+    \ # ---------- Views - HD - Adjustment - Disinfection
+    sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \
     \ # ---------- Views - HD - States Data
     sources/view/hd/data/VHDOperationModeData.cpp \
     sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \
@@ -444,7 +474,9 @@
     sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp \
     sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp \
     \ # ---------- Views - DG - Data - Pre-Treatment - Progress
-    sources/view/dg/data/VDGFilterFlushData.cpp \
+    sources/view/dg/data/pretreatment/VDGFilterFlushData.cpp \
+    \ # ---------- Views - DG - Data - Disinfect - Progress
+    sources/view/dg/data/disinfect/VDisinfectDGData.cpp \
     \ # ---------- Views - DG - Data
     sources/view/dg/data/VDGDrainPumpData.cpp \
     sources/view/dg/data/VDGHeatersData.cpp \