diff --git a/README.md b/README.md
index 0b41ac1bd8049e0dfdf6fa89d8922d630d6cc899..55e784307213f556f4d506d7f79af3fe95034543 100644
--- a/README.md
+++ b/README.md
@@ -6,4 +6,12 @@
 
 
 ## SD-RAN
-[See files of SD-RAN here](sd-ran/)
\ No newline at end of file
+[See files of SD-RAN here](sd-ran/)
+
+
+## Important Links
+[OAI Reference Architecture for 5G and 6G Research with USRP](https://kb.ettus.com/OAI_Reference_Architecture_for_5G_and_6G_Research_with_USRP/)
+
+[OpenAirInterface 5G Core Network Deployment and Testing with gnbsim](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/blob/master/docs/DEPLOY_SA5G_SLICING.md)
+
+[Testing gNodeB with COTS UE](https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/develop/doc/TESTING_GNB_W_COTS_UE.md)
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
diff --git a/openairinterface5g/openairinterface-install-scripts/flexRIC_oai_gNB_install.sh b/openairinterface5g/openairinterface-install-scripts/flexRIC_oai_gNB_and_oai_UE_install.sh
similarity index 100%
rename from openairinterface5g/openairinterface-install-scripts/flexRIC_oai_gNB_install.sh
rename to openairinterface5g/openairinterface-install-scripts/flexRIC_oai_gNB_and_oai_UE_install.sh
diff --git a/openairinterface5g/openairinterface-install-scripts/oai_gNB_and_UE_install.sh b/openairinterface5g/openairinterface-install-scripts/oai_gNB_and_UE_install.sh
index 1d44706926077cc62369c7ece545a253d97c74a9..50b3641f42aca893289c3f55ab3dc643df6d7250 100755
--- a/openairinterface5g/openairinterface-install-scripts/oai_gNB_and_UE_install.sh
+++ b/openairinterface5g/openairinterface-install-scripts/oai_gNB_and_UE_install.sh
@@ -2,18 +2,6 @@
 
 sudo apt-get update
 
-## Install dependencies 
-# sudo apt-get install -y autotools-dev
-sudo apt-get install -y automake 					    # Required for run 'swig/autogen.sh'
-sudo apt-get install -y g++ make libpcre2-dev byacc     # Required for swig install
-sudo apt-get install -y cmake python3-dev libsctp-dev 	# Required for flexric install
-# sudo apt-get install -y libpcre2-dev
-# sudo apt-get install -y pcre2-utils
-# sudo apt-get install -y bison
-# sudo apt-get install -y byacc
-# sudo apt-get install -y g++ 
-# sudo apt-get install -y libsctp-dev python3.8 libpcre2-dev python3-dev 
-
 ## Repository OAI dependencies
 sudo add-apt-repository ppa:ettusresearch/uhd -y
 sudo apt-get update -y
@@ -21,8 +9,9 @@ sudo apt-get update -y
 ## OAI dependencies
 ## Testar com a libuhd4.4.0 ao invés de libuhd4.2.0u
 sudo apt-get install libuhd-dev uhd-host -y
-sudo apt-get install libuhd4.2.0 -y					# Required for OpenAirInterface install
+sudo apt-get install libuhd4.2.0 libuhd4.4.0 y					# Required for OpenAirInterface install
 sudo dpkg -i --force-overwrite /var/cache/apt/archives/libuhd4.2.0_4.2.0.1-0ubuntu1~focal1_amd64.deb
+sudo dpkg -i --force-overwrite /var/cache/apt/archives/libuhd4.4.0_4.4.0.0-0ubuntu1~focal1_amd64.deb
 
 # Work directory path is the current directory
 WORK_DIR=$HOME