diff --git a/plat/juno/aarch64/plat_helpers.S b/plat/arm/board/juno/aarch64/juno_helpers.S
similarity index 100%
rename from plat/juno/aarch64/plat_helpers.S
rename to plat/arm/board/juno/aarch64/juno_helpers.S
diff --git a/plat/juno/include/plat_macros.S b/plat/arm/board/juno/include/plat_macros.S
similarity index 100%
rename from plat/juno/include/plat_macros.S
rename to plat/arm/board/juno/include/plat_macros.S
diff --git a/plat/juno/include/platform_def.h b/plat/arm/board/juno/include/platform_def.h
similarity index 100%
rename from plat/juno/include/platform_def.h
rename to plat/arm/board/juno/include/platform_def.h
diff --git a/plat/juno/include/platform_oid.h b/plat/arm/board/juno/include/platform_oid.h
similarity index 100%
rename from plat/juno/include/platform_oid.h
rename to plat/arm/board/juno/include/platform_oid.h
diff --git a/plat/juno/juno_def.h b/plat/arm/board/juno/juno_def.h
similarity index 100%
rename from plat/juno/juno_def.h
rename to plat/arm/board/juno/juno_def.h
diff --git a/plat/juno/plat_security.c b/plat/arm/board/juno/juno_security.c
similarity index 100%
rename from plat/juno/plat_security.c
rename to plat/arm/board/juno/juno_security.c
diff --git a/plat/juno/platform.mk b/plat/arm/board/juno/platform.mk
similarity index 92%
rename from plat/juno/platform.mk
rename to plat/arm/board/juno/platform.mk
index 8399c0a90f..d8d4f14505 100644
--- a/plat/juno/platform.mk
+++ b/plat/arm/board/juno/platform.mk
@@ -28,14 +28,14 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-PLAT_INCLUDES		:=	-Iplat/juno/include
+PLAT_INCLUDES		:=	-Iplat/arm/board/juno/include
 
-PLAT_BL_COMMON_SOURCES	:=	plat/juno/aarch64/plat_helpers.S
+PLAT_BL_COMMON_SOURCES	:=	plat/arm/board/juno/aarch64/juno_helpers.S
 
 BL1_SOURCES		+=	lib/cpus/aarch64/cortex_a53.S		\
 				lib/cpus/aarch64/cortex_a57.S
 
-BL2_SOURCES		+=	plat/juno/plat_security.c		\
+BL2_SOURCES		+=	plat/arm/board/juno/juno_security.c	\
 
 BL31_SOURCES		+=	lib/cpus/aarch64/cortex_a53.S		\
 				lib/cpus/aarch64/cortex_a57.S
diff --git a/plat/juno/tsp/tsp-juno.mk b/plat/arm/board/juno/tsp/tsp-juno.mk
similarity index 100%
rename from plat/juno/tsp/tsp-juno.mk
rename to plat/arm/board/juno/tsp/tsp-juno.mk