diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 8f696ed653554131b107d2a4a3cf30f9bab98eff..da90efdaee12beea8c66f641adf7e9d119395c1b 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -817,6 +817,7 @@ include_directories("${OPENAIR_DIR}/targets/ARCH/COMMON")
 include_directories("${OPENAIR_DIR}/targets/ARCH/EXMIMO/USERSPACE/LIB/")
 include_directories("${OPENAIR_DIR}/targets/ARCH/EXMIMO/DEFS")
 include_directories("${OPENAIR2_DIR}/ENB_APP")
+include_directories("${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC")
 include_directories("${OPENAIR2_DIR}/UTIL/OSA")
 include_directories("${OPENAIR2_DIR}/UTIL/LFDS/liblfds6.1.1/liblfds611/inc")
 include_directories("${OPENAIR2_DIR}/UTIL/LFDS/liblfds7.0.0/liblfds700/inc")
@@ -903,12 +904,12 @@ if (FLEXRAN_AGENT_SB_IF)
     ${OPENAIR2_DIR}/ENB_APP/flexran_agent_handler.c
     ${OPENAIR2_DIR}/ENB_APP/flexran_agent_common.c
     ${OPENAIR2_DIR}/ENB_APP/flexran_agent_common_internal.c
-    ${OPENAIR2_DIR}/ENB_APP/flexran_agent_mac.c
+    ${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
     ${OPENAIR2_DIR}/ENB_APP/flexran_agent.c
     ${OPENAIR2_DIR}/ENB_APP/flexran_agent_task_manager.c
     ${OPENAIR2_DIR}/ENB_APP/flexran_agent_net_comm.c
     ${OPENAIR2_DIR}/ENB_APP/flexran_agent_async.c
-    ${OPENAIR2_DIR}/ENB_APP/flexran_agent_mac_internal.c
+    ${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
     )
   set(FLEXRAN_AGENT_LIB FLEXRAN_AGENT)
   #include_directories(${OPENAIR2_DIR}/ENB_APP)
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index b5fd7efd702e9a03511880e75654be7ca08406fc..d6f5a40da7d475a1f2a7d642819f987a627b3948 100644
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -64,7 +64,7 @@
 
 //Agent-related headers
 #include "ENB_APP/flexran_agent_extern.h"
-#include "ENB_APP/flexran_agent_mac.h"
+#include "ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.h"
 #include "LAYER2/MAC/flexran_agent_mac_proto.h"
 
 //#define DIAG_PHY
diff --git a/openair2/ENB_APP/flexran_agent_mac.c b/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
similarity index 100%
rename from openair2/ENB_APP/flexran_agent_mac.c
rename to openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
diff --git a/openair2/ENB_APP/flexran_agent_mac.h b/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.h
similarity index 100%
rename from openair2/ENB_APP/flexran_agent_mac.h
rename to openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.h
diff --git a/openair2/ENB_APP/flexran_agent_mac_defs.h b/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_defs.h
similarity index 100%
rename from openair2/ENB_APP/flexran_agent_mac_defs.h
rename to openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_defs.h
diff --git a/openair2/ENB_APP/flexran_agent_mac_internal.c b/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
similarity index 100%
rename from openair2/ENB_APP/flexran_agent_mac_internal.c
rename to openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
diff --git a/openair2/ENB_APP/flexran_agent_mac_internal.h b/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.h
similarity index 100%
rename from openair2/ENB_APP/flexran_agent_mac_internal.h
rename to openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.h