Index: dialin/__init__.py
===================================================================
diff -u -r5818c70699fbe02a31d136f440baee0d9f2cb39d -rb543d90a50cbef509d10f4c1412d87bf6eee2e4e
--- dialin/__init__.py	(.../__init__.py)	(revision 5818c70699fbe02a31d136f440baee0d9f2cb39d)
+++ dialin/__init__.py	(.../__init__.py)	(revision b543d90a50cbef509d10f4c1412d87bf6eee2e4e)
@@ -1,3 +1,6 @@
 from .version import VERSION
+from .hd.hemodialysis_device import HD
+from .dg.dialysate_generator import DG
+from .ui.hd_proxy import HDSimulator
 
 __version__= VERSION
\ No newline at end of file
Index: dialin/common/__init__.py
===================================================================
diff -u -r80501868a8f9a2c145945bbebb486fb3a32edfb2 -rb543d90a50cbef509d10f4c1412d87bf6eee2e4e
--- dialin/common/__init__.py	(.../__init__.py)	(revision 80501868a8f9a2c145945bbebb486fb3a32edfb2)
+++ dialin/common/__init__.py	(.../__init__.py)	(revision b543d90a50cbef509d10f4c1412d87bf6eee2e4e)
@@ -1 +1,2 @@
+from .alarm_defs import AlarmList, AlarmPriorities
+from .msg_defs import MsgIds
\ No newline at end of file
Index: dialin/dg/__init__.py
===================================================================
diff -u -r4bdb012848d1b59be5edc31d677b77b9d95f6190 -rb543d90a50cbef509d10f4c1412d87bf6eee2e4e
--- dialin/dg/__init__.py	(.../__init__.py)	(revision 4bdb012848d1b59be5edc31d677b77b9d95f6190)
+++ dialin/dg/__init__.py	(.../__init__.py)	(revision b543d90a50cbef509d10f4c1412d87bf6eee2e4e)
@@ -13,4 +13,14 @@
 # @date (original) 02-Apr-2020
 #
 ############################################################################
-from ..utils.base import _AbstractSubSystem, _publish
+from .dialysate_generator import DG
+from .constants import RESET, NO_RESET
+from .drain_pump import DGDrainPump
+from .hd_proxy import DGHDProxy
+from .heaters import Heaters
+from .load_cells import DGLoadCells
+from .pressures import DGPressures
+from .reservoirs import DGReservoirs
+from .ro_pump import DGROPump
+from .temperature_sensors import TemperatureSensors
+from .valves import DGValves
Index: dialin/hd/__init__.py
===================================================================
diff -u -r8c39fe1f9affe360ee6a97c5e6243e58a5c27509 -rb543d90a50cbef509d10f4c1412d87bf6eee2e4e
--- dialin/hd/__init__.py	(.../__init__.py)	(revision 8c39fe1f9affe360ee6a97c5e6243e58a5c27509)
+++ dialin/hd/__init__.py	(.../__init__.py)	(revision b543d90a50cbef509d10f4c1412d87bf6eee2e4e)
@@ -1 +1,12 @@
+from .hemodialysis_device import HD
+from .alarms import HDAlarms
+from .blood_flow import HDBloodFlow
+from .buttons import HDButtons
+from .constants import RESET, NO_RESET, BUTTON_PRESSED, BUTTON_RELEASED
+from .dialysate_inlet_flow import HDDialysateInletFlow
+from .dialysate_outlet_flow import HDDialysateOutletFlow
+from .pressure_occlusion import HDPressureOcclusion
+from .rtc import HDRTC
+from .treatment import HDTreatment
+from .ui_proxy import HDUIProxy
+from .watchdog import HDWatchdog
Index: dialin/protocols/__init__.py
===================================================================
diff -u -r8c39fe1f9affe360ee6a97c5e6243e58a5c27509 -rb543d90a50cbef509d10f4c1412d87bf6eee2e4e
--- dialin/protocols/__init__.py	(.../__init__.py)	(revision 8c39fe1f9affe360ee6a97c5e6243e58a5c27509)
+++ dialin/protocols/__init__.py	(.../__init__.py)	(revision b543d90a50cbef509d10f4c1412d87bf6eee2e4e)
@@ -1 +1,4 @@
+from .CAN import DenaliCanMessenger
+from .CAN import DenaliChannels
+from .CAN import LongDenaliMessageBuilder
+from .CAN import DenaliMessage
Index: tests/test_hd.py
===================================================================
diff -u -r8d1f61499650e23dac6f857e48daad42180db949 -rb543d90a50cbef509d10f4c1412d87bf6eee2e4e
--- tests/test_hd.py	(.../test_hd.py)	(revision 8d1f61499650e23dac6f857e48daad42180db949)
+++ tests/test_hd.py	(.../test_hd.py)	(revision b543d90a50cbef509d10f4c1412d87bf6eee2e4e)
@@ -16,7 +16,7 @@
 import sys
 sys.path.append("..")
 from dialin.hd.constants import RESET, NO_RESET
-from dialin.hd.hemodialysis_device import HD
+from dialin import HD
 from time import sleep
 import unittest
 
Index: tests/unit_tests/test_imports.py
===================================================================
diff -u -rc3cc81dada72714b9675594cc0c6a79975e8991d -rb543d90a50cbef509d10f4c1412d87bf6eee2e4e
--- tests/unit_tests/test_imports.py	(.../test_imports.py)	(revision c3cc81dada72714b9675594cc0c6a79975e8991d)
+++ tests/unit_tests/test_imports.py	(.../test_imports.py)	(revision b543d90a50cbef509d10f4c1412d87bf6eee2e4e)
@@ -74,6 +74,34 @@
                                    unittests,
                                    utils)
 
+    def test_package_imports(self):
+        from dialin import HD, HDSimulator, DG
 
+        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 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
+
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)