Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -r5ac4d7d984a093a2e76df9ecef4b3753f76b6abd -r8a3a1047368db91a54399f3d0d30548fe55c222d
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 5ac4d7d984a093a2e76df9ecef4b3753f76b6abd)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 8a3a1047368db91a54399f3d0d30548fe55c222d)
@@ -150,36 +150,33 @@
 
         # Create command groups
         self.accel = DGAccelerometer(self.can_interface, self.logger)
-        self.fluid_leak = DGFluidLeak(self.can_interface, self.logger)
         self.alarms = DGAlarms(self.can_interface, self.logger)
+        self.calibration_record = DGCalibrationNVRecord(self.can_interface, self.logger)
+        self.chemical_disinfect = ChemicalDisinfect(self.can_interface, self.logger)
         self.concentrate_pumps = ConcentratePumps(self.can_interface, self.logger)
         self.conductivity_sensors = ConductivitySensors(self.can_interface, self.logger)
         self.drain_pump = DGDrainPump(self.can_interface, self.logger)
         self.fans = Fans(self.can_interface, self.logger)
+        self.fluid_leak = DGFluidLeak(self.can_interface, self.logger)
+        self.flush = FlushMode(self.can_interface, self.logger)
         self.hd_proxy = DGHDProxy(self.can_interface, self.logger)
+        self.heat_disinfect = HeatDisinfect(self.can_interface, self.logger)
         self.heaters = Heaters(self.can_interface, self.logger)
         self.load_cells = DGLoadCells(self.can_interface, self.logger)
         self.pressures = DGPressures(self.can_interface, self.logger)
         self.reservoirs = DGReservoirs(self.can_interface, self.logger)
         self.ro_pump = DGROPump(self.can_interface, self.logger)
+        self.rtc = DGRTC(self.can_interface, self.logger)
         self.samplewater = DGSampleWater(self.can_interface, self.logger)
+        self.scheduled_runs_record = DGScheduledRunsNVRecord(self.can_interface, self.logger)
+        self.service_record = DGServiceNVRecord(self.can_interface, self.logger)
+        self.switches = DGSwitches(self.can_interface, self.logger)
+        self.system_record = DGSystemNVRecord(self.can_interface, self.logger)
         self.temperature_sensors = TemperatureSensors(self.can_interface, self.logger)
-        self.conductivity_sensors = ConductivitySensors(self.can_interface, self.logger)
-        self.concentrate_pumps = ConcentratePumps(self.can_interface, self.logger)
-        self.alarms = DGAlarms(self.can_interface, self.logger)
-        self.heat_disinfect = HeatDisinfect(self.can_interface, self.logger)
         self.thermistors = Thermistors(self.can_interface, self.logger)
         self.uv_reactors = UVReactors(self.can_interface, self.logger)
-        self.calibration_record = DGCalibrationNVRecord(self.can_interface, self.logger)
-        self.system_record = DGSystemNVRecord(self.can_interface, self.logger)
-        self.service_record = DGServiceNVRecord(self.can_interface, self.logger)
-        self.scheduled_runs_record = DGScheduledRunsNVRecord(self.can_interface, self.logger)
         self.valves = DGValves(self.can_interface, self.logger)
         self.voltages = DGVoltages(self.can_interface, self.logger)
-        self.flush = FlushMode(self.can_interface, self.logger)
-        self.chemical_disinfect = ChemicalDisinfect(self.can_interface, self.logger)
-        self.rtc = DGRTC(self.can_interface, self.logger)
-        self.switches = DGSwitches(self.can_interface, self.logger)
 
     def get_version(self):
         """
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -r78f3b6100f792682a26f87f6333a1d7243767fb6 -r8a3a1047368db91a54399f3d0d30548fe55c222d
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 78f3b6100f792682a26f87f6333a1d7243767fb6)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 8a3a1047368db91a54399f3d0d30548fe55c222d)
@@ -94,28 +94,28 @@
 
         # Create command groups
         self.accel = HDAccelerometer(self.can_interface, self.logger)
-        self.air_trap = HDAirTrap(self.can_interface, self.logger)
         self.air_bubbles = HDAirBubbles(self.can_interface, self.logger)
+        self.air_trap = HDAirTrap(self.can_interface, self.logger)
         self.alarms = HDAlarms(self.can_interface, self.logger)
-        self.buttons = HDButtons(self.can_interface, self.logger)
         self.blood_leak = HDBloodLeak(self.can_interface, self.logger)
-        self.fluid_leak = HDFluidLeak(self.can_interface, self.logger)
-        self.ui = HDUIProxy(self.can_interface, self.logger)
-        self.rtc = HDRTC(self.can_interface, self.logger)
-        self.watchdog = HDWatchdog(self.can_interface, self.logger)
         self.bloodflow = HDBloodFlow(self.can_interface, self.logger)
+        self.buttons = HDButtons(self.can_interface, self.logger)
+        self.calibration_record = HDCalibrationNVRecord(self.can_interface, self.logger)
         self.dialysate_inlet_flow = HDDialysateInletFlow(self.can_interface, self.logger)
         self.dialysate_outlet_flow = HDDialysateOutletFlow(self.can_interface, self.logger)
-        self.treatment = HDTreatment(self.can_interface, self.logger)
-        self.pretreatment = HDPreTreatment(self.can_interface, self.logger)
+        self.fluid_leak = HDFluidLeak(self.can_interface, self.logger)
         self.pressure_occlusion = HDPressureOcclusion(self.can_interface, self.logger)
+        self.pretreatment = HDPreTreatment(self.can_interface, self.logger)
+        self.rtc = HDRTC(self.can_interface, self.logger)
+        self.service_record = HDServiceNVRecords(self.can_interface, self.logger)
+        self.switches = HDSwitches(self.can_interface, self.logger)
         self.syringe_pump = HDSyringePump(self.can_interface, self.logger)
+        self.system_record = HDSystemNVRecords(self.can_interface, self.logger)
+        self.treatment = HDTreatment(self.can_interface, self.logger)
+        self.ui = HDUIProxy(self.can_interface, self.logger)
         self.valves = HDValves(self.can_interface, self.logger)
         self.voltages = HDVoltages(self.can_interface, self.logger)
-        self.calibration_record = HDCalibrationNVRecord(self.can_interface, self.logger)
-        self.system_record = HDSystemNVRecords(self.can_interface, self.logger)
-        self.service_record = HDServiceNVRecords(self.can_interface, self.logger)
-        self.switches = HDSwitches(self.can_interface, self.logger)
+        self.watchdog = HDWatchdog(self.can_interface, self.logger)
 
     def get_operation_mode(self):
         """
Index: tests/peter/test_gen_requirements.py
===================================================================
diff -u -rca7a00d1584b97eed9471fe4a5f17a7aa3ea62d8 -r8a3a1047368db91a54399f3d0d30548fe55c222d
--- tests/peter/test_gen_requirements.py	(.../test_gen_requirements.py)	(revision ca7a00d1584b97eed9471fe4a5f17a7aa3ea62d8)
+++ tests/peter/test_gen_requirements.py	(.../test_gen_requirements.py)	(revision 8a3a1047368db91a54399f3d0d30548fe55c222d)
@@ -83,19 +83,30 @@
     hd = HD()
 
     modules = [
+        hd,
+        hd.accel,
+        hd.air_bubbles,
+        hd.air_trap,
         hd.alarms,
-        hd.buttons,
-        hd.ui,
-        hd.rtc,
-        hd.watchdog,
+        hd.blood_leak,
         hd.bloodflow,
+        hd.buttons,
+        hd.calibration_record,
         hd.dialysate_inlet_flow,
         hd.dialysate_outlet_flow,
-        hd.treatment,
+        hd.fluid_leak,
         hd.pressure_occlusion,
+        hd.pretreatment,
+        hd.rtc,
+        hd.service_record,
+        hd.switches,
+        hd.syringe_pump,
+        hd.system_record,
+        hd.treatment,
+        hd.ui,
         hd.valves,
-        hd.air_trap,
-        hd.accel
+        hd.voltages,
+        hd.watchdog,
     ]
     gen_publish_requirements(modules)
     gen_cmd_requirements(modules)
@@ -111,12 +122,35 @@
     dg = DG()
 
     modules = [
+        dg,
+        dg.accel,
         dg.alarms,
+        dg.calibration_record,
+        dg.chemical_disinfect,
         dg.concentrate_pumps,
+        dg.conductivity_sensors,
+        dg.drain_pump,
         dg.fans,
+        dg.fluid_leak,
+        dg.flush,
+        dg.hd_proxy,
         dg.heat_disinfect,
+        dg.heaters,
+        dg.load_cells,
+        dg.pressures,
+        dg.reservoirs,
+        dg.ro_pump,
+        dg.rtc,
+        dg.samplewater,
+        dg.scheduled_runs_record,
+        dg.service_record,
+        dg.switches,
+        dg.system_record,
+        dg.temperature_sensors,
         dg.thermistors,
         dg.uv_reactors,
+        dg.valves,
+        dg.voltages,
     ]
 
     gen_publish_requirements(modules)