Index: sources/model/mmodel.h
===================================================================
diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3
--- sources/model/mmodel.h	(.../mmodel.h)	(revision 6616f7b9b88efffa42ab605833d296afb76d3cb1)
+++ sources/model/mmodel.h	(.../mmodel.h)	(revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3)
@@ -29,6 +29,7 @@
 #include "mtreatmentadjustultrafiltrationstateresponse.h"
 #include "mtreatmentadjustultrafiltrationeditresponse.h"
 #include "mtreatmentadjustultrafiltrationconfirmresponse.h"
+#include "mtreatmentadjustrequests.h"
 
 /*!
  * \brief Message interpretation instruction
@@ -113,53 +114,7 @@
  * The the only reason thy have been defined to help overloadding the adjusmtent methods
  * Otherwise the parameters are so tiny models.
  */
-namespace Model {
 
-#include "HDDefs.h"
-
-class MAdjustBloodDialysateReq {
-public:
-    quint32     bloodFlow = 0;
-    quint32 dialysateFlow = 0;
-};
-
-class MAdjustDurationReq {
-public:
-    quint32 duratoin = 0;
-};
-
-class MAdjustUltrafiltrationStateReq {
-public:
-    enum State{
-        ePaused     =  0,
-        eRunning    =  1,
-    };
-    State requestedState = ePaused; // the requested state. Initially it's running => paused.
-};
-
-class MAdjustUltrafiltrationReq {
-public:
-    float volume = 0;
-};
-
-class MAdjustUltrafiltrationConfirmReq {
-public:
-    enum Options : quint32 {
-        eDuration  = UF_Adjustments::UF_ADJ_TREATMENT_TIME,
-        eRate      = UF_Adjustments::UF_ADJ_UF_RATE,
-    };
-    float   volume = 0;
-    Options option = eDuration;
-};
-
-}
-
-typedef Model::        MAdjustBloodDialysateReq         AdjustBloodDialysateRequestData;
-typedef Model::              MAdjustDurationReq               AdjustDurationRequestData;
-typedef Model::  MAdjustUltrafiltrationStateReq   AdjustUltrafiltrationStateRequestData;
-typedef Model::       MAdjustUltrafiltrationReq    AdjustUltrafiltrationEditRequestData;
-typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData;
-
 //--------------------------------------------------------------------------------//
 //-------- Please add the model type to the lists below to register them ---------//
 //--------------------------------------------------------------------------------//