diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-arndale.mk b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-arndale.mk
index 2ef725f61..cec0957f3 100644
--- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-arndale.mk
+++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-arndale.mk
@@ -9,12 +9,12 @@ INC_DIR += $(REP_DIR)/src/core/spec/arndale
 INC_DIR += $(REP_DIR)/src/core/spec/arm_v7/virtualization
 
 # add C++ sources
-SRC_CC += spec/arm/gicv2.cc
-SRC_CC += spec/arndale/platform_services.cc
 SRC_CC += kernel/vm_thread_on.cc
+SRC_CC += spec/arm/gicv2.cc
 SRC_CC += spec/arm_v7/virtualization/kernel/vm.cc
-SRC_CC += spec/arm_v7/vm_session_component.cc
+SRC_CC += spec/arm_v7/virtualization/platform_services.cc
 SRC_CC += spec/arm_v7/virtualization/vm_session_component.cc
+SRC_CC += spec/arm_v7/vm_session_component.cc
 SRC_CC += vm_session_common.cc
 
 # add assembly sources
diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx53_qsb_tz.mk b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx53_qsb_tz.mk
index 7dcfeb7a0..734243c2b 100644
--- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx53_qsb_tz.mk
+++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx53_qsb_tz.mk
@@ -1,11 +1,11 @@
 INC_DIR += $(REP_DIR)/src/core/spec/arm_v7/trustzone
 INC_DIR += $(REP_DIR)/src/core/spec/imx53/trustzone
 
-SRC_CC += spec/imx53/trustzone/platform_services.cc
 SRC_CC += kernel/vm_thread_on.cc
 SRC_CC += spec/arm_v7/trustzone/kernel/vm.cc
-SRC_CC += spec/arm_v7/vm_session_component.cc
+SRC_CC += spec/arm_v7/trustzone/platform_services.cc
 SRC_CC += spec/arm_v7/trustzone/vm_session_component.cc
+SRC_CC += spec/arm_v7/vm_session_component.cc
 
 SRC_S += spec/arm_v7/trustzone/exception_vector.s
 
diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx7d_sabre.mk b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx7d_sabre.mk
index 019c0fb2b..838137de0 100644
--- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx7d_sabre.mk
+++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx7d_sabre.mk
@@ -9,13 +9,13 @@ INC_DIR += $(REP_DIR)/src/core/spec/imx7d_sabre
 INC_DIR += $(REP_DIR)/src/core/spec/arm_v7/virtualization
 
 # add C++ sources
+SRC_CC += kernel/vm_thread_on.cc
 SRC_CC += spec/arm/generic_timer.cc
 SRC_CC += spec/arm/gicv2.cc
-SRC_CC += spec/arndale/platform_services.cc
-SRC_CC += kernel/vm_thread_on.cc
 SRC_CC += spec/arm_v7/virtualization/kernel/vm.cc
-SRC_CC += spec/arm_v7/vm_session_component.cc
+SRC_CC += spec/arm_v7/virtualization/platform_services.cc
 SRC_CC += spec/arm_v7/virtualization/vm_session_component.cc
+SRC_CC += spec/arm_v7/vm_session_component.cc
 SRC_CC += vm_session_common.cc
 
 # add assembly sources
diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-usb_armory.mk b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-usb_armory.mk
index cd7425a4a..0a86704d2 100644
--- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-usb_armory.mk
+++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-usb_armory.mk
@@ -11,13 +11,13 @@ INC_DIR += $(REP_DIR)/src/core/spec/arm_v7/trustzone
 INC_DIR += $(REP_DIR)/src/core/spec/imx53/trustzone
 
 # add C++ sources
-SRC_CC += spec/imx53/trustzone/platform_services.cc
 SRC_CC += kernel/vm_thread_on.cc
-SRC_CC += spec/arm_v7/trustzone/kernel/vm.cc
-SRC_CC += spec/arm_v7/vm_session_component.cc
-SRC_CC += spec/arm_v7/trustzone/vm_session_component.cc
 SRC_CC += spec/arm/imx_epit.cc
 SRC_CC += spec/arm/imx_tzic.cc
+SRC_CC += spec/arm_v7/trustzone/kernel/vm.cc
+SRC_CC += spec/arm_v7/trustzone/platform_services.cc
+SRC_CC += spec/arm_v7/trustzone/vm_session_component.cc
+SRC_CC += spec/arm_v7/vm_session_component.cc
 
 # add assembly sources
 SRC_S += spec/arm_v7/trustzone/exception_vector.s
diff --git a/repos/base-hw/src/core/spec/imx53/trustzone/platform_services.cc b/repos/base-hw/src/core/spec/arm_v7/trustzone/platform_services.cc
similarity index 100%
rename from repos/base-hw/src/core/spec/imx53/trustzone/platform_services.cc
rename to repos/base-hw/src/core/spec/arm_v7/trustzone/platform_services.cc
diff --git a/repos/base-hw/src/core/spec/arndale/platform_services.cc b/repos/base-hw/src/core/spec/arm_v7/virtualization/platform_services.cc
similarity index 100%
rename from repos/base-hw/src/core/spec/arndale/platform_services.cc
rename to repos/base-hw/src/core/spec/arm_v7/virtualization/platform_services.cc