diff --git a/srsenb/hdr/stack/s1ap/ngap.h b/srsenb/hdr/stack/ngap/ngap.h
similarity index 100%
rename from srsenb/hdr/stack/s1ap/ngap.h
rename to srsenb/hdr/stack/ngap/ngap.h
diff --git a/srsenb/src/stack/CMakeLists.txt b/srsenb/src/stack/CMakeLists.txt
index 7793457c0..d5c67cc0f 100644
--- a/srsenb/src/stack/CMakeLists.txt
+++ b/srsenb/src/stack/CMakeLists.txt
@@ -9,6 +9,7 @@
 add_subdirectory(mac)
 add_subdirectory(rrc)
 add_subdirectory(s1ap)
+add_subdirectory(ngap)
 add_subdirectory(upper)
 
 set(SOURCES enb_stack_lte.cc)
diff --git a/srsenb/src/stack/ngap/CMakeLists.txt b/srsenb/src/stack/ngap/CMakeLists.txt
new file mode 100644
index 000000000..fd4c1f8bd
--- /dev/null
+++ b/srsenb/src/stack/ngap/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 ngap.cc)
+add_library(srsgnb_ngap STATIC ${SOURCES})
diff --git a/srsenb/src/stack/s1ap/ngap.cc b/srsenb/src/stack/ngap/ngap.cc
similarity index 99%
rename from srsenb/src/stack/s1ap/ngap.cc
rename to srsenb/src/stack/ngap/ngap.cc
index 0165517ce..7f901d8e1 100644
--- a/srsenb/src/stack/s1ap/ngap.cc
+++ b/srsenb/src/stack/ngap/ngap.cc
@@ -10,7 +10,7 @@
  *
  */
 
-#include "srsenb/hdr/stack/s1ap/ngap.h"
+#include "srsenb/hdr/stack/ngap/ngap.h"
 
 #define procError(fmt, ...) ngap_ptr->logger.error("Proc \"%s\" - " fmt, name(), ##__VA_ARGS__)
 #define procWarning(fmt, ...) ngap_ptr->logger.warning("Proc \"%s\" - " fmt, name(), ##__VA_ARGS__)
diff --git a/srsenb/src/stack/s1ap/CMakeLists.txt b/srsenb/src/stack/s1ap/CMakeLists.txt
index 0f8d2ad5a..c84077f04 100644
--- a/srsenb/src/stack/s1ap/CMakeLists.txt
+++ b/srsenb/src/stack/s1ap/CMakeLists.txt
@@ -8,6 +8,3 @@
 
 set(SOURCES s1ap.cc)
 add_library(srsenb_s1ap STATIC ${SOURCES})
-
-set(SOURCES ngap.cc)
-add_library(srsgnb_ngap STATIC ${SOURCES})