Index: firmware/source/sys_main.c
===================================================================
diff -u -raf8485c010085b535a81e9c44426c60eea2535e6 -r051326e2671e8d5b3e99eaa109ea549e94a929f3
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision af8485c010085b535a81e9c44426c60eea2535e6)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 051326e2671e8d5b3e99eaa109ea549e94a929f3)
@@ -63,21 +63,26 @@
 #include "rti.h"
 
 #include "TDCommon.h"
-#include "AlarmLamp.h"
-#include "BubbleDetector.h"
+#include "AirPump.h"
+#include "AirTrap.h"
+#include "BloodFlow.h"
+#include "Bubbles.h"
+#include "Buttons.h"
 #include "CpldInterface.h"
 #include "DDInterface.h"
 #include "FpgaTD.h"
 #include "InternalADC.h"
 #include "Interrupts.h"
 #include "MsgQueues.h"
 #include "OperationModes.h"
-#include "PressureSensor.h"
-#include "SystemComm.h"
+#include "Pressures.h"
+#include "Switches.h"
 #include "SystemCommTD.h"
 #include "TaskBG.h"
 #include "Timers.h"
 #include "Utilities.h"
+#include "Valves.h"
+#include "Voltages.h"
 #include "WatchdogMgmt.h"
 
 static void initProcessor( void );
@@ -172,9 +177,6 @@
     initAlarmMgmtTD();
     // Initialize drivers
     initInternalADC();
-//    initBattery();
-    initBubbleDetector();
-    initPressureSensor();
     // Initialize async interrupt handlers
     initInterrupts();
     // Initialize services
@@ -188,8 +190,17 @@
     initSystemCommTD();
     initWatchdogMgmt();
     // Initialize monitors
+//    initBattery();
+    initBubbles();
+    initButtons();
+    initPressure();
+    initSwitches();
+    initVoltagesMonitor();
     // Initialize controllers
-    initAlarmLamp();
+    initAirPump();
+    initAirTrap();
+    initBloodFlow();
+    initValves();
     // Initialize modes
     initOperationModes();
 }