diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6dc7140900ddccbbe4a22d60ddbac4be4bba2813..29d9b3be6c9c41b9edcfbd389ff97c679117baf2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2166,7 +2166,7 @@ set(XFORMS_SOURCE_NR
   ${OPENAIR1_DIR}/PHY/TOOLS/nr_phy_scope.c
   )
 set(XFORMS_SOURCE_SOFTMODEM
-  ${OPENAIR_TARGETS}/RT/USER/stats.c
+  ${OPENAIR_DIR}/executables/stats.c
   )
 set(XFORMSINTERFACE_SOURCE
   ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
@@ -2273,10 +2273,10 @@ target_link_libraries (test5Gnas LIB_5GNAS_GNB CONFIG_LIB minimal_lib )
 ###################################################
 
 add_executable(lte-softmodem
-  ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
-  ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
-  ${OPENAIR_TARGETS}/RT/USER/ru_control.c
-  ${OPENAIR_TARGETS}/RT/USER/lte-softmodem.c
+  ${OPENAIR_DIR}/executables/lte-enb.c
+  ${OPENAIR_DIR}/executables/lte-ru.c
+  ${OPENAIR_DIR}/executables/ru_control.c
+  ${OPENAIR_DIR}/executables/lte-softmodem.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
   ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c
   ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
@@ -2349,8 +2349,8 @@ target_link_libraries (ocp-enb
 target_link_libraries (ocp-enb ${LIBXML2_LIBRARIES} pthread m CONFIG_LIB rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} sctp ${CMAKE_DL_LIBS} ${LIB_LMS_LIBRARIES} ${T_LIB})
 
 add_executable(oairu
-  ${OPENAIR_TARGETS}/RT/USER/lte-ru.c
-  ${OPENAIR_TARGETS}/RT/USER/ru_control.c
+  ${OPENAIR_DIR}/executables/lte-ru.c
+  ${OPENAIR_DIR}/executables/ru_control.c
   ${OPENAIR_DIR}/radio/COMMON/common_lib.c
   ${OPENAIR_DIR}/radio/COMMON/record_player.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
@@ -2378,8 +2378,8 @@ target_link_libraries(lte-softmodem PRIVATE
 #######################################
 
 add_executable(lte-uesoftmodem
-  ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
-  ${OPENAIR_TARGETS}/RT/USER/lte-uesoftmodem.c
+  ${OPENAIR_DIR}/executables/lte-ue.c
+  ${OPENAIR_DIR}/executables/lte-uesoftmodem.c
   ${OPENAIR_DIR}/executables/softmodem-common.c
   ${OPENAIR_DIR}/executables/create_tasks_ue.c
   ${OPENAIR_DIR}/radio/COMMON/common_lib.c
diff --git a/executables/create_tasks.c b/executables/create_tasks.c
index 0081eca66da4187f28aca62a3a2c460a29a2b309..12504f55d5b25b02c08e53a5bba4dc96859a7586 100644
--- a/executables/create_tasks.c
+++ b/executables/create_tasks.c
@@ -22,7 +22,7 @@
 # include "intertask_interface.h"
 # include "create_tasks.h"
 # include "common/utils/LOG/log.h"
-# include "targets/RT/USER/lte-softmodem.h"
+# include "executables/lte-softmodem.h"
 # include "common/ran_context.h"
 
   #include "sctp_eNB_task.h"
diff --git a/executables/create_tasks_mbms.c b/executables/create_tasks_mbms.c
index 9853c1b6ec8069b98ed61cb2d24737778a41be04..73495d871330695d1ce2c5b274361c3928a59324 100644
--- a/executables/create_tasks_mbms.c
+++ b/executables/create_tasks_mbms.c
@@ -22,7 +22,7 @@
 # include "intertask_interface.h"
 # include "create_tasks.h"
 # include "common/utils/LOG/log.h"
-# include "targets/RT/USER/lte-softmodem.h"
+# include "executables/lte-softmodem.h"
 # include "common/ran_context.h"
 
     #include "sctp_eNB_task.h"
diff --git a/targets/RT/USER/lte-enb.c b/executables/lte-enb.c
similarity index 99%
rename from targets/RT/USER/lte-enb.c
rename to executables/lte-enb.c
index 25a1abcc18473ee474c4a003c3e6acb5be52acf5..67189815cb39f0b17d6c31fbcf986020383cf41e 100644
--- a/targets/RT/USER/lte-enb.c
+++ b/executables/lte-enb.c
@@ -83,7 +83,7 @@
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "UTIL/OPT/opt.h"
 #include "enb_config.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 
 #include "s1ap_eNB.h"
 #include "SIMULATION/ETH_TRANSPORT/proto.h"
diff --git a/targets/RT/USER/lte-ru.c b/executables/lte-ru.c
similarity index 100%
rename from targets/RT/USER/lte-ru.c
rename to executables/lte-ru.c
diff --git a/targets/RT/USER/lte-softmodem.c b/executables/lte-softmodem.c
similarity index 100%
rename from targets/RT/USER/lte-softmodem.c
rename to executables/lte-softmodem.c
diff --git a/targets/RT/USER/lte-softmodem.h b/executables/lte-softmodem.h
similarity index 100%
rename from targets/RT/USER/lte-softmodem.h
rename to executables/lte-softmodem.h
diff --git a/targets/RT/USER/lte-ue.c b/executables/lte-ue.c
similarity index 100%
rename from targets/RT/USER/lte-ue.c
rename to executables/lte-ue.c
diff --git a/targets/RT/USER/lte-uesoftmodem.c b/executables/lte-uesoftmodem.c
similarity index 100%
rename from targets/RT/USER/lte-uesoftmodem.c
rename to executables/lte-uesoftmodem.c
diff --git a/executables/main-fs6.c b/executables/main-fs6.c
index acae580512fed96a9c8586618c0673cd631415b8..51bf6d166e992eefc8e464bf8a739e51aa2fd611 100644
--- a/executables/main-fs6.c
+++ b/executables/main-fs6.c
@@ -25,7 +25,7 @@
 #include <common/utils/LOG/log.h>
 #include <common/utils/system.h>
 #include <common/config/config_userapi.h>
-#include <targets/RT/USER/lte-softmodem.h>
+#include "executables/lte-softmodem.h"
 #include <openair1/PHY/defs_eNB.h>
 #include <openair1/PHY/phy_extern.h>
 #include <nfapi/oai_integration/vendor_ext.h>
diff --git a/executables/main-ocp.c b/executables/main-ocp.c
index 9567b631805e5758ae3e43cb5ccd026ce8ec2081..9f6c3574ec7197ab3a2a574a2618b02a6895dfab 100644
--- a/executables/main-ocp.c
+++ b/executables/main-ocp.c
@@ -24,11 +24,11 @@
 
 /*
  * This file replaces
- * targets/RT/USER/lte-softmodem.c
- * targets/RT/USER/rt_wrapper.c
- * targets/RT/USER/lte-ru.c
- * targets/RT/USER/lte-enb.c
- * targets/RT/USER/ru_control.c
+ * executables/lte-softmodem.c
+ * executables/rt_wrapper.c
+ * executables/lte-ru.c
+ * executables/lte-enb.c
+ * executables/ru_control.c
  * openair1/SCHED/prach_procedures.c
  * The merger of OpenAir central code to this branch
  * should check if these 3 files are modified and analyze if code code has to be copied in here
@@ -42,7 +42,7 @@
 static int DEFBANDS[] = {7};
 static int DEFENBS[] = {0};
 #include <common/config/config_userapi.h>
-#include <targets/RT/USER/lte-softmodem.h>
+#include "executables/lte-softmodem.h"
 #include <openair1/PHY/defs_eNB.h>
 #include <openair1/PHY/phy_extern.h>
 #include <nfapi/oai_integration/vendor_ext.h>
diff --git a/executables/nr-softmodem.c b/executables/nr-softmodem.c
index 101f3dde418e78bde5d13d5a46b8111907dcaad8..cf603b74785a66b52efdbc3b7080efc8ad530cf6 100644
--- a/executables/nr-softmodem.c
+++ b/executables/nr-softmodem.c
@@ -51,7 +51,7 @@
 #include "PHY_INTERFACE/phy_interface_vars.h"
 #include "gnb_config.h"
 #include "SIMULATION/TOOLS/sim.h"
-#include <targets/RT/USER/lte-softmodem.h>
+#include "executables/lte-softmodem.h"
 
 #ifdef SMBV
 #include "PHY/TOOLS/smbv.h"
diff --git a/targets/RT/USER/rfsim.c b/executables/rfsim.c
similarity index 100%
rename from targets/RT/USER/rfsim.c
rename to executables/rfsim.c
diff --git a/targets/RT/USER/ru_control.c b/executables/ru_control.c
similarity index 100%
rename from targets/RT/USER/ru_control.c
rename to executables/ru_control.c
diff --git a/targets/RT/USER/stats.c b/executables/stats.c
similarity index 100%
rename from targets/RT/USER/stats.c
rename to executables/stats.c
diff --git a/executables/transport_split.c b/executables/transport_split.c
index e7199637ccf505bd9b011a981d100d6f3c5e45c9..6a21e90a6fffa6990b6eee514a57734f78b3f65b 100644
--- a/executables/transport_split.c
+++ b/executables/transport_split.c
@@ -29,7 +29,7 @@
 #include <netinet/in.h>
 #include <netinet/udp.h>
 #include <netdb.h>
-#include <targets/RT/USER/lte-softmodem.h>
+#include "executables/lte-softmodem.h"
 
 bool createUDPsock (char *sourceIP, char *sourcePort, char *destIP, char *destPort, UDPsock_t *result) {
   struct addrinfo hints= {0}, *servinfo, *p;
diff --git a/nfapi/oai_integration/nfapi_pnf.c b/nfapi/oai_integration/nfapi_pnf.c
index 8a3d879231f0afcb75d40107e36a3cabe06addb8..864791141f31aca0f58beb14a711be6dc23d2e55 100644
--- a/nfapi/oai_integration/nfapi_pnf.c
+++ b/nfapi/oai_integration/nfapi_pnf.c
@@ -59,7 +59,7 @@
 #include "openair1/PHY/defs_gNB.h"
 #include <openair1/SCHED/fapi_l1.h>
 #include <openair1/PHY/NR_TRANSPORT/nr_transport_proto.h>
-#include <targets/RT/USER/lte-softmodem.h>
+#include "executables/lte-softmodem.h"
 #include "nfapi/open-nFAPI/pnf/inc/pnf_p7.h"
 
 #define NUM_P5_PHY 2
diff --git a/nfapi/oai_integration/nfapi_vnf.c b/nfapi/oai_integration/nfapi_vnf.c
index eabadc619387d4441444145aef78e4e32c3f6a19..a83f87ec8a48fd5b51e16c22c1c2f2a3e1d5b4a7 100644
--- a/nfapi/oai_integration/nfapi_vnf.c
+++ b/nfapi/oai_integration/nfapi_vnf.c
@@ -40,7 +40,7 @@
 #include "PHY/defs_eNB.h"
 #include "PHY/LTE_TRANSPORT/transport_proto.h"
 #include "openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
-#include <targets/RT/USER/lte-softmodem.h>
+#include "executables/lte-softmodem.h"
 
 #include "common/ran_context.h"
 #include "openair2/PHY_INTERFACE/queue_t.h"
diff --git a/openair1/PHY/LTE_TRANSPORT/dci.c b/openair1/PHY/LTE_TRANSPORT/dci.c
index 24f94ad78f369676f9fad662a955af71850f36f0..3f43a1cc42d1182110efe80c90cf02cf8563fc07 100644
--- a/openair1/PHY/LTE_TRANSPORT/dci.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci.c
@@ -45,7 +45,7 @@
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "PHY/LTE_TRANSPORT/transport_extern.h"
 #include "PHY/LTE_REFSIG/lte_refsig.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 //#define DEBUG_DCI_ENCODING 1
 //#define DEBUG_DCI_DECODING 1
 //#define DEBUG_PHY
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c b/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
index b658dc10437ec35f6df4bae79935bc1f65ca0706..8032a2f0ba9d801f976a24011546f76c62525a5b 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
@@ -40,7 +40,7 @@
 #include "SCHED/sched_eNB.h"
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "common/utils/LOG/log.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 #include <syscall.h>
 #include <common/utils/threadPool/thread-pool.h>
 
diff --git a/openair1/PHY/LTE_TRANSPORT/print_stats.c b/openair1/PHY/LTE_TRANSPORT/print_stats.c
index bdd3cb6f459158066290ee968446313f767901cf..856e392070b73b07967aefb89e15bfb3c11d7cc9 100644
--- a/openair1/PHY/LTE_TRANSPORT/print_stats.c
+++ b/openair1/PHY/LTE_TRANSPORT/print_stats.c
@@ -31,7 +31,7 @@
 */
 
 #include "PHY/LTE_TRANSPORT/proto.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 #include "PHY/defs.h"
 #include "PHY/extern.h"
 #include "SCHED/extern.h"
diff --git a/openair1/PHY/LTE_TRANSPORT/pss.c b/openair1/PHY/LTE_TRANSPORT/pss.c
index ce524ef611c3e9cf98528166d7d01d6e9a864858..34a7ba70073e82178ff1ab8f32cf2a36643e428d 100644
--- a/openair1/PHY/LTE_TRANSPORT/pss.c
+++ b/openair1/PHY/LTE_TRANSPORT/pss.c
@@ -38,7 +38,7 @@
 //#include "defs.h"
 #include "PHY/defs_eNB.h"
 #include "PHY/phy_extern.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 
 int generate_pss(int32_t **txdataF,
                  short amp,
diff --git a/openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c b/openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
index ff7affe1b3a2855d5db9faf8785c364b533f63f9..68d653605c17b285053541c08161e3602373ed83 100644
--- a/openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
+++ b/openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
@@ -31,7 +31,7 @@
 */
 #include "PHY/types.h"
 #include "PHY/defs_UE.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 #include "PHY/phy_extern_ue.h"
 #include "SCHED_UE/sched_UE.h"
 #include "transport_proto_ue.h"
diff --git a/openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c b/openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c
index 6c0599092950ffae5029d511a757390c3662a1e0..547076682733da79e6fe47984ab2dce0a91e5f5b 100644
--- a/openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c
+++ b/openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c
@@ -31,7 +31,7 @@
  */
 #include "PHY/sse_intrin.h"
 #include "PHY/defs_UE.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 #include "PHY/phy_extern_ue.h"
 //#include "prach.h"
 #include "PHY/LTE_TRANSPORT/if4_tools.h"
diff --git a/openair1/PHY/TOOLS/lte_enb_scope.c b/openair1/PHY/TOOLS/lte_enb_scope.c
index 0e873addbcf44f6c73fe1d205b311f0e4cee831e..6c51cebac3e2d1d750be7ec3097f363ef508ac0f 100644
--- a/openair1/PHY/TOOLS/lte_enb_scope.c
+++ b/openair1/PHY/TOOLS/lte_enb_scope.c
@@ -30,11 +30,11 @@
  * \warning
  */
 
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 #include "UTIL/OPT/opt.h"
 #include "common/config/config_userapi.h"
 #include "PHY/TOOLS/lte_phy_scope.h"
-#include "targets/RT/USER/stats.h"
+#include "executables/stats.h"
 
 // current status is that every UE has a DL scope for a SINGLE eNB (eNB_id=0)
 // at eNB 0, an UL scope for every UE
diff --git a/openair1/PHY/TOOLS/lte_ue_scope.c b/openair1/PHY/TOOLS/lte_ue_scope.c
index 2c45437cdfa309c4abc61e0470482095757a73df..3b14ad4da9ad335c3bd43f45da223b3d232c5a87 100644
--- a/openair1/PHY/TOOLS/lte_ue_scope.c
+++ b/openair1/PHY/TOOLS/lte_ue_scope.c
@@ -31,11 +31,11 @@
  * \warning
  */
 
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 #include "UTIL/OPT/opt.h"
 #include "common/config/config_userapi.h"
 #include "PHY/TOOLS/lte_phy_scope.h"
-#include "targets/RT/USER/stats.h"
+#include "executables/stats.h"
 #include "PHY/phy_vars_ue.h"
 // current status is that every UE has a DL scope for a SINGLE eNB (eNB_id=0)
 // at eNB 0, an UL scope for every UE
diff --git a/openair1/SCHED/ru_procedures.c b/openair1/SCHED/ru_procedures.c
index 2f60dde0a23385b91adfe0fc3aa4bf5d9acca268..fc566db485650b85e4092a3a2dc585d700d651a9 100644
--- a/openair1/SCHED/ru_procedures.c
+++ b/openair1/SCHED/ru_procedures.c
@@ -71,7 +71,7 @@
 
 #include <time.h>
 #include "openair1/SCHED/sched_common_extern.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 #include "common/ran_context.h"
 
 void feptx0(RU_t *ru,
diff --git a/openair1/SCHED_UE/phy_procedures_lte_ue.c b/openair1/SCHED_UE/phy_procedures_lte_ue.c
index e2f9401e59a8bece233412b8b0a44d08c38d7761..7cff63b4bbf5d1b3aa344f1d6b1d3ee81b9f349f 100644
--- a/openair1/SCHED_UE/phy_procedures_lte_ue.c
+++ b/openair1/SCHED_UE/phy_procedures_lte_ue.c
@@ -37,7 +37,7 @@
 #include "PHY/defs_UE.h"
 #include "PHY/phy_extern_ue.h"
 //#include "executables/nr-uesoftmodem.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 
 #include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
 #include "SCHED_UE/sched_UE.h"
diff --git a/openair1/SIMULATION/LTE_PHY/ulsim.c b/openair1/SIMULATION/LTE_PHY/ulsim.c
index 3d13a4244f1f42b2805d96eb8e84553b397638a4..60c658913eb92621994fb8bcc7b3d7eca36ffcab 100644
--- a/openair1/SIMULATION/LTE_PHY/ulsim.c
+++ b/openair1/SIMULATION/LTE_PHY/ulsim.c
@@ -53,7 +53,7 @@
 #include "nfapi/oai_integration/vendor_ext.h"
 #include "common/config/config_load_configmodule.h"
 #include "executables/thread-common.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 #include "executables/split_headers.h"
 #include "common/ran_context.h"
 #include "PHY/LTE_ESTIMATION/lte_estimation.h"
diff --git a/openair2/ENB_APP/enb_app.c b/openair2/ENB_APP/enb_app.c
index b9c8e5bb5161468b0d87f1e69d89cbb1d9f8f0f7..54fc1bf6be14d8c7d3027ebf9c81cdbbedd473e4 100644
--- a/openair2/ENB_APP/enb_app.c
+++ b/openair2/ENB_APP/enb_app.c
@@ -34,7 +34,7 @@
 #include "enb_config.h"
 #include "assertions.h"
 #include "common/ran_context.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 
 #include "common/utils/LOG/log.h"
 
@@ -55,7 +55,7 @@ extern RAN_CONTEXT_t RC;
 
 #   define ENB_REGISTER_RETRY_DELAY 10
 
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 
 
 /*************************** ENB M2AP **************************/
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index 94ebd6409f7ae1a7381f55d4ecb5f17019d0142d..3f935c37703c446ad27e39449fb73ded15eac32c 100644
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -49,7 +49,7 @@
 #include "radio/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
 #include "nfapi_vnf.h"
 #include "nfapi_pnf.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 #include "L1_paramdef.h"
 #include "MACRLC_paramdef.h"
 #include "common/config/config_userapi.h"
diff --git a/openair2/LAYER2/MAC/eNB_scheduler.c b/openair2/LAYER2/MAC/eNB_scheduler.c
index 354d54f74fd9c444419175388f82f407d9f8953f..3b07b274429b970011ba31ecc3074904ccc65c1d 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler.c
@@ -30,7 +30,7 @@
  */
 
 #include "assertions.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 #include "LAYER2/MAC/mac.h"
 #include "LAYER2/MAC/mac_extern.h"
 
diff --git a/openair2/LAYER2/MAC/ue_procedures.c b/openair2/LAYER2/MAC/ue_procedures.c
index 2c04bc247c704d091b95b16a632588a87362326b..5eeec0d42b9604c905ddfc157d0d0719f37358ff 100644
--- a/openair2/LAYER2/MAC/ue_procedures.c
+++ b/openair2/LAYER2/MAC/ue_procedures.c
@@ -50,7 +50,7 @@
 #include "openair2/PHY_INTERFACE/phy_stub_UE.h"
 
 #include "pdcp.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 
 #include "intertask_interface.h"
 
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
index e9854662a30d430b3fd8831edfa6f5d8cdb1653a..e39e1dc090d89b15bdd9e1bc3011950d0f4dc738 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
@@ -50,7 +50,7 @@
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "common/ngran_types.h"
 #include "common/openairinterface5g_limits.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 #include "SIMULATION/ETH_TRANSPORT/proto.h"
 #include "UTIL/OSA/osa_defs.h"
 #include "openair2/RRC/NAS/nas_config.h"
diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
index 876def54996cdd5998628a49f0fc988f591d6ecd..17944c59e45a9c122ee4d164a0ad610ef6946af5 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
@@ -547,7 +547,7 @@ void pdcp_layer_init(void)
 }
 
 #include "nfapi/oai_integration/vendor_ext.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 #include "openair2/RRC/NAS/nas_config.h"
 
 uint64_t nr_pdcp_module_init(uint64_t _pdcp_optmask, int id)
diff --git a/openair2/MCE_APP/mce_app.c b/openair2/MCE_APP/mce_app.c
index fb52002bf37d38d62c7ff379020cfddfa1874475..37b461e819f83dcb95ae0ce9248649d9f33134ed 100644
--- a/openair2/MCE_APP/mce_app.c
+++ b/openair2/MCE_APP/mce_app.c
@@ -34,7 +34,7 @@
 #include "mce_config.h"
 #include "assertions.h"
 #include "common/ran_context.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 
 #include "common/utils/LOG/log.h"
 
@@ -57,7 +57,7 @@ extern RAN_CONTEXT_t RC;
 
 #   define MCE_REGISTER_RETRY_DELAY 10
 
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 
 static m2ap_mbms_scheduling_information_t * m2ap_mbms_scheduling_information_local = NULL;
 static m2ap_setup_resp_t * m2ap_setup_resp_local = NULL;
diff --git a/openair2/RRC/LTE/MESSAGES/asn1_msg.c b/openair2/RRC/LTE/MESSAGES/asn1_msg.c
index 263eee2a1098fd6973aa42e7858366d111a0a1e6..4cbf23ee9da9cbd515d495b1efdbc817a520383d 100644
--- a/openair2/RRC/LTE/MESSAGES/asn1_msg.c
+++ b/openair2/RRC/LTE/MESSAGES/asn1_msg.c
@@ -47,7 +47,7 @@
 #include <asn_application.h>
 #include <asn_internal.h> /* for _ASN_DEFAULT_STACK_MAX */
 #include <per_encoder.h>
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 #include "assertions.h"
 #include "LTE_RRCConnectionRequest.h"
 #include "LTE_UL-CCCH-Message.h"
diff --git a/openair2/RRC/LTE/rrc_UE.c b/openair2/RRC/LTE/rrc_UE.c
index 2773e63ab363b293095e30c64d5d20187ea78715..cd7e524bf9d81b2737fc80ec8b4bf791436009fb 100644
--- a/openair2/RRC/LTE/rrc_UE.c
+++ b/openair2/RRC/LTE/rrc_UE.c
@@ -76,7 +76,7 @@
 #include <common/utils/system.h>
 
 #include "intertask_interface.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 
 #include "SIMULATION/TOOLS/sim.h" // for taus
 
diff --git a/openair2/RRC/NAS/nas_config.c b/openair2/RRC/NAS/nas_config.c
index bf4d0ec12947f0bc0627e7afbb77784bdc9f3148..b50e52586af4f47a9b24ba056923d1c1d291df0d 100644
--- a/openair2/RRC/NAS/nas_config.c
+++ b/openair2/RRC/NAS/nas_config.c
@@ -44,7 +44,7 @@
 
 #include "nas_config.h"
 #include "common/utils/LOG/log.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 #include "common/config/config_userapi.h"
 #include "pdcp.h"
 
diff --git a/openair3/MME_APP/mme_app.c b/openair3/MME_APP/mme_app.c
index ea7f7b91aef24b482ebc598acfc632888c625883..2c1d524c156c4475888d12bdc9d55bc9d0be7fd7 100644
--- a/openair3/MME_APP/mme_app.c
+++ b/openair3/MME_APP/mme_app.c
@@ -34,7 +34,7 @@
 #include "mme_config.h"
 #include "assertions.h"
 #include "common/ran_context.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 
 #include "common/utils/LOG/log.h"
 
@@ -57,7 +57,7 @@ extern RAN_CONTEXT_t RC;
 
 #   define MCE_REGISTER_RETRY_DELAY 10
 
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 
 
 
diff --git a/openair3/NAS/UE/EMM/Authentication.c b/openair3/NAS/UE/EMM/Authentication.c
index a3b58f89f42bf5f5cd8aca173629ba623954058f..a387580b60d626080b52bce48b2ac2518d644d6f 100644
--- a/openair3/NAS/UE/EMM/Authentication.c
+++ b/openair3/NAS/UE/EMM/Authentication.c
@@ -68,7 +68,7 @@ Description Defines the authentication EMM procedure executed by the
 #include "usim_api.h"
 #include "secu_defs.h"
 #include "Authentication.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 
 
 /****************************************************************************/
diff --git a/openair3/NAS/UE/EMM/SAP/EmmDeregisteredNormalService.c b/openair3/NAS/UE/EMM/SAP/EmmDeregisteredNormalService.c
index 0925cb4e0f2dfa8620efdc1d413bdc7ccb2e7267..a49f71cd4bf94ef502891de92dc0a933277beee2 100644
--- a/openair3/NAS/UE/EMM/SAP/EmmDeregisteredNormalService.c
+++ b/openair3/NAS/UE/EMM/SAP/EmmDeregisteredNormalService.c
@@ -47,7 +47,7 @@ Description Implements the EPS Mobility Management procedures executed
 #include "commonDef.h"
 #include "networkDef.h"
 #include "nas_log.h"
-#include "targets/RT/USER/lte-softmodem.h"
+#include "executables/lte-softmodem.h"
 #include "emm_proc.h"
 
 #include <assert.h>
diff --git a/targets/RT/USER/init_b200.sh b/targets/RT/USER/init_b200.sh
deleted file mode 100644
index e1d96a42862added93cf1390e8e34b5b4d1c70da..0000000000000000000000000000000000000000
--- a/targets/RT/USER/init_b200.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-sudo udevadm control --reload-rules
-sudo udevadm trigger
-sudo uhd_usrp_probe --args="type=b200"
-
diff --git a/targets/RT/USER/stats.fd b/targets/RT/USER/stats.fd
deleted file mode 100644
index 2e8ea186cf90671bb3d084c9f333a8f112b751e7..0000000000000000000000000000000000000000
--- a/targets/RT/USER/stats.fd
+++ /dev/null
@@ -1,52 +0,0 @@
-Magic: 14000
-
-Internal Form Definition File
-    (do not change)
-
-Number of forms: 1
-Unit of measure: FL_COORD_PIXEL
-
-=============== FORM ===============
-Name: stats_form
-Width: 1115
-Height: 900
-Number of Objects: 2
-
---------------------
-class: FL_BOX
-type: UP_BOX
-box: 0 0 1115 900
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 60 50 1000 810
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_NORMAL_STYLE
-size: FL_TINY_SIZE
-lcol: FL_BLACK
-label: test
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: stats_text
-callback: 
-argument: 
-
-==============================
-create_the_forms
diff --git a/targets/RT/USER/stats.h b/targets/RT/USER/stats.h
deleted file mode 100644
index 15ee4a808765c73b1c3cb2b77c6bf0671d5f842c..0000000000000000000000000000000000000000
--- a/targets/RT/USER/stats.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/* Header file generated by fdesign on Thu Aug 28 12:13:51 2014 */
-
-#ifndef _TARGETS_RT_USER_STATS_H_
-#define _TARGETS_RT_USER_STATS_H_
-
-#include <forms.h>
-
-/* Callbacks, globals and object handlers */
-
-extern void reset_stats( FL_OBJECT *, long );
-
-/* Forms and Objects */
-
-typedef struct {
-  FL_FORM   * stats_form;
-  void      * vdata;
-  char      * cdata;
-  long        ldata;
-  FL_OBJECT * stats_text;
-  FL_OBJECT * stats_button;
-} FD_stats_form;
-
-extern FD_stats_form * create_form_stats_form( void );
-
-#endif /* _TARGETS_RT_USER_STATS_H_ */