Index: tests/unit_tests/test_imports.py
===================================================================
diff -u -r72c423da1d07c40699f40b5da5bee6d992d3082c -reb02c56e88faeeda46ed62b1c0ec841dca0b9aba
--- tests/unit_tests/test_imports.py	(.../test_imports.py)	(revision 72c423da1d07c40699f40b5da5bee6d992d3082c)
+++ tests/unit_tests/test_imports.py	(.../test_imports.py)	(revision eb02c56e88faeeda46ed62b1c0ec841dca0b9aba)
@@ -20,119 +20,85 @@
 
 class Test(unittest.TestCase):
 
-    def test_td_imports(self):
+    def test_hd_imports(self):
+        from dialin.hd.alarms import HDAlarms
+        from dialin.hd.blood_flow import HDBloodFlow
+        from dialin.hd.buttons import HDButtons
+        from dialin.hd.constants import RESET, NO_RESET
+        from dialin.hd.dialysate_inlet_flow import HDDialysateInletFlow
+        from dialin.hd.dialysate_outlet_flow import HDDialysateOutletFlow
+        from dialin.hd.hemodialysis_device import HD
+        from dialin.hd.pressure_occlusion import HDPressureOcclusion
+        from dialin.hd.rtc import HDRTC
+        from dialin.hd.treatment import HDTreatment
+        from dialin.hd.ui_proxy import HDUIProxy
+        from dialin.hd.watchdog import HDWatchdog
 
-        from leahi_dialin.td import TD
-        from leahi_dialin.td.modules.air_pump import TDAirPump
-        from leahi_dialin.td.modules.air_trap import TDAirTrap
-        from leahi_dialin.td.modules.alarms import TDAlarms
-        from leahi_dialin.td.modules.blood_flow import TDBloodFlow
-        from leahi_dialin.td.modules.bubble_detector import TDBubbleDectector
-        from leahi_dialin.td.modules.ejector import TDEjector
-        from leahi_dialin.td.modules.pressure_sensors import TDPressureSensors
-        from leahi_dialin.td.modules.switches import TDSwitches
-        from leahi_dialin.td.modules.treatment import TDTreatment
-        from leahi_dialin.td.modules.valves import TDValves
-        from leahi_dialin.td.modules.voltages import TDVoltages
+    def test_dg_imports(self):
 
-        from leahi_dialin.td.proxies.dd_proxy import DDProxy
+        from dialin.dg.dialysate_generator import DG
+        from dialin.dg.drain_pump import DGDrainPump
+        from dialin.dg.hd_proxy import DGHDProxy
+        from dialin.dg.load_cells import DGLoadCells
+        from dialin.dg.pressures import DGPressures
+        from dialin.dg.reservoirs import DGReservoirs
 
-    def test_dd_imports(self):
 
-        from leahi_dialin.dd.dialysate_delivery import DD
-        from leahi_dialin.dd.modules.balancing_chamber import DDBalancingChamber
-        from leahi_dialin.dd.modules.concentrate_pump import DDConcentratePumps
-        from leahi_dialin.dd.modules.conductivity_sensors import DDConductivitySensors
-        from leahi_dialin.dd.modules.dialysate_pump import DDDialysatePumps
-        from leahi_dialin.dd.modules.gen_dialysate import DDGenDialysate
-        from leahi_dialin.dd.modules.heaters import DDHeaters
-        from leahi_dialin.dd.modules.levels import DDLevels
-        from leahi_dialin.dd.modules.piston_pump import DDPistonPumps
-        from leahi_dialin.dd.modules.post_gen_dialysate import DDPostGenDialysate
-        from leahi_dialin.dd.modules.pre_gen_dialysate import DDPreGenDialysate
-        from leahi_dialin.dd.modules.pressure_sensors import DDPressureSensors
-        from leahi_dialin.dd.modules.temperature_sensors import DDTemperatureSensors
-        from leahi_dialin.dd.modules.valves import DDValves
-
-    def test_fp_imports(self):
-
-        from leahi_dialin.fp.filtration_purification import FP
-        from leahi_dialin.fp.modules.conductivity_sensors import FPConductivitySensors
-        from leahi_dialin.fp.modules.flow_sensors import FPFlowSensors
-        from leahi_dialin.fp.modules.levels import FPLevels
-        from leahi_dialin.fp.modules.pressure_sensors import FPPressureSensors
-        from leahi_dialin.fp.modules.temperatures import FPTemperatureSensors
-        from leahi_dialin.fp.modules.valves import FPValves
-        from leahi_dialin.fp.modules.water_pumps import FPPumps
-
-
     def test_protocols_imports(self):
 
-        from leahi_dialin.protocols.CAN import (DenaliCanMessenger,
+        from dialin.protocols.CAN import (DenaliCanMessenger,
                                           DenaliMessage,
                                           DenaliChannels,
                                           LongDenaliMessageBuilder)
 
     def test_utils_imports(self):
 
-        from leahi_dialin.utils.conversions import (integer_to_bytearray,
+        from dialin.utils.conversions import (integer_to_bytearray,
                                               float_to_bytearray)
 
     def test_api_version(self):
 
-        import leahi_dialin
-        print(leahi_dialin.__version__)
+        import dialin
+        print(dialin.__version__)
 
     def test_package_imports(self):
-        from leahi_dialin import TD, DD, FP
+        from dialin import HD, HDSimulator, DG
 
-        from leahi_dialin.td import TD
-        from leahi_dialin.td.modules.air_pump import TDAirPump
-        from leahi_dialin.td.modules.air_trap import TDAirTrap
-        from leahi_dialin.td.modules.alarms import TDAlarms
-        from leahi_dialin.td.modules.blood_flow import TDBloodFlow
-        from leahi_dialin.td.modules.bubble_detector import TDBubbleDectector
-        from leahi_dialin.td.modules.ejector import TDEjector
-        from leahi_dialin.td.modules.pressure_sensors import TDPressureSensors
-        from leahi_dialin.td.modules.switches import TDSwitches
-        from leahi_dialin.td.modules.treatment import TDTreatment
-        from leahi_dialin.td.modules.valves import TDValves
-        from leahi_dialin.td.modules.voltages import TDVoltages
+        from dialin.hd import HD
+        from dialin.hd import HDAlarms
+        from dialin.hd import HDBloodFlow
+        from dialin.hd import HDButtons
+        from dialin.hd import RESET, NO_RESET, BUTTON_PRESSED, BUTTON_RELEASED
+        from dialin.hd import HDDialysateInletFlow
+        from dialin.hd import HDDialysateOutletFlow
+        from dialin.hd import HDPressureOcclusion
+        from dialin.hd import HDRTC
+        from dialin.hd import HDTreatment
+        from dialin.hd import HDUIProxy
+        from dialin.hd import HDWatchdog
 
-        from leahi_dialin.td.proxies.dd_proxy import DDProxy
+        from dialin.dg import DG
+        from dialin.dg import RESET, NO_RESET
+        from dialin.dg import DGDrainPump
+        from dialin.dg import DGHDProxy
+        from dialin.dg import Heaters
+        from dialin.dg import DGLoadCells
+        from dialin.dg import DGPressures
+        from dialin.dg import DGReservoirs
+        from dialin.dg import DGROPump
+        from dialin.dg import TemperatureSensors
+        from dialin.dg import DGValves
 
-        from leahi_dialin.dd.dialysate_delivery import DD
-        from leahi_dialin.dd.modules.balancing_chamber import DDBalancingChamber
-        from leahi_dialin.dd.modules.concentrate_pump import DDConcentratePumps
-        from leahi_dialin.dd.modules.conductivity_sensors import DDConductivitySensors
-        from leahi_dialin.dd.modules.dialysate_pump import DDDialysatePumps
-        from leahi_dialin.dd.modules.gen_dialysate import DDGenDialysate
-        from leahi_dialin.dd.modules.heaters import DDHeaters
-        from leahi_dialin.dd.modules.levels import DDLevels
-        from leahi_dialin.dd.modules.piston_pump import DDPistonPumps
-        from leahi_dialin.dd.modules.post_gen_dialysate import DDPostGenDialysate
-        from leahi_dialin.dd.modules.pre_gen_dialysate import DDPreGenDialysate
-        from leahi_dialin.dd.modules.pressure_sensors import DDPressureSensors
-        from leahi_dialin.dd.modules.temperature_sensors import DDTemperatureSensors
-        from leahi_dialin.dd.modules.valves import DDValves
+        from dialin.ui import HDSimulator
 
-        from leahi_dialin.fp.filtration_purification import FP
-        from leahi_dialin.fp.modules.conductivity_sensors import FPConductivitySensors
-        from leahi_dialin.fp.modules.flow_sensors import FPFlowSensors
-        from leahi_dialin.fp.modules.levels import FPLevels
-        from leahi_dialin.fp.modules.pressure_sensors import FPPressureSensors
-        from leahi_dialin.fp.modules.temperatures import FPTemperatureSensors
-        from leahi_dialin.fp.modules.valves import FPValves
-        from leahi_dialin.fp.modules.water_pumps import FPPumps
-
-
     def test_common(self):
-        from leahi_dialin.common import (AlarmList,
+        from dialin.common import (AlarmList,
                                    AlarmPriority,
                                    AlarmFlags,
                                    AlarmPriorities,
                                    MsgIds,
                                    MsgFieldPositions,
+                                   Ranges,
                                    RequestRejectReasons)