diff --git a/BUILD.gn b/BUILD.gn
index d462c38..d5c5c30 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -183,7 +183,7 @@
   cpu = "cortex-a72"
   origin_address = "0x80000"
   boot_flow = "//src/boot_flow:linux"
-  console = "//project/reference/rpi:mini_uart"
+  console = "//project/reference/rpi4:mini_uart"
   iommu = "//src/iommu:absent"
   gic_version = 2
   heap_pages = 180
diff --git a/aem_v8a_fvp/BUILD.gn b/aem_v8a_fvp/BUILD.gn
deleted file mode 100644
index ac39689..0000000
--- a/aem_v8a_fvp/BUILD.gn
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2018 The Hafnium Authors.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://opensource.org/licenses/BSD-3-Clause.
-
-source_set("aem_v8a_fvp") {
-}
diff --git a/qemu_aarch64/BUILD.gn b/qemu_aarch64/BUILD.gn
deleted file mode 100644
index 1a14312..0000000
--- a/qemu_aarch64/BUILD.gn
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2018 The Hafnium Authors.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://opensource.org/licenses/BSD-3-Clause.
-
-source_set("qemu_aarch64") {
-}
diff --git a/rpi/BUILD.gn b/rpi/BUILD.gn
deleted file mode 100644
index 3bd9a33..0000000
--- a/rpi/BUILD.gn
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019 The Hafnium Authors.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://opensource.org/licenses/BSD-3-Clause.
-
-import("args.gni")
-
-source_set("mini_uart") {
-  sources = [ "mini_uart.c" ]
-
-  assert(gpio_base_address != 0,
-         "\"gpio_base_address\" must be defined for ${target_name}.")
-  assert(aux_base_address != 0,
-         "\"aux_base_address\" must be defined for ${target_name}.")
-  assert(core_freq_mhz != 0,
-         "\"core_freq_mhz\" must be defined for ${target_name}.")
-  assert(baudrate != 0, "\"baudrate\" must be defined for ${target_name}.")
-
-  defines = [
-    "GPIO_BASE=${gpio_base_address}",
-    "AUX_BASE=${aux_base_address}",
-    "CORE_FREQ_MHZ=${core_freq_mhz}",
-    "BAUDRATE=${baudrate}",
-  ]
-}
diff --git a/rpi4/BUILD.gn b/rpi4/BUILD.gn
index 6decd71..1046c6b 100644
--- a/rpi4/BUILD.gn
+++ b/rpi4/BUILD.gn
@@ -4,5 +4,26 @@
 # license that can be found in the LICENSE file or at
 # https://opensource.org/licenses/BSD-3-Clause.
 
+import("args.gni")
+
 source_set("rpi4") {
 }
+
+source_set("mini_uart") {
+  sources = [ "mini_uart.c" ]
+
+  assert(gpio_base_address != 0,
+         "\"gpio_base_address\" must be defined for ${target_name}.")
+  assert(aux_base_address != 0,
+         "\"aux_base_address\" must be defined for ${target_name}.")
+  assert(core_freq_mhz != 0,
+         "\"core_freq_mhz\" must be defined for ${target_name}.")
+  assert(baudrate != 0, "\"baudrate\" must be defined for ${target_name}.")
+
+  defines = [
+    "GPIO_BASE=${gpio_base_address}",
+    "AUX_BASE=${aux_base_address}",
+    "CORE_FREQ_MHZ=${core_freq_mhz}",
+    "BAUDRATE=${baudrate}",
+  ]
+}
diff --git a/rpi/args.gni b/rpi4/args.gni
similarity index 100%
rename from rpi/args.gni
rename to rpi4/args.gni
diff --git a/rpi/mini_uart.c b/rpi4/mini_uart.c
similarity index 100%
rename from rpi/mini_uart.c
rename to rpi4/mini_uart.c
diff --git a/secure_aem_v8a_fvp/BUILD.gn b/secure_aem_v8a_fvp/BUILD.gn
deleted file mode 100644
index 5c9c8e3..0000000
--- a/secure_aem_v8a_fvp/BUILD.gn
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019 The Hafnium Authors.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://opensource.org/licenses/BSD-3-Clause.
-
-source_set("secure_aem_v8a_fvp") {
-}