UE NAS refactor

src/ue/mm/access.cpp → src/ue/nas/mm/access.cpp

@@ -9,7 +9,7 @@
 #include "mm.hpp"
 
 #include <nas/utils.hpp>
-#include <ue/sm/sm.hpp>
+#include <ue/nas/sm/sm.hpp>
 
 namespace nr::ue
 {

src/ue/mm/dereg.cpp → src/ue/nas/mm/dereg.cpp

@@ -9,7 +9,7 @@
 #include "mm.hpp"
 #include <nas/utils.hpp>
 #include <ue/app/task.hpp>
-#include <ue/sm/sm.hpp>
+#include <ue/nas/sm/sm.hpp>
 
 namespace nr::ue
 {

src/ue/mm/radio.cpp → src/ue/nas/mm/radio.cpp

@@ -11,7 +11,7 @@
 #include <nas/utils.hpp>
 #include <ue/app/task.hpp>
 #include <ue/rrc/task.hpp>
-#include <ue/sm/sm.hpp>
+#include <ue/nas/sm/sm.hpp>
 
 namespace nr::ue
 {

src/ue/mm/slice.cpp → src/ue/nas/mm/slice.cpp

@@ -9,7 +9,7 @@
 #include "mm.hpp"
 #include <nas/utils.hpp>
 #include <ue/app/task.hpp>
-#include <ue/sm/sm.hpp>
+#include <ue/nas/sm/sm.hpp>
 
 namespace nr::ue
 {

src/ue/mm/transport.cpp → src/ue/nas/mm/transport.cpp

@@ -11,7 +11,7 @@
 #include <nas/utils.hpp>
 #include <ue/nas/enc.hpp>
 #include <ue/rrc/task.hpp>
-#include <ue/sm/sm.hpp>
+#include <ue/nas/sm/sm.hpp>
 
 namespace nr::ue
 {

src/ue/sm/establishment.cpp → src/ue/nas/sm/establishment.cpp

@@ -11,7 +11,7 @@
 #include <nas/proto_conf.hpp>
 #include <nas/utils.hpp>
 #include <ue/app/task.hpp>
-#include <ue/mm/mm.hpp>
+#include <ue/nas/mm/mm.hpp>
 
 namespace nr::ue
 {

src/ue/sm/interface.cpp → src/ue/nas/sm/interface.cpp

@@ -11,7 +11,7 @@
 #include <nas/proto_conf.hpp>
 #include <nas/utils.hpp>
 #include <ue/app/task.hpp>
-#include <ue/mm/mm.hpp>
+#include <ue/nas/mm/mm.hpp>
 
 namespace nr::ue
 {

src/ue/sm/procedure.cpp → src/ue/nas/sm/procedure.cpp

@@ -10,7 +10,7 @@
 #include <nas/utils.hpp>
 #include <set>
 #include <ue/app/task.hpp>
-#include <ue/mm/mm.hpp>
+#include <ue/nas/mm/mm.hpp>
 
 namespace nr::ue
 {

src/ue/sm/release.cpp → src/ue/nas/sm/release.cpp

@@ -11,7 +11,7 @@
 #include <nas/utils.hpp>
 #include <optional>
 #include <ue/app/task.hpp>
-#include <ue/mm/mm.hpp>
+#include <ue/nas/mm/mm.hpp>
 
 namespace nr::ue
 {

src/ue/sm/timer.cpp → src/ue/nas/sm/timer.cpp

@@ -11,7 +11,7 @@
 #include <nas/proto_conf.hpp>
 #include <nas/utils.hpp>
 #include <ue/app/task.hpp>
-#include <ue/mm/mm.hpp>
+#include <ue/nas/mm/mm.hpp>
 
 namespace nr::ue
 {

src/ue/sm/transport.cpp → src/ue/nas/sm/transport.cpp

@@ -8,7 +8,7 @@
 
 #include "sm.hpp"
 #include <nas/utils.hpp>
-#include <ue/mm/mm.hpp>
+#include <ue/nas/mm/mm.hpp>
 
 namespace nr::ue
 {

src/ue/nas/task.hpp

@@ -12,9 +12,9 @@
 #include <crypt/milenage.hpp>
 #include <nas/nas.hpp>
 #include <nas/timer.hpp>
-#include <ue/mm/mm.hpp>
+#include <ue/nas/mm/mm.hpp>
+#include <ue/nas/sm/sm.hpp>
 #include <ue/nts.hpp>
-#include <ue/sm/sm.hpp>
 #include <ue/types.hpp>
 #include <utils/nts.hpp>