diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0eb8df40e..49870cec0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -658,13 +658,14 @@ if(RF_FOUND)
   endif(ENABLE_SRSUE)
 
   if(ENABLE_SRSENB)
-    message(STATUS "Building with srsENB")
+    message(STATUS "Building with srsENB/srsGNB")
     add_subdirectory(srsenb)
+    add_subdirectory(srsgnb)
   else(ENABLE_SRSENB)
-    message(STATUS "srsENB build disabled")
+    message(STATUS "srsENB/srsGNB build disabled")
   endif(ENABLE_SRSENB)
 else(RF_FOUND)
-  message(STATUS "srsUE and srsENB builds disabled due to missing RF driver")
+  message(STATUS "srsUE and srsENB/srsGNB builds disabled due to missing RF driver")
 endif(RF_FOUND)
 
 if(ENABLE_SRSEPC)
diff --git a/lib/include/srsran/interfaces/gnb_mac_interfaces.h b/lib/include/srsran/interfaces/gnb_mac_interfaces.h
index bd1f29136..e25f3953a 100644
--- a/lib/include/srsran/interfaces/gnb_mac_interfaces.h
+++ b/lib/include/srsran/interfaces/gnb_mac_interfaces.h
@@ -13,7 +13,7 @@
 #ifndef SRSRAN_GNB_MAC_INTERFACES_H
 #define SRSRAN_GNB_MAC_INTERFACES_H
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_interface.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_interface.h"
 
 namespace srsenb {
 
diff --git a/srsenb/hdr/enb.h b/srsenb/hdr/enb.h
index 0edb56925..44ceac557 100644
--- a/srsenb/hdr/enb.h
+++ b/srsenb/hdr/enb.h
@@ -31,8 +31,8 @@
 #include "srsenb/hdr/stack/enb_stack_base.h"
 #include "srsenb/hdr/stack/rrc/rrc_config.h"
 
-#include "srsenb/hdr/stack/gnb_stack_nr.h"
 #include "srsenb/hdr/stack/mac/sched_interface.h"
+#include "srsgnb/hdr/stack/gnb_stack_nr.h"
 #include "srsran/common/bcd_helpers.h"
 #include "srsran/common/buffer_pool.h"
 #include "srsran/common/interfaces_common.h"
diff --git a/srsenb/hdr/x2_adapter.h b/srsenb/hdr/x2_adapter.h
index ee6eb10c7..2c4f5becf 100644
--- a/srsenb/hdr/x2_adapter.h
+++ b/srsenb/hdr/x2_adapter.h
@@ -30,9 +30,9 @@
 #ifndef SRSENB_X2_ADAPTER_H
 #define SRSENB_X2_ADAPTER_H
 
+#include "srsgnb/hdr/stack/gnb_stack_nr.h"
 #include "srsran/interfaces/enb_x2_interfaces.h"
 #include "stack/enb_stack_lte.h"
-#include "stack/gnb_stack_nr.h"
 
 namespace srsenb {
 
diff --git a/srsenb/src/CMakeLists.txt b/srsenb/src/CMakeLists.txt
index e4e26793d..ae3250670 100644
--- a/srsenb/src/CMakeLists.txt
+++ b/srsenb/src/CMakeLists.txt
@@ -29,7 +29,7 @@ add_executable(srsenb main.cc enb.cc metrics_stdout.cc metrics_csv.cc metrics_js
 set(SRSENB_SOURCES srsenb_phy srsenb_stack srsenb_common srsenb_s1ap srsenb_upper srsenb_mac srsenb_rrc srslog system)
 set(SRSRAN_SOURCES srsran_common srsran_mac srsran_phy srsran_gtpu srsran_rlc srsran_pdcp srsran_radio rrc_asn1 s1ap_asn1 enb_cfg_parser srslog support system)
 
-set(SRSENB_SOURCES ${SRSENB_SOURCES} srsgnb_stack srsgnb_ngap srsgnb_upper srsgnb_mac srsgnb_rrc)
+set(SRSENB_SOURCES ${SRSENB_SOURCES} srsgnb_stack srsgnb_ngap srsgnb_mac srsgnb_rrc)
 set(SRSRAN_SOURCES ${SRSRAN_SOURCES} rrc_nr_asn1 ngap_nr_asn1)
 
 target_link_libraries(srsenb  ${SRSENB_SOURCES}
diff --git a/srsenb/src/enb.cc b/srsenb/src/enb.cc
index 7babf6a28..215a0354e 100644
--- a/srsenb/src/enb.cc
+++ b/srsenb/src/enb.cc
@@ -12,9 +12,9 @@
 
 #include "srsenb/hdr/enb.h"
 #include "srsenb/hdr/stack/enb_stack_lte.h"
-#include "srsenb/hdr/stack/gnb_stack_nr.h"
 #include "srsenb/hdr/x2_adapter.h"
 #include "srsenb/src/enb_cfg_parser.h"
+#include "srsgnb/hdr/stack/gnb_stack_nr.h"
 #include "srsran/build_info.h"
 #include "srsran/common/enb_events.h"
 #include "srsran/radio/radio_null.h"
diff --git a/srsenb/src/stack/CMakeLists.txt b/srsenb/src/stack/CMakeLists.txt
index d5c67cc0f..54c0d2c43 100644
--- a/srsenb/src/stack/CMakeLists.txt
+++ b/srsenb/src/stack/CMakeLists.txt
@@ -9,13 +9,8 @@
 add_subdirectory(mac)
 add_subdirectory(rrc)
 add_subdirectory(s1ap)
-add_subdirectory(ngap)
 add_subdirectory(upper)
 
 set(SOURCES enb_stack_lte.cc)
 
-add_library(srsenb_stack STATIC ${SOURCES})
-target_link_libraries(srsenb_stack)
-
-add_library(srsgnb_stack STATIC gnb_stack_nr.cc)
-target_link_libraries(srsgnb_stack srsue_upper)
+add_library(srsenb_stack STATIC ${SOURCES})
\ No newline at end of file
diff --git a/srsenb/src/stack/mac/CMakeLists.txt b/srsenb/src/stack/mac/CMakeLists.txt
index 44bea9de7..2a08dc6ee 100644
--- a/srsenb/src/stack/mac/CMakeLists.txt
+++ b/srsenb/src/stack/mac/CMakeLists.txt
@@ -15,6 +15,4 @@ set(SOURCES mac.cc ue.cc sched.cc sched_carrier.cc sched_grid.cc sched_ue_ctrl/s
             sched_phy_ch/sf_cch_allocator.cc sched_phy_ch/sched_dci.cc sched_phy_ch/sched_phy_resource.cc
             sched_helpers.cc)
 add_library(srsenb_mac STATIC ${SOURCES} $<TARGET_OBJECTS:mac_schedulers>)
-target_link_libraries(srsenb_mac srsenb_mac_common)
-
-add_subdirectory(nr)
\ No newline at end of file
+target_link_libraries(srsenb_mac srsenb_mac_common)
\ No newline at end of file
diff --git a/srsenb/src/stack/rrc/CMakeLists.txt b/srsenb/src/stack/rrc/CMakeLists.txt
index ef93b47a1..58d0cd511 100644
--- a/srsenb/src/stack/rrc/CMakeLists.txt
+++ b/srsenb/src/stack/rrc/CMakeLists.txt
@@ -8,7 +8,4 @@
 
 set(SOURCES rrc.cc rrc_ue.cc rrc_mobility.cc rrc_cell_cfg.cc rrc_bearer_cfg.cc mac_controller.cc ue_rr_cfg.cc ue_meas_cfg.cc rrc_endc.cc)
 add_library(srsenb_rrc STATIC ${SOURCES})
-
-set(SOURCES rrc_nr.cc nr/cell_asn1_config.cc)
-add_library(srsgnb_rrc STATIC ${SOURCES})
-target_link_libraries(srsgnb_rrc srsran_rrc_nr)
+  
\ No newline at end of file
diff --git a/srsenb/src/stack/upper/CMakeLists.txt b/srsenb/src/stack/upper/CMakeLists.txt
index 53637962a..21e1b1b4d 100644
--- a/srsenb/src/stack/upper/CMakeLists.txt
+++ b/srsenb/src/stack/upper/CMakeLists.txt
@@ -8,7 +8,4 @@
 
 set(SOURCES gtpu.cc pdcp.cc rlc.cc)
 add_library(srsenb_upper STATIC ${SOURCES})
-target_link_libraries(srsenb_upper srsran_asn1 srsran_gtpu)
-
-set(SOURCES sdap.cc)
-add_library(srsgnb_upper STATIC ${SOURCES})
\ No newline at end of file
+target_link_libraries(srsenb_upper srsran_asn1 srsran_gtpu)
\ No newline at end of file
diff --git a/srsenb/test/CMakeLists.txt b/srsenb/test/CMakeLists.txt
index a7d93ea1f..b648a8e05 100644
--- a/srsenb/test/CMakeLists.txt
+++ b/srsenb/test/CMakeLists.txt
@@ -11,7 +11,6 @@ add_subdirectory(phy)
 add_subdirectory(upper)
 add_subdirectory(rrc)
 add_subdirectory(s1ap)
-add_subdirectory(ngap)
 
 add_executable(enb_metrics_test enb_metrics_test.cc ../src/metrics_stdout.cc ../src/metrics_csv.cc)
 target_link_libraries(enb_metrics_test srsran_phy srsran_common)
diff --git a/srsenb/test/mac/CMakeLists.txt b/srsenb/test/mac/CMakeLists.txt
index 2d3806231..ddde6de06 100644
--- a/srsenb/test/mac/CMakeLists.txt
+++ b/srsenb/test/mac/CMakeLists.txt
@@ -73,6 +73,4 @@ add_test(sched_cqi_test sched_cqi_test)
 
 add_executable(sched_phy_resource_test sched_phy_resource_test.cc)
 target_link_libraries(sched_phy_resource_test srsran_common srsenb_mac srsran_mac sched_test_common)
-add_test(sched_phy_resource_test sched_phy_resource_test)
-
-add_subdirectory(nr)
\ No newline at end of file
+add_test(sched_phy_resource_test sched_phy_resource_test)
\ No newline at end of file
diff --git a/srsenb/test/rrc/CMakeLists.txt b/srsenb/test/rrc/CMakeLists.txt
index 6861842bd..06ecb4221 100644
--- a/srsenb/test/rrc/CMakeLists.txt
+++ b/srsenb/test/rrc/CMakeLists.txt
@@ -9,10 +9,6 @@
 add_library(test_helpers test_helpers.cc)
 target_link_libraries(test_helpers srsenb_rrc srsenb_common rrc_asn1 rrc_nr_asn1 s1ap_asn1 srsran_common enb_cfg_parser ${LIBCONFIGPP_LIBRARIES})
 
-add_executable(rrc_nr_test rrc_nr_test.cc)
-target_link_libraries(rrc_nr_test srsgnb_rrc test_helpers ${ATOMIC_LIBS})
-add_test(rrc_nr_test rrc_nr_test -i ${CMAKE_CURRENT_SOURCE_DIR}/../..)
-
 add_executable(rrc_meascfg_test rrc_meascfg_test.cc)
 target_link_libraries(rrc_meascfg_test test_helpers ${ATOMIC_LIBS})
 
diff --git a/srsgnb/CMakeLists.txt b/srsgnb/CMakeLists.txt
new file mode 100644
index 000000000..a3bed30f1
--- /dev/null
+++ b/srsgnb/CMakeLists.txt
@@ -0,0 +1,9 @@
+#
+# Copyright 2013-2021 Software Radio Systems Limited
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the distribution.
+#
+
+add_subdirectory(src)
\ No newline at end of file
diff --git a/srsenb/hdr/stack/gnb_stack_nr.h b/srsgnb/hdr/stack/gnb_stack_nr.h
similarity index 95%
rename from srsenb/hdr/stack/gnb_stack_nr.h
rename to srsgnb/hdr/stack/gnb_stack_nr.h
index b35e20bbc..85d68bc1f 100644
--- a/srsenb/hdr/stack/gnb_stack_nr.h
+++ b/srsgnb/hdr/stack/gnb_stack_nr.h
@@ -18,13 +18,13 @@
 #ifndef SRSRAN_GNB_STACK_NR_H
 #define SRSRAN_GNB_STACK_NR_H
 
-#include "srsenb/hdr/stack/mac/nr/mac_nr.h"
-#include "srsenb/hdr/stack/rrc/rrc_nr.h"
-#include "upper/pdcp.h"
-#include "upper/rlc.h"
-#include "upper/sdap.h"
+#include "srsenb/hdr/stack/upper/pdcp.h"
+#include "srsenb/hdr/stack/upper/rlc.h"
+#include "srsgnb/hdr/stack/mac/mac_nr.h"
+#include "srsgnb/hdr/stack/rrc/rrc_nr.h"
+#include "srsgnb/hdr/stack/sdap/sdap.h"
 
-#include "enb_stack_base.h"
+#include "srsenb/hdr/stack/enb_stack_base.h"
 #include "srsran/interfaces/gnb_interfaces.h"
 
 namespace srsenb {
diff --git a/srsenb/hdr/stack/mac/nr/harq_softbuffer.h b/srsgnb/hdr/stack/mac/harq_softbuffer.h
similarity index 100%
rename from srsenb/hdr/stack/mac/nr/harq_softbuffer.h
rename to srsgnb/hdr/stack/mac/harq_softbuffer.h
diff --git a/srsenb/hdr/stack/mac/nr/mac_nr.h b/srsgnb/hdr/stack/mac/mac_nr.h
similarity index 99%
rename from srsenb/hdr/stack/mac/nr/mac_nr.h
rename to srsgnb/hdr/stack/mac/mac_nr.h
index eaecbcb4e..9306272ed 100644
--- a/srsenb/hdr/stack/mac/nr/mac_nr.h
+++ b/srsgnb/hdr/stack/mac/mac_nr.h
@@ -18,7 +18,7 @@
 
 #include "srsenb/hdr/common/rnti_pool.h"
 #include "srsenb/hdr/stack/enb_stack_base.h"
-#include "srsenb/hdr/stack/mac/nr/ue_nr.h"
+#include "srsgnb/hdr/stack/mac/ue_nr.h"
 #include "srsran/common/task_scheduler.h"
 #include "srsran/interfaces/enb_metrics_interface.h"
 #include "srsran/interfaces/enb_rlc_interfaces.h"
diff --git a/srsenb/hdr/stack/mac/nr/sched_nr.h b/srsgnb/hdr/stack/mac/sched_nr.h
similarity index 100%
rename from srsenb/hdr/stack/mac/nr/sched_nr.h
rename to srsgnb/hdr/stack/mac/sched_nr.h
diff --git a/srsenb/hdr/stack/mac/nr/sched_nr_bwp.h b/srsgnb/hdr/stack/mac/sched_nr_bwp.h
similarity index 100%
rename from srsenb/hdr/stack/mac/nr/sched_nr_bwp.h
rename to srsgnb/hdr/stack/mac/sched_nr_bwp.h
diff --git a/srsenb/hdr/stack/mac/nr/sched_nr_cfg.h b/srsgnb/hdr/stack/mac/sched_nr_cfg.h
similarity index 100%
rename from srsenb/hdr/stack/mac/nr/sched_nr_cfg.h
rename to srsgnb/hdr/stack/mac/sched_nr_cfg.h
diff --git a/srsenb/hdr/stack/mac/nr/sched_nr_grant_allocator.h b/srsgnb/hdr/stack/mac/sched_nr_grant_allocator.h
similarity index 98%
rename from srsenb/hdr/stack/mac/nr/sched_nr_grant_allocator.h
rename to srsgnb/hdr/stack/mac/sched_nr_grant_allocator.h
index d1d6fb98a..8ff63de58 100644
--- a/srsenb/hdr/stack/mac/nr/sched_nr_grant_allocator.h
+++ b/srsgnb/hdr/stack/mac/sched_nr_grant_allocator.h
@@ -13,12 +13,12 @@
 #ifndef SRSRAN_SCHED_NR_GRANT_ALLOCATOR_H
 #define SRSRAN_SCHED_NR_GRANT_ALLOCATOR_H
 
-#include "../sched_common.h"
 #include "lib/include/srsran/adt/circular_array.h"
 #include "sched_nr_helpers.h"
 #include "sched_nr_interface.h"
 #include "sched_nr_pdcch.h"
 #include "sched_nr_ue.h"
+#include "srsenb/hdr/stack/mac/sched_common.h"
 
 namespace srsenb {
 namespace sched_nr_impl {
diff --git a/srsenb/hdr/stack/mac/nr/sched_nr_harq.h b/srsgnb/hdr/stack/mac/sched_nr_harq.h
similarity index 98%
rename from srsenb/hdr/stack/mac/nr/sched_nr_harq.h
rename to srsgnb/hdr/stack/mac/sched_nr_harq.h
index 5ab33d932..7d88a4b71 100644
--- a/srsenb/hdr/stack/mac/nr/sched_nr_harq.h
+++ b/srsgnb/hdr/stack/mac/sched_nr_harq.h
@@ -14,7 +14,7 @@
 #define SRSRAN_SCHED_NR_HARQ_H
 
 #include "sched_nr_cfg.h"
-#include "srsenb/hdr/stack/mac/nr/harq_softbuffer.h"
+#include "srsgnb/hdr/stack/mac/harq_softbuffer.h"
 #include "srsran/common/slot_point.h"
 #include <array>
 
diff --git a/srsenb/hdr/stack/mac/nr/sched_nr_helpers.h b/srsgnb/hdr/stack/mac/sched_nr_helpers.h
similarity index 100%
rename from srsenb/hdr/stack/mac/nr/sched_nr_helpers.h
rename to srsgnb/hdr/stack/mac/sched_nr_helpers.h
diff --git a/srsenb/hdr/stack/mac/nr/sched_nr_interface.h b/srsgnb/hdr/stack/mac/sched_nr_interface.h
similarity index 100%
rename from srsenb/hdr/stack/mac/nr/sched_nr_interface.h
rename to srsgnb/hdr/stack/mac/sched_nr_interface.h
diff --git a/srsenb/hdr/stack/mac/nr/sched_nr_pdcch.h b/srsgnb/hdr/stack/mac/sched_nr_pdcch.h
similarity index 98%
rename from srsenb/hdr/stack/mac/nr/sched_nr_pdcch.h
rename to srsgnb/hdr/stack/mac/sched_nr_pdcch.h
index 8526d9635..8e13d2608 100644
--- a/srsenb/hdr/stack/mac/nr/sched_nr_pdcch.h
+++ b/srsgnb/hdr/stack/mac/sched_nr_pdcch.h
@@ -13,7 +13,7 @@
 #ifndef SRSRAN_SCHED_NR_PDCCH_H
 #define SRSRAN_SCHED_NR_PDCCH_H
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_cfg.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_cfg.h"
 #include "srsran/adt/bounded_bitset.h"
 #include "srsran/adt/bounded_vector.h"
 #include "srsran/phy/common/phy_common_nr.h"
diff --git a/srsenb/hdr/stack/mac/nr/sched_nr_rb.h b/srsgnb/hdr/stack/mac/sched_nr_rb.h
similarity index 99%
rename from srsenb/hdr/stack/mac/nr/sched_nr_rb.h
rename to srsgnb/hdr/stack/mac/sched_nr_rb.h
index 9ccf1d251..ec0af28a6 100644
--- a/srsenb/hdr/stack/mac/nr/sched_nr_rb.h
+++ b/srsgnb/hdr/stack/mac/sched_nr_rb.h
@@ -13,7 +13,7 @@
 #ifndef SRSRAN_SCHED_NR_RB_H
 #define SRSRAN_SCHED_NR_RB_H
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_interface.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_interface.h"
 #include "srsran/adt/bounded_bitset.h"
 #include "srsran/phy/common/phy_common_nr.h"
 
diff --git a/srsenb/hdr/stack/mac/nr/sched_nr_signalling.h b/srsgnb/hdr/stack/mac/sched_nr_signalling.h
similarity index 100%
rename from srsenb/hdr/stack/mac/nr/sched_nr_signalling.h
rename to srsgnb/hdr/stack/mac/sched_nr_signalling.h
diff --git a/srsenb/hdr/stack/mac/nr/sched_nr_time_rr.h b/srsgnb/hdr/stack/mac/sched_nr_time_rr.h
similarity index 100%
rename from srsenb/hdr/stack/mac/nr/sched_nr_time_rr.h
rename to srsgnb/hdr/stack/mac/sched_nr_time_rr.h
diff --git a/srsenb/hdr/stack/mac/nr/sched_nr_ue.h b/srsgnb/hdr/stack/mac/sched_nr_ue.h
similarity index 100%
rename from srsenb/hdr/stack/mac/nr/sched_nr_ue.h
rename to srsgnb/hdr/stack/mac/sched_nr_ue.h
diff --git a/srsenb/hdr/stack/mac/nr/sched_nr_worker.h b/srsgnb/hdr/stack/mac/sched_nr_worker.h
similarity index 100%
rename from srsenb/hdr/stack/mac/nr/sched_nr_worker.h
rename to srsgnb/hdr/stack/mac/sched_nr_worker.h
diff --git a/srsenb/hdr/stack/mac/nr/ue_nr.h b/srsgnb/hdr/stack/mac/ue_nr.h
similarity index 98%
rename from srsenb/hdr/stack/mac/nr/ue_nr.h
rename to srsgnb/hdr/stack/mac/ue_nr.h
index e5576cbe0..3282a85b1 100644
--- a/srsenb/hdr/stack/mac/nr/ue_nr.h
+++ b/srsgnb/hdr/stack/mac/ue_nr.h
@@ -14,7 +14,7 @@
 #define SRSENB_UE_NR_H
 
 #include "srsenb/hdr/stack/mac/common/mac_metrics.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr_interface.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_interface.h"
 #include "srsran/common/block_queue.h"
 #include "srsran/common/interfaces_common.h"
 #include "srsran/interfaces/enb_rlc_interfaces.h"
diff --git a/srsenb/hdr/stack/ngap/ngap.h b/srsgnb/hdr/stack/ngap/ngap.h
similarity index 100%
rename from srsenb/hdr/stack/ngap/ngap.h
rename to srsgnb/hdr/stack/ngap/ngap.h
diff --git a/srsenb/hdr/stack/ngap/ngap_interfaces.h b/srsgnb/hdr/stack/ngap/ngap_interfaces.h
similarity index 100%
rename from srsenb/hdr/stack/ngap/ngap_interfaces.h
rename to srsgnb/hdr/stack/ngap/ngap_interfaces.h
diff --git a/srsenb/hdr/stack/ngap/ngap_metrics.h b/srsgnb/hdr/stack/ngap/ngap_metrics.h
similarity index 100%
rename from srsenb/hdr/stack/ngap/ngap_metrics.h
rename to srsgnb/hdr/stack/ngap/ngap_metrics.h
diff --git a/srsenb/hdr/stack/ngap/ngap_ue.h b/srsgnb/hdr/stack/ngap/ngap_ue.h
similarity index 100%
rename from srsenb/hdr/stack/ngap/ngap_ue.h
rename to srsgnb/hdr/stack/ngap/ngap_ue.h
diff --git a/srsenb/hdr/stack/ngap/ngap_ue_bearer_manager.h b/srsgnb/hdr/stack/ngap/ngap_ue_bearer_manager.h
similarity index 100%
rename from srsenb/hdr/stack/ngap/ngap_ue_bearer_manager.h
rename to srsgnb/hdr/stack/ngap/ngap_ue_bearer_manager.h
diff --git a/srsenb/hdr/stack/ngap/ngap_ue_proc.h b/srsgnb/hdr/stack/ngap/ngap_ue_proc.h
similarity index 98%
rename from srsenb/hdr/stack/ngap/ngap_ue_proc.h
rename to srsgnb/hdr/stack/ngap/ngap_ue_proc.h
index 3d1cad5e1..36f2e57fc 100644
--- a/srsenb/hdr/stack/ngap/ngap_ue_proc.h
+++ b/srsgnb/hdr/stack/ngap/ngap_ue_proc.h
@@ -16,7 +16,7 @@
 #include "ngap_interfaces.h"
 #include "ngap_ue_utils.h"
 
-#include "srsenb/hdr/stack/ngap/ngap_ue_bearer_manager.h"
+#include "srsgnb/hdr/stack/ngap/ngap_ue_bearer_manager.h"
 #include "srsran/asn1/asn1_utils.h"
 #include "srsran/asn1/ngap.h"
 #include "srsran/common/buffer_pool.h"
diff --git a/srsenb/hdr/stack/ngap/ngap_ue_utils.h b/srsgnb/hdr/stack/ngap/ngap_ue_utils.h
similarity index 100%
rename from srsenb/hdr/stack/ngap/ngap_ue_utils.h
rename to srsgnb/hdr/stack/ngap/ngap_ue_utils.h
diff --git a/srsenb/hdr/stack/rrc/nr/cell_asn1_config.h b/srsgnb/hdr/stack/rrc/cell_asn1_config.h
similarity index 100%
rename from srsenb/hdr/stack/rrc/nr/cell_asn1_config.h
rename to srsgnb/hdr/stack/rrc/cell_asn1_config.h
diff --git a/srsenb/hdr/stack/rrc/nr/rrc_config_nr.h b/srsgnb/hdr/stack/rrc/rrc_config_nr.h
similarity index 97%
rename from srsenb/hdr/stack/rrc/nr/rrc_config_nr.h
rename to srsgnb/hdr/stack/rrc/rrc_config_nr.h
index 0dfec758f..5a67958f5 100644
--- a/srsenb/hdr/stack/rrc/nr/rrc_config_nr.h
+++ b/srsgnb/hdr/stack/rrc/rrc_config_nr.h
@@ -13,8 +13,8 @@
 #ifndef SRSRAN_RRC_CONFIG_NR_H
 #define SRSRAN_RRC_CONFIG_NR_H
 
-#include "../rrc_config_common.h"
 #include "srsenb/hdr/phy/phy_interfaces.h"
+#include "srsenb/hdr/stack/rrc/rrc_config_common.h"
 #include "srsran/asn1/rrc_nr.h"
 #include "srsran/interfaces/gnb_rrc_nr_interfaces.h"
 #include "srsue/hdr/phy/phy_common.h"
diff --git a/srsenb/hdr/stack/rrc/rrc_nr.h b/srsgnb/hdr/stack/rrc/rrc_nr.h
similarity index 98%
rename from srsenb/hdr/stack/rrc/rrc_nr.h
rename to srsgnb/hdr/stack/rrc/rrc_nr.h
index c03694ba2..267764daa 100644
--- a/srsenb/hdr/stack/rrc/rrc_nr.h
+++ b/srsgnb/hdr/stack/rrc/rrc_nr.h
@@ -13,10 +13,10 @@
 #ifndef SRSENB_RRC_NR_H
 #define SRSENB_RRC_NR_H
 
-#include "rrc_config_common.h"
-#include "rrc_metrics.h"
 #include "srsenb/hdr/stack/enb_stack_base.h"
-#include "srsenb/hdr/stack/rrc/nr/rrc_config_nr.h"
+#include "srsenb/hdr/stack/rrc/rrc_config_common.h"
+#include "srsenb/hdr/stack/rrc/rrc_metrics.h"
+#include "srsgnb/hdr/stack/rrc/rrc_config_nr.h"
 #include "srsran/asn1/rrc_nr.h"
 #include "srsran/common/block_queue.h"
 #include "srsran/common/buffer_pool.h"
diff --git a/srsenb/hdr/stack/upper/sdap.h b/srsgnb/hdr/stack/sdap/sdap.h
similarity index 100%
rename from srsenb/hdr/stack/upper/sdap.h
rename to srsgnb/hdr/stack/sdap/sdap.h
diff --git a/srsgnb/src/CMakeLists.txt b/srsgnb/src/CMakeLists.txt
new file mode 100644
index 000000000..51071b535
--- /dev/null
+++ b/srsgnb/src/CMakeLists.txt
@@ -0,0 +1,9 @@
+#
+# Copyright 2013-2021 Software Radio Systems Limited
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the distribution.
+#
+
+add_subdirectory(stack)
\ No newline at end of file
diff --git a/srsgnb/src/stack/CMakeLists.txt b/srsgnb/src/stack/CMakeLists.txt
new file mode 100644
index 000000000..369888e94
--- /dev/null
+++ b/srsgnb/src/stack/CMakeLists.txt
@@ -0,0 +1,18 @@
+#
+# Copyright 2013-2021 Software Radio Systems Limited
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the distribution.
+#
+
+include_directories(${PROJECT_SOURCE_DIR})
+
+add_subdirectory(mac)
+add_subdirectory(ngap)
+add_subdirectory(rrc)
+add_subdirectory(sdap)
+
+set(SOURCES gnb_stack_nr.cc)
+
+add_library(srsgnb_stack STATIC ${SOURCES})
\ No newline at end of file
diff --git a/srsenb/src/stack/gnb_stack_nr.cc b/srsgnb/src/stack/gnb_stack_nr.cc
similarity index 98%
rename from srsenb/src/stack/gnb_stack_nr.cc
rename to srsgnb/src/stack/gnb_stack_nr.cc
index cbd145c58..1cb69ecd9 100644
--- a/srsenb/src/stack/gnb_stack_nr.cc
+++ b/srsgnb/src/stack/gnb_stack_nr.cc
@@ -10,9 +10,9 @@
  *
  */
 
-#include "srsenb/hdr/stack/gnb_stack_nr.h"
-#include "srsenb/hdr/stack/ngap/ngap.h"
+#include "srsgnb/hdr/stack/gnb_stack_nr.h"
 #include "srsenb/hdr/stack/upper/gtpu.h"
+#include "srsgnb/hdr/stack/ngap/ngap.h"
 #include "srsran/common/network_utils.h"
 #include "srsran/common/standard_streams.h"
 #include "srsran/srsran.h"
diff --git a/srsenb/src/stack/mac/nr/CMakeLists.txt b/srsgnb/src/stack/mac/CMakeLists.txt
similarity index 91%
rename from srsenb/src/stack/mac/nr/CMakeLists.txt
rename to srsgnb/src/stack/mac/CMakeLists.txt
index 995f067d7..9164d1551 100644
--- a/srsenb/src/stack/mac/nr/CMakeLists.txt
+++ b/srsgnb/src/stack/mac/CMakeLists.txt
@@ -24,3 +24,6 @@ set(SOURCES mac_nr.cc
 
 add_library(srsgnb_mac STATIC ${SOURCES})
 target_link_libraries(srsgnb_mac srsenb_mac_common)
+include_directories(${PROJECT_SOURCE_DIR})
+
+add_subdirectory(test)
\ No newline at end of file
diff --git a/srsenb/src/stack/mac/nr/harq_softbuffer.cc b/srsgnb/src/stack/mac/harq_softbuffer.cc
similarity index 97%
rename from srsenb/src/stack/mac/nr/harq_softbuffer.cc
rename to srsgnb/src/stack/mac/harq_softbuffer.cc
index b60465d8f..6035b1c69 100644
--- a/srsenb/src/stack/mac/nr/harq_softbuffer.cc
+++ b/srsgnb/src/stack/mac/harq_softbuffer.cc
@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsenb/hdr/stack/mac/nr/harq_softbuffer.h"
+#include "srsgnb/hdr/stack/mac/harq_softbuffer.h"
 #include "srsran/adt/pool/obj_pool.h"
 
 namespace srsenb {
diff --git a/srsenb/src/stack/mac/nr/mac_nr.cc b/srsgnb/src/stack/mac/mac_nr.cc
similarity index 99%
rename from srsenb/src/stack/mac/nr/mac_nr.cc
rename to srsgnb/src/stack/mac/mac_nr.cc
index 496cc7c6a..2a837db8f 100644
--- a/srsenb/src/stack/mac/nr/mac_nr.cc
+++ b/srsgnb/src/stack/mac/mac_nr.cc
@@ -10,8 +10,8 @@
  *
  */
 
-#include "srsenb/hdr/stack/mac/nr/mac_nr.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr.h"
+#include "srsgnb/hdr/stack/mac/mac_nr.h"
+#include "srsgnb/hdr/stack/mac/sched_nr.h"
 #include "srsran/common/buffer_pool.h"
 #include "srsran/common/phy_cfg_nr_default.h"
 #include "srsran/common/rwlock_guard.h"
diff --git a/srsenb/src/stack/mac/nr/sched_nr.cc b/srsgnb/src/stack/mac/sched_nr.cc
similarity index 98%
rename from srsenb/src/stack/mac/nr/sched_nr.cc
rename to srsgnb/src/stack/mac/sched_nr.cc
index 348680053..c99121abc 100644
--- a/srsenb/src/stack/mac/nr/sched_nr.cc
+++ b/srsgnb/src/stack/mac/sched_nr.cc
@@ -10,11 +10,11 @@
  *
  */
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr.h"
+#include "srsgnb/hdr/stack/mac/sched_nr.h"
 #include "srsenb/hdr/stack/mac/common/mac_metrics.h"
-#include "srsenb/hdr/stack/mac/nr/harq_softbuffer.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr_bwp.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr_worker.h"
+#include "srsgnb/hdr/stack/mac/harq_softbuffer.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_bwp.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_worker.h"
 #include "srsran/common/phy_cfg_nr_default.h"
 #include "srsran/common/string_helpers.h"
 #include "srsran/common/thread_pool.h"
diff --git a/srsenb/src/stack/mac/nr/sched_nr_bwp.cc b/srsgnb/src/stack/mac/sched_nr_bwp.cc
similarity index 99%
rename from srsenb/src/stack/mac/nr/sched_nr_bwp.cc
rename to srsgnb/src/stack/mac/sched_nr_bwp.cc
index 77fdf35cb..2b82b1d0d 100644
--- a/srsenb/src/stack/mac/nr/sched_nr_bwp.cc
+++ b/srsgnb/src/stack/mac/sched_nr_bwp.cc
@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_bwp.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_bwp.h"
 #include "srsran/common/standard_streams.h"
 #include "srsran/common/string_helpers.h"
 
diff --git a/srsenb/src/stack/mac/nr/sched_nr_cfg.cc b/srsgnb/src/stack/mac/sched_nr_cfg.cc
similarity index 97%
rename from srsenb/src/stack/mac/nr/sched_nr_cfg.cc
rename to srsgnb/src/stack/mac/sched_nr_cfg.cc
index 7da89466e..46a90096c 100644
--- a/srsenb/src/stack/mac/nr/sched_nr_cfg.cc
+++ b/srsgnb/src/stack/mac/sched_nr_cfg.cc
@@ -10,8 +10,8 @@
  *
  */
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_cfg.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr_helpers.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_cfg.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_helpers.h"
 #include "srsran/adt/optional_array.h"
 extern "C" {
 #include "srsran/phy/phch/ra_ul_nr.h"
diff --git a/srsenb/src/stack/mac/nr/sched_nr_grant_allocator.cc b/srsgnb/src/stack/mac/sched_nr_grant_allocator.cc
similarity index 98%
rename from srsenb/src/stack/mac/nr/sched_nr_grant_allocator.cc
rename to srsgnb/src/stack/mac/sched_nr_grant_allocator.cc
index e94090a81..95aa5f1cf 100644
--- a/srsenb/src/stack/mac/nr/sched_nr_grant_allocator.cc
+++ b/srsgnb/src/stack/mac/sched_nr_grant_allocator.cc
@@ -10,9 +10,9 @@
  *
  */
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_grant_allocator.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr_bwp.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr_helpers.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_grant_allocator.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_bwp.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_helpers.h"
 
 namespace srsenb {
 namespace sched_nr_impl {
diff --git a/srsenb/src/stack/mac/nr/sched_nr_harq.cc b/srsgnb/src/stack/mac/sched_nr_harq.cc
similarity index 98%
rename from srsenb/src/stack/mac/nr/sched_nr_harq.cc
rename to srsgnb/src/stack/mac/sched_nr_harq.cc
index b4160a61f..a70c8f877 100644
--- a/srsenb/src/stack/mac/nr/sched_nr_harq.cc
+++ b/srsgnb/src/stack/mac/sched_nr_harq.cc
@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_harq.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_harq.h"
 #include "srsran/common/buffer_pool.h"
 
 namespace srsenb {
diff --git a/srsenb/src/stack/mac/nr/sched_nr_helpers.cc b/srsgnb/src/stack/mac/sched_nr_helpers.cc
similarity index 97%
rename from srsenb/src/stack/mac/nr/sched_nr_helpers.cc
rename to srsgnb/src/stack/mac/sched_nr_helpers.cc
index 9d881f2b3..d3707be10 100644
--- a/srsenb/src/stack/mac/nr/sched_nr_helpers.cc
+++ b/srsgnb/src/stack/mac/sched_nr_helpers.cc
@@ -10,10 +10,10 @@
  *
  */
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_helpers.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr_grant_allocator.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr_harq.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr_ue.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_helpers.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_grant_allocator.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_harq.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_ue.h"
 #include "srsran/common/string_helpers.h"
 
 namespace srsenb {
diff --git a/srsenb/src/stack/mac/nr/sched_nr_pdcch.cc b/srsgnb/src/stack/mac/sched_nr_pdcch.cc
similarity index 99%
rename from srsenb/src/stack/mac/nr/sched_nr_pdcch.cc
rename to srsgnb/src/stack/mac/sched_nr_pdcch.cc
index df438a989..78709bf42 100644
--- a/srsenb/src/stack/mac/nr/sched_nr_pdcch.cc
+++ b/srsgnb/src/stack/mac/sched_nr_pdcch.cc
@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_pdcch.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_pdcch.h"
 
 namespace srsenb {
 namespace sched_nr_impl {
diff --git a/srsenb/src/stack/mac/nr/sched_nr_rb.cc b/srsgnb/src/stack/mac/sched_nr_rb.cc
similarity index 98%
rename from srsenb/src/stack/mac/nr/sched_nr_rb.cc
rename to srsgnb/src/stack/mac/sched_nr_rb.cc
index e24844b7f..db77d4221 100644
--- a/srsenb/src/stack/mac/nr/sched_nr_rb.cc
+++ b/srsgnb/src/stack/mac/sched_nr_rb.cc
@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_rb.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_rb.h"
 
 namespace srsenb {
 namespace sched_nr_impl {
diff --git a/srsenb/src/stack/mac/nr/sched_nr_signalling.cc b/srsgnb/src/stack/mac/sched_nr_signalling.cc
similarity index 98%
rename from srsenb/src/stack/mac/nr/sched_nr_signalling.cc
rename to srsgnb/src/stack/mac/sched_nr_signalling.cc
index 5d125b5e8..df738a0b0 100644
--- a/srsenb/src/stack/mac/nr/sched_nr_signalling.cc
+++ b/srsgnb/src/stack/mac/sched_nr_signalling.cc
@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_signalling.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_signalling.h"
 
 #define POS_IN_BURST_FIRST_BIT_IDX 0
 #define POS_IN_BURST_SECOND_BIT_IDX 1
diff --git a/srsenb/src/stack/mac/nr/sched_nr_time_rr.cc b/srsgnb/src/stack/mac/sched_nr_time_rr.cc
similarity index 97%
rename from srsenb/src/stack/mac/nr/sched_nr_time_rr.cc
rename to srsgnb/src/stack/mac/sched_nr_time_rr.cc
index b46ed63cb..34b7f3806 100644
--- a/srsenb/src/stack/mac/nr/sched_nr_time_rr.cc
+++ b/srsgnb/src/stack/mac/sched_nr_time_rr.cc
@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_time_rr.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_time_rr.h"
 
 namespace srsenb {
 namespace sched_nr_impl {
diff --git a/srsenb/src/stack/mac/nr/sched_nr_ue.cc b/srsgnb/src/stack/mac/sched_nr_ue.cc
similarity index 97%
rename from srsenb/src/stack/mac/nr/sched_nr_ue.cc
rename to srsgnb/src/stack/mac/sched_nr_ue.cc
index 1a41fb5c0..41f73f60b 100644
--- a/srsenb/src/stack/mac/nr/sched_nr_ue.cc
+++ b/srsgnb/src/stack/mac/sched_nr_ue.cc
@@ -10,8 +10,8 @@
  *
  */
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_ue.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr_pdcch.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_ue.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_pdcch.h"
 #include "srsran/common/string_helpers.h"
 
 namespace srsenb {
diff --git a/srsenb/src/stack/mac/nr/sched_nr_worker.cc b/srsgnb/src/stack/mac/sched_nr_worker.cc
similarity index 98%
rename from srsenb/src/stack/mac/nr/sched_nr_worker.cc
rename to srsgnb/src/stack/mac/sched_nr_worker.cc
index b981c1404..c4ac886c5 100644
--- a/srsenb/src/stack/mac/nr/sched_nr_worker.cc
+++ b/srsgnb/src/stack/mac/sched_nr_worker.cc
@@ -10,9 +10,9 @@
  *
  */
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_worker.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_worker.h"
 #include "srsenb/hdr/stack/mac/common/mac_metrics.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr_signalling.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_signalling.h"
 #include "srsran/common/string_helpers.h"
 
 namespace srsenb {
diff --git a/srsenb/test/mac/nr/CMakeLists.txt b/srsgnb/src/stack/mac/test/CMakeLists.txt
similarity index 100%
rename from srsenb/test/mac/nr/CMakeLists.txt
rename to srsgnb/src/stack/mac/test/CMakeLists.txt
diff --git a/srsenb/test/mac/nr/sched_nr_cfg_generators.h b/srsgnb/src/stack/mac/test/sched_nr_cfg_generators.h
similarity index 98%
rename from srsenb/test/mac/nr/sched_nr_cfg_generators.h
rename to srsgnb/src/stack/mac/test/sched_nr_cfg_generators.h
index 93e927612..37d425705 100644
--- a/srsenb/test/mac/nr/sched_nr_cfg_generators.h
+++ b/srsgnb/src/stack/mac/test/sched_nr_cfg_generators.h
@@ -13,7 +13,7 @@
 #ifndef SRSRAN_SCHED_NR_CFG_GENERATORS_H
 #define SRSRAN_SCHED_NR_CFG_GENERATORS_H
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_interface.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_interface.h"
 #include "srsran/common/phy_cfg_nr_default.h"
 
 namespace srsenb {
diff --git a/srsenb/test/mac/nr/sched_nr_common_test.cc b/srsgnb/src/stack/mac/test/sched_nr_common_test.cc
similarity index 98%
rename from srsenb/test/mac/nr/sched_nr_common_test.cc
rename to srsgnb/src/stack/mac/test/sched_nr_common_test.cc
index a5fb89906..0ab6f9a35 100644
--- a/srsenb/test/mac/nr/sched_nr_common_test.cc
+++ b/srsgnb/src/stack/mac/test/sched_nr_common_test.cc
@@ -11,7 +11,7 @@
  */
 
 #include "sched_nr_common_test.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr_cfg.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_cfg.h"
 #include "srsran/support/srsran_test.h"
 
 namespace srsenb {
diff --git a/srsenb/test/mac/nr/sched_nr_common_test.h b/srsgnb/src/stack/mac/test/sched_nr_common_test.h
similarity index 95%
rename from srsenb/test/mac/nr/sched_nr_common_test.h
rename to srsgnb/src/stack/mac/test/sched_nr_common_test.h
index 096a0d3d4..a835ba8f9 100644
--- a/srsenb/test/mac/nr/sched_nr_common_test.h
+++ b/srsgnb/src/stack/mac/test/sched_nr_common_test.h
@@ -13,7 +13,7 @@
 #ifndef SRSRAN_SCHED_NR_COMMON_TEST_H
 #define SRSRAN_SCHED_NR_COMMON_TEST_H
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_pdcch.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_pdcch.h"
 #include "srsran/adt/span.h"
 
 namespace srsenb {
diff --git a/srsenb/test/mac/nr/sched_nr_prb_test.cc b/srsgnb/src/stack/mac/test/sched_nr_prb_test.cc
similarity index 98%
rename from srsenb/test/mac/nr/sched_nr_prb_test.cc
rename to srsgnb/src/stack/mac/test/sched_nr_prb_test.cc
index 25d3c65d4..bd619eec1 100644
--- a/srsenb/test/mac/nr/sched_nr_prb_test.cc
+++ b/srsgnb/src/stack/mac/test/sched_nr_prb_test.cc
@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsenb/hdr/stack/mac/nr/sched_nr_rb.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_rb.h"
 #include "srsran/common/test_common.h"
 
 using namespace srsenb;
diff --git a/srsenb/test/mac/nr/sched_nr_rar_test.cc b/srsgnb/src/stack/mac/test/sched_nr_rar_test.cc
similarity index 98%
rename from srsenb/test/mac/nr/sched_nr_rar_test.cc
rename to srsgnb/src/stack/mac/test/sched_nr_rar_test.cc
index 991950c5a..dbd0870c4 100644
--- a/srsenb/test/mac/nr/sched_nr_rar_test.cc
+++ b/srsgnb/src/stack/mac/test/sched_nr_rar_test.cc
@@ -12,7 +12,7 @@
 
 #include "sched_nr_cfg_generators.h"
 #include "sched_nr_common_test.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr_bwp.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_bwp.h"
 #include "srsran/common/test_common.h"
 #include "srsran/support/srsran_test.h"
 #include <random>
diff --git a/srsenb/test/mac/nr/sched_nr_sim_ue.cc b/srsgnb/src/stack/mac/test/sched_nr_sim_ue.cc
similarity index 100%
rename from srsenb/test/mac/nr/sched_nr_sim_ue.cc
rename to srsgnb/src/stack/mac/test/sched_nr_sim_ue.cc
diff --git a/srsenb/test/mac/nr/sched_nr_sim_ue.h b/srsgnb/src/stack/mac/test/sched_nr_sim_ue.h
similarity index 98%
rename from srsenb/test/mac/nr/sched_nr_sim_ue.h
rename to srsgnb/src/stack/mac/test/sched_nr_sim_ue.h
index d70f9f396..6ed98e4bc 100644
--- a/srsenb/test/mac/nr/sched_nr_sim_ue.h
+++ b/srsgnb/src/stack/mac/test/sched_nr_sim_ue.h
@@ -13,8 +13,8 @@
 #ifndef SRSRAN_SCHED_NR_SIM_UE_H
 #define SRSRAN_SCHED_NR_SIM_UE_H
 
-#include "../sched_sim_ue.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr.h"
+#include "srsenb/test/mac/sched_sim_ue.h"
+#include "srsgnb/hdr/stack/mac/sched_nr.h"
 #include "srsran/adt/circular_array.h"
 #include <condition_variable>
 #include <semaphore.h>
diff --git a/srsenb/test/mac/nr/sched_nr_test.cc b/srsgnb/src/stack/mac/test/sched_nr_test.cc
similarity index 100%
rename from srsenb/test/mac/nr/sched_nr_test.cc
rename to srsgnb/src/stack/mac/test/sched_nr_test.cc
diff --git a/srsenb/test/mac/nr/sched_nr_ue_ded_test_suite.cc b/srsgnb/src/stack/mac/test/sched_nr_ue_ded_test_suite.cc
similarity index 96%
rename from srsenb/test/mac/nr/sched_nr_ue_ded_test_suite.cc
rename to srsgnb/src/stack/mac/test/sched_nr_ue_ded_test_suite.cc
index 5b76f6098..13d934a78 100644
--- a/srsenb/test/mac/nr/sched_nr_ue_ded_test_suite.cc
+++ b/srsgnb/src/stack/mac/test/sched_nr_ue_ded_test_suite.cc
@@ -11,7 +11,7 @@
  */
 
 #include "sched_nr_ue_ded_test_suite.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr_grant_allocator.h"
+#include "srsgnb/hdr/stack/mac/sched_nr_grant_allocator.h"
 #include "srsran/common/test_common.h"
 
 namespace srsenb {
diff --git a/srsenb/test/mac/nr/sched_nr_ue_ded_test_suite.h b/srsgnb/src/stack/mac/test/sched_nr_ue_ded_test_suite.h
similarity index 100%
rename from srsenb/test/mac/nr/sched_nr_ue_ded_test_suite.h
rename to srsgnb/src/stack/mac/test/sched_nr_ue_ded_test_suite.h
diff --git a/srsenb/src/stack/mac/nr/ue_nr.cc b/srsgnb/src/stack/mac/ue_nr.cc
similarity index 99%
rename from srsenb/src/stack/mac/nr/ue_nr.cc
rename to srsgnb/src/stack/mac/ue_nr.cc
index 35e99cea4..c6fe7d3ee 100644
--- a/srsenb/src/stack/mac/nr/ue_nr.cc
+++ b/srsgnb/src/stack/mac/ue_nr.cc
@@ -15,7 +15,7 @@
 #include <iostream>
 #include <string.h>
 
-#include "srsenb/hdr/stack/mac/nr/ue_nr.h"
+#include "srsgnb/hdr/stack/mac/ue_nr.h"
 #include "srsran/common/buffer_pool.h"
 #include "srsran/common/string_helpers.h"
 #include "srsran/interfaces/gnb_interfaces.h"
diff --git a/srsenb/src/stack/ngap/CMakeLists.txt b/srsgnb/src/stack/ngap/CMakeLists.txt
similarity index 100%
rename from srsenb/src/stack/ngap/CMakeLists.txt
rename to srsgnb/src/stack/ngap/CMakeLists.txt
diff --git a/srsenb/src/stack/ngap/ngap.cc b/srsgnb/src/stack/ngap/ngap.cc
similarity index 99%
rename from srsenb/src/stack/ngap/ngap.cc
rename to srsgnb/src/stack/ngap/ngap.cc
index fcfb9adf1..c57f13f39 100644
--- a/srsenb/src/stack/ngap/ngap.cc
+++ b/srsgnb/src/stack/ngap/ngap.cc
@@ -10,8 +10,8 @@
  *
  */
 
-#include "srsenb/hdr/stack/ngap/ngap.h"
-#include "srsenb/hdr/stack/ngap/ngap_ue.h"
+#include "srsgnb/hdr/stack/ngap/ngap.h"
+#include "srsgnb/hdr/stack/ngap/ngap_ue.h"
 #include "srsran/common/int_helpers.h"
 
 using srsran::s1ap_mccmnc_to_plmn;
diff --git a/srsenb/src/stack/ngap/ngap_ue.cc b/srsgnb/src/stack/ngap/ngap_ue.cc
similarity index 98%
rename from srsenb/src/stack/ngap/ngap_ue.cc
rename to srsgnb/src/stack/ngap/ngap_ue.cc
index 3d9d0608a..1efcf8d4a 100644
--- a/srsenb/src/stack/ngap/ngap_ue.cc
+++ b/srsgnb/src/stack/ngap/ngap_ue.cc
@@ -10,9 +10,9 @@
  *
  */
 
-#include "srsenb/hdr/stack/ngap/ngap_ue.h"
-#include "srsenb/hdr/stack/ngap/ngap.h"
-#include "srsenb/hdr/stack/ngap/ngap_ue_proc.h"
+#include "srsgnb/hdr/stack/ngap/ngap_ue.h"
+#include "srsgnb/hdr/stack/ngap/ngap.h"
+#include "srsgnb/hdr/stack/ngap/ngap_ue_proc.h"
 #include "srsran/common/int_helpers.h"
 
 using namespace asn1::ngap_nr;
diff --git a/srsenb/src/stack/ngap/ngap_ue_bearer_manager.cc b/srsgnb/src/stack/ngap/ngap_ue_bearer_manager.cc
similarity index 98%
rename from srsenb/src/stack/ngap/ngap_ue_bearer_manager.cc
rename to srsgnb/src/stack/ngap/ngap_ue_bearer_manager.cc
index 55ceb18c2..ad336df4c 100644
--- a/srsenb/src/stack/ngap/ngap_ue_bearer_manager.cc
+++ b/srsgnb/src/stack/ngap/ngap_ue_bearer_manager.cc
@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsenb/hdr/stack/ngap/ngap_ue_bearer_manager.h"
+#include "srsgnb/hdr/stack/ngap/ngap_ue_bearer_manager.h"
 
 namespace srsenb {
 ngap_ue_bearer_manager::ngap_ue_bearer_manager(gtpu_interface_rrc* gtpu_, srslog::basic_logger& logger_) :
diff --git a/srsenb/src/stack/ngap/ngap_ue_proc.cc b/srsgnb/src/stack/ngap/ngap_ue_proc.cc
similarity index 99%
rename from srsenb/src/stack/ngap/ngap_ue_proc.cc
rename to srsgnb/src/stack/ngap/ngap_ue_proc.cc
index 750cf5ac9..9c2ba883a 100644
--- a/srsenb/src/stack/ngap/ngap_ue_proc.cc
+++ b/srsgnb/src/stack/ngap/ngap_ue_proc.cc
@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsenb/hdr/stack/ngap/ngap_ue_proc.h"
+#include "srsgnb/hdr/stack/ngap/ngap_ue_proc.h"
 
 using namespace srsran;
 
diff --git a/srsenb/test/ngap/CMakeLists.txt b/srsgnb/src/stack/ngap/test/CMakeLists.txt
similarity index 100%
rename from srsenb/test/ngap/CMakeLists.txt
rename to srsgnb/src/stack/ngap/test/CMakeLists.txt
diff --git a/srsenb/test/ngap/ngap_test.cc b/srsgnb/src/stack/ngap/test/ngap_test.cc
similarity index 100%
rename from srsenb/test/ngap/ngap_test.cc
rename to srsgnb/src/stack/ngap/test/ngap_test.cc
diff --git a/srsgnb/src/stack/rrc/CMakeLists.txt b/srsgnb/src/stack/rrc/CMakeLists.txt
new file mode 100644
index 000000000..58ee3867c
--- /dev/null
+++ b/srsgnb/src/stack/rrc/CMakeLists.txt
@@ -0,0 +1,15 @@
+#
+# Copyright 2013-2021 Software Radio Systems Limited
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the distribution.
+#
+
+set(SOURCES rrc_nr.cc cell_asn1_config.cc)
+add_library(srsgnb_rrc STATIC ${SOURCES})
+target_link_libraries(srsgnb_rrc srsran_rrc_nr)
+
+include_directories(${PROJECT_SOURCE_DIR})
+
+add_subdirectory(test)
\ No newline at end of file
diff --git a/srsenb/src/stack/rrc/nr/cell_asn1_config.cc b/srsgnb/src/stack/rrc/cell_asn1_config.cc
similarity index 99%
rename from srsenb/src/stack/rrc/nr/cell_asn1_config.cc
rename to srsgnb/src/stack/rrc/cell_asn1_config.cc
index 09e39751b..c6535f280 100644
--- a/srsenb/src/stack/rrc/nr/cell_asn1_config.cc
+++ b/srsgnb/src/stack/rrc/cell_asn1_config.cc
@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsenb/hdr/stack/rrc/nr/cell_asn1_config.h"
+#include "srsgnb/hdr/stack/rrc/cell_asn1_config.h"
 #include "srsran/rrc/nr/rrc_nr_cfg_utils.h"
 #include <bitset>
 
diff --git a/srsenb/src/stack/rrc/rrc_nr.cc b/srsgnb/src/stack/rrc/rrc_nr.cc
similarity index 99%
rename from srsenb/src/stack/rrc/rrc_nr.cc
rename to srsgnb/src/stack/rrc/rrc_nr.cc
index 0a50b9f84..e2069af70 100644
--- a/srsenb/src/stack/rrc/rrc_nr.cc
+++ b/srsgnb/src/stack/rrc/rrc_nr.cc
@@ -10,10 +10,10 @@
  *
  */
 
-#include "srsenb/hdr/stack/rrc/rrc_nr.h"
+#include "srsgnb/hdr/stack/rrc/rrc_nr.h"
 #include "srsenb/hdr/common/common_enb.h"
-#include "srsenb/hdr/stack/rrc/nr/cell_asn1_config.h"
-#include "srsenb/test/mac/nr/sched_nr_cfg_generators.h"
+#include "srsgnb/hdr/stack/rrc/cell_asn1_config.h"
+#include "srsgnb/src/stack/mac/test/sched_nr_cfg_generators.h"
 #include "srsran/asn1/rrc_nr_utils.h"
 #include "srsran/common/common_nr.h"
 #include "srsran/common/phy_cfg_nr_default.h"
diff --git a/srsgnb/src/stack/rrc/test/CMakeLists.txt b/srsgnb/src/stack/rrc/test/CMakeLists.txt
new file mode 100644
index 000000000..798e2556d
--- /dev/null
+++ b/srsgnb/src/stack/rrc/test/CMakeLists.txt
@@ -0,0 +1,11 @@
+#
+# Copyright 2013-2021 Software Radio Systems Limited
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the distribution.
+#
+
+add_executable(rrc_nr_test rrc_nr_test.cc)
+target_link_libraries(rrc_nr_test srsgnb_rrc test_helpers ${ATOMIC_LIBS})
+add_test(rrc_nr_test rrc_nr_test -i ${CMAKE_CURRENT_SOURCE_DIR}/../..)
\ No newline at end of file
diff --git a/srsenb/test/rrc/rrc_nr_test.cc b/srsgnb/src/stack/rrc/test/rrc_nr_test.cc
similarity index 99%
rename from srsenb/test/rrc/rrc_nr_test.cc
rename to srsgnb/src/stack/rrc/test/rrc_nr_test.cc
index a7a024955..dc56df1f2 100644
--- a/srsenb/test/rrc/rrc_nr_test.cc
+++ b/srsgnb/src/stack/rrc/test/rrc_nr_test.cc
@@ -11,10 +11,10 @@
  */
 
 #include "srsenb/hdr/enb.h"
-#include "srsenb/hdr/stack/rrc/rrc_nr.h"
 #include "srsenb/test/common/dummy_classes_common.h"
 #include "srsenb/test/common/dummy_classes_nr.h"
 #include "srsenb/test/rrc/test_helpers.h"
+#include "srsgnb/hdr/stack/rrc/rrc_nr.h"
 #include "srsran/common/test_common.h"
 #include "srsran/interfaces/gnb_rrc_nr_interfaces.h"
 #include <iostream>
diff --git a/srsgnb/src/stack/sdap/CMakeLists.txt b/srsgnb/src/stack/sdap/CMakeLists.txt
new file mode 100644
index 000000000..245242ee5
--- /dev/null
+++ b/srsgnb/src/stack/sdap/CMakeLists.txt
@@ -0,0 +1,10 @@
+#
+# Copyright 2013-2021 Software Radio Systems Limited
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the distribution.
+#
+
+set(SOURCES sdap.cc)
+add_library(srsgnb_sdap STATIC ${SOURCES})
\ No newline at end of file
diff --git a/srsenb/src/stack/upper/sdap.cc b/srsgnb/src/stack/sdap/sdap.cc
similarity index 95%
rename from srsenb/src/stack/upper/sdap.cc
rename to srsgnb/src/stack/sdap/sdap.cc
index 64935aae3..54394b5a3 100644
--- a/srsenb/src/stack/upper/sdap.cc
+++ b/srsgnb/src/stack/sdap/sdap.cc
@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsenb/hdr/stack/upper/sdap.h"
+#include "srsgnb/hdr/stack/sdap/sdap.h"
 
 namespace srsenb {
 
diff --git a/test/phy/dummy_gnb_stack.h b/test/phy/dummy_gnb_stack.h
index 51a616d50..790547448 100644
--- a/test/phy/dummy_gnb_stack.h
+++ b/test/phy/dummy_gnb_stack.h
@@ -15,11 +15,11 @@
 
 #include "dummy_rx_harq_proc.h"
 #include "dummy_tx_harq_proc.h"
-#include "srsenb/hdr/stack/mac/nr/mac_nr.h"
-#include "srsenb/hdr/stack/mac/nr/sched_nr.h"
 #include "srsenb/test/common/dummy_classes_nr.h"
 #include "srsenb/test/common/rlc_test_dummy.h"
-#include "srsenb/test/mac/nr/sched_nr_cfg_generators.h"
+#include "srsgnb/hdr/stack/mac/mac_nr.h"
+#include "srsgnb/hdr/stack/mac/sched_nr.h"
+#include "srsgnb/src/stack/mac/test/sched_nr_cfg_generators.h"
 #include "srsran/srslog/srslog.h"
 #include <mutex>
 #include <set>