diff --git a/firmware/controllers/controllers.mk b/firmware/controllers/controllers.mk
index 61f34b284a..2209150a3c 100644
--- a/firmware/controllers/controllers.mk
+++ b/firmware/controllers/controllers.mk
@@ -19,24 +19,24 @@ CONTROLLERS_SRC_CPP = \
 	$(CONTROLLERS_DIR)/gauges/tachometer.cpp \
 	$(CONTROLLERS_DIR)/gauges/malfunction_indicator.cpp \
 	$(CONTROLLERS_DIR)/gauges/lcd_controller.cpp \
-	$(CONTROLLERS_DIR)/scheduling/signal_executor_sleep.cpp \
-	$(CONTROLLERS_DIR)/scheduling/single_timer_executor.cpp \
-	$(CONTROLLERS_DIR)/scheduling/pwm_generator_logic.cpp \
-	$(CONTROLLERS_DIR)/scheduling/event_queue.cpp \
-	$(PROJECT_DIR)/controllers/settings.cpp \
-	$(PROJECT_DIR)/controllers/core/error_handling.cpp \
-	$(PROJECT_DIR)/controllers/map_averaging.cpp \
-	$(PROJECT_DIR)/controllers/flash_main.cpp \
-	$(PROJECT_DIR)/controllers/injector_central.cpp \
-	$(PROJECT_DIR)/controllers/obd2.cpp \
- 	$(PROJECT_DIR)/controllers/engine_controller.cpp \
-	$(PROJECT_DIR)/controllers/persistent_store.cpp \
+	$(CONTROLLERS_DIR)/system/timer/signal_executor_sleep.cpp \
+	$(CONTROLLERS_DIR)/system/timer/single_timer_executor.cpp \
+	$(CONTROLLERS_DIR)/system/timer/pwm_generator_logic.cpp \
+	$(CONTROLLERS_DIR)/system/timer/event_queue.cpp \
+	$(CONTROLLERS_DIR)/settings.cpp \
+	$(CONTROLLERS_DIR)/core/error_handling.cpp \
+	$(CONTROLLERS_DIR)/map_averaging.cpp \
+	$(CONTROLLERS_DIR)/flash_main.cpp \
+	$(CONTROLLERS_DIR)/injector_central.cpp \
+	$(CONTROLLERS_DIR)/obd2.cpp \
+ 	$(CONTROLLERS_DIR)/engine_controller.cpp \
+	$(CONTROLLERS_DIR)/persistent_store.cpp \
 	
 
 CONTROLLERS_INC=\
 	$(CONTROLLERS_DIR) \
-	$(CONTROLLERS_DIR)/scheduling \
 	$(CONTROLLERS_DIR)/system \
+	$(CONTROLLERS_DIR)/system/timer \
 	$(CONTROLLERS_DIR)/algo \
 	$(CONTROLLERS_DIR)/trigger/decoders \
 	$(CONTROLLERS_DIR)/trigger \
diff --git a/firmware/controllers/scheduling/event_queue.cpp b/firmware/controllers/system/timer/event_queue.cpp
similarity index 100%
rename from firmware/controllers/scheduling/event_queue.cpp
rename to firmware/controllers/system/timer/event_queue.cpp
diff --git a/firmware/controllers/scheduling/event_queue.h b/firmware/controllers/system/timer/event_queue.h
similarity index 100%
rename from firmware/controllers/scheduling/event_queue.h
rename to firmware/controllers/system/timer/event_queue.h
diff --git a/firmware/controllers/scheduling/pwm_generator_logic.cpp b/firmware/controllers/system/timer/pwm_generator_logic.cpp
similarity index 100%
rename from firmware/controllers/scheduling/pwm_generator_logic.cpp
rename to firmware/controllers/system/timer/pwm_generator_logic.cpp
diff --git a/firmware/controllers/scheduling/pwm_generator_logic.h b/firmware/controllers/system/timer/pwm_generator_logic.h
similarity index 100%
rename from firmware/controllers/scheduling/pwm_generator_logic.h
rename to firmware/controllers/system/timer/pwm_generator_logic.h
diff --git a/firmware/controllers/scheduling/readme.md b/firmware/controllers/system/timer/readme.md
similarity index 100%
rename from firmware/controllers/scheduling/readme.md
rename to firmware/controllers/system/timer/readme.md
diff --git a/firmware/controllers/scheduling/scheduler.h b/firmware/controllers/system/timer/scheduler.h
similarity index 100%
rename from firmware/controllers/scheduling/scheduler.h
rename to firmware/controllers/system/timer/scheduler.h
diff --git a/firmware/controllers/scheduling/signal_executor_sleep.cpp b/firmware/controllers/system/timer/signal_executor_sleep.cpp
similarity index 100%
rename from firmware/controllers/scheduling/signal_executor_sleep.cpp
rename to firmware/controllers/system/timer/signal_executor_sleep.cpp
diff --git a/firmware/controllers/scheduling/signal_executor_sleep.h b/firmware/controllers/system/timer/signal_executor_sleep.h
similarity index 100%
rename from firmware/controllers/scheduling/signal_executor_sleep.h
rename to firmware/controllers/system/timer/signal_executor_sleep.h
diff --git a/firmware/controllers/scheduling/single_timer_executor.cpp b/firmware/controllers/system/timer/single_timer_executor.cpp
similarity index 100%
rename from firmware/controllers/scheduling/single_timer_executor.cpp
rename to firmware/controllers/system/timer/single_timer_executor.cpp
diff --git a/firmware/controllers/scheduling/single_timer_executor.h b/firmware/controllers/system/timer/single_timer_executor.h
similarity index 100%
rename from firmware/controllers/scheduling/single_timer_executor.h
rename to firmware/controllers/system/timer/single_timer_executor.h