diff --git a/plat/fvp/aarch64/fvp_common.c b/plat/arm/board/fvp/aarch64/fvp_common.c
similarity index 100%
rename from plat/fvp/aarch64/fvp_common.c
rename to plat/arm/board/fvp/aarch64/fvp_common.c
diff --git a/plat/fvp/aarch64/fvp_helpers.S b/plat/arm/board/fvp/aarch64/fvp_helpers.S
similarity index 100%
rename from plat/fvp/aarch64/fvp_helpers.S
rename to plat/arm/board/fvp/aarch64/fvp_helpers.S
diff --git a/plat/fvp/drivers/pwrc/fvp_pwrc.c b/plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c
similarity index 100%
rename from plat/fvp/drivers/pwrc/fvp_pwrc.c
rename to plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c
diff --git a/plat/fvp/drivers/pwrc/fvp_pwrc.h b/plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.h
similarity index 100%
rename from plat/fvp/drivers/pwrc/fvp_pwrc.h
rename to plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.h
diff --git a/plat/fvp/bl1_fvp_setup.c b/plat/arm/board/fvp/fvp_bl1_setup.c
similarity index 100%
rename from plat/fvp/bl1_fvp_setup.c
rename to plat/arm/board/fvp/fvp_bl1_setup.c
diff --git a/plat/fvp/bl2_fvp_setup.c b/plat/arm/board/fvp/fvp_bl2_setup.c
similarity index 100%
rename from plat/fvp/bl2_fvp_setup.c
rename to plat/arm/board/fvp/fvp_bl2_setup.c
diff --git a/plat/fvp/bl31_fvp_setup.c b/plat/arm/board/fvp/fvp_bl31_setup.c
similarity index 100%
rename from plat/fvp/bl31_fvp_setup.c
rename to plat/arm/board/fvp/fvp_bl31_setup.c
diff --git a/plat/fvp/fvp_def.h b/plat/arm/board/fvp/fvp_def.h
similarity index 100%
rename from plat/fvp/fvp_def.h
rename to plat/arm/board/fvp/fvp_def.h
diff --git a/plat/fvp/fvp_io_storage.c b/plat/arm/board/fvp/fvp_io_storage.c
similarity index 100%
rename from plat/fvp/fvp_io_storage.c
rename to plat/arm/board/fvp/fvp_io_storage.c
diff --git a/plat/fvp/fvp_pm.c b/plat/arm/board/fvp/fvp_pm.c
similarity index 100%
rename from plat/fvp/fvp_pm.c
rename to plat/arm/board/fvp/fvp_pm.c
diff --git a/plat/fvp/fvp_private.h b/plat/arm/board/fvp/fvp_private.h
similarity index 100%
rename from plat/fvp/fvp_private.h
rename to plat/arm/board/fvp/fvp_private.h
diff --git a/plat/fvp/fvp_security.c b/plat/arm/board/fvp/fvp_security.c
similarity index 100%
rename from plat/fvp/fvp_security.c
rename to plat/arm/board/fvp/fvp_security.c
diff --git a/plat/fvp/fvp_topology.c b/plat/arm/board/fvp/fvp_topology.c
similarity index 100%
rename from plat/fvp/fvp_topology.c
rename to plat/arm/board/fvp/fvp_topology.c
diff --git a/plat/fvp/include/plat_macros.S b/plat/arm/board/fvp/include/plat_macros.S
similarity index 100%
rename from plat/fvp/include/plat_macros.S
rename to plat/arm/board/fvp/include/plat_macros.S
diff --git a/plat/fvp/include/platform_def.h b/plat/arm/board/fvp/include/platform_def.h
similarity index 100%
rename from plat/fvp/include/platform_def.h
rename to plat/arm/board/fvp/include/platform_def.h
diff --git a/plat/fvp/include/platform_oid.h b/plat/arm/board/fvp/include/platform_oid.h
similarity index 100%
rename from plat/fvp/include/platform_oid.h
rename to plat/arm/board/fvp/include/platform_oid.h
diff --git a/plat/fvp/platform.mk b/plat/arm/board/fvp/platform.mk
similarity index 80%
rename from plat/fvp/platform.mk
rename to plat/arm/board/fvp/platform.mk
index c20cd0884c..cba18c7992 100644
--- a/plat/fvp/platform.mk
+++ b/plat/arm/board/fvp/platform.mk
@@ -30,11 +30,11 @@
 
 
 PLAT_INCLUDES		:=	-Iinclude/plat/arm/board/common			\
-				-Iplat/fvp/include
+				-Iplat/arm/board/fvp/include
 
 
 PLAT_BL_COMMON_SOURCES	:=	drivers/arm/pl011/pl011_console.S		\
-				plat/fvp/aarch64/fvp_common.c
+				plat/arm/board/fvp/aarch64/fvp_common.c
 
 BL1_SOURCES		+=	drivers/io/io_semihosting.c			\
 				lib/cpus/aarch64/aem_generic.S			\
@@ -42,26 +42,26 @@ BL1_SOURCES		+=	drivers/io/io_semihosting.c			\
 				lib/cpus/aarch64/cortex_a57.S			\
 				lib/semihosting/semihosting.c			\
 				lib/semihosting/aarch64/semihosting_call.S	\
-				plat/fvp/aarch64/fvp_helpers.S			\
-				plat/fvp/bl1_fvp_setup.c			\
-				plat/fvp/fvp_io_storage.c
+				plat/arm/board/fvp/aarch64/fvp_helpers.S	\
+				plat/arm/board/fvp/fvp_bl1_setup.c		\
+				plat/arm/board/fvp/fvp_io_storage.c
 
 BL2_SOURCES		+=	drivers/io/io_semihosting.c			\
 				lib/semihosting/semihosting.c			\
 				lib/semihosting/aarch64/semihosting_call.S	\
-				plat/fvp/bl2_fvp_setup.c			\
-				plat/fvp/fvp_io_storage.c			\
-				plat/fvp/fvp_security.c
+				plat/arm/board/fvp/fvp_bl2_setup.c		\
+				plat/arm/board/fvp/fvp_io_storage.c		\
+				plat/arm/board/fvp/fvp_security.c
 
 BL31_SOURCES		+=	lib/cpus/aarch64/aem_generic.S			\
 				lib/cpus/aarch64/cortex_a53.S			\
 				lib/cpus/aarch64/cortex_a57.S			\
-				plat/fvp/bl31_fvp_setup.c			\
-				plat/fvp/fvp_pm.c				\
-				plat/fvp/fvp_security.c				\
-				plat/fvp/fvp_topology.c				\
-				plat/fvp/aarch64/fvp_helpers.S			\
-				plat/fvp/drivers/pwrc/fvp_pwrc.c
+				plat/arm/board/fvp/fvp_bl31_setup.c		\
+				plat/arm/board/fvp/fvp_pm.c			\
+				plat/arm/board/fvp/fvp_security.c		\
+				plat/arm/board/fvp/fvp_topology.c		\
+				plat/arm/board/fvp/aarch64/fvp_helpers.S	\
+				plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c
 
 ifneq (${TRUSTED_BOARD_BOOT},0)
   BL1_SOURCES		+=	plat/arm/board/common/board_arm_trusted_boot.c
diff --git a/plat/fvp/tsp/tsp_fvp_setup.c b/plat/arm/board/fvp/tsp/fvp_tsp_setup.c
similarity index 100%
rename from plat/fvp/tsp/tsp_fvp_setup.c
rename to plat/arm/board/fvp/tsp/fvp_tsp_setup.c
diff --git a/plat/fvp/tsp/tsp-fvp.mk b/plat/arm/board/fvp/tsp/tsp-fvp.mk
similarity index 96%
rename from plat/fvp/tsp/tsp-fvp.mk
rename to plat/arm/board/fvp/tsp/tsp-fvp.mk
index 8ba3784948..8773ee037d 100644
--- a/plat/fvp/tsp/tsp-fvp.mk
+++ b/plat/arm/board/fvp/tsp/tsp-fvp.mk
@@ -29,6 +29,6 @@
 #
 
 # TSP source files specific to FVP platform
-BL32_SOURCES		+=	plat/fvp/tsp/tsp_fvp_setup.c
+BL32_SOURCES		+=	plat/arm/board/fvp/tsp/fvp_tsp_setup.c
 
 include plat/arm/common/tsp/arm_tsp.mk