diff --git a/Kernel/Arch/aarch64/Aarch64_asm_utils.S b/Kernel/Arch/aarch64/Prekernel/Aarch64_asm_utils.S
similarity index 100%
rename from Kernel/Arch/aarch64/Aarch64_asm_utils.S
rename to Kernel/Arch/aarch64/Prekernel/Aarch64_asm_utils.S
diff --git a/Kernel/Arch/aarch64/Aarch64_asm_utils.h b/Kernel/Arch/aarch64/Prekernel/Aarch64_asm_utils.h
similarity index 100%
rename from Kernel/Arch/aarch64/Aarch64_asm_utils.h
rename to Kernel/Arch/aarch64/Prekernel/Aarch64_asm_utils.h
diff --git a/Kernel/Arch/aarch64/Prekernel.h b/Kernel/Arch/aarch64/Prekernel/Prekernel.h
similarity index 100%
rename from Kernel/Arch/aarch64/Prekernel.h
rename to Kernel/Arch/aarch64/Prekernel/Prekernel.h
diff --git a/Kernel/Arch/aarch64/PrekernelCommon.cpp b/Kernel/Arch/aarch64/Prekernel/PrekernelCommon.cpp
similarity index 100%
rename from Kernel/Arch/aarch64/PrekernelCommon.cpp
rename to Kernel/Arch/aarch64/Prekernel/PrekernelCommon.cpp
diff --git a/Kernel/Arch/aarch64/PrekernelExceptions.cpp b/Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp
similarity index 100%
rename from Kernel/Arch/aarch64/PrekernelExceptions.cpp
rename to Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp
diff --git a/Kernel/Arch/aarch64/PrekernelMMU.cpp b/Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp
similarity index 100%
rename from Kernel/Arch/aarch64/PrekernelMMU.cpp
rename to Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp
diff --git a/Kernel/Arch/aarch64/boot.S b/Kernel/Arch/aarch64/Prekernel/boot.S
similarity index 100%
rename from Kernel/Arch/aarch64/boot.S
rename to Kernel/Arch/aarch64/Prekernel/boot.S
diff --git a/Kernel/Arch/aarch64/Framebuffer.cpp b/Kernel/Arch/aarch64/RPi/Framebuffer.cpp
similarity index 100%
rename from Kernel/Arch/aarch64/Framebuffer.cpp
rename to Kernel/Arch/aarch64/RPi/Framebuffer.cpp
diff --git a/Kernel/Arch/aarch64/Framebuffer.h b/Kernel/Arch/aarch64/RPi/Framebuffer.h
similarity index 100%
rename from Kernel/Arch/aarch64/Framebuffer.h
rename to Kernel/Arch/aarch64/RPi/Framebuffer.h
diff --git a/Kernel/Arch/aarch64/FramebufferMailboxMessages.h b/Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h
similarity index 100%
rename from Kernel/Arch/aarch64/FramebufferMailboxMessages.h
rename to Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h
diff --git a/Kernel/Arch/aarch64/GPIO.cpp b/Kernel/Arch/aarch64/RPi/GPIO.cpp
similarity index 100%
rename from Kernel/Arch/aarch64/GPIO.cpp
rename to Kernel/Arch/aarch64/RPi/GPIO.cpp
diff --git a/Kernel/Arch/aarch64/GPIO.h b/Kernel/Arch/aarch64/RPi/GPIO.h
similarity index 100%
rename from Kernel/Arch/aarch64/GPIO.h
rename to Kernel/Arch/aarch64/RPi/GPIO.h
diff --git a/Kernel/Arch/aarch64/MMIO.cpp b/Kernel/Arch/aarch64/RPi/MMIO.cpp
similarity index 100%
rename from Kernel/Arch/aarch64/MMIO.cpp
rename to Kernel/Arch/aarch64/RPi/MMIO.cpp
diff --git a/Kernel/Arch/aarch64/MMIO.h b/Kernel/Arch/aarch64/RPi/MMIO.h
similarity index 100%
rename from Kernel/Arch/aarch64/MMIO.h
rename to Kernel/Arch/aarch64/RPi/MMIO.h
diff --git a/Kernel/Arch/aarch64/Mailbox.cpp b/Kernel/Arch/aarch64/RPi/Mailbox.cpp
similarity index 100%
rename from Kernel/Arch/aarch64/Mailbox.cpp
rename to Kernel/Arch/aarch64/RPi/Mailbox.cpp
diff --git a/Kernel/Arch/aarch64/Mailbox.h b/Kernel/Arch/aarch64/RPi/Mailbox.h
similarity index 100%
rename from Kernel/Arch/aarch64/Mailbox.h
rename to Kernel/Arch/aarch64/RPi/Mailbox.h
diff --git a/Kernel/Arch/aarch64/Timer.cpp b/Kernel/Arch/aarch64/RPi/Timer.cpp
similarity index 100%
rename from Kernel/Arch/aarch64/Timer.cpp
rename to Kernel/Arch/aarch64/RPi/Timer.cpp
diff --git a/Kernel/Arch/aarch64/Timer.h b/Kernel/Arch/aarch64/RPi/Timer.h
similarity index 100%
rename from Kernel/Arch/aarch64/Timer.h
rename to Kernel/Arch/aarch64/RPi/Timer.h
diff --git a/Kernel/Arch/aarch64/UART.cpp b/Kernel/Arch/aarch64/RPi/UART.cpp
similarity index 100%
rename from Kernel/Arch/aarch64/UART.cpp
rename to Kernel/Arch/aarch64/RPi/UART.cpp
diff --git a/Kernel/Arch/aarch64/UART.h b/Kernel/Arch/aarch64/RPi/UART.h
similarity index 100%
rename from Kernel/Arch/aarch64/UART.h
rename to Kernel/Arch/aarch64/RPi/UART.h
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 0452c6c19f..9835e1d13b 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -389,22 +389,35 @@ if (NOT "${SERENITY_ARCH}" STREQUAL "aarch64")
         ${CRYPTO_SOURCES}
     )
 else()
+    set(PREKERNEL_SOURCES
+        Arch/aarch64/Prekernel/PrekernelMMU.cpp
+        Arch/aarch64/Prekernel/PrekernelExceptions.cpp
+        Arch/aarch64/Prekernel/PrekernelCommon.cpp
+        Arch/aarch64/Prekernel/boot.S
+        Arch/aarch64/Prekernel/Aarch64_asm_utils.S
+
+        Prekernel/UBSanitizer.cpp
+    )
+    set(RPI_SOURCES
+        Arch/aarch64/RPi/GPIO.cpp
+        Arch/aarch64/RPi/Framebuffer.cpp
+        Arch/aarch64/RPi/Mailbox.cpp
+        Arch/aarch64/RPi/Timer.cpp
+        Arch/aarch64/RPi/UART.cpp
+        Arch/aarch64/RPi/MMIO.cpp
+    )
     set(SOURCES
         ${AK_SOURCES}
+        ${PREKERNEL_SOURCES}
+        ${RPI_SOURCES}
 
         Arch/aarch64/BootPPMParser.cpp
-        Arch/aarch64/CrashHandler.cpp
-        Arch/aarch64/GPIO.cpp
-        Arch/aarch64/Framebuffer.cpp
-        Arch/aarch64/Mailbox.cpp
-        Arch/aarch64/MainIdRegister.cpp
-        Arch/aarch64/MMIO.cpp
+        Arch/aarch64/CrashHandler.cpp        
+        Arch/aarch64/MainIdRegister.cpp        
         Arch/aarch64/PageDirectory.cpp
-        Arch/aarch64/Timer.cpp
-        Arch/aarch64/UART.cpp
         Arch/aarch64/Utils.cpp
 
-        Arch/aarch64/dummy.cpp
+        Arch/aarch64/Dummy.cpp
 
         # Preload specific
         Arch/aarch64/init.cpp
@@ -416,12 +429,10 @@ else()
         Arch/aarch64/boot.S
         Arch/aarch64/Aarch64_asm_utils.S
         Arch/aarch64/vector_table.S
-
         Arch/aarch64/SmapDisabler.cpp
         Arch/aarch64/ScopedCritical.cpp
-        MiniStdLib.cpp
-        Prekernel/UBSanitizer.cpp
 
+        MiniStdLib.cpp
         Heap/kmalloc.cpp
 
         Memory/AddressSpace.cpp