Index: simulator/run.py
===================================================================
diff -u -rbefca1db0402e031a5b692aa93dc74bfb314eb9e -r93fe289e1e33e4b2cf824e30f810490f073ecab3
--- simulator/run.py	(.../run.py)	(revision befca1db0402e031a5b692aa93dc74bfb314eb9e)
+++ simulator/run.py	(.../run.py)	(revision 93fe289e1e33e4b2cf824e30f810490f073ecab3)
@@ -4,8 +4,8 @@
 
 # import project classes
 # import names
-from dialin.squish import utils, denaliMessages
-from dialin.squish.denaliMessages import txStates, EResponse
+from dialin.ui import utils, hd_simulator
+from dialin.ui.hd_simulator import txStates, EResponse
 # Import PySide2 classes
 from PySide2.QtUiTools import QUiLoader
 from PySide2 import QtCore, QtWidgets
@@ -262,7 +262,7 @@
             self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IN_PROGRESS
 
         target = self.cmbSalineAcceptTarget.currentText()
-        denaliMessages.setSalineBolusResponse(True, 0, target, self.saline_requested_state)
+        hd_simulator.setSalineBolusResponse(True, 0, target, self.saline_requested_state)
         self.lblSalineAction.setText('Accepted ' + target)
 
     @Slot()
@@ -272,7 +272,7 @@
         :return: none
         """
         reason = self.spnSalineRejectReason.value()
-        denaliMessages.setSalineBolusResponse(False, reason, 0, self.saline_requested_state)
+        hd_simulator.setSalineBolusResponse(False, reason, 0, self.saline_requested_state)
         self.lblSalineAction.setText('Rejected ' + "{}".format(reason))
 
     @Slot()
@@ -281,7 +281,7 @@
         the slot for accept ultrafiltration pause button
         :return: none
         """
-        denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse(
+        hd_simulator.setTreatmentAdjustUltrafiltrationStateResponse(
             EResponse.Accepted, 0, txStates.UF_PAUSED_STATE)
         self.lblUfPauseAction.setText('Accepted ')
 
@@ -292,7 +292,7 @@
         :return: none
         """
         reason = self.spnUfPauseRejectReason.value()
-        denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse(
+        hd_simulator.setTreatmentAdjustUltrafiltrationStateResponse(
             EResponse.Rejected, reason, txStates.UF_RUNNING_STATE)
         self.lblUfPauseAction.setText('Rejected ' + "{}".format(reason))
 
@@ -302,7 +302,7 @@
         the slot for accept ultrafiltration resume accept
         :return: none
         """
-        denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse(
+        hd_simulator.setTreatmentAdjustUltrafiltrationStateResponse(
             EResponse.Accepted, 0, txStates.UF_RUNNING_STATE)
         self.lblUfResumeAction.setText('Accepted ')
 
@@ -313,7 +313,7 @@
         :return: none
         """
         reason = self.spnUfResumeRejectReason.value()
-        denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse(
+        hd_simulator.setTreatmentAdjustUltrafiltrationStateResponse(
             EResponse.Rejected, reason, txStates.UF_PAUSED_STATE)
         self.lblUfResumeAction.setText('Rejected ' + "{}".format(reason))
 
@@ -323,7 +323,7 @@
         the slot for accept ultrafiltration next button
         :return: none
         """
-        denaliMessages.setTreatmentAdjustUltrafiltrationEditResponse(
+        hd_simulator.setTreatmentAdjustUltrafiltrationEditResponse(
             EResponse.Accepted, 0, 2500, 60, 0, 10, 0, 10)
         self.lblUfEditAction.setText('Accepted ')
 
@@ -334,7 +334,7 @@
         :return: none
         """
         reason = self.spnUfEditRejectReason.value()
-        denaliMessages.setTreatmentAdjustUltrafiltrationEditResponse(
+        hd_simulator.setTreatmentAdjustUltrafiltrationEditResponse(
             EResponse.Rejected, reason, 2500, 60, 0, 10, 0, 10)
         self.lblUfEditAction.setText('Rejected ' + "{}".format(reason))
 
@@ -347,7 +347,7 @@
         sub_mode = self.tblSalineSubMode.verticalHeaderItem(self.tblSalineSubMode.currentRow()).text()
         uf_state = self.tblSalineUFStates.verticalHeaderItem(self.tblSalineUFStates.currentRow()).text()
         saline = self.tblSalineSalineStates.verticalHeaderItem(self.tblSalineSalineStates.currentRow()).text()
-        denaliMessages.setTreatmentStatesData(sub_mode, uf_state, saline)
+        hd_simulator.setTreatmentStatesData(sub_mode, uf_state, saline)
 
     @Slot()
     def do_saline_data(self):
@@ -356,25 +356,25 @@
         by calling the denaliMessage API setTreatmentSalineBolusData
         :return: none
         """
-        denaliMessages.setTreatmentSalineBolusData(self.sldSalineTarget.value(),
-                                                   self.sldSalineCumulative.value(),
-                                                   self.sldSalineVolume.value())
+        hd_simulator.setTreatmentSalineBolusData(self.sldSalineTarget.value(),
+                                                 self.sldSalineCumulative.value(),
+                                                 self.sldSalineVolume.value())
 
     @Slot()
     def do_uf_volume_data(self):
         """
         sends the ultrafiltration delivered volume message
         :return: none
         """
-        denaliMessages.setTreatmentUltrafiltration(self.sldUfVolume.value(), 0, 0, 0, 0, 0, 0)
+        hd_simulator.setTreatmentUltrafiltration(self.sldUfVolume.value(), 0, 0, 0, 0, 0, 0)
 
     @Slot()
     def do_ranges_data(self):
         """
         sends the treatment ranges message with given value on the screen
         :return: none
         """
-        denaliMessages.setTreatmentParamRanges(
+        hd_simulator.setTreatmentParamRanges(
             self.spnDurationMin.value(),
             self.spnDurationMax.value(),
             self.spnUFVolumeMin.value(),