diff --git a/src/apps/d2dMultihop/MultihopD2D.cc b/src/apps/d2dMultihop/MultihopD2D.cc
index 65a532f92..11451f9ae 100644
--- a/src/apps/d2dMultihop/MultihopD2D.cc
+++ b/src/apps/d2dMultihop/MultihopD2D.cc
@@ -18,7 +18,7 @@
 
 #include "apps/d2dMultihop/MultihopD2D.h"
 #include "apps/d2dMultihop/TrickleTimerMsg_m.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 
 namespace simu5g {
 
diff --git a/src/apps/d2dMultihop/MultihopD2D.h b/src/apps/d2dMultihop/MultihopD2D.h
index 240012175..0c3ad9f22 100644
--- a/src/apps/d2dMultihop/MultihopD2D.h
+++ b/src/apps/d2dMultihop/MultihopD2D.h
@@ -20,8 +20,8 @@
 #include "apps/d2dMultihop/MultihopD2DPacket_m.h"
 #include "apps/d2dMultihop/statistics/MultihopD2DStatistics.h"
 #include "apps/d2dMultihop/eventGenerator/EventGenerator.h"
-#include "stack/mac/layer/LteMacBase.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/mac/LteMacBase.h"
+#include "stack/phy/LtePhyBase.h"
 
 namespace simu5g {
 
diff --git a/src/apps/d2dMultihop/eventGenerator/EventGenerator.cc b/src/apps/d2dMultihop/eventGenerator/EventGenerator.cc
index 8240ed0e6..134b2a028 100644
--- a/src/apps/d2dMultihop/eventGenerator/EventGenerator.cc
+++ b/src/apps/d2dMultihop/eventGenerator/EventGenerator.cc
@@ -11,7 +11,7 @@
 
 #include "apps/d2dMultihop/eventGenerator/EventGenerator.h"
 #include "common/LteCommon.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/phy/LtePhyBase.h"
 
 namespace simu5g {
 
diff --git a/src/apps/d2dMultihop/eventGenerator/EventGenerator.h b/src/apps/d2dMultihop/eventGenerator/EventGenerator.h
index f0575414c..434e11931 100644
--- a/src/apps/d2dMultihop/eventGenerator/EventGenerator.h
+++ b/src/apps/d2dMultihop/eventGenerator/EventGenerator.h
@@ -18,7 +18,7 @@
 
 #include "apps/d2dMultihop/MultihopD2D.h"
 #include "common/binder/Binder.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/phy/LtePhyBase.h"
 
 namespace simu5g {
 
diff --git a/src/apps/mecRequestResponseApp/MecRequestApp.h b/src/apps/mecRequestResponseApp/MecRequestApp.h
index 307065ba2..a9088c8a5 100644
--- a/src/apps/mecRequestResponseApp/MecRequestApp.h
+++ b/src/apps/mecRequestResponseApp/MecRequestApp.h
@@ -19,7 +19,7 @@
 
 #include "apps/mecRequestResponseApp/packets/MecRequestResponsePacket_m.h"
 #include "apps/mecRequestResponseApp/packets/MigrationTimer_m.h"
-#include "stack/phy/layer/NRPhyUe.h"
+#include "stack/phy/NRPhyUe.h"
 
 namespace simu5g {
 
diff --git a/src/common/LteCommon.cc b/src/common/LteCommon.cc
index 8016fbf6d..ca1726dbc 100644
--- a/src/common/LteCommon.cc
+++ b/src/common/LteCommon.cc
@@ -20,7 +20,7 @@
 #include "common/binder/Binder.h"
 #include "common/cellInfo/CellInfo.h"
 #include "corenetwork/trafficFlowFilter/TftControlInfo_m.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 #include "x2/packet/X2ControlInfo_m.h"
 
 namespace simu5g {
diff --git a/src/common/binder/Binder.cc b/src/common/binder/Binder.cc
index 0da73d864..e6059dbe4 100644
--- a/src/common/binder/Binder.cc
+++ b/src/common/binder/Binder.cc
@@ -17,8 +17,8 @@
 #include "common/binder/Binder.h"
 #include "corenetwork/statsCollector/BaseStationStatsCollector.h"
 #include "corenetwork/statsCollector/UeStatsCollector.h"
-#include "stack/mac/layer/LteMacUe.h"
-#include "stack/phy/layer/LtePhyUe.h"
+#include "stack/mac/LteMacUe.h"
+#include "stack/phy/LtePhyUe.h"
 
 namespace simu5g {
 
diff --git a/src/common/binder/Binder.h b/src/common/binder/Binder.h
index ebb644924..1c1a299fe 100644
--- a/src/common/binder/Binder.h
+++ b/src/common/binder/Binder.h
@@ -22,7 +22,7 @@
 #include "common/LteCommon.h"
 #include "common/blerCurves/PhyPisaData.h"
 #include "nodes/ExtCell.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 
 namespace simu5g {
 
diff --git a/src/corenetwork/statsCollector/BaseStationStatsCollector.cc b/src/corenetwork/statsCollector/BaseStationStatsCollector.cc
index 261aaf01c..c370b4c7b 100644
--- a/src/corenetwork/statsCollector/BaseStationStatsCollector.cc
+++ b/src/corenetwork/statsCollector/BaseStationStatsCollector.cc
@@ -12,9 +12,7 @@
 #include "corenetwork/statsCollector/BaseStationStatsCollector.h"
 #include "corenetwork/statsCollector/UeStatsCollector.h"
 #include "stack/packetFlowManager/PacketFlowManagerEnb.h"
-#include "stack/rlc/um/LteRlcUm.h"
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 #include <string>
 
 namespace simu5g {
diff --git a/src/corenetwork/statsCollector/BaseStationStatsCollector.h b/src/corenetwork/statsCollector/BaseStationStatsCollector.h
index fd68c8355..0152e17b2 100644
--- a/src/corenetwork/statsCollector/BaseStationStatsCollector.h
+++ b/src/corenetwork/statsCollector/BaseStationStatsCollector.h
@@ -21,8 +21,8 @@
 #include <map>
 #include "corenetwork/statsCollector/L2Measures/L2MeasBase.h"
 #include "common/cellInfo/CellInfo.h"
-#include "stack/mac/layer/LteMacEnb.h"
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+#include "stack/mac/LteMacEnb.h"
+#include "stack/pdcp_rrc/LtePdcpRrc.h"
 #include "stack/rlc/um/LteRlcUm.h"
 #include "stack/packetFlowManager/PacketFlowManagerEnb.h"
 
diff --git a/src/corenetwork/statsCollector/UeStatsCollector.cc b/src/corenetwork/statsCollector/UeStatsCollector.cc
index e35b6057c..4aed1ec8d 100644
--- a/src/corenetwork/statsCollector/UeStatsCollector.cc
+++ b/src/corenetwork/statsCollector/UeStatsCollector.cc
@@ -13,9 +13,9 @@
 #include <inet/networklayer/common/NetworkInterface.h>
 
 #include "corenetwork/statsCollector/UeStatsCollector.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 #include "stack/packetFlowManager/PacketFlowManagerUe.h"
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+#include "stack/pdcp_rrc/LtePdcpRrc.h"
 
 namespace simu5g {
 
diff --git a/src/corenetwork/statsCollector/UeStatsCollector.h b/src/corenetwork/statsCollector/UeStatsCollector.h
index c676fc328..45796d1d9 100644
--- a/src/corenetwork/statsCollector/UeStatsCollector.h
+++ b/src/corenetwork/statsCollector/UeStatsCollector.h
@@ -20,9 +20,9 @@
 #include "corenetwork/statsCollector/L2Measures/L2MeasBase.h"
 #include <string>
 #include "corenetwork/statsCollector/UeStatsCollector.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 #include "stack/packetFlowManager/PacketFlowManagerUe.h"
-// #include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+// #include "stack/pdcp_rrc/LtePdcpRrc.h"
 
 namespace simu5g {
 
diff --git a/src/nodes/backgroundCell/BackgroundCellChannelModel.cc b/src/nodes/backgroundCell/BackgroundCellChannelModel.cc
index de2a9e45c..bf60013e2 100644
--- a/src/nodes/backgroundCell/BackgroundCellChannelModel.cc
+++ b/src/nodes/backgroundCell/BackgroundCellChannelModel.cc
@@ -11,8 +11,8 @@
 
 #include "nodes/backgroundCell/BackgroundCellChannelModel.h"
 #include "nodes/backgroundCell/BackgroundScheduler.h"
-#include "stack/phy/layer/LtePhyBase.h"
-#include "stack/phy/layer/LtePhyUe.h"
+#include "stack/phy/LtePhyBase.h"
+#include "stack/phy/LtePhyUe.h"
 #include "stack/phy/ChannelModel/LteRealisticChannelModel.h"
 
 namespace simu5g {
diff --git a/src/nodes/backgroundCell/BackgroundCellTrafficManager.cc b/src/nodes/backgroundCell/BackgroundCellTrafficManager.cc
index 0cbe8ac4d..56588113a 100644
--- a/src/nodes/backgroundCell/BackgroundCellTrafficManager.cc
+++ b/src/nodes/backgroundCell/BackgroundCellTrafficManager.cc
@@ -14,8 +14,8 @@
 #include "nodes/backgroundCell/BackgroundCellAmc.h"
 #include "nodes/backgroundCell/BackgroundCellAmcNr.h"
 #include "stack/backgroundTrafficGenerator/ActiveUeNotification_m.h"
-#include "stack/mac/layer/LteMacEnb.h"
-#include "stack/phy/layer/LtePhyEnb.h"
+#include "stack/mac/LteMacEnb.h"
+#include "stack/phy/LtePhyEnb.h"
 #include "stack/phy/ChannelModel/LteChannelModel.h"
 
 namespace simu5g {
diff --git a/src/stack/backgroundTrafficGenerator/BackgroundTrafficManager.h b/src/stack/backgroundTrafficGenerator/BackgroundTrafficManager.h
index 13f31a524..d89bbd18f 100644
--- a/src/stack/backgroundTrafficGenerator/BackgroundTrafficManager.h
+++ b/src/stack/backgroundTrafficGenerator/BackgroundTrafficManager.h
@@ -18,8 +18,8 @@
 #include "common/blerCurves/PhyPisaData.h"
 #include "stack/backgroundTrafficGenerator/BackgroundTrafficManagerBase.h"
 #include "stack/backgroundTrafficGenerator/generators/TrafficGeneratorBase.h"
-#include "stack/mac/layer/LteMacEnb.h"
-#include "stack/phy/layer/LtePhyEnb.h"
+#include "stack/mac/LteMacEnb.h"
+#include "stack/phy/LtePhyEnb.h"
 
 namespace simu5g {
 
diff --git a/src/stack/backgroundTrafficGenerator/BackgroundTrafficManagerBase.h b/src/stack/backgroundTrafficGenerator/BackgroundTrafficManagerBase.h
index 3a4141ee6..2e71f72d1 100644
--- a/src/stack/backgroundTrafficGenerator/BackgroundTrafficManagerBase.h
+++ b/src/stack/backgroundTrafficGenerator/BackgroundTrafficManagerBase.h
@@ -18,8 +18,8 @@
 #include "common/blerCurves/PhyPisaData.h"
 #include "stack/backgroundTrafficGenerator/IBackgroundTrafficManager.h"
 #include "stack/backgroundTrafficGenerator/generators/TrafficGeneratorBase.h"
-#include "stack/mac/layer/LteMacEnb.h"
-#include "stack/phy/layer/LtePhyEnb.h"
+#include "stack/mac/LteMacEnb.h"
+#include "stack/phy/LtePhyEnb.h"
 
 namespace simu5g {
 
diff --git a/src/stack/compManager/LteCompManagerBase.h b/src/stack/compManager/LteCompManagerBase.h
index 1ed7ea43d..c8c63acaa 100644
--- a/src/stack/compManager/LteCompManagerBase.h
+++ b/src/stack/compManager/LteCompManagerBase.h
@@ -13,7 +13,7 @@
 #define LTE_LTECOMPMANAGERBASE_H_
 
 #include "common/LteCommon.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 #include "stack/mac/buffer/LteMacBuffer.h"
 #include "x2/packet/X2ControlInfo_m.h"
 #include "stack/compManager/X2CompMsg.h"
diff --git a/src/stack/d2dModeSelection/D2DModeSelectionBase.h b/src/stack/d2dModeSelection/D2DModeSelectionBase.h
index 7a8dbd600..b24e273fb 100644
--- a/src/stack/d2dModeSelection/D2DModeSelectionBase.h
+++ b/src/stack/d2dModeSelection/D2DModeSelectionBase.h
@@ -14,7 +14,7 @@
 
 #include <inet/common/ModuleRefByPar.h>
 
-#include "stack/mac/layer/LteMacEnbD2D.h"
+#include "stack/mac/LteMacEnbD2D.h"
 
 namespace simu5g {
 
diff --git a/src/stack/d2dModeSelection/d2dModeSelectionBestCqi/D2DModeSelectionBestCqi.cc b/src/stack/d2dModeSelection/D2DModeSelectionBestCqi.cc
similarity index 97%
rename from src/stack/d2dModeSelection/d2dModeSelectionBestCqi/D2DModeSelectionBestCqi.cc
rename to src/stack/d2dModeSelection/D2DModeSelectionBestCqi.cc
index 4c3924086..576691d90 100644
--- a/src/stack/d2dModeSelection/d2dModeSelectionBestCqi/D2DModeSelectionBestCqi.cc
+++ b/src/stack/d2dModeSelection/D2DModeSelectionBestCqi.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/d2dModeSelection/d2dModeSelectionBestCqi/D2DModeSelectionBestCqi.h"
+#include "stack/d2dModeSelection/D2DModeSelectionBestCqi.h"
 
 namespace simu5g {
 
diff --git a/src/stack/d2dModeSelection/d2dModeSelectionBestCqi/D2DModeSelectionBestCqi.h b/src/stack/d2dModeSelection/D2DModeSelectionBestCqi.h
similarity index 100%
rename from src/stack/d2dModeSelection/d2dModeSelectionBestCqi/D2DModeSelectionBestCqi.h
rename to src/stack/d2dModeSelection/D2DModeSelectionBestCqi.h
diff --git a/src/stack/dualConnectivityManager/DualConnectivityManager.h b/src/stack/dualConnectivityManager/DualConnectivityManager.h
index 60fe4de07..d2b62715c 100644
--- a/src/stack/dualConnectivityManager/DualConnectivityManager.h
+++ b/src/stack/dualConnectivityManager/DualConnectivityManager.h
@@ -17,7 +17,7 @@
 #include "common/LteCommon.h"
 #include "x2/packet/X2ControlInfo_m.h"
 #include "stack/dualConnectivityManager/X2DualConnectivityDataMsg.h"
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+#include "stack/pdcp_rrc/LtePdcpRrc.h"
 
 namespace simu5g {
 
diff --git a/src/stack/ip2nic/IP2Nic.cc b/src/stack/ip2nic/IP2Nic.cc
index 41de47cc7..11ecdb0e0 100644
--- a/src/stack/ip2nic/IP2Nic.cc
+++ b/src/stack/ip2nic/IP2Nic.cc
@@ -28,7 +28,7 @@
 #include <inet/linklayer/common/InterfaceTag_m.h>
 
 #include "stack/ip2nic/IP2Nic.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 #include "common/binder/Binder.h"
 #include "common/cellInfo/CellInfo.h"
 
diff --git a/src/stack/mac/layer/LteMacBase.cc b/src/stack/mac/LteMacBase.cc
similarity index 99%
rename from src/stack/mac/layer/LteMacBase.cc
rename to src/stack/mac/LteMacBase.cc
index 18a13e1e2..849590715 100644
--- a/src/stack/mac/layer/LteMacBase.cc
+++ b/src/stack/mac/LteMacBase.cc
@@ -12,7 +12,7 @@
 #include "common/LteControlInfo.h"
 #include "common/binder/Binder.h"
 #include "common/cellInfo/CellInfo.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 #include "stack/mac/buffer/harq/LteHarqBufferTx.h"
 #include "stack/mac/buffer/harq_d2d/LteHarqBufferRxD2D.h"
 #include "stack/mac/buffer/harq/LteHarqBufferRx.h"
@@ -23,7 +23,7 @@
 #include "stack/mac/buffer/LteMacBuffer.h"
 #include "assert.h"
 #include "stack/packetFlowManager/PacketFlowManagerBase.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/phy/LtePhyBase.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/layer/LteMacBase.h b/src/stack/mac/LteMacBase.h
similarity index 100%
rename from src/stack/mac/layer/LteMacBase.h
rename to src/stack/mac/LteMacBase.h
diff --git a/src/stack/mac/layer/LteMacEnb.cc b/src/stack/mac/LteMacEnb.cc
similarity index 99%
rename from src/stack/mac/layer/LteMacEnb.cc
rename to src/stack/mac/LteMacEnb.cc
index 39b202070..6827dbeb4 100644
--- a/src/stack/mac/layer/LteMacEnb.cc
+++ b/src/stack/mac/LteMacEnb.cc
@@ -15,8 +15,8 @@
 #include <inet/common/TimeTag_m.h>
 
 #include "common/LteCommon.h"
-#include "stack/mac/layer/LteMacEnb.h"
-#include "stack/mac/layer/LteMacUe.h"
+#include "stack/mac/LteMacEnb.h"
+#include "stack/mac/LteMacUe.h"
 #include "stack/mac/buffer/harq/LteHarqBufferRx.h"
 #include "stack/mac/buffer/LteMacBuffer.h"
 #include "stack/mac/buffer/LteMacQueue.h"
@@ -30,12 +30,12 @@
 #include "stack/mac/amc/UserTxParams.h"
 #include "stack/mac/packet/LteRac_m.h"
 #include "stack/mac/packet/LteMacSduRequest.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/phy/LtePhyBase.h"
 #include "stack/rlc/packet/LteRlcDataPdu.h"
 #include "stack/rlc/am/packet/LteRlcAmPdu_m.h"
 #include "stack/packetFlowManager/PacketFlowManagerBase.h"
 #include "stack/rlc/um/LteRlcUm.h"
-#include "stack/pdcp_rrc/layer/NRPdcpRrcEnb.h"
+#include "stack/pdcp_rrc/NRPdcpRrcEnb.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/layer/LteMacEnb.h b/src/stack/mac/LteMacEnb.h
similarity index 99%
rename from src/stack/mac/layer/LteMacEnb.h
rename to src/stack/mac/LteMacEnb.h
index 4c12d01af..418751dcb 100644
--- a/src/stack/mac/layer/LteMacEnb.h
+++ b/src/stack/mac/LteMacEnb.h
@@ -15,7 +15,7 @@
 #include <inet/common/ModuleRefByPar.h>
 
 #include "common/cellInfo/CellInfo.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 #include "stack/mac/amc/LteAmc.h"
 #include "common/LteCommon.h"
 #include "stack/backgroundTrafficGenerator/IBackgroundTrafficManager.h"
diff --git a/src/stack/mac/layer/LteMacEnbD2D.cc b/src/stack/mac/LteMacEnbD2D.cc
similarity index 99%
rename from src/stack/mac/layer/LteMacEnbD2D.cc
rename to src/stack/mac/LteMacEnbD2D.cc
index 3001e1f9f..2996026ca 100644
--- a/src/stack/mac/layer/LteMacEnbD2D.cc
+++ b/src/stack/mac/LteMacEnbD2D.cc
@@ -9,8 +9,8 @@
 // and cannot be removed from it.
 //
 
-#include "stack/mac/layer/LteMacEnbD2D.h"
-#include "stack/mac/layer/LteMacUeD2D.h"
+#include "stack/mac/LteMacEnbD2D.h"
+#include "stack/mac/LteMacUeD2D.h"
 #include "stack/phy/packet/LteFeedbackPkt.h"
 #include "stack/mac/buffer/harq/LteHarqBufferRx.h"
 #include "stack/mac/amc/AmcPilotD2D.h"
diff --git a/src/stack/mac/layer/LteMacEnbD2D.h b/src/stack/mac/LteMacEnbD2D.h
similarity index 99%
rename from src/stack/mac/layer/LteMacEnbD2D.h
rename to src/stack/mac/LteMacEnbD2D.h
index 94ee86d73..2e1ea90f9 100644
--- a/src/stack/mac/layer/LteMacEnbD2D.h
+++ b/src/stack/mac/LteMacEnbD2D.h
@@ -12,7 +12,7 @@
 #ifndef _LTE_LTEMACENBD2D_H_
 #define _LTE_LTEMACENBD2D_H_
 
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 #include "stack/mac/buffer/LteMacBuffer.h"
 #include "stack/mac/buffer/harq_d2d/LteHarqBufferMirrorD2D.h"
 #include "stack/d2dModeSelection/D2DModeSwitchNotification_m.h"
diff --git a/src/stack/mac/layer/LteMacUe.cc b/src/stack/mac/LteMacUe.cc
similarity index 99%
rename from src/stack/mac/layer/LteMacUe.cc
rename to src/stack/mac/LteMacUe.cc
index 1daf6a46b..040eb9e45 100644
--- a/src/stack/mac/layer/LteMacUe.cc
+++ b/src/stack/mac/LteMacUe.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/mac/layer/LteMacUe.h"
+#include "stack/mac/LteMacUe.h"
 
 #include <inet/networklayer/ipv4/Ipv4InterfaceData.h>
 
diff --git a/src/stack/mac/layer/LteMacUe.h b/src/stack/mac/LteMacUe.h
similarity index 98%
rename from src/stack/mac/layer/LteMacUe.h
rename to src/stack/mac/LteMacUe.h
index c22d20d83..76f445099 100644
--- a/src/stack/mac/layer/LteMacUe.h
+++ b/src/stack/mac/LteMacUe.h
@@ -12,8 +12,8 @@
 #ifndef _LTE_LTEMACUE_H_
 #define _LTE_LTEMACUE_H_
 
-#include "stack/mac/layer/LteMacBase.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/mac/LteMacBase.h"
+#include "stack/phy/LtePhyBase.h"
 #include "stack/mac/buffer/harq/LteHarqBufferTx.h"
 #include "stack/phy/feedback/LteFeedback.h"
 
diff --git a/src/stack/mac/layer/LteMacUeD2D.cc b/src/stack/mac/LteMacUeD2D.cc
similarity index 99%
rename from src/stack/mac/layer/LteMacUeD2D.cc
rename to src/stack/mac/LteMacUeD2D.cc
index 6cf5de367..791ae7819 100644
--- a/src/stack/mac/layer/LteMacUeD2D.cc
+++ b/src/stack/mac/LteMacUeD2D.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/mac/layer/LteMacUeD2D.h"
+#include "stack/mac/LteMacUeD2D.h"
 
 #include "stack/mac/buffer/harq/LteHarqBufferRx.h"
 #include "stack/mac/buffer/LteMacQueue.h"
diff --git a/src/stack/mac/layer/LteMacUeD2D.h b/src/stack/mac/LteMacUeD2D.h
similarity index 97%
rename from src/stack/mac/layer/LteMacUeD2D.h
rename to src/stack/mac/LteMacUeD2D.h
index 3f0355758..09b15fa04 100644
--- a/src/stack/mac/layer/LteMacUeD2D.h
+++ b/src/stack/mac/LteMacUeD2D.h
@@ -12,8 +12,8 @@
 #ifndef _LTE_LTEMACUED2D_H_
 #define _LTE_LTEMACUED2D_H_
 
-#include "stack/mac/layer/LteMacUe.h"
-#include "stack/mac/layer/LteMacEnbD2D.h"
+#include "stack/mac/LteMacUe.h"
+#include "stack/mac/LteMacEnbD2D.h"
 #include "stack/mac/buffer/harq_d2d/LteHarqBufferTxD2D.h"
 
 namespace simu5g {
diff --git a/src/stack/mac/layer/NRMacGnb.cc b/src/stack/mac/NRMacGnb.cc
similarity index 96%
rename from src/stack/mac/layer/NRMacGnb.cc
rename to src/stack/mac/NRMacGnb.cc
index 314ef8f15..e24f4d428 100644
--- a/src/stack/mac/layer/NRMacGnb.cc
+++ b/src/stack/mac/NRMacGnb.cc
@@ -8,7 +8,7 @@
 // The above files and the present reference are part of the software itself,
 // and cannot be removed from it.
 //
-#include "stack/mac/layer/NRMacGnb.h"
+#include "stack/mac/NRMacGnb.h"
 #include "stack/mac/scheduler/NRSchedulerGnbUl.h"
 
 namespace simu5g {
diff --git a/src/stack/mac/layer/NRMacGnb.h b/src/stack/mac/NRMacGnb.h
similarity index 93%
rename from src/stack/mac/layer/NRMacGnb.h
rename to src/stack/mac/NRMacGnb.h
index 226f15e6c..9efa267eb 100644
--- a/src/stack/mac/layer/NRMacGnb.h
+++ b/src/stack/mac/NRMacGnb.h
@@ -12,7 +12,7 @@
 #ifndef _NRMACGNB_H_
 #define _NRMACGNB_H_
 
-#include "stack/mac/layer/LteMacEnbD2D.h"
+#include "stack/mac/LteMacEnbD2D.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/layer/NRMacUe.cc b/src/stack/mac/NRMacUe.cc
similarity index 99%
rename from src/stack/mac/layer/NRMacUe.cc
rename to src/stack/mac/NRMacUe.cc
index 9d1b6f44f..6f4021b7d 100644
--- a/src/stack/mac/layer/NRMacUe.cc
+++ b/src/stack/mac/NRMacUe.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/mac/layer/NRMacUe.h"
+#include "stack/mac/NRMacUe.h"
 
 #include <inet/common/TimeTag_m.h>
 
diff --git a/src/stack/mac/layer/NRMacUe.h b/src/stack/mac/NRMacUe.h
similarity index 96%
rename from src/stack/mac/layer/NRMacUe.h
rename to src/stack/mac/NRMacUe.h
index bdd93dffa..0e3833d0e 100644
--- a/src/stack/mac/layer/NRMacUe.h
+++ b/src/stack/mac/NRMacUe.h
@@ -12,7 +12,7 @@
 #ifndef _NRMACUED2D_H_
 #define _NRMACUED2D_H_
 
-#include "stack/mac/layer/LteMacUeD2D.h"
+#include "stack/mac/LteMacUeD2D.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/allocator/LteAllocationModule.cc b/src/stack/mac/allocator/LteAllocationModule.cc
index c81c0c09a..be42cff98 100644
--- a/src/stack/mac/allocator/LteAllocationModule.cc
+++ b/src/stack/mac/allocator/LteAllocationModule.cc
@@ -10,7 +10,7 @@
 //
 
 #include "stack/mac/allocator/LteAllocationModule.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/allocator/LteAllocationModule.h b/src/stack/mac/allocator/LteAllocationModule.h
index 918234724..4a5564f38 100644
--- a/src/stack/mac/allocator/LteAllocationModule.h
+++ b/src/stack/mac/allocator/LteAllocationModule.h
@@ -15,7 +15,7 @@
 #include "common/LteCommon.h"
 #include "stack/mac/allocator/LteAllocatorUtils.h"
 
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/allocator/LteAllocationModuleFrequencyReuse.cc b/src/stack/mac/allocator/LteAllocationModuleFrequencyReuse.cc
index 1bd0451da..01a3bb6e2 100644
--- a/src/stack/mac/allocator/LteAllocationModuleFrequencyReuse.cc
+++ b/src/stack/mac/allocator/LteAllocationModuleFrequencyReuse.cc
@@ -10,7 +10,7 @@
 //
 
 #include "stack/mac/allocator/LteAllocationModuleFrequencyReuse.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/amc/LteAmc.cc b/src/stack/mac/amc/LteAmc.cc
index 6b38be450..2a4e300ce 100644
--- a/src/stack/mac/amc/LteAmc.cc
+++ b/src/stack/mac/amc/LteAmc.cc
@@ -12,7 +12,7 @@
 #include <omnetpp.h>
 
 #include "stack/mac/amc/LteAmc.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 
 // NOTE: AMC Pilots header file inclusions must go here
 #include "stack/mac/amc/AmcPilotAuto.h"
diff --git a/src/stack/mac/amc/LteAmc.h b/src/stack/mac/amc/LteAmc.h
index c086b0eed..95fffb170 100644
--- a/src/stack/mac/amc/LteAmc.h
+++ b/src/stack/mac/amc/LteAmc.h
@@ -20,7 +20,7 @@
 #include "stack/mac/amc/AmcPilot.h"
 #include "stack/mac/amc/LteMcs.h"
 #include "stack/mac/amc/UserTxParams.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 #include "common/binder/Binder.h"
 
 namespace simu5g {
diff --git a/src/stack/mac/buffer/harq/LteHarqBufferRx.cc b/src/stack/mac/buffer/harq/LteHarqBufferRx.cc
index c7eae3ea8..581b40d0b 100644
--- a/src/stack/mac/buffer/harq/LteHarqBufferRx.cc
+++ b/src/stack/mac/buffer/harq/LteHarqBufferRx.cc
@@ -13,8 +13,8 @@
 #include "stack/mac/packet/LteMacPdu.h"
 #include "common/LteControlInfo.h"
 #include "stack/mac/packet/LteHarqFeedback_m.h"
-#include "stack/mac/layer/LteMacBase.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacBase.h"
+#include "stack/mac/LteMacEnb.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/buffer/harq/LteHarqBufferRx.h b/src/stack/mac/buffer/harq/LteHarqBufferRx.h
index 3e6b93e82..4d26016f6 100644
--- a/src/stack/mac/buffer/harq/LteHarqBufferRx.h
+++ b/src/stack/mac/buffer/harq/LteHarqBufferRx.h
@@ -12,7 +12,7 @@
 #ifndef _LTE_LTEHARQBUFFERRX_H_
 #define _LTE_LTEHARQBUFFERRX_H_
 
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 #include "stack/mac/buffer/harq/LteHarqProcessRx.h"
 
 namespace simu5g {
diff --git a/src/stack/mac/buffer/harq/LteHarqBufferTx.h b/src/stack/mac/buffer/harq/LteHarqBufferTx.h
index 8f8a25c49..1d6a17c39 100644
--- a/src/stack/mac/buffer/harq/LteHarqBufferTx.h
+++ b/src/stack/mac/buffer/harq/LteHarqBufferTx.h
@@ -15,7 +15,7 @@
 #include <vector>
 #include "stack/mac/packet/LteHarqFeedback_m.h"
 #include "stack/mac/buffer/harq/LteHarqProcessTx.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/buffer/harq/LteHarqProcessRx.cc b/src/stack/mac/buffer/harq/LteHarqProcessRx.cc
index f94618531..23a115e83 100644
--- a/src/stack/mac/buffer/harq/LteHarqProcessRx.cc
+++ b/src/stack/mac/buffer/harq/LteHarqProcessRx.cc
@@ -10,8 +10,8 @@
 //
 
 #include "stack/mac/buffer/harq/LteHarqProcessRx.h"
-#include "stack/mac/layer/LteMacBase.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacBase.h"
+#include "stack/mac/LteMacEnb.h"
 #include "common/LteControlInfo.h"
 #include "common/binder/Binder.h"
 #include "stack/mac/packet/LteHarqFeedback_m.h"
diff --git a/src/stack/mac/buffer/harq/LteHarqProcessTx.h b/src/stack/mac/buffer/harq/LteHarqProcessTx.h
index f38c60fae..25269f517 100644
--- a/src/stack/mac/buffer/harq/LteHarqProcessTx.h
+++ b/src/stack/mac/buffer/harq/LteHarqProcessTx.h
@@ -13,7 +13,7 @@
 #define _LTE_LTEHARQPROCESSTX_H_
 
 #include "stack/mac/buffer/harq/LteHarqUnitTx.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/buffer/harq/LteHarqUnitTx.cc b/src/stack/mac/buffer/harq/LteHarqUnitTx.cc
index 09f3a1f94..faba1664c 100644
--- a/src/stack/mac/buffer/harq/LteHarqUnitTx.cc
+++ b/src/stack/mac/buffer/harq/LteHarqUnitTx.cc
@@ -10,7 +10,7 @@
 //
 
 #include "stack/mac/buffer/harq/LteHarqUnitTx.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 #include <omnetpp.h>
 
 namespace simu5g {
diff --git a/src/stack/mac/buffer/harq/LteHarqUnitTx.h b/src/stack/mac/buffer/harq/LteHarqUnitTx.h
index abaed1ab4..b86a7db38 100644
--- a/src/stack/mac/buffer/harq/LteHarqUnitTx.h
+++ b/src/stack/mac/buffer/harq/LteHarqUnitTx.h
@@ -17,7 +17,7 @@
 #include "stack/mac/packet/LteMacPdu.h"
 #include "common/LteControlInfo.h"
 #include "common/LteCommon.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/buffer/harq_d2d/LteHarqBufferMirrorD2D.h b/src/stack/mac/buffer/harq_d2d/LteHarqBufferMirrorD2D.h
index be4b67b29..7f4c1c10e 100644
--- a/src/stack/mac/buffer/harq_d2d/LteHarqBufferMirrorD2D.h
+++ b/src/stack/mac/buffer/harq_d2d/LteHarqBufferMirrorD2D.h
@@ -16,7 +16,7 @@
 #include "common/LteCommon.h"
 #include "stack/mac/packet/LteHarqFeedback_m.h"
 #include "stack/mac/buffer/harq_d2d/LteHarqProcessMirrorD2D.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/buffer/harq_d2d/LteHarqBufferRxD2D.cc b/src/stack/mac/buffer/harq_d2d/LteHarqBufferRxD2D.cc
index c4fd08c42..08e4cd11e 100644
--- a/src/stack/mac/buffer/harq_d2d/LteHarqBufferRxD2D.cc
+++ b/src/stack/mac/buffer/harq_d2d/LteHarqBufferRxD2D.cc
@@ -13,10 +13,10 @@
 #include "stack/mac/packet/LteMacPdu.h"
 #include "common/LteControlInfo.h"
 #include "stack/mac/packet/LteHarqFeedback_m.h"
-#include "stack/mac/layer/LteMacBase.h"
-#include "stack/mac/layer/LteMacEnb.h"
-#include "stack/mac/layer/LteMacUeD2D.h"
-#include "stack/mac/layer/LteMacEnbD2D.h"
+#include "stack/mac/LteMacBase.h"
+#include "stack/mac/LteMacEnb.h"
+#include "stack/mac/LteMacUeD2D.h"
+#include "stack/mac/LteMacEnbD2D.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/buffer/harq_d2d/LteHarqProcessMirrorD2D.h b/src/stack/mac/buffer/harq_d2d/LteHarqProcessMirrorD2D.h
index 8c8b03709..0c480a9ab 100644
--- a/src/stack/mac/buffer/harq_d2d/LteHarqProcessMirrorD2D.h
+++ b/src/stack/mac/buffer/harq_d2d/LteHarqProcessMirrorD2D.h
@@ -14,7 +14,7 @@
 
 #include <omnetpp.h>
 #include "common/LteCommon.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/buffer/harq_d2d/LteHarqProcessRxD2D.cc b/src/stack/mac/buffer/harq_d2d/LteHarqProcessRxD2D.cc
index 6af1bab44..ea93ba1de 100644
--- a/src/stack/mac/buffer/harq_d2d/LteHarqProcessRxD2D.cc
+++ b/src/stack/mac/buffer/harq_d2d/LteHarqProcessRxD2D.cc
@@ -10,8 +10,8 @@
 //
 
 #include "stack/mac/buffer/harq_d2d/LteHarqProcessRxD2D.h"
-#include "stack/mac/layer/LteMacBase.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacBase.h"
+#include "stack/mac/LteMacEnb.h"
 #include "common/LteControlInfo.h"
 #include "stack/mac/packet/LteHarqFeedback_m.h"
 #include "stack/mac/packet/LteMacPdu.h"
diff --git a/src/stack/mac/buffer/harq_d2d/LteHarqUnitTxD2D.cc b/src/stack/mac/buffer/harq_d2d/LteHarqUnitTxD2D.cc
index d9da09b10..6c087b84c 100644
--- a/src/stack/mac/buffer/harq_d2d/LteHarqUnitTxD2D.cc
+++ b/src/stack/mac/buffer/harq_d2d/LteHarqUnitTxD2D.cc
@@ -10,7 +10,7 @@
 //
 
 #include "stack/mac/buffer/harq_d2d/LteHarqUnitTxD2D.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/buffer/harq_d2d/LteHarqUnitTxD2D.h b/src/stack/mac/buffer/harq_d2d/LteHarqUnitTxD2D.h
index 26b92ab61..2866df20c 100644
--- a/src/stack/mac/buffer/harq_d2d/LteHarqUnitTxD2D.h
+++ b/src/stack/mac/buffer/harq_d2d/LteHarqUnitTxD2D.h
@@ -13,8 +13,8 @@
 #define _LTE_LTEHARQUNITTXD2D_H_
 
 #include "stack/mac/buffer/harq/LteHarqUnitTx.h"
-#include "stack/mac/layer/LteMacUeD2D.h"
-#include "stack/mac/layer/LteMacEnbD2D.h"
+#include "stack/mac/LteMacUeD2D.h"
+#include "stack/mac/LteMacEnbD2D.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/conflict_graph/ConflictGraph.h b/src/stack/mac/conflict_graph/ConflictGraph.h
index 431cc7a35..d7741f12f 100644
--- a/src/stack/mac/conflict_graph/ConflictGraph.h
+++ b/src/stack/mac/conflict_graph/ConflictGraph.h
@@ -12,7 +12,7 @@
 #ifndef CONFLICTGRAPH_H
 #define CONFLICTGRAPH_H
 
-#include "stack/mac/layer/LteMacEnbD2D.h"
+#include "stack/mac/LteMacEnbD2D.h"
 #include "common/cellInfo/CellInfo.h"
 
 namespace simu5g {
diff --git a/src/stack/mac/conflict_graph/DistanceBasedConflictGraph.cc b/src/stack/mac/conflict_graph/DistanceBasedConflictGraph.cc
index fe9e1c1be..3c88f2b49 100644
--- a/src/stack/mac/conflict_graph/DistanceBasedConflictGraph.cc
+++ b/src/stack/mac/conflict_graph/DistanceBasedConflictGraph.cc
@@ -10,7 +10,7 @@
 //
 
 #include "stack/mac/conflict_graph/DistanceBasedConflictGraph.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/phy/LtePhyBase.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/scheduler/LcgScheduler.h b/src/stack/mac/scheduler/LcgScheduler.h
index ddb9f5b7c..0af56c557 100644
--- a/src/stack/mac/scheduler/LcgScheduler.h
+++ b/src/stack/mac/scheduler/LcgScheduler.h
@@ -13,7 +13,7 @@
 #define _LTE_LCGSCHEDULER_H_
 
 #include "common/LteCommon.h"
-#include "stack/mac/layer/LteMacUe.h"
+#include "stack/mac/LteMacUe.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/scheduler/LteScheduler.h b/src/stack/mac/scheduler/LteScheduler.h
index 39a45d563..303b1c00c 100644
--- a/src/stack/mac/scheduler/LteScheduler.h
+++ b/src/stack/mac/scheduler/LteScheduler.h
@@ -13,7 +13,7 @@
 #define _LTE_LTESCHEDULER_H_
 
 #include "common/LteCommon.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/scheduler/LteSchedulerEnb.cc b/src/stack/mac/scheduler/LteSchedulerEnb.cc
index 28f8ae9c1..f33107b03 100644
--- a/src/stack/mac/scheduler/LteSchedulerEnb.cc
+++ b/src/stack/mac/scheduler/LteSchedulerEnb.cc
@@ -22,7 +22,7 @@
 #include "stack/mac/scheduling_modules/LteAllocatorBestFit.h"
 #include "stack/mac/buffer/LteMacBuffer.h"
 #include "stack/mac/buffer/LteMacQueue.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/phy/LtePhyBase.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/scheduler/LteSchedulerEnb.h b/src/stack/mac/scheduler/LteSchedulerEnb.h
index ba4f73e5d..5316d78b0 100644
--- a/src/stack/mac/scheduler/LteSchedulerEnb.h
+++ b/src/stack/mac/scheduler/LteSchedulerEnb.h
@@ -15,7 +15,7 @@
 #include "common/LteCommon.h"
 #include "stack/mac/buffer/harq/LteHarqBufferTx.h"
 #include "stack/mac/allocator/LteAllocatorUtils.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/scheduler/LteSchedulerEnbDl.cc b/src/stack/mac/scheduler/LteSchedulerEnbDl.cc
index cd78a810e..b6052024e 100644
--- a/src/stack/mac/scheduler/LteSchedulerEnbDl.cc
+++ b/src/stack/mac/scheduler/LteSchedulerEnbDl.cc
@@ -10,7 +10,7 @@
 //
 
 #include "stack/mac/scheduler/LteSchedulerEnbDl.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 #include "stack/mac/scheduler/LteScheduler.h"
 #include "stack/mac/allocator/LteAllocationModule.h"
 #include "stack/mac/buffer/LteMacBuffer.h"
diff --git a/src/stack/mac/scheduler/LteSchedulerEnbUl.cc b/src/stack/mac/scheduler/LteSchedulerEnbUl.cc
index 32d330333..59aad4eeb 100644
--- a/src/stack/mac/scheduler/LteSchedulerEnbUl.cc
+++ b/src/stack/mac/scheduler/LteSchedulerEnbUl.cc
@@ -10,11 +10,11 @@
 //
 
 #include "stack/mac/scheduler/LteSchedulerEnbUl.h"
-#include "stack/mac/layer/LteMacEnb.h"
-#include "stack/mac/layer/LteMacEnbD2D.h"
+#include "stack/mac/LteMacEnb.h"
+#include "stack/mac/LteMacEnbD2D.h"
 #include "stack/mac/buffer/harq/LteHarqBufferRx.h"
 #include "stack/mac/allocator/LteAllocationModule.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/phy/LtePhyBase.h"
 
 namespace simu5g {
 
diff --git a/src/stack/mac/scheduler/LteSchedulerUeUl.cc b/src/stack/mac/scheduler/LteSchedulerUeUl.cc
index e2e7fe05d..c37a180b0 100644
--- a/src/stack/mac/scheduler/LteSchedulerUeUl.cc
+++ b/src/stack/mac/scheduler/LteSchedulerUeUl.cc
@@ -10,7 +10,7 @@
 //
 
 #include "stack/mac/scheduler/LteSchedulerUeUl.h"
-#include "stack/mac/layer/LteMacUe.h"
+#include "stack/mac/LteMacUe.h"
 #include "stack/mac/amc/UserTxParams.h"
 #include "stack/mac/packet/LteSchedulingGrant.h"
 #include "stack/mac/packet/LteMacPdu.h"
diff --git a/src/stack/mac/scheduler/LteSchedulerUeUl.h b/src/stack/mac/scheduler/LteSchedulerUeUl.h
index ecbe40bf7..6b0b992ee 100644
--- a/src/stack/mac/scheduler/LteSchedulerUeUl.h
+++ b/src/stack/mac/scheduler/LteSchedulerUeUl.h
@@ -14,7 +14,7 @@
 
 #include "common/LteCommon.h"
 
-#include "stack/mac/layer/LteMacUe.h"
+#include "stack/mac/LteMacUe.h"
 #include "stack/mac/scheduler/LcgScheduler.h"
 
 namespace simu5g {
diff --git a/src/stack/mac/scheduler/NRSchedulerGnbUl.cc b/src/stack/mac/scheduler/NRSchedulerGnbUl.cc
index a869dd99c..ac3a3af97 100644
--- a/src/stack/mac/scheduler/NRSchedulerGnbUl.cc
+++ b/src/stack/mac/scheduler/NRSchedulerGnbUl.cc
@@ -10,7 +10,7 @@
 //
 
 #include "stack/mac/scheduler/NRSchedulerGnbUl.h"
-#include "stack/mac/layer/NRMacGnb.h"
+#include "stack/mac/NRMacGnb.h"
 #include "stack/mac/buffer/harq/LteHarqBufferRx.h"
 #include "stack/mac/allocator/LteAllocationModule.h"
 
diff --git a/src/stack/packetFlowManager/PacketFlowManagerBase.cc b/src/stack/packetFlowManager/PacketFlowManagerBase.cc
index 3205b08db..10c043cc9 100644
--- a/src/stack/packetFlowManager/PacketFlowManagerBase.cc
+++ b/src/stack/packetFlowManager/PacketFlowManagerBase.cc
@@ -13,8 +13,8 @@
 
 #include <inet/common/ModuleAccess.h>
 
-#include "stack/mac/layer/LteMacBase.h"
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+#include "stack/mac/LteMacBase.h"
+#include "stack/pdcp_rrc/LtePdcpRrc.h"
 #include "stack/rlc/LteRlcDefs.h"
 #include "stack/rlc/packet/LteRlcDataPdu.h"
 
diff --git a/src/stack/packetFlowManager/PacketFlowManagerEnb.cc b/src/stack/packetFlowManager/PacketFlowManagerEnb.cc
index 8c7ebb9c1..f356a0e7e 100644
--- a/src/stack/packetFlowManager/PacketFlowManagerEnb.cc
+++ b/src/stack/packetFlowManager/PacketFlowManagerEnb.cc
@@ -10,8 +10,8 @@
 //
 
 #include "PacketFlowManagerEnb.h"
-#include "stack/mac/layer/LteMacBase.h"
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+#include "stack/mac/LteMacBase.h"
+#include "stack/pdcp_rrc/LtePdcpRrc.h"
 #include "stack/rlc/LteRlcDefs.h"
 #include "stack/rlc/packet/LteRlcDataPdu.h"
 #include "stack/mac/packet/LteMacPdu.h"
diff --git a/src/stack/packetFlowManager/PacketFlowManagerEnb.h b/src/stack/packetFlowManager/PacketFlowManagerEnb.h
index b6e53a7b5..1c5fbcf46 100644
--- a/src/stack/packetFlowManager/PacketFlowManagerEnb.h
+++ b/src/stack/packetFlowManager/PacketFlowManagerEnb.h
@@ -17,7 +17,7 @@
 #include "nodes/mec/utils/MecCommon.h"
 
 #include "PacketFlowManagerBase.h"
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+#include "stack/pdcp_rrc/LtePdcpRrc.h"
 #include "stack/packetFlowManager/PacketFlowManagerBase.h"
 
 namespace simu5g {
diff --git a/src/stack/packetFlowManager/PacketFlowManagerUe.cc b/src/stack/packetFlowManager/PacketFlowManagerUe.cc
index be697161e..4edb62383 100644
--- a/src/stack/packetFlowManager/PacketFlowManagerUe.cc
+++ b/src/stack/packetFlowManager/PacketFlowManagerUe.cc
@@ -10,8 +10,8 @@
 //
 
 #include "PacketFlowManagerUe.h"
-#include "stack/mac/layer/LteMacBase.h"
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+#include "stack/mac/LteMacBase.h"
+#include "stack/pdcp_rrc/LtePdcpRrc.h"
 #include "stack/rlc/LteRlcDefs.h"
 #include "stack/rlc/packet/LteRlcDataPdu.h"
 #include "stack/mac/packet/LteMacPdu.h"
diff --git a/src/stack/pdcp_rrc/layer/LtePdcpRrc.cc b/src/stack/pdcp_rrc/LtePdcpRrc.cc
similarity index 99%
rename from src/stack/pdcp_rrc/layer/LtePdcpRrc.cc
rename to src/stack/pdcp_rrc/LtePdcpRrc.cc
index d8ac432fe..11d9c673e 100644
--- a/src/stack/pdcp_rrc/layer/LtePdcpRrc.cc
+++ b/src/stack/pdcp_rrc/LtePdcpRrc.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+#include "stack/pdcp_rrc/LtePdcpRrc.h"
 
 #include <inet/networklayer/ipv4/Ipv4Header_m.h>
 #include <inet/transportlayer/tcp_common/TcpHeader.h>
diff --git a/src/stack/pdcp_rrc/layer/LtePdcpRrc.h b/src/stack/pdcp_rrc/LtePdcpRrc.h
similarity index 98%
rename from src/stack/pdcp_rrc/layer/LtePdcpRrc.h
rename to src/stack/pdcp_rrc/LtePdcpRrc.h
index d24a3107c..64823d4f1 100644
--- a/src/stack/pdcp_rrc/layer/LtePdcpRrc.h
+++ b/src/stack/pdcp_rrc/LtePdcpRrc.h
@@ -19,8 +19,8 @@
 #include "common/LteCommon.h"
 #include "stack/pdcp_rrc/ConnectionsTable.h"
 #include "common/LteControlInfo.h"
-#include "stack/pdcp_rrc/layer/entity/LteTxPdcpEntity.h"
-#include "stack/pdcp_rrc/layer/entity/LteRxPdcpEntity.h"
+#include "stack/pdcp_rrc/LteTxPdcpEntity.h"
+#include "stack/pdcp_rrc/LteRxPdcpEntity.h"
 #include "stack/pdcp_rrc/packet/LtePdcpPdu_m.h"
 
 namespace simu5g {
diff --git a/src/stack/pdcp_rrc/layer/LtePdcpRrcEnbD2D.cc b/src/stack/pdcp_rrc/LtePdcpRrcEnbD2D.cc
similarity index 98%
rename from src/stack/pdcp_rrc/layer/LtePdcpRrcEnbD2D.cc
rename to src/stack/pdcp_rrc/LtePdcpRrcEnbD2D.cc
index f67a9e867..852ae70cb 100644
--- a/src/stack/pdcp_rrc/layer/LtePdcpRrcEnbD2D.cc
+++ b/src/stack/pdcp_rrc/LtePdcpRrcEnbD2D.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/pdcp_rrc/layer/LtePdcpRrcEnbD2D.h"
+#include "stack/pdcp_rrc/LtePdcpRrcEnbD2D.h"
 
 #include <inet/common/packet/Packet.h>
 
diff --git a/src/stack/pdcp_rrc/layer/LtePdcpRrcEnbD2D.h b/src/stack/pdcp_rrc/LtePdcpRrcEnbD2D.h
similarity index 95%
rename from src/stack/pdcp_rrc/layer/LtePdcpRrcEnbD2D.h
rename to src/stack/pdcp_rrc/LtePdcpRrcEnbD2D.h
index 01c3a8d9c..a186aff12 100644
--- a/src/stack/pdcp_rrc/layer/LtePdcpRrcEnbD2D.h
+++ b/src/stack/pdcp_rrc/LtePdcpRrcEnbD2D.h
@@ -13,7 +13,7 @@
 #define _LTE_LTEPDCPRRCENBD2D_H_
 
 #include <omnetpp.h>
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+#include "stack/pdcp_rrc/LtePdcpRrc.h"
 
 namespace simu5g {
 
diff --git a/src/stack/pdcp_rrc/layer/LtePdcpRrcUeD2D.cc b/src/stack/pdcp_rrc/LtePdcpRrcUeD2D.cc
similarity index 99%
rename from src/stack/pdcp_rrc/layer/LtePdcpRrcUeD2D.cc
rename to src/stack/pdcp_rrc/LtePdcpRrcUeD2D.cc
index 347cb7420..896f2b680 100644
--- a/src/stack/pdcp_rrc/layer/LtePdcpRrcUeD2D.cc
+++ b/src/stack/pdcp_rrc/LtePdcpRrcUeD2D.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/pdcp_rrc/layer/LtePdcpRrcUeD2D.h"
+#include "stack/pdcp_rrc/LtePdcpRrcUeD2D.h"
 #include <inet/networklayer/common/L3AddressResolver.h>
 #include "stack/d2dModeSelection/D2DModeSwitchNotification_m.h"
 #include "stack/packetFlowManager/PacketFlowManagerBase.h"
diff --git a/src/stack/pdcp_rrc/layer/LtePdcpRrcUeD2D.h b/src/stack/pdcp_rrc/LtePdcpRrcUeD2D.h
similarity index 97%
rename from src/stack/pdcp_rrc/layer/LtePdcpRrcUeD2D.h
rename to src/stack/pdcp_rrc/LtePdcpRrcUeD2D.h
index a84853d0d..d66e99afb 100644
--- a/src/stack/pdcp_rrc/layer/LtePdcpRrcUeD2D.h
+++ b/src/stack/pdcp_rrc/LtePdcpRrcUeD2D.h
@@ -13,7 +13,7 @@
 #define _LTE_LTEPDCPRRCUED2D_H_
 
 #include <omnetpp.h>
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+#include "stack/pdcp_rrc/LtePdcpRrc.h"
 
 namespace simu5g {
 
diff --git a/src/stack/pdcp_rrc/layer/entity/LteRxPdcpEntity.cc b/src/stack/pdcp_rrc/LteRxPdcpEntity.cc
similarity index 96%
rename from src/stack/pdcp_rrc/layer/entity/LteRxPdcpEntity.cc
rename to src/stack/pdcp_rrc/LteRxPdcpEntity.cc
index f90e53f26..d76dd3431 100644
--- a/src/stack/pdcp_rrc/layer/entity/LteRxPdcpEntity.cc
+++ b/src/stack/pdcp_rrc/LteRxPdcpEntity.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/pdcp_rrc/layer/entity/LteRxPdcpEntity.h"
+#include "stack/pdcp_rrc/LteRxPdcpEntity.h"
 #include "stack/packetFlowManager/PacketFlowManagerBase.h"
 
 namespace simu5g {
diff --git a/src/stack/pdcp_rrc/layer/entity/LteRxPdcpEntity.h b/src/stack/pdcp_rrc/LteRxPdcpEntity.h
similarity index 97%
rename from src/stack/pdcp_rrc/layer/entity/LteRxPdcpEntity.h
rename to src/stack/pdcp_rrc/LteRxPdcpEntity.h
index 8a3c683c8..03a6faf20 100644
--- a/src/stack/pdcp_rrc/layer/entity/LteRxPdcpEntity.h
+++ b/src/stack/pdcp_rrc/LteRxPdcpEntity.h
@@ -15,7 +15,7 @@
 #include <omnetpp.h>
 #include "common/LteCommon.h"
 #include "common/LteControlInfo.h"
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+#include "stack/pdcp_rrc/LtePdcpRrc.h"
 
 namespace simu5g {
 
diff --git a/src/stack/pdcp_rrc/layer/entity/LteTxPdcpEntity.cc b/src/stack/pdcp_rrc/LteTxPdcpEntity.cc
similarity index 98%
rename from src/stack/pdcp_rrc/layer/entity/LteTxPdcpEntity.cc
rename to src/stack/pdcp_rrc/LteTxPdcpEntity.cc
index 43820c229..8c0d9761b 100644
--- a/src/stack/pdcp_rrc/layer/entity/LteTxPdcpEntity.cc
+++ b/src/stack/pdcp_rrc/LteTxPdcpEntity.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/pdcp_rrc/layer/entity/LteTxPdcpEntity.h"
+#include "stack/pdcp_rrc/LteTxPdcpEntity.h"
 
 #include <inet/common/ProtocolTag_m.h>
 
diff --git a/src/stack/pdcp_rrc/layer/entity/LteTxPdcpEntity.h b/src/stack/pdcp_rrc/LteTxPdcpEntity.h
similarity index 96%
rename from src/stack/pdcp_rrc/layer/entity/LteTxPdcpEntity.h
rename to src/stack/pdcp_rrc/LteTxPdcpEntity.h
index 7baf23ba6..76196fec9 100644
--- a/src/stack/pdcp_rrc/layer/entity/LteTxPdcpEntity.h
+++ b/src/stack/pdcp_rrc/LteTxPdcpEntity.h
@@ -15,7 +15,7 @@
 #include <omnetpp.h>
 #include "common/LteCommon.h"
 #include "common/LteControlInfo.h"
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+#include "stack/pdcp_rrc/LtePdcpRrc.h"
 
 namespace simu5g {
 
diff --git a/src/stack/pdcp_rrc/layer/NRPdcpRrcEnb.cc b/src/stack/pdcp_rrc/NRPdcpRrcEnb.cc
similarity index 99%
rename from src/stack/pdcp_rrc/layer/NRPdcpRrcEnb.cc
rename to src/stack/pdcp_rrc/NRPdcpRrcEnb.cc
index 230632c27..357a9232a 100644
--- a/src/stack/pdcp_rrc/layer/NRPdcpRrcEnb.cc
+++ b/src/stack/pdcp_rrc/NRPdcpRrcEnb.cc
@@ -11,7 +11,7 @@
 
 #include <inet/networklayer/common/NetworkInterface.h>
 
-#include "stack/pdcp_rrc/layer/NRPdcpRrcEnb.h"
+#include "stack/pdcp_rrc/NRPdcpRrcEnb.h"
 #include "stack/packetFlowManager/PacketFlowManagerBase.h"
 
 namespace simu5g {
diff --git a/src/stack/pdcp_rrc/layer/NRPdcpRrcEnb.h b/src/stack/pdcp_rrc/NRPdcpRrcEnb.h
similarity index 96%
rename from src/stack/pdcp_rrc/layer/NRPdcpRrcEnb.h
rename to src/stack/pdcp_rrc/NRPdcpRrcEnb.h
index 6f6773b65..3a7888108 100644
--- a/src/stack/pdcp_rrc/layer/NRPdcpRrcEnb.h
+++ b/src/stack/pdcp_rrc/NRPdcpRrcEnb.h
@@ -15,8 +15,8 @@
 #include <omnetpp.h>
 #include <inet/common/ModuleRefByPar.h>
 
-#include "entity/NRTxPdcpEntity.h"
-#include "stack/pdcp_rrc/layer/LtePdcpRrcEnbD2D.h"
+#include "stack/pdcp_rrc/NRTxPdcpEntity.h"
+#include "stack/pdcp_rrc/LtePdcpRrcEnbD2D.h"
 #include "stack/dualConnectivityManager/DualConnectivityManager.h"
 
 namespace simu5g {
diff --git a/src/stack/pdcp_rrc/layer/NRPdcpRrcUe.cc b/src/stack/pdcp_rrc/NRPdcpRrcUe.cc
similarity index 98%
rename from src/stack/pdcp_rrc/layer/NRPdcpRrcUe.cc
rename to src/stack/pdcp_rrc/NRPdcpRrcUe.cc
index abdf9d557..2fe82db55 100644
--- a/src/stack/pdcp_rrc/layer/NRPdcpRrcUe.cc
+++ b/src/stack/pdcp_rrc/NRPdcpRrcUe.cc
@@ -11,9 +11,9 @@
 
 #include <inet/networklayer/common/NetworkInterface.h>
 
-#include "stack/pdcp_rrc/layer/NRPdcpRrcUe.h"
-#include "stack/pdcp_rrc/layer/entity/NRTxPdcpEntity.h"
-#include "stack/pdcp_rrc/layer/entity/NRRxPdcpEntity.h"
+#include "stack/pdcp_rrc/NRPdcpRrcUe.h"
+#include "stack/pdcp_rrc/NRTxPdcpEntity.h"
+#include "stack/pdcp_rrc/NRRxPdcpEntity.h"
 #include "stack/packetFlowManager/PacketFlowManagerBase.h"
 
 namespace simu5g {
diff --git a/src/stack/pdcp_rrc/layer/NRPdcpRrcUe.h b/src/stack/pdcp_rrc/NRPdcpRrcUe.h
similarity index 98%
rename from src/stack/pdcp_rrc/layer/NRPdcpRrcUe.h
rename to src/stack/pdcp_rrc/NRPdcpRrcUe.h
index 4c80ebf06..f932e84c3 100644
--- a/src/stack/pdcp_rrc/layer/NRPdcpRrcUe.h
+++ b/src/stack/pdcp_rrc/NRPdcpRrcUe.h
@@ -14,7 +14,7 @@
 
 #include <omnetpp.h>
 
-#include "stack/pdcp_rrc/layer/LtePdcpRrcUeD2D.h"
+#include "stack/pdcp_rrc/LtePdcpRrcUeD2D.h"
 
 namespace simu5g {
 
diff --git a/src/stack/pdcp_rrc/layer/entity/NRRxPdcpEntity.cc b/src/stack/pdcp_rrc/NRRxPdcpEntity.cc
similarity index 99%
rename from src/stack/pdcp_rrc/layer/entity/NRRxPdcpEntity.cc
rename to src/stack/pdcp_rrc/NRRxPdcpEntity.cc
index c477c5c18..8780b5f33 100644
--- a/src/stack/pdcp_rrc/layer/entity/NRRxPdcpEntity.cc
+++ b/src/stack/pdcp_rrc/NRRxPdcpEntity.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/pdcp_rrc/layer/entity/NRRxPdcpEntity.h"
+#include "stack/pdcp_rrc/NRRxPdcpEntity.h"
 
 namespace simu5g {
 
diff --git a/src/stack/pdcp_rrc/layer/entity/NRRxPdcpEntity.h b/src/stack/pdcp_rrc/NRRxPdcpEntity.h
similarity index 97%
rename from src/stack/pdcp_rrc/layer/entity/NRRxPdcpEntity.h
rename to src/stack/pdcp_rrc/NRRxPdcpEntity.h
index ad0150add..95586e4cd 100644
--- a/src/stack/pdcp_rrc/layer/entity/NRRxPdcpEntity.h
+++ b/src/stack/pdcp_rrc/NRRxPdcpEntity.h
@@ -12,7 +12,7 @@
 #ifndef _NRRXPDCPENTITY_H_
 #define _NRRXPDCPENTITY_H_
 
-#include "stack/pdcp_rrc/layer/entity/LteRxPdcpEntity.h"
+#include "stack/pdcp_rrc/LteRxPdcpEntity.h"
 #include "stack/dualConnectivityManager/DualConnectivityManager.h"
 #include "common/timer/TTimer.h"
 
diff --git a/src/stack/pdcp_rrc/layer/entity/NRTxPdcpEntity.cc b/src/stack/pdcp_rrc/NRTxPdcpEntity.cc
similarity index 98%
rename from src/stack/pdcp_rrc/layer/entity/NRTxPdcpEntity.cc
rename to src/stack/pdcp_rrc/NRTxPdcpEntity.cc
index 48bd39168..0a43a6df5 100644
--- a/src/stack/pdcp_rrc/layer/entity/NRTxPdcpEntity.cc
+++ b/src/stack/pdcp_rrc/NRTxPdcpEntity.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/pdcp_rrc/layer/entity/NRTxPdcpEntity.h"
+#include "stack/pdcp_rrc/NRTxPdcpEntity.h"
 
 namespace simu5g {
 
diff --git a/src/stack/pdcp_rrc/layer/entity/NRTxPdcpEntity.h b/src/stack/pdcp_rrc/NRTxPdcpEntity.h
similarity index 94%
rename from src/stack/pdcp_rrc/layer/entity/NRTxPdcpEntity.h
rename to src/stack/pdcp_rrc/NRTxPdcpEntity.h
index 5f15c13fe..57d48d57a 100644
--- a/src/stack/pdcp_rrc/layer/entity/NRTxPdcpEntity.h
+++ b/src/stack/pdcp_rrc/NRTxPdcpEntity.h
@@ -12,7 +12,7 @@
 #ifndef _NRTXPDCPENTITY_H_
 #define _NRTXPDCPENTITY_H_
 
-#include "stack/pdcp_rrc/layer/entity/LteTxPdcpEntity.h"
+#include "stack/pdcp_rrc/LteTxPdcpEntity.h"
 #include "stack/dualConnectivityManager/DualConnectivityManager.h"
 
 namespace simu5g {
diff --git a/src/stack/phy/ChannelModel/LteChannelModel.h b/src/stack/phy/ChannelModel/LteChannelModel.h
index 340363627..dd0e64c6a 100644
--- a/src/stack/phy/ChannelModel/LteChannelModel.h
+++ b/src/stack/phy/ChannelModel/LteChannelModel.h
@@ -17,7 +17,7 @@
 #include "common/LteCommon.h"
 #include "common/LteControlInfo.h"
 #include "common/carrierAggregation/ComponentCarrier.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/phy/LtePhyBase.h"
 #include "stack/phy/packet/LteAirFrame.h"
 #include <omnetpp.h>
 
diff --git a/src/stack/phy/ChannelModel/LteRealisticChannelModel.cc b/src/stack/phy/ChannelModel/LteRealisticChannelModel.cc
index d09cdc147..b1bc27443 100644
--- a/src/stack/phy/ChannelModel/LteRealisticChannelModel.cc
+++ b/src/stack/phy/ChannelModel/LteRealisticChannelModel.cc
@@ -19,8 +19,8 @@
 #include "common/LteCommon.h"
 #include "nodes/ExtCell.h"
 #include "nodes/backgroundCell/BackgroundScheduler.h"
-#include "stack/phy/layer/LtePhyUe.h"
-#include "stack/mac/layer/LteMacEnbD2D.h"
+#include "stack/phy/LtePhyUe.h"
+#include "stack/mac/LteMacEnbD2D.h"
 
 namespace simu5g {
 
diff --git a/src/stack/phy/layer/LtePhyBase.cc b/src/stack/phy/LtePhyBase.cc
similarity index 99%
rename from src/stack/phy/layer/LtePhyBase.cc
rename to src/stack/phy/LtePhyBase.cc
index 93610f236..89de69275 100644
--- a/src/stack/phy/layer/LtePhyBase.cc
+++ b/src/stack/phy/LtePhyBase.cc
@@ -9,9 +9,9 @@
 // and cannot be removed from it.
 //
 
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/phy/LtePhyBase.h"
 #include "common/LteCommon.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 
 namespace simu5g {
 
diff --git a/src/stack/phy/layer/LtePhyBase.h b/src/stack/phy/LtePhyBase.h
similarity index 100%
rename from src/stack/phy/layer/LtePhyBase.h
rename to src/stack/phy/LtePhyBase.h
diff --git a/src/stack/phy/layer/LtePhyEnb.cc b/src/stack/phy/LtePhyEnb.cc
similarity index 99%
rename from src/stack/phy/layer/LtePhyEnb.cc
rename to src/stack/phy/LtePhyEnb.cc
index bd1f1f017..c44c093a1 100644
--- a/src/stack/phy/layer/LtePhyEnb.cc
+++ b/src/stack/phy/LtePhyEnb.cc
@@ -11,7 +11,7 @@
 
 #include <inet/networklayer/common/NetworkInterface.h>
 
-#include "stack/phy/layer/LtePhyEnb.h"
+#include "stack/phy/LtePhyEnb.h"
 #include "stack/phy/packet/LteFeedbackPkt.h"
 #include "stack/phy/das/DasFilter.h"
 #include "common/LteCommon.h"
diff --git a/src/stack/phy/layer/LtePhyEnb.h b/src/stack/phy/LtePhyEnb.h
similarity index 97%
rename from src/stack/phy/layer/LtePhyEnb.h
rename to src/stack/phy/LtePhyEnb.h
index 60798d0a6..0210c0d80 100644
--- a/src/stack/phy/layer/LtePhyEnb.h
+++ b/src/stack/phy/LtePhyEnb.h
@@ -12,7 +12,7 @@
 #ifndef _LTE_AIRPHYENB_H_
 #define _LTE_AIRPHYENB_H_
 
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/phy/LtePhyBase.h"
 
 namespace simu5g {
 
diff --git a/src/stack/phy/layer/LtePhyEnbD2D.cc b/src/stack/phy/LtePhyEnbD2D.cc
similarity index 99%
rename from src/stack/phy/layer/LtePhyEnbD2D.cc
rename to src/stack/phy/LtePhyEnbD2D.cc
index 93f3689ea..092c0fc7a 100644
--- a/src/stack/phy/layer/LtePhyEnbD2D.cc
+++ b/src/stack/phy/LtePhyEnbD2D.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/phy/layer/LtePhyEnbD2D.h"
+#include "stack/phy/LtePhyEnbD2D.h"
 #include "stack/phy/packet/LteFeedbackPkt.h"
 #include "common/LteCommon.h"
 #include "stack/phy/das/DasFilter.h"
diff --git a/src/stack/phy/layer/LtePhyEnbD2D.h b/src/stack/phy/LtePhyEnbD2D.h
similarity index 95%
rename from src/stack/phy/layer/LtePhyEnbD2D.h
rename to src/stack/phy/LtePhyEnbD2D.h
index 0136c57af..0017c6edd 100644
--- a/src/stack/phy/layer/LtePhyEnbD2D.h
+++ b/src/stack/phy/LtePhyEnbD2D.h
@@ -12,7 +12,7 @@
 #ifndef _LTE_AIRPHYENBD2D_H_
 #define _LTE_AIRPHYENBD2D_H_
 
-#include "stack/phy/layer/LtePhyEnb.h"
+#include "stack/phy/LtePhyEnb.h"
 
 namespace simu5g {
 
diff --git a/src/stack/phy/layer/LtePhyUe.cc b/src/stack/phy/LtePhyUe.cc
similarity index 99%
rename from src/stack/phy/layer/LtePhyUe.cc
rename to src/stack/phy/LtePhyUe.cc
index 81e1eaf3e..caeff8471 100644
--- a/src/stack/phy/layer/LtePhyUe.cc
+++ b/src/stack/phy/LtePhyUe.cc
@@ -10,10 +10,10 @@
 //
 
 #include <assert.h>
-#include "stack/phy/layer/LtePhyUe.h"
+#include "stack/phy/LtePhyUe.h"
 
 #include "stack/ip2nic/IP2Nic.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 #include "stack/phy/packet/LteFeedbackPkt.h"
 #include "stack/phy/feedback/LteDlFeedbackGenerator.h"
 
diff --git a/src/stack/phy/layer/LtePhyUe.h b/src/stack/phy/LtePhyUe.h
similarity index 97%
rename from src/stack/phy/layer/LtePhyUe.h
rename to src/stack/phy/LtePhyUe.h
index d1f69088e..99bac9333 100644
--- a/src/stack/phy/layer/LtePhyUe.h
+++ b/src/stack/phy/LtePhyUe.h
@@ -15,11 +15,11 @@
 #include <inet/mobility/contract/IMobility.h>
 
 #include "stack/ip2nic/IP2Nic.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/phy/LtePhyBase.h"
 #include "stack/phy/das/DasFilter.h"
-#include "stack/mac/layer/LteMacUe.h"
+#include "stack/mac/LteMacUe.h"
 #include "stack/rlc/um/LteRlcUm.h"
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+#include "stack/pdcp_rrc/LtePdcpRrc.h"
 #include "stack/phy/feedback/LteDlFeedbackGenerator.h"
 
 namespace simu5g {
diff --git a/src/stack/phy/layer/LtePhyUeD2D.cc b/src/stack/phy/LtePhyUeD2D.cc
similarity index 99%
rename from src/stack/phy/layer/LtePhyUeD2D.cc
rename to src/stack/phy/LtePhyUeD2D.cc
index ace77086d..858f12229 100644
--- a/src/stack/phy/layer/LtePhyUeD2D.cc
+++ b/src/stack/phy/LtePhyUeD2D.cc
@@ -10,7 +10,7 @@
 //
 
 #include <assert.h>
-#include "stack/phy/layer/LtePhyUeD2D.h"
+#include "stack/phy/LtePhyUeD2D.h"
 #include "stack/phy/packet/LteFeedbackPkt.h"
 #include "stack/d2dModeSelection/D2DModeSelectionBase.h"
 
diff --git a/src/stack/phy/layer/LtePhyUeD2D.h b/src/stack/phy/LtePhyUeD2D.h
similarity index 98%
rename from src/stack/phy/layer/LtePhyUeD2D.h
rename to src/stack/phy/LtePhyUeD2D.h
index cebe1b454..abc70a0ce 100644
--- a/src/stack/phy/layer/LtePhyUeD2D.h
+++ b/src/stack/phy/LtePhyUeD2D.h
@@ -12,7 +12,7 @@
 #ifndef _LTE_AIRPHYUED2D_H_
 #define _LTE_AIRPHYUED2D_H_
 
-#include "stack/phy/layer/LtePhyUe.h"
+#include "stack/phy/LtePhyUe.h"
 
 namespace simu5g {
 
diff --git a/src/stack/phy/layer/NRPhyUe.cc b/src/stack/phy/NRPhyUe.cc
similarity index 99%
rename from src/stack/phy/layer/NRPhyUe.cc
rename to src/stack/phy/NRPhyUe.cc
index 32504183f..a72fcc845 100644
--- a/src/stack/phy/layer/NRPhyUe.cc
+++ b/src/stack/phy/NRPhyUe.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/phy/layer/NRPhyUe.h"
+#include "stack/phy/NRPhyUe.h"
 
 #include "stack/ip2nic/IP2Nic.h"
 #include "stack/phy/feedback/LteDlFeedbackGenerator.h"
diff --git a/src/stack/phy/layer/NRPhyUe.h b/src/stack/phy/NRPhyUe.h
similarity index 96%
rename from src/stack/phy/layer/NRPhyUe.h
rename to src/stack/phy/NRPhyUe.h
index ab8730acd..acdfac827 100644
--- a/src/stack/phy/layer/NRPhyUe.h
+++ b/src/stack/phy/NRPhyUe.h
@@ -14,7 +14,7 @@
 
 #include <inet/common/ModuleRefByPar.h>
 
-#include "stack/phy/layer/LtePhyUeD2D.h"
+#include "stack/phy/LtePhyUeD2D.h"
 
 namespace simu5g {
 
diff --git a/src/stack/phy/das/DasFilter.h b/src/stack/phy/das/DasFilter.h
index 28b93486c..8aba98197 100644
--- a/src/stack/phy/das/DasFilter.h
+++ b/src/stack/phy/das/DasFilter.h
@@ -18,8 +18,8 @@
 #include "common/LteControlInfo.h"
 #include "common/binder/Binder.h"
 #include "common/LteCommon.h"
-#include "stack/phy/layer/LtePhyBase.h"
-#include "stack/phy/layer/LtePhyEnb.h"
+#include "stack/phy/LtePhyBase.h"
+#include "stack/phy/LtePhyEnb.h"
 
 namespace simu5g {
 
diff --git a/src/stack/phy/feedback/LteDlFeedbackGenerator.h b/src/stack/phy/feedback/LteDlFeedbackGenerator.h
index 73b02202e..1a7b03769 100644
--- a/src/stack/phy/feedback/LteDlFeedbackGenerator.h
+++ b/src/stack/phy/feedback/LteDlFeedbackGenerator.h
@@ -22,7 +22,7 @@
 #include "common/timer/TTimer.h"
 #include "common/timer/TTimerMsg_m.h"
 #include "stack/phy/feedback/LteFeedbackComputation.h"
-#include "stack/phy/layer/LtePhyUe.h"
+#include "stack/phy/LtePhyUe.h"
 
 namespace simu5g {
 
diff --git a/src/stack/rlc/LteRlc.ned b/src/stack/rlc/LteRlc.ned
index 0580105df..c6f56a6cd 100644
--- a/src/stack/rlc/LteRlc.ned
+++ b/src/stack/rlc/LteRlc.ned
@@ -12,6 +12,11 @@
 
 package simu5g.stack.rlc;
 
+import simu5g.stack.rlc.am.LteRlcAm;
+import simu5g.stack.rlc.tm.LteRlcTm;
+import simu5g.stack.rlc.um.ILteRlcUm;
+
+
 //
 // The LteRlc module implements the functionalities of the Radio Link Control (RLC) layer.
 // It provides mechanisms for end-to-end connectivity over the radio interface. It
diff --git a/src/stack/rlc/AmRxEntity.ned b/src/stack/rlc/am/AmRxEntity.ned
similarity index 97%
rename from src/stack/rlc/AmRxEntity.ned
rename to src/stack/rlc/am/AmRxEntity.ned
index cd7b5ef50..061419e9b 100644
--- a/src/stack/rlc/AmRxEntity.ned
+++ b/src/stack/rlc/am/AmRxEntity.ned
@@ -10,7 +10,7 @@
 //
 
 
-package simu5g.stack.rlc;
+package simu5g.stack.rlc.am;
 
 //
 // This module implements the receiving functionalities of the Acknowledged
diff --git a/src/stack/rlc/AmTxEntity.ned b/src/stack/rlc/am/AmTxEntity.ned
similarity index 98%
rename from src/stack/rlc/AmTxEntity.ned
rename to src/stack/rlc/am/AmTxEntity.ned
index be9ad1733..2440d3a7f 100644
--- a/src/stack/rlc/AmTxEntity.ned
+++ b/src/stack/rlc/am/AmTxEntity.ned
@@ -10,7 +10,7 @@
 //
 
 
-package simu5g.stack.rlc;
+package simu5g.stack.rlc.am;
 
 //
 // This module implements the transmitting functionalities of the Acknowledged
diff --git a/src/stack/rlc/LteRlcAm.ned b/src/stack/rlc/am/LteRlcAm.ned
similarity index 99%
rename from src/stack/rlc/LteRlcAm.ned
rename to src/stack/rlc/am/LteRlcAm.ned
index 53db30367..3fa161d07 100644
--- a/src/stack/rlc/LteRlcAm.ned
+++ b/src/stack/rlc/am/LteRlcAm.ned
@@ -10,7 +10,7 @@
 //
 
 
-package simu5g.stack.rlc;
+package simu5g.stack.rlc.am;
 
 //
 // This module implements the functionalities of the Acknowledged Mode (AM) of the
diff --git a/src/stack/rlc/am/buffer/AmRxQueue.cc b/src/stack/rlc/am/buffer/AmRxQueue.cc
index a2e38000a..86e50c5db 100644
--- a/src/stack/rlc/am/buffer/AmRxQueue.cc
+++ b/src/stack/rlc/am/buffer/AmRxQueue.cc
@@ -13,7 +13,7 @@
 
 #include "common/LteCommon.h"
 #include "common/LteControlInfo.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 #include "stack/rlc/am/LteRlcAm.h"
 
 namespace simu5g {
diff --git a/src/stack/rlc/AmRxQueue.ned b/src/stack/rlc/am/buffer/AmRxQueue.ned
similarity index 96%
rename from src/stack/rlc/AmRxQueue.ned
rename to src/stack/rlc/am/buffer/AmRxQueue.ned
index 4f7a65ecb..dc56ba9b2 100644
--- a/src/stack/rlc/AmRxQueue.ned
+++ b/src/stack/rlc/am/buffer/AmRxQueue.ned
@@ -10,7 +10,7 @@
 //
 
 
-package simu5g.stack.rlc;
+package simu5g.stack.rlc.am.buffer;
 
 //
 // Receive Buffer of RLC AM
diff --git a/src/stack/rlc/am/buffer/AmTxQueue.cc b/src/stack/rlc/am/buffer/AmTxQueue.cc
index ae9984a61..a6449d710 100644
--- a/src/stack/rlc/am/buffer/AmTxQueue.cc
+++ b/src/stack/rlc/am/buffer/AmTxQueue.cc
@@ -11,7 +11,7 @@
 
 #include "stack/rlc/am/buffer/AmTxQueue.h"
 #include "stack/rlc/am/LteRlcAm.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 
 namespace simu5g {
 
diff --git a/src/stack/rlc/AmTxQueue.ned b/src/stack/rlc/am/buffer/AmTxQueue.ned
similarity index 95%
rename from src/stack/rlc/AmTxQueue.ned
rename to src/stack/rlc/am/buffer/AmTxQueue.ned
index d558f3bc5..05b9e9c19 100644
--- a/src/stack/rlc/AmTxQueue.ned
+++ b/src/stack/rlc/am/buffer/AmTxQueue.ned
@@ -10,7 +10,7 @@
 //
 
 
-package simu5g.stack.rlc;
+package simu5g.stack.rlc.am.buffer;
 
 //
 // Transmit Buffer of RLC AM
diff --git a/src/stack/rlc/LteRlcTm.ned b/src/stack/rlc/tm/LteRlcTm.ned
similarity index 98%
rename from src/stack/rlc/LteRlcTm.ned
rename to src/stack/rlc/tm/LteRlcTm.ned
index 3eb9d286c..a52ee44ac 100644
--- a/src/stack/rlc/LteRlcTm.ned
+++ b/src/stack/rlc/tm/LteRlcTm.ned
@@ -10,7 +10,7 @@
 //
 
 
-package simu5g.stack.rlc;
+package simu5g.stack.rlc.tm;
 
 //
 // This module implements the functionalities of the Transparent Mode (TM) of the
diff --git a/src/stack/rlc/ILteRlcUm.ned b/src/stack/rlc/um/ILteRlcUm.ned
similarity index 97%
rename from src/stack/rlc/ILteRlcUm.ned
rename to src/stack/rlc/um/ILteRlcUm.ned
index e0210abf5..6f368b51a 100644
--- a/src/stack/rlc/ILteRlcUm.ned
+++ b/src/stack/rlc/um/ILteRlcUm.ned
@@ -10,7 +10,7 @@
 //
 
 
-package simu5g.stack.rlc;
+package simu5g.stack.rlc.um;
 
 //
 // Interface module for the Unacknowledged Mode (UM) of the Radio Link Control (RLC) layer.
diff --git a/src/stack/rlc/um/LteRlcUm.h b/src/stack/rlc/um/LteRlcUm.h
index b7e8163f6..278f48011 100644
--- a/src/stack/rlc/um/LteRlcUm.h
+++ b/src/stack/rlc/um/LteRlcUm.h
@@ -16,10 +16,10 @@
 #include "common/LteCommon.h"
 #include "common/LteControlInfo.h"
 #include "stack/rlc/packet/LteRlcSdu_m.h"
-#include "stack/rlc/um/entity/UmTxEntity.h"
-#include "stack/rlc/um/entity/UmRxEntity.h"
+#include "stack/rlc/um/UmTxEntity.h"
+#include "stack/rlc/um/UmRxEntity.h"
 #include "stack/rlc/packet/LteRlcDataPdu.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 #include "nodes/mec/utils/MecCommon.h"
 
 namespace simu5g {
diff --git a/src/stack/rlc/LteRlcUm.ned b/src/stack/rlc/um/LteRlcUm.ned
similarity index 99%
rename from src/stack/rlc/LteRlcUm.ned
rename to src/stack/rlc/um/LteRlcUm.ned
index f775ce8a7..5917c6bdd 100644
--- a/src/stack/rlc/LteRlcUm.ned
+++ b/src/stack/rlc/um/LteRlcUm.ned
@@ -10,7 +10,7 @@
 //
 
 
-package simu5g.stack.rlc;
+package simu5g.stack.rlc.um;
 
 //
 // This module implements the functionalities of the Unacknowledged Mode (UM) of the
diff --git a/src/stack/rlc/LteRlcUmD2D.ned b/src/stack/rlc/um/LteRlcUmD2D.ned
similarity index 98%
rename from src/stack/rlc/LteRlcUmD2D.ned
rename to src/stack/rlc/um/LteRlcUmD2D.ned
index e5b3c363a..884b65c3d 100644
--- a/src/stack/rlc/LteRlcUmD2D.ned
+++ b/src/stack/rlc/um/LteRlcUmD2D.ned
@@ -10,7 +10,7 @@
 //
 
 
-package simu5g.stack.rlc;
+package simu5g.stack.rlc.um;
 
 //
 // This module implements the functionalities of the Unacknowledged Mode (UM) of the
diff --git a/src/stack/rlc/um/entity/UmRxEntity.cc b/src/stack/rlc/um/UmRxEntity.cc
similarity index 99%
rename from src/stack/rlc/um/entity/UmRxEntity.cc
rename to src/stack/rlc/um/UmRxEntity.cc
index bf87cae42..4c4f17c39 100644
--- a/src/stack/rlc/um/entity/UmRxEntity.cc
+++ b/src/stack/rlc/um/UmRxEntity.cc
@@ -10,9 +10,9 @@
 //
 
 #include "stack/rlc/um/LteRlcUm.h"
-#include "stack/rlc/um/entity/UmRxEntity.h"
-#include "stack/mac/layer/LteMacBase.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/rlc/um//UmRxEntity.h"
+#include "stack/mac/LteMacBase.h"
+#include "stack/mac/LteMacEnb.h"
 
 namespace simu5g {
 
diff --git a/src/stack/rlc/um/entity/UmRxEntity.h b/src/stack/rlc/um/UmRxEntity.h
similarity index 100%
rename from src/stack/rlc/um/entity/UmRxEntity.h
rename to src/stack/rlc/um/UmRxEntity.h
diff --git a/src/stack/rlc/UmRxEntity.ned b/src/stack/rlc/um/UmRxEntity.ned
similarity index 97%
rename from src/stack/rlc/UmRxEntity.ned
rename to src/stack/rlc/um/UmRxEntity.ned
index 6fd074c22..8111368da 100644
--- a/src/stack/rlc/UmRxEntity.ned
+++ b/src/stack/rlc/um/UmRxEntity.ned
@@ -10,7 +10,7 @@
 //
 
 
-package simu5g.stack.rlc;
+package simu5g.stack.rlc.um;
 
 //
 // This module implements the receiving-side functionalities of the Unacknowledged
diff --git a/src/stack/rlc/um/entity/UmTxEntity.cc b/src/stack/rlc/um/UmTxEntity.cc
similarity index 99%
rename from src/stack/rlc/um/entity/UmTxEntity.cc
rename to src/stack/rlc/um/UmTxEntity.cc
index a733e4acb..be0dd13bc 100644
--- a/src/stack/rlc/um/entity/UmTxEntity.cc
+++ b/src/stack/rlc/um/UmTxEntity.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/rlc/um/entity/UmTxEntity.h"
+#include "stack/rlc/um/UmTxEntity.h"
 #include "stack/rlc/am/packet/LteRlcAmPdu.h"
 
 #include "stack/packetFlowManager/PacketFlowManagerUe.h"
diff --git a/src/stack/rlc/um/entity/UmTxEntity.h b/src/stack/rlc/um/UmTxEntity.h
similarity index 100%
rename from src/stack/rlc/um/entity/UmTxEntity.h
rename to src/stack/rlc/um/UmTxEntity.h
diff --git a/src/stack/rlc/UmTxEntity.ned b/src/stack/rlc/um/UmTxEntity.ned
similarity index 97%
rename from src/stack/rlc/UmTxEntity.ned
rename to src/stack/rlc/um/UmTxEntity.ned
index 3091d6d07..cf76b3b8f 100644
--- a/src/stack/rlc/UmTxEntity.ned
+++ b/src/stack/rlc/um/UmTxEntity.ned
@@ -10,7 +10,7 @@
 //
 
 
-package simu5g.stack.rlc;
+package simu5g.stack.rlc.um;
 
 //
 // This module implements the transmission side functionalities of the Unacknowledged
diff --git a/src/x2/X2AppClient.cc b/src/x2/X2AppClient.cc
index d25b315c4..5a8f8f5bb 100644
--- a/src/x2/X2AppClient.cc
+++ b/src/x2/X2AppClient.cc
@@ -15,7 +15,7 @@
 #include "x2/X2AppClient.h"
 #include "common/binder/Binder.h"
 #include <inet/transportlayer/contract/sctp/SctpCommand_m.h>
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 
 namespace simu5g {