diff --git a/src/modules/ekf2/CMakeLists.txt b/src/modules/ekf2/CMakeLists.txt
index c202aa07e0..53d188af51 100644
--- a/src/modules/ekf2/CMakeLists.txt
+++ b/src/modules/ekf2/CMakeLists.txt
@@ -196,8 +196,8 @@ endif()
 
 if(CONFIG_EKF2_OPTICAL_FLOW)
 	list(APPEND EKF_SRCS
-		EKF/optical_flow_control.cpp
-		EKF/optflow_fusion.cpp
+		EKF/aid_sources/optical_flow/optical_flow_control.cpp
+		EKF/aid_sources/optical_flow/optical_flow_fusion.cpp
 	)
 endif()
 
diff --git a/src/modules/ekf2/EKF/CMakeLists.txt b/src/modules/ekf2/EKF/CMakeLists.txt
index e5d2e9f4d8..efe8a97fa1 100644
--- a/src/modules/ekf2/EKF/CMakeLists.txt
+++ b/src/modules/ekf2/EKF/CMakeLists.txt
@@ -115,8 +115,8 @@ endif()
 
 if(CONFIG_EKF2_OPTICAL_FLOW)
 	list(APPEND EKF_SRCS
-		optical_flow_control.cpp
-		optflow_fusion.cpp
+		aid_sources/optical_flow/optical_flow_control.cpp
+		aid_sources/optical_flow/optical_flow_fusion.cpp
 	)
 endif()
 
diff --git a/src/modules/ekf2/EKF/optical_flow_control.cpp b/src/modules/ekf2/EKF/aid_sources/optical_flow/optical_flow_control.cpp
similarity index 100%
rename from src/modules/ekf2/EKF/optical_flow_control.cpp
rename to src/modules/ekf2/EKF/aid_sources/optical_flow/optical_flow_control.cpp
diff --git a/src/modules/ekf2/EKF/optflow_fusion.cpp b/src/modules/ekf2/EKF/aid_sources/optical_flow/optical_flow_fusion.cpp
similarity index 100%
rename from src/modules/ekf2/EKF/optflow_fusion.cpp
rename to src/modules/ekf2/EKF/aid_sources/optical_flow/optical_flow_fusion.cpp