diff --git a/targets/RTAI/LAUNCH_SCRIPTS/load_module.sh b/targets/RT/LAUNCH_SCRIPTS/load_module.sh
similarity index 100%
rename from targets/RTAI/LAUNCH_SCRIPTS/load_module.sh
rename to targets/RT/LAUNCH_SCRIPTS/load_module.sh
diff --git a/targets/RTAI/LAUNCH_SCRIPTS/nas_enb.sh b/targets/RT/LAUNCH_SCRIPTS/nas_enb.sh
similarity index 100%
rename from targets/RTAI/LAUNCH_SCRIPTS/nas_enb.sh
rename to targets/RT/LAUNCH_SCRIPTS/nas_enb.sh
diff --git a/targets/RTAI/LAUNCH_SCRIPTS/nas_ue.sh b/targets/RT/LAUNCH_SCRIPTS/nas_ue.sh
similarity index 100%
rename from targets/RTAI/LAUNCH_SCRIPTS/nas_ue.sh
rename to targets/RT/LAUNCH_SCRIPTS/nas_ue.sh
diff --git a/targets/RTAI/LAUNCH_SCRIPTS/nas_ue2.sh b/targets/RT/LAUNCH_SCRIPTS/nas_ue2.sh
similarity index 100%
rename from targets/RTAI/LAUNCH_SCRIPTS/nas_ue2.sh
rename to targets/RT/LAUNCH_SCRIPTS/nas_ue2.sh
diff --git a/targets/RTAI/LAUNCH_SCRIPTS/start_eNb_mode1.sh b/targets/RT/LAUNCH_SCRIPTS/start_eNb_mode1.sh
similarity index 100%
rename from targets/RTAI/LAUNCH_SCRIPTS/start_eNb_mode1.sh
rename to targets/RT/LAUNCH_SCRIPTS/start_eNb_mode1.sh
diff --git a/targets/RTAI/LAUNCH_SCRIPTS/start_eNb_mode2.sh b/targets/RT/LAUNCH_SCRIPTS/start_eNb_mode2.sh
similarity index 100%
rename from targets/RTAI/LAUNCH_SCRIPTS/start_eNb_mode2.sh
rename to targets/RT/LAUNCH_SCRIPTS/start_eNb_mode2.sh
diff --git a/targets/RTAI/LAUNCH_SCRIPTS/start_eNb_mode6.sh b/targets/RT/LAUNCH_SCRIPTS/start_eNb_mode6.sh
similarity index 100%
rename from targets/RTAI/LAUNCH_SCRIPTS/start_eNb_mode6.sh
rename to targets/RT/LAUNCH_SCRIPTS/start_eNb_mode6.sh
diff --git a/targets/RTAI/LAUNCH_SCRIPTS/start_emos.sh b/targets/RT/LAUNCH_SCRIPTS/start_emos.sh
similarity index 100%
rename from targets/RTAI/LAUNCH_SCRIPTS/start_emos.sh
rename to targets/RT/LAUNCH_SCRIPTS/start_emos.sh
diff --git a/targets/RTAI/LAUNCH_SCRIPTS/start_rf.sh b/targets/RT/LAUNCH_SCRIPTS/start_rf.sh
similarity index 100%
rename from targets/RTAI/LAUNCH_SCRIPTS/start_rf.sh
rename to targets/RT/LAUNCH_SCRIPTS/start_rf.sh
diff --git a/targets/RTAI/LAUNCH_SCRIPTS/start_test_fs4.sh b/targets/RT/LAUNCH_SCRIPTS/start_test_fs4.sh
similarity index 100%
rename from targets/RTAI/LAUNCH_SCRIPTS/start_test_fs4.sh
rename to targets/RT/LAUNCH_SCRIPTS/start_test_fs4.sh
diff --git a/targets/RTAI/LAUNCH_SCRIPTS/start_ue.sh b/targets/RT/LAUNCH_SCRIPTS/start_ue.sh
similarity index 100%
rename from targets/RTAI/LAUNCH_SCRIPTS/start_ue.sh
rename to targets/RT/LAUNCH_SCRIPTS/start_ue.sh
diff --git a/targets/RTAI/LAUNCH_SCRIPTS/start_ue2.sh b/targets/RT/LAUNCH_SCRIPTS/start_ue2.sh
similarity index 100%
rename from targets/RTAI/LAUNCH_SCRIPTS/start_ue2.sh
rename to targets/RT/LAUNCH_SCRIPTS/start_ue2.sh
diff --git a/targets/RTAI/LAUNCH_SCRIPTS/stop_rf.sh b/targets/RT/LAUNCH_SCRIPTS/stop_rf.sh
similarity index 100%
rename from targets/RTAI/LAUNCH_SCRIPTS/stop_rf.sh
rename to targets/RT/LAUNCH_SCRIPTS/stop_rf.sh
diff --git a/targets/RTAI/Makefile b/targets/RT/Makefile
similarity index 100%
rename from targets/RTAI/Makefile
rename to targets/RT/Makefile
diff --git a/targets/RTAI/USER/.runinfo b/targets/RT/USER/.runinfo
similarity index 100%
rename from targets/RTAI/USER/.runinfo
rename to targets/RT/USER/.runinfo
diff --git a/targets/RTAI/USER/.ue.nvram b/targets/RT/USER/.ue.nvram
similarity index 100%
rename from targets/RTAI/USER/.ue.nvram
rename to targets/RT/USER/.ue.nvram
diff --git a/targets/RTAI/USER/.ue_emm.nvram b/targets/RT/USER/.ue_emm.nvram
similarity index 100%
rename from targets/RTAI/USER/.ue_emm.nvram
rename to targets/RT/USER/.ue_emm.nvram
diff --git a/targets/RTAI/USER/.usim.nvram b/targets/RT/USER/.usim.nvram
similarity index 100%
rename from targets/RTAI/USER/.usim.nvram
rename to targets/RT/USER/.usim.nvram
diff --git a/targets/RTAI/USER/Makefile b/targets/RT/USER/Makefile
similarity index 100%
rename from targets/RTAI/USER/Makefile
rename to targets/RT/USER/Makefile
diff --git a/targets/RTAI/USER/Makefile.agilent b/targets/RT/USER/Makefile.agilent
similarity index 100%
rename from targets/RTAI/USER/Makefile.agilent
rename to targets/RT/USER/Makefile.agilent
diff --git a/targets/RTAI/USER/Makefile.msg_many b/targets/RT/USER/Makefile.msg_many
similarity index 100%
rename from targets/RTAI/USER/Makefile.msg_many
rename to targets/RT/USER/Makefile.msg_many
diff --git a/targets/RTAI/USER/TOOLS/thread_ipc.c b/targets/RT/USER/TOOLS/thread_ipc.c
similarity index 100%
rename from targets/RTAI/USER/TOOLS/thread_ipc.c
rename to targets/RT/USER/TOOLS/thread_ipc.c
diff --git a/targets/RTAI/USER/TOOLS/thread_ipc.h b/targets/RT/USER/TOOLS/thread_ipc.h
similarity index 100%
rename from targets/RTAI/USER/TOOLS/thread_ipc.h
rename to targets/RT/USER/TOOLS/thread_ipc.h
diff --git a/targets/RTAI/USER/condtest.c b/targets/RT/USER/condtest.c
similarity index 100%
rename from targets/RTAI/USER/condtest.c
rename to targets/RT/USER/condtest.c
diff --git a/targets/RTAI/USER/dot11.c b/targets/RT/USER/dot11.c
similarity index 100%
rename from targets/RTAI/USER/dot11.c
rename to targets/RT/USER/dot11.c
diff --git a/targets/RTAI/USER/emos-raw.c b/targets/RT/USER/emos-raw.c
similarity index 100%
rename from targets/RTAI/USER/emos-raw.c
rename to targets/RT/USER/emos-raw.c
diff --git a/targets/RTAI/USER/enb2tx_850rflo.lime b/targets/RT/USER/enb2tx_850rflo.lime
similarity index 100%
rename from targets/RTAI/USER/enb2tx_850rflo.lime
rename to targets/RT/USER/enb2tx_850rflo.lime
diff --git a/targets/RTAI/USER/enb2txrflo.lime b/targets/RT/USER/enb2txrflo.lime
similarity index 100%
rename from targets/RTAI/USER/enb2txrflo.lime
rename to targets/RT/USER/enb2txrflo.lime
diff --git a/targets/RTAI/USER/enb2txrxg.lime b/targets/RT/USER/enb2txrxg.lime
similarity index 100%
rename from targets/RTAI/USER/enb2txrxg.lime
rename to targets/RT/USER/enb2txrxg.lime
diff --git a/targets/RTAI/USER/enb2txtxg.lime b/targets/RT/USER/enb2txtxg.lime
similarity index 100%
rename from targets/RTAI/USER/enb2txtxg.lime
rename to targets/RT/USER/enb2txtxg.lime
diff --git a/targets/RTAI/USER/enb4txrflo.lime b/targets/RT/USER/enb4txrflo.lime
similarity index 100%
rename from targets/RTAI/USER/enb4txrflo.lime
rename to targets/RT/USER/enb4txrflo.lime
diff --git a/targets/RTAI/USER/enb4txrxg.lime b/targets/RT/USER/enb4txrxg.lime
similarity index 100%
rename from targets/RTAI/USER/enb4txrxg.lime
rename to targets/RT/USER/enb4txrxg.lime
diff --git a/targets/RTAI/USER/ex2_2rfdc.lime b/targets/RT/USER/ex2_2rfdc.lime
similarity index 100%
rename from targets/RTAI/USER/ex2_2rfdc.lime
rename to targets/RT/USER/ex2_2rfdc.lime
diff --git a/targets/RTAI/USER/ex2_2rflo.lime b/targets/RT/USER/ex2_2rflo.lime
similarity index 100%
rename from targets/RTAI/USER/ex2_2rflo.lime
rename to targets/RT/USER/ex2_2rflo.lime
diff --git a/targets/RTAI/USER/ex2_2rxg.lime b/targets/RT/USER/ex2_2rxg.lime
similarity index 100%
rename from targets/RTAI/USER/ex2_2rxg.lime
rename to targets/RT/USER/ex2_2rxg.lime
diff --git a/targets/RTAI/USER/ex2_2txg.lime b/targets/RT/USER/ex2_2txg.lime
similarity index 100%
rename from targets/RTAI/USER/ex2_2txg.lime
rename to targets/RT/USER/ex2_2txg.lime
diff --git a/targets/RTAI/USER/ex2_850rfdc.lime b/targets/RT/USER/ex2_850rfdc.lime
similarity index 100%
rename from targets/RTAI/USER/ex2_850rfdc.lime
rename to targets/RT/USER/ex2_850rfdc.lime
diff --git a/targets/RTAI/USER/ex2_850rflo.lime b/targets/RT/USER/ex2_850rflo.lime
similarity index 100%
rename from targets/RTAI/USER/ex2_850rflo.lime
rename to targets/RT/USER/ex2_850rflo.lime
diff --git a/targets/RTAI/USER/ex2_850rxg.lime b/targets/RT/USER/ex2_850rxg.lime
similarity index 100%
rename from targets/RTAI/USER/ex2_850rxg.lime
rename to targets/RT/USER/ex2_850rxg.lime
diff --git a/targets/RTAI/USER/ex2_850txg.lime b/targets/RT/USER/ex2_850txg.lime
similarity index 100%
rename from targets/RTAI/USER/ex2_850txg.lime
rename to targets/RT/USER/ex2_850txg.lime
diff --git a/targets/RTAI/USER/ieee80211p-softmodem.c b/targets/RT/USER/ieee80211p-softmodem.c
similarity index 100%
rename from targets/RTAI/USER/ieee80211p-softmodem.c
rename to targets/RT/USER/ieee80211p-softmodem.c
diff --git a/targets/RTAI/USER/init_exmimo.sh b/targets/RT/USER/init_exmimo.sh
similarity index 100%
rename from targets/RTAI/USER/init_exmimo.sh
rename to targets/RT/USER/init_exmimo.sh
diff --git a/targets/RTAI/USER/init_exmimo2.sh b/targets/RT/USER/init_exmimo2.sh
similarity index 100%
rename from targets/RTAI/USER/init_exmimo2.sh
rename to targets/RT/USER/init_exmimo2.sh
diff --git a/targets/RTAI/USER/lte-enb.c b/targets/RT/USER/lte-enb.c
similarity index 100%
rename from targets/RTAI/USER/lte-enb.c
rename to targets/RT/USER/lte-enb.c
diff --git a/targets/RTAI/USER/lte-softmodem-usrp.c b/targets/RT/USER/lte-softmodem-usrp.c
similarity index 100%
rename from targets/RTAI/USER/lte-softmodem-usrp.c
rename to targets/RT/USER/lte-softmodem-usrp.c
diff --git a/targets/RTAI/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
similarity index 100%
rename from targets/RTAI/USER/lte-softmodem.c
rename to targets/RT/USER/lte-softmodem.c
diff --git a/targets/RTAI/USER/lte_scope.c b/targets/RT/USER/lte_scope.c
similarity index 100%
rename from targets/RTAI/USER/lte_scope.c
rename to targets/RT/USER/lte_scope.c
diff --git a/targets/RTAI/USER/lte_scope.fd b/targets/RT/USER/lte_scope.fd
similarity index 100%
rename from targets/RTAI/USER/lte_scope.fd
rename to targets/RT/USER/lte_scope.fd
diff --git a/targets/RTAI/USER/lte_scope.h b/targets/RT/USER/lte_scope.h
similarity index 100%
rename from targets/RTAI/USER/lte_scope.h
rename to targets/RT/USER/lte_scope.h
diff --git a/targets/RTAI/USER/make_for_usrp.sh b/targets/RT/USER/make_for_usrp.sh
similarity index 100%
rename from targets/RTAI/USER/make_for_usrp.sh
rename to targets/RT/USER/make_for_usrp.sh
diff --git a/targets/RTAI/USER/msg_helper.c b/targets/RT/USER/msg_helper.c
similarity index 100%
rename from targets/RTAI/USER/msg_helper.c
rename to targets/RT/USER/msg_helper.c
diff --git a/targets/RTAI/USER/msg_many.c b/targets/RT/USER/msg_many.c
similarity index 100%
rename from targets/RTAI/USER/msg_many.c
rename to targets/RT/USER/msg_many.c
diff --git a/targets/RTAI/USER/msg_many.h b/targets/RT/USER/msg_many.h
similarity index 100%
rename from targets/RTAI/USER/msg_many.h
rename to targets/RT/USER/msg_many.h
diff --git a/targets/RTAI/USER/rt_wrapper.c b/targets/RT/USER/rt_wrapper.c
similarity index 100%
rename from targets/RTAI/USER/rt_wrapper.c
rename to targets/RT/USER/rt_wrapper.c
diff --git a/targets/RTAI/USER/rt_wrapper.h b/targets/RT/USER/rt_wrapper.h
similarity index 100%
rename from targets/RTAI/USER/rt_wrapper.h
rename to targets/RT/USER/rt_wrapper.h
diff --git a/targets/RTAI/USER/sched_dlsch.c b/targets/RT/USER/sched_dlsch.c
similarity index 100%
rename from targets/RTAI/USER/sched_dlsch.c
rename to targets/RT/USER/sched_dlsch.c
diff --git a/targets/RTAI/USER/sched_rx_pdsch.c b/targets/RT/USER/sched_rx_pdsch.c
similarity index 100%
rename from targets/RTAI/USER/sched_rx_pdsch.c
rename to targets/RT/USER/sched_rx_pdsch.c
diff --git a/targets/RTAI/USER/sched_ulsch.c b/targets/RT/USER/sched_ulsch.c
similarity index 100%
rename from targets/RTAI/USER/sched_ulsch.c
rename to targets/RT/USER/sched_ulsch.c
diff --git a/targets/RTAI/USER/sleeptest.c b/targets/RT/USER/sleeptest.c
similarity index 100%
rename from targets/RTAI/USER/sleeptest.c
rename to targets/RT/USER/sleeptest.c
diff --git a/targets/RTAI/USER/stats.c b/targets/RT/USER/stats.c
similarity index 100%
rename from targets/RTAI/USER/stats.c
rename to targets/RT/USER/stats.c
diff --git a/targets/RTAI/USER/stats.fd b/targets/RT/USER/stats.fd
similarity index 100%
rename from targets/RTAI/USER/stats.fd
rename to targets/RT/USER/stats.fd
diff --git a/targets/RTAI/USER/stats.h b/targets/RT/USER/stats.h
similarity index 100%
rename from targets/RTAI/USER/stats.h
rename to targets/RT/USER/stats.h
diff --git a/targets/RTAI/USER/synctest.c b/targets/RT/USER/synctest.c
similarity index 100%
rename from targets/RTAI/USER/synctest.c
rename to targets/RT/USER/synctest.c
diff --git a/targets/RTAI/USER/ue1rflo.lime b/targets/RT/USER/ue1rflo.lime
similarity index 100%
rename from targets/RTAI/USER/ue1rflo.lime
rename to targets/RT/USER/ue1rflo.lime
diff --git a/targets/RTAI/USER/ue1rxg.lime b/targets/RT/USER/ue1rxg.lime
similarity index 100%
rename from targets/RTAI/USER/ue1rxg.lime
rename to targets/RT/USER/ue1rxg.lime
diff --git a/targets/RTAI/USER/ue1txg.lime b/targets/RT/USER/ue1txg.lime
similarity index 100%
rename from targets/RTAI/USER/ue1txg.lime
rename to targets/RT/USER/ue1txg.lime
diff --git a/targets/RTAI/USER/ue2rflo.lime b/targets/RT/USER/ue2rflo.lime
similarity index 100%
rename from targets/RTAI/USER/ue2rflo.lime
rename to targets/RT/USER/ue2rflo.lime
diff --git a/targets/RTAI/USER/ue2rxg.lime b/targets/RT/USER/ue2rxg.lime
similarity index 100%
rename from targets/RTAI/USER/ue2rxg.lime
rename to targets/RT/USER/ue2rxg.lime
diff --git a/targets/RTAI/USER/ue2txg.lime b/targets/RT/USER/ue2txg.lime
similarity index 100%
rename from targets/RTAI/USER/ue2txg.lime
rename to targets/RT/USER/ue2txg.lime
diff --git a/targets/RTAI/USER/zeptorflo.lime b/targets/RT/USER/zeptorflo.lime
similarity index 100%
rename from targets/RTAI/USER/zeptorflo.lime
rename to targets/RT/USER/zeptorflo.lime
diff --git a/targets/RTAI/USER/zeptorxg.lime b/targets/RT/USER/zeptorxg.lime
similarity index 100%
rename from targets/RTAI/USER/zeptorxg.lime
rename to targets/RT/USER/zeptorxg.lime