diff --git a/scenario_exe_parser.py b/TPF/scenario_exe_parser.py
similarity index 100%
rename from scenario_exe_parser.py
rename to TPF/scenario_exe_parser.py
diff --git a/scenario_execution.py b/TPF/scenario_execution.py
similarity index 100%
rename from scenario_execution.py
rename to TPF/scenario_execution.py
diff --git a/scenario_scan.py b/TPF/scenario_scan.py
similarity index 100%
rename from scenario_scan.py
rename to TPF/scenario_scan.py
diff --git a/test_execution.sh b/TPF/test_execution.sh
similarity index 100%
rename from test_execution.sh
rename to TPF/test_execution.sh
diff --git a/tpf_execution.py b/TPF/tpf_execution.py
similarity index 100%
rename from tpf_execution.py
rename to TPF/tpf_execution.py
diff --git a/deploy.sh b/deploy.sh
index 8fe643a..5e5a29e 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -56,9 +56,11 @@ chmod -R 755 /home/asf/testarena_backend/TPF
 
 # Copy scripts to TPF
 cp gitea_repo_controller.sh /home/asf/testarena_backend/TPF/
-cp scenario_execution.py /home/asf/testarena_backend/TPF/
-cp scenario_exe_parser.py /home/asf/testarena_backend/TPF/
-cp test_execution.sh /home/asf/testarena_backend/TPF/
+cp TPF/scenario_execution.py /home/asf/testarena_backend/TPF/
+cp TPF/scenario_exe_parser.py /home/asf/testarena_backend/TPF/
+cp TPF/test_execution.sh /home/asf/testarena_backend/TPF/
+cp TPF/scenario_scan.py /home/asf/testarena_backend/TPF/
+cp TPF/tpf_execution.py /home/asf/testarena_backend/TPF/
 chmod +x /home/asf/testarena_backend/TPF/*.sh
 
 # 5. Set up Systemd Services