SPM: Properly placing Cactus test files

Signed-off-by: J-Alves <joao.alves@arm.com>
Change-Id: I28b718775792d94458756fcab59b3c62c7800233
diff --git a/spm/cactus/cactus_test_cmds.h b/include/runtime_services/cactus_test_cmds.h
similarity index 100%
rename from spm/cactus/cactus_test_cmds.h
rename to include/runtime_services/cactus_test_cmds.h
diff --git a/spm/cactus/cactus.mk b/spm/cactus/cactus.mk
index 971a9d6..ac32d12 100644
--- a/spm/cactus/cactus.mk
+++ b/spm/cactus/cactus.mk
@@ -33,16 +33,16 @@
 	$(addprefix spm/cactus/,			\
 		aarch64/cactus_entrypoint.S		\
 		cactus_debug.c				\
-		cactus_ffa_tests.c 			\
 		cactus_main.c				\
-		cactus_test_cmds.c			\
 	)						\
 	$(addprefix spm/common/,			\
 		aarch64/sp_arch_helpers.S		\
 		sp_helpers.c				\
 	)						\
 	$(addprefix spm/cactus/cactus_tests/,		\
+		cactus_ffa_tests.c 			\
 		cactus_test_cpu_features.c		\
+		cactus_test_cmds.c			\
 		cactus_test_direct_messaging.c		\
 		cactus_test_memory_sharing.c		\
 	)
diff --git a/spm/cactus/cactus_test_cmds.c b/spm/cactus/cactus_tests/cactus_test_cmds.c
similarity index 100%
rename from spm/cactus/cactus_test_cmds.c
rename to spm/cactus/cactus_tests/cactus_test_cmds.c
diff --git a/spm/cactus/cactus_ffa_tests.c b/spm/cactus/cactus_tests/cactus_test_ffa.c
similarity index 100%
rename from spm/cactus/cactus_ffa_tests.c
rename to spm/cactus/cactus_tests/cactus_test_ffa.c