diff --git a/cicd_tests/cfi_smokescreen_configs.sh b/cicd_tests/cfi_smokescreen_configs.sh
deleted file mode 100644
index 8b5d6d2e62ad04f6831db4193254b7b656f6e4f1..0000000000000000000000000000000000000000
--- a/cicd_tests/cfi_smokescreen_configs.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-
-configs=(do_cfi_4_byte 
-	 do_coloring_cfi_4_byte 
-	 do_cfi_exe_nonces_1_byte
-	 do_cfi_exe_nonces
-	 do_cfi_exe_nonces_4_byte_non_exe_color_non_exe
-	 do_cfi_exe_nonces_8_byte
-	 do_cfi_exe_nonces_1_byte_color_exe
-	 do_cfi_exe_nonces_color_exe
-	 do_cfi_exe_nonces_8_byte_color_exe
-	 do_cfi_exe_nonces_4_byte_non_exe_color_both)
-
-
-do_cfi_4_byte()
-{
-        $PS $1 $2 --backend zipr --critical-step move_globals=on --critical-step selective_cfi=on --step-option selective_cfi:--multimodule --step-option move_globals:--elftables-only --step-option fix_calls:--fix-all --step-option zipr:"--add-sections false" --step-option selective_cfi:"--nonce-size 4"
-}
-
-do_coloring_cfi_4_byte()
-{
-        $PS $1 $2 --backend zipr --critical-step move_globals=on --critical-step selective_cfi=on --step-option selective_cfi:--multimodule --step-option move_globals:--elftables-only --step-option fix_calls:--fix-all --step-option selective_cfi:--color --step-option zipr:"--add-sections false" --step-option selective_cfi:"--nonce-size 4"
-}
-
-do_cfi_exe_nonces_1_byte()
-{
-        $PS $1 $2 --backend zipr --critical-step move_globals=on --critical-step selective_cfi=on --step-option selective_cfi:--multimodule --step-option move_globals:--elftables-only  --step-option fix_calls:--no-fix-safefn --step-option selective_cfi:--exe-nonce-for-call --step-option zipr:"--add-sections false" --step-option selective_cfi:"--exe-nonce-size 1"
-}
-
-do_cfi_exe_nonces()
-{
-        $PS $1 $2 --backend zipr --critical-step move_globals=on --critical-step selective_cfi=on --step-option selective_cfi:--multimodule --step-option move_globals:--elftables-only  --step-option fix_calls:--no-fix-safefn --step-option selective_cfi:--exe-nonce-for-call --step-option zipr:"--add-sections false"
-}
-
-do_cfi_exe_nonces_4_byte_non_exe_color_non_exe()
-{
-        $PS $1 $2 --backend zipr --critical-step move_globals=on --critical-step selective_cfi=on --step-option selective_cfi:--multimodule --step-option move_globals:--elftables-only  --step-option fix_calls:--no-fix-safefn --step-option selective_cfi:--exe-nonce-for-call --step-option zipr:"--add-sections false" --step-option selective_cfi:"--nonce-size 4" --step-option selective_cfi:--color
-}
-
-do_cfi_exe_nonces_8_byte()
-{
-        $PS $1 $2 --backend zipr --critical-step move_globals=on --critical-step selective_cfi=on --step-option selective_cfi:--multimodule --step-option move_globals:--elftables-only  --step-option fix_calls:--no-fix-safefn --step-option selective_cfi:--exe-nonce-for-call --step-option zipr:"--add-sections false" --step-option selective_cfi:"--exe-nonce-size 8"
-}
-
-do_cfi_exe_nonces_1_byte_color_exe()
-{
-        $PS $1 $2 --backend zipr --critical-step move_globals=on --critical-step selective_cfi=on --step-option selective_cfi:--multimodule --step-option move_globals:--elftables-only  --step-option fix_calls:--no-fix-safefn --step-option selective_cfi:--exe-nonce-for-call --step-option zipr:"--add-sections false" --step-option selective_cfi:"--exe-nonce-size 1" --step-option selective_cfi:--color-exe-nonces
-}
-
-do_cfi_exe_nonces_color_exe()
-{
-        $PS $1 $2 --backend zipr --critical-step move_globals=on --critical-step selective_cfi=on --step-option selective_cfi:--multimodule --step-option move_globals:--elftables-only  --step-option fix_calls:--no-fix-safefn --step-option selective_cfi:--exe-nonce-for-call --step-option zipr:"--add-sections false" --step-option selective_cfi:--color-exe-nonces
-}
-
-do_cfi_exe_nonces_8_byte_color_exe()
-{
-        $PS $1 $2 --backend zipr --critical-step move_globals=on --critical-step selective_cfi=on --step-option selective_cfi:--multimodule --step-option move_globals:--elftables-only  --step-option fix_calls:--no-fix-safefn --step-option selective_cfi:--exe-nonce-for-call --step-option zipr:"--add-sections false" --step-option selective_cfi:"--exe-nonce-size 8" --step-option selective_cfi:--color-exe-nonces
-}
-
-do_cfi_exe_nonces_4_byte_non_exe_color_both()
-{
-        $PS $1 $2 --backend zipr --critical-step move_globals=on --critical-step selective_cfi=on --step-option selective_cfi:--multimodule --step-option move_globals:--elftables-only  --step-option fix_calls:--no-fix-safefn --step-option selective_cfi:--exe-nonce-for-call --step-option zipr:"--add-sections false" --step-option selective_cfi:"--nonce-size 4" --step-option selective_cfi:--color-exe-nonces --step-option selective_cfi:--color
-}
diff --git a/cicd_tests/test_fib.sh b/cicd_tests/test_fib.sh
index 8fdee266207ec096aa307f2ec1177fe06d7289b4..1b8c4ddec196c16b52610e4f921706fc4f737e3a 100755
--- a/cicd_tests/test_fib.sh
+++ b/cicd_tests/test_fib.sh
@@ -6,9 +6,9 @@ trap clean EXIT
 
 cd $CICD_MODULE_WORK_DIR/peasoup_umbrella
 source set_env_vars
-cd ./security_transforms/cicd_tests
+cd ./security_transforms/tools/selective_cfi/tests/cicd_tests/fib_src
 
-source cfi_smokescreen_configs.sh
+source ../cfi_smokescreen_configs.sh
 
 get_correct()
 {
diff --git a/cicd_tests/test_foo.sh b/cicd_tests/test_foo.sh
index e9162cf017c59735f429cd801604a54422a2e12a..1e98e9d22996af035d43dcd0ce56d7068c9a5944 100755
--- a/cicd_tests/test_foo.sh
+++ b/cicd_tests/test_foo.sh
@@ -6,9 +6,9 @@ trap clean EXIT
 
 cd $CICD_MODULE_WORK_DIR/peasoup_umbrella
 source set_env_vars
-cd ./security_transforms/cicd_tests
+cd ./security_transforms/tools/selective_cfi/tests/cicd_tests/foo_src
 
-source cfi_smokescreen_configs.sh 
+source ../cfi_smokescreen_configs.sh 
 
 get_correct()
 {
diff --git a/cicd_tests/fib.c b/tools/selective_cfi/tests/cicd_tests/fib_src/fib.c
similarity index 100%
rename from cicd_tests/fib.c
rename to tools/selective_cfi/tests/cicd_tests/fib_src/fib.c
diff --git a/cicd_tests/libfib.c b/tools/selective_cfi/tests/cicd_tests/fib_src/libfib.c
similarity index 100%
rename from cicd_tests/libfib.c
rename to tools/selective_cfi/tests/cicd_tests/fib_src/libfib.c
diff --git a/cicd_tests/libfib2.c b/tools/selective_cfi/tests/cicd_tests/fib_src/libfib2.c
similarity index 100%
rename from cicd_tests/libfib2.c
rename to tools/selective_cfi/tests/cicd_tests/fib_src/libfib2.c
diff --git a/cicd_tests/foo.c b/tools/selective_cfi/tests/cicd_tests/foo_src/foo.c
similarity index 100%
rename from cicd_tests/foo.c
rename to tools/selective_cfi/tests/cicd_tests/foo_src/foo.c
diff --git a/cicd_tests/libfoo.c b/tools/selective_cfi/tests/cicd_tests/foo_src/libfoo.c
similarity index 100%
rename from cicd_tests/libfoo.c
rename to tools/selective_cfi/tests/cicd_tests/foo_src/libfoo.c
diff --git a/tools/selective_cfi/tests/dude.c b/tools/selective_cfi/tests/manual_tests/dude.c
similarity index 100%
rename from tools/selective_cfi/tests/dude.c
rename to tools/selective_cfi/tests/manual_tests/dude.c
diff --git a/tools/selective_cfi/tests/fib.c b/tools/selective_cfi/tests/manual_tests/fib.c
similarity index 100%
rename from tools/selective_cfi/tests/fib.c
rename to tools/selective_cfi/tests/manual_tests/fib.c
diff --git a/tools/selective_cfi/tests/foo.c b/tools/selective_cfi/tests/manual_tests/foo.c
similarity index 100%
rename from tools/selective_cfi/tests/foo.c
rename to tools/selective_cfi/tests/manual_tests/foo.c
diff --git a/tools/selective_cfi/tests/libc_driver.c b/tools/selective_cfi/tests/manual_tests/libc_driver.c
similarity index 100%
rename from tools/selective_cfi/tests/libc_driver.c
rename to tools/selective_cfi/tests/manual_tests/libc_driver.c
diff --git a/tools/selective_cfi/tests/libdude.c b/tools/selective_cfi/tests/manual_tests/libdude.c
similarity index 100%
rename from tools/selective_cfi/tests/libdude.c
rename to tools/selective_cfi/tests/manual_tests/libdude.c
diff --git a/tools/selective_cfi/tests/libfib.c b/tools/selective_cfi/tests/manual_tests/libfib.c
similarity index 100%
rename from tools/selective_cfi/tests/libfib.c
rename to tools/selective_cfi/tests/manual_tests/libfib.c
diff --git a/tools/selective_cfi/tests/libfib2.c b/tools/selective_cfi/tests/manual_tests/libfib2.c
similarity index 100%
rename from tools/selective_cfi/tests/libfib2.c
rename to tools/selective_cfi/tests/manual_tests/libfib2.c
diff --git a/tools/selective_cfi/tests/libfoo.c b/tools/selective_cfi/tests/manual_tests/libfoo.c
similarity index 100%
rename from tools/selective_cfi/tests/libfoo.c
rename to tools/selective_cfi/tests/manual_tests/libfoo.c
diff --git a/tools/selective_cfi/tests/pow.c b/tools/selective_cfi/tests/manual_tests/pow.c
similarity index 100%
rename from tools/selective_cfi/tests/pow.c
rename to tools/selective_cfi/tests/manual_tests/pow.c
diff --git a/tools/selective_cfi/tests/test_coreutils.sh b/tools/selective_cfi/tests/manual_tests/test_coreutils.sh
similarity index 100%
rename from tools/selective_cfi/tests/test_coreutils.sh
rename to tools/selective_cfi/tests/manual_tests/test_coreutils.sh
diff --git a/tools/selective_cfi/tests/test_dude.sh b/tools/selective_cfi/tests/manual_tests/test_dude.sh
similarity index 98%
rename from tools/selective_cfi/tests/test_dude.sh
rename to tools/selective_cfi/tests/manual_tests/test_dude.sh
index d873f0ff044672b1550e828d90283098fd9431c8..1f9882df059fffee017341acb5635b51e47a3971 100755
--- a/tools/selective_cfi/tests/test_dude.sh
+++ b/tools/selective_cfi/tests/manual_tests/test_dude.sh
@@ -1,6 +1,6 @@
 #!/bin/bash  
 
-source cfi_all_configs.sh
+source ../cfi_all_configs.sh
 
 get_correct()
 {
diff --git a/tools/selective_cfi/tests/test_fib.sh b/tools/selective_cfi/tests/manual_tests/test_fib.sh
similarity index 98%
rename from tools/selective_cfi/tests/test_fib.sh
rename to tools/selective_cfi/tests/manual_tests/test_fib.sh
index 4cb29073dd4790c9409e5ba1ccbf56cdb2f64e5a..0bd770d5f1494a32c504d86f68894bacce235e25 100755
--- a/tools/selective_cfi/tests/test_fib.sh
+++ b/tools/selective_cfi/tests/manual_tests/test_fib.sh
@@ -1,6 +1,6 @@
 #!/bin/bash  
 
-source cfi_all_configs.sh
+source ../cfi_smokescreen_configs.sh
 
 get_correct()
 {
diff --git a/tools/selective_cfi/tests/test_foo.sh b/tools/selective_cfi/tests/manual_tests/test_foo.sh
similarity index 98%
rename from tools/selective_cfi/tests/test_foo.sh
rename to tools/selective_cfi/tests/manual_tests/test_foo.sh
index 5f0cd9aebb5e6ca22e6cecec9757d686f2e66137..e0ae9c8dd873dfda2021733bd9bf2cb80a1bd2fa 100755
--- a/tools/selective_cfi/tests/test_foo.sh
+++ b/tools/selective_cfi/tests/manual_tests/test_foo.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source cfi_smokescreen_configs.sh 
+source ../cfi_smokescreen_configs.sh 
 
 get_correct()
 {
diff --git a/tools/selective_cfi/tests/test_libc.sh b/tools/selective_cfi/tests/manual_tests/test_libc.sh
similarity index 98%
rename from tools/selective_cfi/tests/test_libc.sh
rename to tools/selective_cfi/tests/manual_tests/test_libc.sh
index 52638634e3ae4dbd500ccd2a7e4e49f974fa8ec9..8c50b1a60f53a3706699dd740bc07ebef68b152e 100755
--- a/tools/selective_cfi/tests/test_libc.sh
+++ b/tools/selective_cfi/tests/manual_tests/test_libc.sh
@@ -3,7 +3,7 @@
 libcpath=""
 
 
-source cfi_all_configs.sh
+source ../cfi_all_configs.sh
 
 
 get_correct()
diff --git a/tools/selective_cfi/tests/test_pow.sh b/tools/selective_cfi/tests/manual_tests/test_pow.sh
similarity index 98%
rename from tools/selective_cfi/tests/test_pow.sh
rename to tools/selective_cfi/tests/manual_tests/test_pow.sh
index 18bc4e38934185b4a88de0b0f6286f53429e40ee..0f8c6465c9fcc397f534959437ac5ab30ef3b40d 100755
--- a/tools/selective_cfi/tests/test_pow.sh
+++ b/tools/selective_cfi/tests/manual_tests/test_pow.sh
@@ -1,7 +1,7 @@
 #!/bin/bash 
 
 
-source cfi_all_configs.sh
+source ../cfi_all_configs.sh
 
 
 get_correct()
diff --git a/tools/selective_cfi/tests/test_spec.sh b/tools/selective_cfi/tests/manual_tests/test_spec.sh
similarity index 100%
rename from tools/selective_cfi/tests/test_spec.sh
rename to tools/selective_cfi/tests/manual_tests/test_spec.sh