diff --git a/openairinterface5g/openairinterface-conf/basic_deployment/cu_gnb.conf b/openairinterface5g/openairinterface-conf/flexric_gNB_UE/cu_gnb.conf similarity index 100% rename from openairinterface5g/openairinterface-conf/basic_deployment/cu_gnb.conf rename to openairinterface5g/openairinterface-conf/flexric_gNB_UE/cu_gnb.conf diff --git a/openairinterface5g/openairinterface-conf/basic_deployment/du_gnb.conf b/openairinterface5g/openairinterface-conf/flexric_gNB_UE/du_gnb.conf similarity index 100% rename from openairinterface5g/openairinterface-conf/basic_deployment/du_gnb.conf rename to openairinterface5g/openairinterface-conf/flexric_gNB_UE/du_gnb.conf diff --git a/openairinterface5g/openairinterface-conf/basic_deployment/run_SIMU_oai_ran.sh b/openairinterface5g/openairinterface-conf/flexric_gNB_UE/run_SIMU_oai_ran.sh similarity index 100% rename from openairinterface5g/openairinterface-conf/basic_deployment/run_SIMU_oai_ran.sh rename to openairinterface5g/openairinterface-conf/flexric_gNB_UE/run_SIMU_oai_ran.sh diff --git a/openairinterface5g/openairinterface-conf/basic_deployment/run_SIMU_oai_ran_w_UE.sh b/openairinterface5g/openairinterface-conf/flexric_gNB_UE/run_SIMU_oai_ran_w_UE.sh similarity index 100% rename from openairinterface5g/openairinterface-conf/basic_deployment/run_SIMU_oai_ran_w_UE.sh rename to openairinterface5g/openairinterface-conf/flexric_gNB_UE/run_SIMU_oai_ran_w_UE.sh diff --git a/openairinterface5g/openairinterface-conf/basic_deployment/run_USRP_oai_UE.sh b/openairinterface5g/openairinterface-conf/flexric_gNB_UE/run_USRP_oai_UE.sh similarity index 100% rename from openairinterface5g/openairinterface-conf/basic_deployment/run_USRP_oai_UE.sh rename to openairinterface5g/openairinterface-conf/flexric_gNB_UE/run_USRP_oai_UE.sh diff --git a/openairinterface5g/openairinterface-conf/basic_deployment/run_USRP_oai_ran.sh b/openairinterface5g/openairinterface-conf/flexric_gNB_UE/run_USRP_oai_ran.sh similarity index 100% rename from openairinterface5g/openairinterface-conf/basic_deployment/run_USRP_oai_ran.sh rename to openairinterface5g/openairinterface-conf/flexric_gNB_UE/run_USRP_oai_ran.sh diff --git a/openairinterface5g/openairinterface-conf/basic_deployment/ue.conf b/openairinterface5g/openairinterface-conf/flexric_gNB_UE/ue.conf similarity index 100% rename from openairinterface5g/openairinterface-conf/basic_deployment/ue.conf rename to openairinterface5g/openairinterface-conf/flexric_gNB_UE/ue.conf