Index: leahi.pro
===================================================================
diff -u -rd62949c62c5512952e86a427285ef0dc72344248 -re68c1cc0f53b3c03943af4b70c46b5954603b53a
--- leahi.pro	(.../leahi.pro)	(revision d62949c62c5512952e86a427285ef0dc72344248)
+++ leahi.pro	(.../leahi.pro)	(revision e68c1cc0f53b3c03943af4b70c46b5954603b53a)
@@ -60,6 +60,7 @@
     sources/model/td \
     sources/model/td/data \
     sources/model/td/data/treatment \
+    sources/model/td/data/pretreatment \
     sources/model/td/data/treatmentlog \
     sources/model/td/alarm \
     sources/model/td/adjustment \
@@ -79,6 +80,7 @@
     sources/view/td \
     sources/view/td/data \
     sources/view/td/data/treatment \
+    sources/view/td/data/pretreatment \
     sources/view/td/adjustment/treatment \
     sources/view/td/adjustment/pretreatment \
     sources/view/td/adjustment/posttreatment \
@@ -198,8 +200,6 @@
     sources/model/td/data/MTDValvesData.h \
     sources/model/td/data/MTDVoltageData.h \
     sources/model/td/data/MWaterSampleData.h \
-    sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \
-    sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \
     sources/model/td/data/treatment/MTreatmentBloodFlowData.h \
     sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \
     sources/model/td/data/treatment/MTreatmentHDFData.h \
@@ -231,6 +231,9 @@
     sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \
     sources/model/td/data/treatmentlog/MTreatmentLogEventData.h \
     sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.h \
+    \ # ---------- Models - TD - Data - Pre-Treatment
+    sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \
+    sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \
     \ # ---------- Models - TD - Adjustment - In-Treatment                      //// ----- @LEAHIZED
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h \
@@ -381,7 +384,6 @@
     sources/model/hd/alarm/MAlarmCleared.h \
     sources/model/hd/alarm/MAlarmActiveList.h \
     \ # ---------- Models - States Data
-    sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \
     sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \
     \ # ---------- Models - HD - Adjustment
     sources/model/hd/adjustment/MAdjustRequestsBase.h \
@@ -496,7 +498,6 @@
     \ # ---------- Views - HD - Adjustment - Disinfection
     sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \
     \ # ---------- Views - HD - Data - States
-    sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \
     sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h \
     \ # ---------- Views - HD - Data - Pre-Treatment - Progress
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h \
@@ -588,9 +589,6 @@
     sources/model/td/data/MTDVoltageData.cpp \
     sources/model/td/data/MWaterSampleData.cpp \
     sources/model/td/data/MTDSyringePumpData.cpp \
-    sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \
-    sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \
-    sources/model/td/data/MTDSyringePumpData.cpp \
     sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \
     sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \
     sources/model/td/data/treatment/MTreatmentHDFData.cpp \
@@ -644,6 +642,9 @@
     sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.cpp \
     sources/model/td/data/treatmentlog/MTreatmentLogEventData.cpp \
     sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.cpp \
+    \ # ---------- Models - Data - States
+    sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \
+    sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \
     \ # ---------- Models - TD - Adjustment - In-Treatment
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp \
@@ -686,7 +687,6 @@
     sources/model/hd/alarm/MAlarmCleared.cpp \
     sources/model/hd/alarm/MAlarmActiveList.cpp \
     \ # ---------- Models - Data - States
-    sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \
     sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \
     \ # ---------- Models - TD - Adjustment - Settings
     sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \
@@ -875,7 +875,6 @@
     \ # ---------- Views - HD - Adjustment - Disinfection
     sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \
     \ # ---------- Views - HD - States Data
-    sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \
     sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \
     \ # ---------- Views - HD - Data
     sources/view/hd/data/VHDAccelerometerData.cpp \