Index: firmware/source/sys_main.c
===================================================================
diff -u -reaadab648c4c1d6d34f3927df6ce5cfb59cdebb6 -r17a448770daa138ebeb6ce79974966e650828f25
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision eaadab648c4c1d6d34f3927df6ce5cfb59cdebb6)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 17a448770daa138ebeb6ce79974966e650828f25)
@@ -64,10 +64,19 @@
 #include "AlarmMgmtRO.h"
 #include "CommBuffers.h"
 #include "Conductivity.h"
+#include "DDInterface.h"
+#include "FilterFlush.h"
 #include "Flow.h"
 #include "FpgaRO.h"
+#include "InternalADC.h"
 #include "Interrupts.h"
 #include "Level.h"
+#include "MembraneFlush.h"
+#include "ModeFault.h"
+#include "ModeInitPOST.h"
+#include "ModeStandby.h"
+#include "ModeWaterGen.h"
+#include "ModeWaterPreGen.h"
 #include "MsgQueues.h"
 #include "OperationModes.h"
 #include "Pressure.h"
@@ -153,28 +162,50 @@
  *************************************************************************/
 static void initSoftware( void )
 {
+
+    // Tasks and Core
     initSemaphores();
     initTimers();
     initSafetyShutdown();
     initAlarmMgmtRO();
     initWatchdogMgmt();
-    initInterrupts();
-    initFPGARO();
     initCommBuffers();
     initMsgQueues();
-    initSystemComm();
+    initSystemCommRO();
+    initTestConfigs();
 
+    // Services
+    initFPGARO();
+    initDDInterface();
+    initInterrupts();
+
+    // Drivers
+    initConductivitySensors();
+    initFlowSensor();
+    initFluidPump();
+    initInternalADC();
+    initPressureSensor();
+    initTemperatureSensors();
+
+    // Controllers
+    initROPump();
+    initValves();
+
+    // Monitors
     initConductivity();
+    initFlow();
     initLevels();
     initPressure();
     initTemperature();
-    initFlow();
 
-    initROPump();
-    initValves();
-
+    // Modes
     initOperationModes();
-    initTestConfigs();
+    initGenWaterMode();
+    initStandbyMode();
+    initInitAndPOSTMode();
+    initFaultMode();
+    initPreGenWMode();
+
 }
 
 /*************************************************************************