Index: Debug/makefile
===================================================================
diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -radd7eb956a7d2c124434541e1f06ca5ae158716f
--- Debug/makefile	(.../makefile)	(revision 765d2c35118e202444e737c66c77faf9678cc87e)
+++ Debug/makefile	(.../makefile)	(revision add7eb956a7d2c124434541e1f06ca5ae158716f)
@@ -10,8 +10,6 @@
 ORDERED_OBJS += \
 "./App/Contollers/AlarmLamp.obj" \
 "./App/Contollers/Buttons.obj" \
-"./App/Contollers/SafetyShutdown.obj" \
-"./App/Contollers/WatchdogMgmt.obj" \
 "./App/Drivers/CPLD.obj" \
 "./App/Modes/ModeFault.obj" \
 "./App/Modes/ModeInitPOST.obj" \
@@ -23,6 +21,9 @@
 "./App/Modes/ModeStandby.obj" \
 "./App/Modes/ModeTreatment.obj" \
 "./App/Modes/OperationModes.obj" \
+"./App/Services/SafetyShutdown.obj" \
+"./App/Services/Timers.obj" \
+"./App/Services/WatchdogMgmt.obj" \
 "./App/Tasks/TaskBG.obj" \
 "./App/Tasks/TaskGeneral.obj" \
 "./App/Tasks/TaskPriority.obj" \
@@ -62,11 +63,13 @@
 -include App/Contollers/subdir_vars.mk
 -include App/Drivers/subdir_vars.mk
 -include App/Modes/subdir_vars.mk
+-include App/Services/subdir_vars.mk
 -include App/Tasks/subdir_vars.mk
 -include source/subdir_vars.mk
 -include App/Contollers/subdir_rules.mk
 -include App/Drivers/subdir_rules.mk
 -include App/Modes/subdir_rules.mk
+-include App/Services/subdir_rules.mk
 -include App/Tasks/subdir_rules.mk
 -include source/subdir_rules.mk
 -include objects.mk
@@ -199,8 +202,9 @@
 # Other Targets
 clean:
 	-$(RM) $(BIN_OUTPUTS__QUOTED)$(EXE_OUTPUTS__QUOTED)
-	-$(RM) "App/Contollers/AlarmLamp.obj" "App/Contollers/Buttons.obj" "App/Contollers/SafetyShutdown.obj" "App/Contollers/WatchdogMgmt.obj" "App/Drivers/CPLD.obj" "App/Modes/ModeFault.obj" "App/Modes/ModeInitPOST.obj" "App/Modes/ModeOpParams.obj" "App/Modes/ModePostTreat.obj" "App/Modes/ModePreTreat.obj" "App/Modes/ModePrescription.obj" "App/Modes/ModeService.obj" "App/Modes/ModeStandby.obj" "App/Modes/ModeTreatment.obj" "App/Modes/OperationModes.obj" "App/Tasks/TaskBG.obj" "App/Tasks/TaskGeneral.obj" "App/Tasks/TaskPriority.obj" "App/Tasks/TaskTimer.obj" "source/dabort.obj" "source/errata_SSWF021_45.obj" "source/esm.obj" "source/gio.obj" "source/lin.obj" "source/notification.obj" "source/pinmux.obj" "source/rti.obj" "source/sys_core.obj" "source/sys_dma.obj" "source/sys_intvecs.obj" "source/sys_main.obj" "source/sys_mpu.obj" "source/sys_pcr.obj" "source/sys_phantom.obj" "source/sys_pmm.obj" "source/sys_pmu.obj" "source/sys_selftest.obj" "source/sys_startup.obj" "source/sys_vim.obj" "source/system.obj" 
-	-$(RM) "App/Contollers/AlarmLamp.d" "App/Contollers/Buttons.d" "App/Contollers/SafetyShutdown.d" "App/Contollers/WatchdogMgmt.d" "App/Drivers/CPLD.d" "App/Modes/ModeFault.d" "App/Modes/ModeInitPOST.d" "App/Modes/ModeOpParams.d" "App/Modes/ModePostTreat.d" "App/Modes/ModePreTreat.d" "App/Modes/ModePrescription.d" "App/Modes/ModeService.d" "App/Modes/ModeStandby.d" "App/Modes/ModeTreatment.d" "App/Modes/OperationModes.d" "App/Tasks/TaskBG.d" "App/Tasks/TaskGeneral.d" "App/Tasks/TaskPriority.d" "App/Tasks/TaskTimer.d" "source/errata_SSWF021_45.d" "source/esm.d" "source/gio.d" "source/lin.d" "source/notification.d" "source/pinmux.d" "source/rti.d" "source/sys_dma.d" "source/sys_main.d" "source/sys_pcr.d" "source/sys_phantom.d" "source/sys_pmm.d" "source/sys_selftest.d" "source/sys_startup.d" "source/sys_vim.d" "source/system.d" 
+	-$(RM) "App/Contollers/AlarmLamp.obj" "App/Contollers/Buttons.obj" "App/Drivers/CPLD.obj" "App/Modes/ModeFault.obj" "App/Modes/ModeInitPOST.obj" "App/Modes/ModeOpParams.obj" "App/Modes/ModePostTreat.obj" "App/Modes/ModePreTreat.obj" "App/Modes/ModePrescription.obj" "App/Modes/ModeService.obj" "App/Modes/ModeStandby.obj" "App/Modes/ModeTreatment.obj" "App/Modes/OperationModes.obj" "App/Services/SafetyShutdown.obj" "App/Services/Timers.obj" "App/Services/WatchdogMgmt.obj" "App/Tasks/TaskBG.obj" "App/Tasks/TaskGeneral.obj" "App/Tasks/TaskPriority.obj" "App/Tasks/TaskTimer.obj" "source/dabort.obj" "source/errata_SSWF021_45.obj" "source/esm.obj" "source/gio.obj" "source/lin.obj" "source/notification.obj" "source/pinmux.obj" "source/rti.obj" "source/sys_core.obj" "source/sys_dma.obj" "source/sys_intvecs.obj" "source/sys_main.obj" "source/sys_mpu.obj" "source/sys_pcr.obj" "source/sys_phantom.obj" "source/sys_pmm.obj" "source/sys_pmu.obj" "source/sys_selftest.obj" "source/sys_startup.obj" "source/sys_vim.obj" 
+	-$(RM) "source/system.obj" 
+	-$(RM) "App/Contollers/AlarmLamp.d" "App/Contollers/Buttons.d" "App/Drivers/CPLD.d" "App/Modes/ModeFault.d" "App/Modes/ModeInitPOST.d" "App/Modes/ModeOpParams.d" "App/Modes/ModePostTreat.d" "App/Modes/ModePreTreat.d" "App/Modes/ModePrescription.d" "App/Modes/ModeService.d" "App/Modes/ModeStandby.d" "App/Modes/ModeTreatment.d" "App/Modes/OperationModes.d" "App/Services/SafetyShutdown.d" "App/Services/Timers.d" "App/Services/WatchdogMgmt.d" "App/Tasks/TaskBG.d" "App/Tasks/TaskGeneral.d" "App/Tasks/TaskPriority.d" "App/Tasks/TaskTimer.d" "source/errata_SSWF021_45.d" "source/esm.d" "source/gio.d" "source/lin.d" "source/notification.d" "source/pinmux.d" "source/rti.d" "source/sys_dma.d" "source/sys_main.d" "source/sys_pcr.d" "source/sys_phantom.d" "source/sys_pmm.d" "source/sys_selftest.d" "source/sys_startup.d" "source/sys_vim.d" "source/system.d" 
 	-$(RM) "source/dabort.d" "source/sys_core.d" "source/sys_intvecs.d" "source/sys_mpu.d" "source/sys_pmu.d" 
 	-@echo 'Finished clean'
 	-@echo ' '