diff --git a/ci-scripts/conf_files/episci_nr-ue.nfapi.conf b/ci-scripts/conf_files/episci/episci_nr-ue.nfapi.conf
similarity index 100%
rename from ci-scripts/conf_files/episci_nr-ue.nfapi.conf
rename to ci-scripts/conf_files/episci/episci_nr-ue.nfapi.conf
diff --git a/ci-scripts/conf_files/episci_rcc.band7.tm1.nfapi.conf b/ci-scripts/conf_files/episci/episci_rcc.band7.tm1.nfapi.conf
similarity index 100%
rename from ci-scripts/conf_files/episci_rcc.band7.tm1.nfapi.conf
rename to ci-scripts/conf_files/episci/episci_rcc.band7.tm1.nfapi.conf
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/episci_rcc.band78.tm1.106PRB.nfapi.conf b/ci-scripts/conf_files/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf
similarity index 100%
rename from targets/PROJECTS/GENERIC-LTE-EPC/CONF/episci_rcc.band78.tm1.106PRB.nfapi.conf
rename to ci-scripts/conf_files/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf
diff --git a/ci-scripts/conf_files/episci_ue.nfapi.conf b/ci-scripts/conf_files/episci/episci_ue.nfapi.conf
similarity index 100%
rename from ci-scripts/conf_files/episci_ue.nfapi.conf
rename to ci-scripts/conf_files/episci/episci_ue.nfapi.conf
diff --git a/ci-scripts/conf_files/proxy_nr-ue.nfapi.conf b/ci-scripts/conf_files/episci/proxy_nr-ue.nfapi.conf
similarity index 100%
rename from ci-scripts/conf_files/proxy_nr-ue.nfapi.conf
rename to ci-scripts/conf_files/episci/proxy_nr-ue.nfapi.conf
diff --git a/ci-scripts/conf_files/proxy_rcc.band7.tm1.nfapi.conf b/ci-scripts/conf_files/episci/proxy_rcc.band7.tm1.nfapi.conf
similarity index 100%
rename from ci-scripts/conf_files/proxy_rcc.band7.tm1.nfapi.conf
rename to ci-scripts/conf_files/episci/proxy_rcc.band7.tm1.nfapi.conf
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/proxy_rcc.band78.tm1.106PRB.nfapi.conf b/ci-scripts/conf_files/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf
similarity index 100%
rename from targets/PROJECTS/GENERIC-LTE-EPC/CONF/proxy_rcc.band78.tm1.106PRB.nfapi.conf
rename to ci-scripts/conf_files/episci/proxy_rcc.band78.tm1.106PRB.nfapi.conf
diff --git a/ci-scripts/conf_files/proxy_ue.nfapi.conf b/ci-scripts/conf_files/episci/proxy_ue.nfapi.conf
similarity index 100%
rename from ci-scripts/conf_files/proxy_ue.nfapi.conf
rename to ci-scripts/conf_files/episci/proxy_ue.nfapi.conf