Index: simulator/run.py
===================================================================
diff -u -rc13dc6ba2410716a3f1c446e564085aeb9114a60 -rcb8d48033154f4b36a6a05b6f31bd10390e84ac7
--- simulator/run.py	(.../run.py)	(revision c13dc6ba2410716a3f1c446e564085aeb9114a60)
+++ simulator/run.py	(.../run.py)	(revision cb8d48033154f4b36a6a05b6f31bd10390e84ac7)
@@ -2,19 +2,20 @@
 import sys
 
 # import project classes
-# import names
-from dialin.squish import utils
-from dialin.squish.denaliMessages import txStates
+from dialin.ui import utils
+from dialin import HDSimulator
+from dialin.ui.hd_simulator import TXStates, EResponse
 # Import PySide2 classes
 from PySide2 import QtCore, QtWidgets
 from PySide2.QtCore import Qt
-
 from runtimewidget import RunTimeWidget
 # later it's planed to load all the classes in plugin folder dynamically
 # so used * in here to load all
 from plugins import *
 
+HDSimulator = HDSimulator()
 
+
 class Simulator(RunTimeWidget):
     """
     The simulator class which loads the ui file dynamically and initializes the objects
@@ -55,7 +56,7 @@
 
     def __init__(self):
         super().__init__("simulator.ui")
-        self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE
+        self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IDLE
         self.initialize()
         self.init_widgets()
         self.init_connections()
@@ -66,7 +67,6 @@
         :return: none
         """
         self.mdiArea = self.find_widget(QtWidgets.QMdiArea, 'mdiArea')
-
         # TODO: this section needs to change to go over the folders in the plugins folder and load each automatically
 
         self.act_treatmentstates = self.find_action('actTreatmentStates')