diff --git a/Kernel/Arch/aarch64/dummy.cpp b/Kernel/Arch/aarch64/Dummy.cpp
similarity index 100%
rename from Kernel/Arch/aarch64/dummy.cpp
rename to Kernel/Arch/aarch64/Dummy.cpp
diff --git a/Kernel/Arch/aarch64/Prekernel/PrekernelCommon.cpp b/Kernel/Arch/aarch64/Prekernel/PrekernelCommon.cpp
index 5f7310daa3..f81eeb74fd 100644
--- a/Kernel/Arch/aarch64/Prekernel/PrekernelCommon.cpp
+++ b/Kernel/Arch/aarch64/Prekernel/PrekernelCommon.cpp
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Arch/aarch64/Prekernel.h>
+#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
 
 #include <Kernel/Arch/aarch64/ASM_wrapper.h>
-#include <Kernel/Arch/aarch64/UART.h>
+#include <Kernel/Arch/aarch64/RPi/UART.h>
 
 namespace Prekernel {
 
diff --git a/Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp b/Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp
index 9feb7fb821..d30d1a1be8 100644
--- a/Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp
+++ b/Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp
@@ -5,8 +5,8 @@
  */
 
 #include <Kernel/Arch/aarch64/ASM_wrapper.h>
-#include <Kernel/Arch/aarch64/Aarch64_asm_utils.h>
-#include <Kernel/Arch/aarch64/Prekernel.h>
+#include <Kernel/Arch/aarch64/Prekernel/Aarch64_asm_utils.h>
+#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
 #include <Kernel/Arch/aarch64/Registers.h>
 
 extern "C" void enter_el2_from_el3();
diff --git a/Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp b/Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp
index 31ec573299..1aaebe7477 100644
--- a/Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp
+++ b/Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp
@@ -6,12 +6,12 @@
 
 #include <AK/Types.h>
 
-#include <Kernel/Arch/aarch64/Prekernel.h>
+#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
 
 #include <Kernel/Arch/aarch64/ASM_wrapper.h>
-#include <Kernel/Arch/aarch64/MMIO.h>
+#include <Kernel/Arch/aarch64/RPi/MMIO.h>
+#include <Kernel/Arch/aarch64/RPi/UART.h>
 #include <Kernel/Arch/aarch64/Registers.h>
-#include <Kernel/Arch/aarch64/UART.h>
 
 // Documentation here for Aarch64 Address Translations
 // https://documentation-service.arm.com/static/5efa1d23dbdee951c1ccdec5?token=
diff --git a/Kernel/Arch/aarch64/RPi/Framebuffer.cpp b/Kernel/Arch/aarch64/RPi/Framebuffer.cpp
index fb99de9adf..7d46863002 100644
--- a/Kernel/Arch/aarch64/RPi/Framebuffer.cpp
+++ b/Kernel/Arch/aarch64/RPi/Framebuffer.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Arch/aarch64/Framebuffer.h>
-#include <Kernel/Arch/aarch64/FramebufferMailboxMessages.h>
+#include <Kernel/Arch/aarch64/RPi/Framebuffer.h>
+#include <Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h>
 #include <Kernel/Arch/aarch64/Utils.h>
 
 namespace Prekernel {
diff --git a/Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h b/Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h
index 7dab801b73..028b3abecd 100644
--- a/Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h
+++ b/Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Kernel/Arch/aarch64/Mailbox.h>
+#include <Kernel/Arch/aarch64/RPi/Mailbox.h>
 
 namespace Prekernel {
 
diff --git a/Kernel/Arch/aarch64/RPi/GPIO.cpp b/Kernel/Arch/aarch64/RPi/GPIO.cpp
index bffba6bade..fec673aca3 100644
--- a/Kernel/Arch/aarch64/RPi/GPIO.cpp
+++ b/Kernel/Arch/aarch64/RPi/GPIO.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Arch/aarch64/GPIO.h>
-#include <Kernel/Arch/aarch64/MMIO.h>
+#include <Kernel/Arch/aarch64/RPi/GPIO.h>
+#include <Kernel/Arch/aarch64/RPi/MMIO.h>
 
 extern "C" void wait_cycles(int n);
 
diff --git a/Kernel/Arch/aarch64/RPi/MMIO.cpp b/Kernel/Arch/aarch64/RPi/MMIO.cpp
index a6b270a17d..8f4dddd9c5 100644
--- a/Kernel/Arch/aarch64/RPi/MMIO.cpp
+++ b/Kernel/Arch/aarch64/RPi/MMIO.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Arch/aarch64/MMIO.h>
 #include <Kernel/Arch/aarch64/MainIdRegister.h>
+#include <Kernel/Arch/aarch64/RPi/MMIO.h>
 
 namespace Prekernel {
 
diff --git a/Kernel/Arch/aarch64/RPi/Mailbox.cpp b/Kernel/Arch/aarch64/RPi/Mailbox.cpp
index d36a5305b4..53988b976f 100644
--- a/Kernel/Arch/aarch64/RPi/Mailbox.cpp
+++ b/Kernel/Arch/aarch64/RPi/Mailbox.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Arch/aarch64/MMIO.h>
-#include <Kernel/Arch/aarch64/Mailbox.h>
+#include <Kernel/Arch/aarch64/RPi/MMIO.h>
+#include <Kernel/Arch/aarch64/RPi/Mailbox.h>
 
 namespace Prekernel {
 
diff --git a/Kernel/Arch/aarch64/RPi/Timer.cpp b/Kernel/Arch/aarch64/RPi/Timer.cpp
index 0a703c180b..bbfd6873d5 100644
--- a/Kernel/Arch/aarch64/RPi/Timer.cpp
+++ b/Kernel/Arch/aarch64/RPi/Timer.cpp
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Arch/aarch64/MMIO.h>
-#include <Kernel/Arch/aarch64/Mailbox.h>
-#include <Kernel/Arch/aarch64/Timer.h>
+#include <Kernel/Arch/aarch64/RPi/MMIO.h>
+#include <Kernel/Arch/aarch64/RPi/Mailbox.h>
+#include <Kernel/Arch/aarch64/RPi/Timer.h>
 #include <Kernel/Arch/aarch64/Utils.h>
 
 namespace Prekernel {
diff --git a/Kernel/Arch/aarch64/RPi/UART.cpp b/Kernel/Arch/aarch64/RPi/UART.cpp
index 36852b6fce..8606a20031 100644
--- a/Kernel/Arch/aarch64/RPi/UART.cpp
+++ b/Kernel/Arch/aarch64/RPi/UART.cpp
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Arch/aarch64/GPIO.h>
-#include <Kernel/Arch/aarch64/MMIO.h>
-#include <Kernel/Arch/aarch64/Timer.h>
-#include <Kernel/Arch/aarch64/UART.h>
+#include <Kernel/Arch/aarch64/RPi/GPIO.h>
+#include <Kernel/Arch/aarch64/RPi/MMIO.h>
+#include <Kernel/Arch/aarch64/RPi/Timer.h>
+#include <Kernel/Arch/aarch64/RPi/UART.h>
 
 namespace Prekernel {
 
diff --git a/Kernel/Arch/aarch64/Utils.cpp b/Kernel/Arch/aarch64/Utils.cpp
index 9c9fe88ae9..afa4e0bbd8 100644
--- a/Kernel/Arch/aarch64/Utils.cpp
+++ b/Kernel/Arch/aarch64/Utils.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Arch/aarch64/UART.h>
+#include <Kernel/Arch/aarch64/RPi/UART.h>
 #include <Kernel/Arch/aarch64/Utils.h>
 
 void Prekernel::dbgln(char const* text)
diff --git a/Kernel/Arch/aarch64/init.cpp b/Kernel/Arch/aarch64/init.cpp
index 3f5cb110ef..ad5d6fc811 100644
--- a/Kernel/Arch/aarch64/init.cpp
+++ b/Kernel/Arch/aarch64/init.cpp
@@ -10,13 +10,13 @@
 #include <AK/Types.h>
 
 #include <Kernel/Arch/aarch64/ASM_wrapper.h>
-#include <Kernel/Arch/aarch64/Aarch64_asm_utils.h>
 #include <Kernel/Arch/aarch64/BootPPMParser.h>
-#include <Kernel/Arch/aarch64/Framebuffer.h>
-#include <Kernel/Arch/aarch64/Mailbox.h>
-#include <Kernel/Arch/aarch64/Prekernel.h>
-#include <Kernel/Arch/aarch64/Timer.h>
-#include <Kernel/Arch/aarch64/UART.h>
+#include <Kernel/Arch/aarch64/Prekernel/Aarch64_asm_utils.h>
+#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
+#include <Kernel/Arch/aarch64/RPi/Framebuffer.h>
+#include <Kernel/Arch/aarch64/RPi/Mailbox.h>
+#include <Kernel/Arch/aarch64/RPi/Timer.h>
+#include <Kernel/Arch/aarch64/RPi/UART.h>
 #include <Kernel/Arch/aarch64/Utils.h>
 
 static void draw_logo();
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 9835e1d13b..6acd0d645f 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -412,28 +412,19 @@ else()
         ${RPI_SOURCES}
 
         Arch/aarch64/BootPPMParser.cpp
-        Arch/aarch64/CrashHandler.cpp        
-        Arch/aarch64/MainIdRegister.cpp        
-        Arch/aarch64/PageDirectory.cpp
-        Arch/aarch64/Utils.cpp
-
+        Arch/aarch64/CrashHandler.cpp
         Arch/aarch64/Dummy.cpp
-
-        # Preload specific
-        Arch/aarch64/init.cpp
-        Arch/aarch64/PrekernelMMU.cpp
-        Arch/aarch64/PrekernelExceptions.cpp
-        Arch/aarch64/PrekernelCommon.cpp
-
-        # Assembly
-        Arch/aarch64/boot.S
-        Arch/aarch64/Aarch64_asm_utils.S
-        Arch/aarch64/vector_table.S
-        Arch/aarch64/SmapDisabler.cpp
+        Arch/aarch64/MainIdRegister.cpp
+        Arch/aarch64/PageDirectory.cpp
         Arch/aarch64/ScopedCritical.cpp
+        Arch/aarch64/SmapDisabler.cpp
+        Arch/aarch64/Utils.cpp
+        Arch/aarch64/init.cpp
+        Arch/aarch64/vector_table.S
 
-        MiniStdLib.cpp
+        # Files from base Kernel
         Heap/kmalloc.cpp
+        MiniStdLib.cpp
 
         Memory/AddressSpace.cpp
         Memory/AnonymousVMObject.cpp