diff --git a/srsenb/hdr/stack/mac/sched.h b/srsenb/hdr/stack/mac/sched.h
index 228cfabcd..c92fb1f9a 100644
--- a/srsenb/hdr/stack/mac/sched.h
+++ b/srsenb/hdr/stack/mac/sched.h
@@ -14,7 +14,6 @@
 #define SRSENB_SCHEDULER_H
 
 #include "sched_grid.h"
-#include "sched_harq.h"
 #include "sched_ue.h"
 #include "srslte/common/log.h"
 #include "srslte/interfaces/enb_interfaces.h"
diff --git a/srsenb/hdr/stack/mac/sched_ue.h b/srsenb/hdr/stack/mac/sched_ue.h
index 7bcce5212..2c10649a9 100644
--- a/srsenb/hdr/stack/mac/sched_ue.h
+++ b/srsenb/hdr/stack/mac/sched_ue.h
@@ -18,7 +18,7 @@
 #include <map>
 #include <vector>
 
-#include "sched_harq.h"
+#include "sched_ue_ctrl/sched_harq.h"
 #include "sched_ue_ctrl/sched_lch.h"
 #include "sched_ue_ctrl/tpc.h"
 #include <bitset>
diff --git a/srsenb/hdr/stack/mac/sched_harq.h b/srsenb/hdr/stack/mac/sched_ue_ctrl/sched_harq.h
similarity index 100%
rename from srsenb/hdr/stack/mac/sched_harq.h
rename to srsenb/hdr/stack/mac/sched_ue_ctrl/sched_harq.h
diff --git a/srsenb/src/stack/mac/CMakeLists.txt b/srsenb/src/stack/mac/CMakeLists.txt
index 758a4c4de..04a7d4713 100644
--- a/srsenb/src/stack/mac/CMakeLists.txt
+++ b/srsenb/src/stack/mac/CMakeLists.txt
@@ -8,7 +8,7 @@
 
 add_subdirectory(schedulers)
 
-set(SOURCES mac.cc ue.cc sched.cc sched_carrier.cc sched_grid.cc sched_harq.cc sched_ue.cc
+set(SOURCES mac.cc ue.cc sched.cc sched_carrier.cc sched_grid.cc sched_ue_ctrl/sched_harq.cc sched_ue.cc
         sched_ue_ctrl/sched_lch.cc sched_helpers.cc)
 add_library(srsenb_mac STATIC ${SOURCES} $<TARGET_OBJECTS:mac_schedulers>)
 
diff --git a/srsenb/src/stack/mac/sched_harq.cc b/srsenb/src/stack/mac/sched_ue_ctrl/sched_harq.cc
similarity index 100%
rename from srsenb/src/stack/mac/sched_harq.cc
rename to srsenb/src/stack/mac/sched_ue_ctrl/sched_harq.cc