diff --git a/firmware/controllers/controllers.mk b/firmware/controllers/controllers.mk
index 2209150a3c..2a06fc155a 100644
--- a/firmware/controllers/controllers.mk
+++ b/firmware/controllers/controllers.mk
@@ -25,7 +25,7 @@ CONTROLLERS_SRC_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)/engine_cycle/map_averaging.cpp \
 	$(CONTROLLERS_DIR)/flash_main.cpp \
 	$(CONTROLLERS_DIR)/injector_central.cpp \
 	$(CONTROLLERS_DIR)/obd2.cpp \
@@ -38,6 +38,7 @@ CONTROLLERS_INC=\
 	$(CONTROLLERS_DIR)/system \
 	$(CONTROLLERS_DIR)/system/timer \
 	$(CONTROLLERS_DIR)/algo \
+	$(CONTROLLERS_DIR)/engine_cycle \
 	$(CONTROLLERS_DIR)/trigger/decoders \
 	$(CONTROLLERS_DIR)/trigger \
     $(CONTROLLERS_DIR)/sensors \
diff --git a/firmware/controllers/map_averaging.cpp b/firmware/controllers/engine_cycle/map_averaging.cpp
similarity index 100%
rename from firmware/controllers/map_averaging.cpp
rename to firmware/controllers/engine_cycle/map_averaging.cpp
diff --git a/firmware/controllers/map_averaging.h b/firmware/controllers/engine_cycle/map_averaging.h
similarity index 100%
rename from firmware/controllers/map_averaging.h
rename to firmware/controllers/engine_cycle/map_averaging.h
diff --git a/firmware/controllers/engine_cycle/readme.md b/firmware/controllers/engine_cycle/readme.md
new file mode 100644
index 0000000000..111595326d
--- /dev/null
+++ b/firmware/controllers/engine_cycle/readme.md
@@ -0,0 +1 @@
+Here we have logic related to engine contol activitied within each engine cycle: coils & injectors mostly.
\ No newline at end of file