diff --git a/Kernel/Arch/aarch64/kprintf.cpp b/Kernel/Arch/aarch64/kprintf.cpp
index ea85134c07..1c90724545 100644
--- a/Kernel/Arch/aarch64/kprintf.cpp
+++ b/Kernel/Arch/aarch64/kprintf.cpp
@@ -6,7 +6,7 @@
 
 #include <AK/Types.h>
 #include <Kernel/Arch/aarch64/RPi/UART.h>
-#include <Kernel/Graphics/Console/BootFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/BootFramebufferConsole.h>
 #include <Kernel/kstdio.h>
 
 // FIXME: Merge the code in this file with Kernel/kprintf.cpp once the proper abstractions are in place.
diff --git a/Kernel/Arch/init.cpp b/Kernel/Arch/init.cpp
index d139131b2b..1a901a0ae2 100644
--- a/Kernel/Arch/init.cpp
+++ b/Kernel/Arch/init.cpp
@@ -16,6 +16,9 @@
 #include <Kernel/Bus/VirtIO/Device.h>
 #include <Kernel/Devices/Audio/Management.h>
 #include <Kernel/Devices/DeviceManagement.h>
+#include <Kernel/Devices/GPU/Console/BootFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/VGATextModeConsole.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Devices/Generic/DeviceControlDevice.h>
 #include <Kernel/Devices/Generic/FullDevice.h>
 #include <Kernel/Devices/Generic/MemoryDevice.h>
@@ -33,9 +36,6 @@
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/Firmware/ACPI/Initialize.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
-#include <Kernel/Graphics/Console/BootFramebufferConsole.h>
-#include <Kernel/Graphics/Console/VGATextModeConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Heap/kmalloc.h>
 #include <Kernel/KSyms.h>
 #include <Kernel/Library/Panic.h>
diff --git a/Kernel/Arch/x86_64/Hypervisor/BochsDisplayConnector.cpp b/Kernel/Arch/x86_64/Hypervisor/BochsDisplayConnector.cpp
index 0a43819004..fd40de1c44 100644
--- a/Kernel/Arch/x86_64/Hypervisor/BochsDisplayConnector.cpp
+++ b/Kernel/Arch/x86_64/Hypervisor/BochsDisplayConnector.cpp
@@ -10,9 +10,9 @@
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/Bochs/Definitions.h>
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Bochs/Definitions.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Management.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Arch/x86_64/Hypervisor/BochsDisplayConnector.h b/Kernel/Arch/x86_64/Hypervisor/BochsDisplayConnector.h
index cf9f79f9a4..43817000d9 100644
--- a/Kernel/Arch/x86_64/Hypervisor/BochsDisplayConnector.h
+++ b/Kernel/Arch/x86_64/Hypervisor/BochsDisplayConnector.h
@@ -7,9 +7,9 @@
 #pragma once
 
 #include <AK/Try.h>
-#include <Kernel/Graphics/Bochs/Definitions.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/DisplayConnector.h>
+#include <Kernel/Devices/GPU/Bochs/Definitions.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/TypedMapping.h>
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index ff516086e4..23be471e85 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -68,6 +68,31 @@ set(KERNEL_SOURCES
     Devices/Generic/RandomDevice.cpp
     Devices/Generic/SelfTTYDevice.cpp
     Devices/Generic/ZeroDevice.cpp
+    Devices/GPU/Bochs/GraphicsAdapter.cpp
+    Devices/GPU/Bochs/QEMUDisplayConnector.cpp
+    Devices/GPU/Console/BootFramebufferConsole.cpp
+    Devices/GPU/Console/GenericFramebufferConsole.cpp
+    Devices/GPU/Console/ContiguousFramebufferConsole.cpp
+    Devices/GPU/Console/VGATextModeConsole.cpp
+    Devices/GPU/DisplayConnector.cpp
+    Devices/GPU/Generic/DisplayConnector.cpp
+    Devices/GPU/Management.cpp
+    Devices/GPU/Intel/Auxiliary/GMBusConnector.cpp
+    Devices/GPU/Intel/Plane/DisplayPlane.cpp
+    Devices/GPU/Intel/Plane/G33DisplayPlane.cpp
+    Devices/GPU/Intel/Transcoder/AnalogDisplayTranscoder.cpp
+    Devices/GPU/Intel/Transcoder/DisplayTranscoder.cpp
+    Devices/GPU/Intel/Transcoder/PLL.cpp
+    Devices/GPU/Intel/DisplayConnectorGroup.cpp
+    Devices/GPU/Intel/NativeDisplayConnector.cpp
+    Devices/GPU/Intel/NativeGraphicsAdapter.cpp
+    Devices/GPU/VMWare/Console.cpp
+    Devices/GPU/VMWare/GraphicsAdapter.cpp
+    Devices/GPU/VMWare/DisplayConnector.cpp
+    Devices/GPU/VirtIO/DisplayConnector.cpp
+    Devices/GPU/VirtIO/Console.cpp
+    Devices/GPU/VirtIO/GPU3DDevice.cpp
+    Devices/GPU/VirtIO/GraphicsAdapter.cpp
     Devices/Storage/ATA/AHCI/Controller.cpp
     Devices/Storage/ATA/AHCI/Port.cpp
     Devices/Storage/ATA/AHCI/InterruptHandler.cpp
@@ -89,31 +114,6 @@ set(KERNEL_SOURCES
     Devices/Storage/StorageController.cpp
     Devices/Storage/StorageDevice.cpp
     Devices/Storage/StorageManagement.cpp
-    Graphics/Bochs/GraphicsAdapter.cpp
-    Graphics/Bochs/QEMUDisplayConnector.cpp
-    Graphics/Console/BootFramebufferConsole.cpp
-    Graphics/Console/GenericFramebufferConsole.cpp
-    Graphics/Console/ContiguousFramebufferConsole.cpp
-    Graphics/Console/VGATextModeConsole.cpp
-    Graphics/DisplayConnector.cpp
-    Graphics/Generic/DisplayConnector.cpp
-    Graphics/GraphicsManagement.cpp
-    Graphics/Intel/Auxiliary/GMBusConnector.cpp
-    Graphics/Intel/Plane/DisplayPlane.cpp
-    Graphics/Intel/Plane/G33DisplayPlane.cpp
-    Graphics/Intel/Transcoder/AnalogDisplayTranscoder.cpp
-    Graphics/Intel/Transcoder/DisplayTranscoder.cpp
-    Graphics/Intel/Transcoder/PLL.cpp
-    Graphics/Intel/DisplayConnectorGroup.cpp
-    Graphics/Intel/NativeDisplayConnector.cpp
-    Graphics/Intel/NativeGraphicsAdapter.cpp
-    Graphics/VMWare/Console.cpp
-    Graphics/VMWare/GraphicsAdapter.cpp
-    Graphics/VMWare/DisplayConnector.cpp
-    Graphics/VirtIOGPU/DisplayConnector.cpp
-    Graphics/VirtIOGPU/Console.cpp
-    Graphics/VirtIOGPU/GPU3DDevice.cpp
-    Graphics/VirtIOGPU/GraphicsAdapter.cpp
     SanCov.cpp
     FileSystem/AnonymousFile.cpp
     FileSystem/BlockBasedFileSystem.cpp
diff --git a/Kernel/Graphics/Bochs/Definitions.h b/Kernel/Devices/GPU/Bochs/Definitions.h
similarity index 100%
rename from Kernel/Graphics/Bochs/Definitions.h
rename to Kernel/Devices/GPU/Bochs/Definitions.h
diff --git a/Kernel/Graphics/Bochs/GraphicsAdapter.cpp b/Kernel/Devices/GPU/Bochs/GraphicsAdapter.cpp
similarity index 93%
rename from Kernel/Graphics/Bochs/GraphicsAdapter.cpp
rename to Kernel/Devices/GPU/Bochs/GraphicsAdapter.cpp
index c707931bf6..3255719e46 100644
--- a/Kernel/Graphics/Bochs/GraphicsAdapter.cpp
+++ b/Kernel/Devices/GPU/Bochs/GraphicsAdapter.cpp
@@ -12,11 +12,11 @@
 #endif
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/IDs.h>
-#include <Kernel/Graphics/Bochs/Definitions.h>
-#include <Kernel/Graphics/Bochs/GraphicsAdapter.h>
-#include <Kernel/Graphics/Bochs/QEMUDisplayConnector.h>
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Bochs/Definitions.h>
+#include <Kernel/Devices/GPU/Bochs/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/Bochs/QEMUDisplayConnector.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <Kernel/Sections.h>
 
diff --git a/Kernel/Graphics/Bochs/GraphicsAdapter.h b/Kernel/Devices/GPU/Bochs/GraphicsAdapter.h
similarity index 85%
rename from Kernel/Graphics/Bochs/GraphicsAdapter.h
rename to Kernel/Devices/GPU/Bochs/GraphicsAdapter.h
index d3c8e02086..728308c693 100644
--- a/Kernel/Graphics/Bochs/GraphicsAdapter.h
+++ b/Kernel/Devices/GPU/Bochs/GraphicsAdapter.h
@@ -8,9 +8,9 @@
 
 #include <AK/Types.h>
 #include <Kernel/Bus/PCI/Device.h>
-#include <Kernel/Graphics/Bochs/Definitions.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/GenericGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/Bochs/Definitions.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/GenericGraphicsAdapter.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/TypedMapping.h>
 
diff --git a/Kernel/Graphics/Bochs/QEMUDisplayConnector.cpp b/Kernel/Devices/GPU/Bochs/QEMUDisplayConnector.cpp
similarity index 97%
rename from Kernel/Graphics/Bochs/QEMUDisplayConnector.cpp
rename to Kernel/Devices/GPU/Bochs/QEMUDisplayConnector.cpp
index 69d1a5bc58..abf2679630 100644
--- a/Kernel/Graphics/Bochs/QEMUDisplayConnector.cpp
+++ b/Kernel/Devices/GPU/Bochs/QEMUDisplayConnector.cpp
@@ -6,9 +6,9 @@
 
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/Bochs/QEMUDisplayConnector.h>
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Bochs/QEMUDisplayConnector.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <LibEDID/Definitions.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/Bochs/QEMUDisplayConnector.h b/Kernel/Devices/GPU/Bochs/QEMUDisplayConnector.h
similarity index 92%
rename from Kernel/Graphics/Bochs/QEMUDisplayConnector.h
rename to Kernel/Devices/GPU/Bochs/QEMUDisplayConnector.h
index 4fa68d3e8d..496e231e9e 100644
--- a/Kernel/Graphics/Bochs/QEMUDisplayConnector.h
+++ b/Kernel/Devices/GPU/Bochs/QEMUDisplayConnector.h
@@ -7,9 +7,9 @@
 #pragma once
 
 #include <AK/Try.h>
-#include <Kernel/Graphics/Bochs/Definitions.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/DisplayConnector.h>
+#include <Kernel/Devices/GPU/Bochs/Definitions.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/TypedMapping.h>
diff --git a/Kernel/Graphics/Console/BootFramebufferConsole.cpp b/Kernel/Devices/GPU/Console/BootFramebufferConsole.cpp
similarity index 97%
rename from Kernel/Graphics/Console/BootFramebufferConsole.cpp
rename to Kernel/Devices/GPU/Console/BootFramebufferConsole.cpp
index b342dd4bb9..6b090847f5 100644
--- a/Kernel/Graphics/Console/BootFramebufferConsole.cpp
+++ b/Kernel/Devices/GPU/Console/BootFramebufferConsole.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Graphics/Console/BootFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/BootFramebufferConsole.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/MemoryManager.h>
 
diff --git a/Kernel/Graphics/Console/BootFramebufferConsole.h b/Kernel/Devices/GPU/Console/BootFramebufferConsole.h
similarity index 95%
rename from Kernel/Graphics/Console/BootFramebufferConsole.h
rename to Kernel/Devices/GPU/Console/BootFramebufferConsole.h
index 1236656b50..a280c54401 100644
--- a/Kernel/Graphics/Console/BootFramebufferConsole.h
+++ b/Kernel/Devices/GPU/Console/BootFramebufferConsole.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
 #include <Kernel/Forward.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
 
 namespace Kernel::Graphics {
 
diff --git a/Kernel/Graphics/Console/Console.h b/Kernel/Devices/GPU/Console/Console.h
similarity index 97%
rename from Kernel/Graphics/Console/Console.h
rename to Kernel/Devices/GPU/Console/Console.h
index d55896101a..e0c355a716 100644
--- a/Kernel/Graphics/Console/Console.h
+++ b/Kernel/Devices/GPU/Console/Console.h
@@ -8,7 +8,7 @@
 
 #include <AK/AtomicRefCounted.h>
 #include <AK/Types.h>
-#include <Kernel/Graphics/GenericGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/GenericGraphicsAdapter.h>
 
 namespace Kernel::Graphics {
 
diff --git a/Kernel/Graphics/Console/ContiguousFramebufferConsole.cpp b/Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.cpp
similarity index 95%
rename from Kernel/Graphics/Console/ContiguousFramebufferConsole.cpp
rename to Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.cpp
index 2480dc81bf..9c770339e4 100644
--- a/Kernel/Graphics/Console/ContiguousFramebufferConsole.cpp
+++ b/Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
 #include <Kernel/TTY/ConsoleManagement.h>
 
 namespace Kernel::Graphics {
diff --git a/Kernel/Graphics/Console/ContiguousFramebufferConsole.h b/Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h
similarity index 92%
rename from Kernel/Graphics/Console/ContiguousFramebufferConsole.h
rename to Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h
index 4a31851b8b..0ae8f2d3fa 100644
--- a/Kernel/Graphics/Console/ContiguousFramebufferConsole.h
+++ b/Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
 
 namespace Kernel::Graphics {
 
diff --git a/Kernel/Graphics/Console/GenericFramebufferConsole.cpp b/Kernel/Devices/GPU/Console/GenericFramebufferConsole.cpp
similarity index 99%
rename from Kernel/Graphics/Console/GenericFramebufferConsole.cpp
rename to Kernel/Devices/GPU/Console/GenericFramebufferConsole.cpp
index 8bf96f5e86..78dd812f50 100644
--- a/Kernel/Graphics/Console/GenericFramebufferConsole.cpp
+++ b/Kernel/Devices/GPU/Console/GenericFramebufferConsole.cpp
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
 #include <Kernel/TTY/ConsoleManagement.h>
 
 namespace Kernel::Graphics {
diff --git a/Kernel/Graphics/Console/GenericFramebufferConsole.h b/Kernel/Devices/GPU/Console/GenericFramebufferConsole.h
similarity index 98%
rename from Kernel/Graphics/Console/GenericFramebufferConsole.h
rename to Kernel/Devices/GPU/Console/GenericFramebufferConsole.h
index 3101fd4591..1065597b9a 100644
--- a/Kernel/Graphics/Console/GenericFramebufferConsole.h
+++ b/Kernel/Devices/GPU/Console/GenericFramebufferConsole.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/Graphics/Console/Console.h>
+#include <Kernel/Devices/GPU/Console/Console.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel::Graphics {
diff --git a/Kernel/Graphics/Console/VGATextModeConsole.cpp b/Kernel/Devices/GPU/Console/VGATextModeConsole.cpp
similarity index 97%
rename from Kernel/Graphics/Console/VGATextModeConsole.cpp
rename to Kernel/Devices/GPU/Console/VGATextModeConsole.cpp
index c70ca7bfeb..24c319a3f4 100644
--- a/Kernel/Graphics/Console/VGATextModeConsole.cpp
+++ b/Kernel/Devices/GPU/Console/VGATextModeConsole.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Graphics/Console/VGATextModeConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Console/VGATextModeConsole.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel::Graphics {
diff --git a/Kernel/Graphics/Console/VGATextModeConsole.h b/Kernel/Devices/GPU/Console/VGATextModeConsole.h
similarity index 96%
rename from Kernel/Graphics/Console/VGATextModeConsole.h
rename to Kernel/Devices/GPU/Console/VGATextModeConsole.h
index f487b1bfae..ad5a46db56 100644
--- a/Kernel/Graphics/Console/VGATextModeConsole.h
+++ b/Kernel/Devices/GPU/Console/VGATextModeConsole.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/Graphics/Console/Console.h>
+#include <Kernel/Devices/GPU/Console/Console.h>
 #include <Kernel/Locking/Spinlock.h>
 
 namespace Kernel::Graphics {
diff --git a/Kernel/Graphics/Definitions.h b/Kernel/Devices/GPU/Definitions.h
similarity index 100%
rename from Kernel/Graphics/Definitions.h
rename to Kernel/Devices/GPU/Definitions.h
diff --git a/Kernel/Graphics/DisplayConnector.cpp b/Kernel/Devices/GPU/DisplayConnector.cpp
similarity index 99%
rename from Kernel/Graphics/DisplayConnector.cpp
rename to Kernel/Devices/GPU/DisplayConnector.cpp
index ea90a175fa..bd69c82d2e 100644
--- a/Kernel/Graphics/DisplayConnector.cpp
+++ b/Kernel/Devices/GPU/DisplayConnector.cpp
@@ -5,11 +5,11 @@
  */
 
 #include <Kernel/API/Ioctl.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/DeviceIdentifiers/CharacterDevicesDirectory.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/Directory.h>
-#include <Kernel/Graphics/DisplayConnector.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Memory/MemoryManager.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/DisplayConnector.h b/Kernel/Devices/GPU/DisplayConnector.h
similarity index 100%
rename from Kernel/Graphics/DisplayConnector.h
rename to Kernel/Devices/GPU/DisplayConnector.h
diff --git a/Kernel/Graphics/Generic/DisplayConnector.cpp b/Kernel/Devices/GPU/Generic/DisplayConnector.cpp
similarity index 92%
rename from Kernel/Graphics/Generic/DisplayConnector.cpp
rename to Kernel/Devices/GPU/Generic/DisplayConnector.cpp
index 1a24a49451..90d4de9ef2 100644
--- a/Kernel/Graphics/Generic/DisplayConnector.cpp
+++ b/Kernel/Devices/GPU/Generic/DisplayConnector.cpp
@@ -5,9 +5,9 @@
  */
 
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
-#include <Kernel/Graphics/Generic/DisplayConnector.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Generic/DisplayConnector.h>
+#include <Kernel/Devices/GPU/Management.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Graphics/Generic/DisplayConnector.h b/Kernel/Devices/GPU/Generic/DisplayConnector.h
similarity index 94%
rename from Kernel/Graphics/Generic/DisplayConnector.h
rename to Kernel/Devices/GPU/Generic/DisplayConnector.h
index c593e4def7..438398b77c 100644
--- a/Kernel/Graphics/Generic/DisplayConnector.h
+++ b/Kernel/Devices/GPU/Generic/DisplayConnector.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #include <AK/Try.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/DisplayConnector.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/TypedMapping.h>
diff --git a/Kernel/Graphics/GenericGraphicsAdapter.h b/Kernel/Devices/GPU/GenericGraphicsAdapter.h
similarity index 100%
rename from Kernel/Graphics/GenericGraphicsAdapter.h
rename to Kernel/Devices/GPU/GenericGraphicsAdapter.h
diff --git a/Kernel/Graphics/Intel/Auxiliary/GMBusConnector.cpp b/Kernel/Devices/GPU/Intel/Auxiliary/GMBusConnector.cpp
similarity index 98%
rename from Kernel/Graphics/Intel/Auxiliary/GMBusConnector.cpp
rename to Kernel/Devices/GPU/Intel/Auxiliary/GMBusConnector.cpp
index 35ac1334b9..a7f7ff1b88 100644
--- a/Kernel/Graphics/Intel/Auxiliary/GMBusConnector.cpp
+++ b/Kernel/Devices/GPU/Intel/Auxiliary/GMBusConnector.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Arch/Delay.h>
-#include <Kernel/Graphics/Intel/Auxiliary/GMBusConnector.h>
+#include <Kernel/Devices/GPU/Intel/Auxiliary/GMBusConnector.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/Intel/Auxiliary/GMBusConnector.h b/Kernel/Devices/GPU/Intel/Auxiliary/GMBusConnector.h
similarity index 100%
rename from Kernel/Graphics/Intel/Auxiliary/GMBusConnector.h
rename to Kernel/Devices/GPU/Intel/Auxiliary/GMBusConnector.h
diff --git a/Kernel/Graphics/Intel/Definitions.h b/Kernel/Devices/GPU/Intel/Definitions.h
similarity index 100%
rename from Kernel/Graphics/Intel/Definitions.h
rename to Kernel/Devices/GPU/Intel/Definitions.h
diff --git a/Kernel/Graphics/Intel/DisplayConnectorGroup.cpp b/Kernel/Devices/GPU/Intel/DisplayConnectorGroup.cpp
similarity index 97%
rename from Kernel/Graphics/Intel/DisplayConnectorGroup.cpp
rename to Kernel/Devices/GPU/Intel/DisplayConnectorGroup.cpp
index b803ac5eda..76046713af 100644
--- a/Kernel/Graphics/Intel/DisplayConnectorGroup.cpp
+++ b/Kernel/Devices/GPU/Intel/DisplayConnectorGroup.cpp
@@ -8,12 +8,12 @@
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
-#include <Kernel/Graphics/Intel/DisplayConnectorGroup.h>
-#include <Kernel/Graphics/Intel/Plane/G33DisplayPlane.h>
-#include <Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.h>
-#include <Kernel/Graphics/Intel/Transcoder/PLL.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Intel/DisplayConnectorGroup.h>
+#include <Kernel/Devices/GPU/Intel/Plane/G33DisplayPlane.h>
+#include <Kernel/Devices/GPU/Intel/Transcoder/AnalogDisplayTranscoder.h>
+#include <Kernel/Devices/GPU/Intel/Transcoder/PLL.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Memory/Region.h>
 #include <Kernel/Memory/TypedMapping.h>
 
diff --git a/Kernel/Graphics/Intel/DisplayConnectorGroup.h b/Kernel/Devices/GPU/Intel/DisplayConnectorGroup.h
similarity index 90%
rename from Kernel/Graphics/Intel/DisplayConnectorGroup.h
rename to Kernel/Devices/GPU/Intel/DisplayConnectorGroup.h
index 4895b0d317..5ef6e4394c 100644
--- a/Kernel/Graphics/Intel/DisplayConnectorGroup.h
+++ b/Kernel/Devices/GPU/Intel/DisplayConnectorGroup.h
@@ -8,12 +8,12 @@
 
 #include <AK/RefPtr.h>
 #include <AK/Try.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/Intel/Auxiliary/GMBusConnector.h>
-#include <Kernel/Graphics/Intel/Definitions.h>
-#include <Kernel/Graphics/Intel/NativeDisplayConnector.h>
-#include <Kernel/Graphics/Intel/Plane/DisplayPlane.h>
-#include <Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Intel/Auxiliary/GMBusConnector.h>
+#include <Kernel/Devices/GPU/Intel/Definitions.h>
+#include <Kernel/Devices/GPU/Intel/NativeDisplayConnector.h>
+#include <Kernel/Devices/GPU/Intel/Plane/DisplayPlane.h>
+#include <Kernel/Devices/GPU/Intel/Transcoder/DisplayTranscoder.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <LibEDID/EDID.h>
diff --git a/Kernel/Graphics/Intel/NativeDisplayConnector.cpp b/Kernel/Devices/GPU/Intel/NativeDisplayConnector.cpp
similarity index 93%
rename from Kernel/Graphics/Intel/NativeDisplayConnector.cpp
rename to Kernel/Devices/GPU/Intel/NativeDisplayConnector.cpp
index d25f8c6f6a..b66c5db033 100644
--- a/Kernel/Graphics/Intel/NativeDisplayConnector.cpp
+++ b/Kernel/Devices/GPU/Intel/NativeDisplayConnector.cpp
@@ -8,10 +8,10 @@
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
-#include <Kernel/Graphics/Intel/DisplayConnectorGroup.h>
-#include <Kernel/Graphics/Intel/NativeDisplayConnector.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Intel/DisplayConnectorGroup.h>
+#include <Kernel/Devices/GPU/Intel/NativeDisplayConnector.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Memory/Region.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/Intel/NativeDisplayConnector.h b/Kernel/Devices/GPU/Intel/NativeDisplayConnector.h
similarity index 92%
rename from Kernel/Graphics/Intel/NativeDisplayConnector.h
rename to Kernel/Devices/GPU/Intel/NativeDisplayConnector.h
index d832a9d6c6..6aca2869e8 100644
--- a/Kernel/Graphics/Intel/NativeDisplayConnector.h
+++ b/Kernel/Devices/GPU/Intel/NativeDisplayConnector.h
@@ -7,10 +7,10 @@
 #pragma once
 
 #include <AK/Try.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/Definitions.h>
-#include <Kernel/Graphics/DisplayConnector.h>
-#include <Kernel/Graphics/Intel/Auxiliary/GMBusConnector.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Definitions.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
+#include <Kernel/Devices/GPU/Intel/Auxiliary/GMBusConnector.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Memory/TypedMapping.h>
 
diff --git a/Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp b/Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.cpp
similarity index 92%
rename from Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp
rename to Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.cpp
index fa576b97d5..326c9049a9 100644
--- a/Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp
+++ b/Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.cpp
@@ -5,10 +5,10 @@
  */
 
 #include <Kernel/Bus/PCI/API.h>
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
-#include <Kernel/Graphics/Definitions.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
-#include <Kernel/Graphics/Intel/NativeGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Definitions.h>
+#include <Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/Intel/NativeGraphicsAdapter.h b/Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.h
similarity index 84%
rename from Kernel/Graphics/Intel/NativeGraphicsAdapter.h
rename to Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.h
index 697e1e216f..69875d958b 100644
--- a/Kernel/Graphics/Intel/NativeGraphicsAdapter.h
+++ b/Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.h
@@ -8,9 +8,9 @@
 
 #include <AK/Types.h>
 #include <Kernel/Bus/PCI/Device.h>
-#include <Kernel/Graphics/Definitions.h>
-#include <Kernel/Graphics/Intel/DisplayConnectorGroup.h>
-#include <Kernel/Graphics/Intel/NativeDisplayConnector.h>
+#include <Kernel/Devices/GPU/Definitions.h>
+#include <Kernel/Devices/GPU/Intel/DisplayConnectorGroup.h>
+#include <Kernel/Devices/GPU/Intel/NativeDisplayConnector.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 #include <LibEDID/EDID.h>
 
diff --git a/Kernel/Graphics/Intel/Plane/DisplayPlane.cpp b/Kernel/Devices/GPU/Intel/Plane/DisplayPlane.cpp
similarity index 97%
rename from Kernel/Graphics/Intel/Plane/DisplayPlane.cpp
rename to Kernel/Devices/GPU/Intel/Plane/DisplayPlane.cpp
index 31b01011c6..de8f033af5 100644
--- a/Kernel/Graphics/Intel/Plane/DisplayPlane.cpp
+++ b/Kernel/Devices/GPU/Intel/Plane/DisplayPlane.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Graphics/Intel/Plane/DisplayPlane.h>
+#include <Kernel/Devices/GPU/Intel/Plane/DisplayPlane.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/Intel/Plane/DisplayPlane.h b/Kernel/Devices/GPU/Intel/Plane/DisplayPlane.h
similarity index 96%
rename from Kernel/Graphics/Intel/Plane/DisplayPlane.h
rename to Kernel/Devices/GPU/Intel/Plane/DisplayPlane.h
index 8dfecbffbf..1cbecd41b1 100644
--- a/Kernel/Graphics/Intel/Plane/DisplayPlane.h
+++ b/Kernel/Devices/GPU/Intel/Plane/DisplayPlane.h
@@ -9,8 +9,8 @@
 #include <AK/RefPtr.h>
 #include <AK/Try.h>
 #include <AK/Types.h>
-#include <Kernel/Graphics/DisplayConnector.h>
-#include <Kernel/Graphics/Intel/Definitions.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
+#include <Kernel/Devices/GPU/Intel/Definitions.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/TypedMapping.h>
 
diff --git a/Kernel/Graphics/Intel/Plane/G33DisplayPlane.cpp b/Kernel/Devices/GPU/Intel/Plane/G33DisplayPlane.cpp
similarity index 97%
rename from Kernel/Graphics/Intel/Plane/G33DisplayPlane.cpp
rename to Kernel/Devices/GPU/Intel/Plane/G33DisplayPlane.cpp
index 05d55dd798..a0ac74be95 100644
--- a/Kernel/Graphics/Intel/Plane/G33DisplayPlane.cpp
+++ b/Kernel/Devices/GPU/Intel/Plane/G33DisplayPlane.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Graphics/Intel/Plane/G33DisplayPlane.h>
+#include <Kernel/Devices/GPU/Intel/Plane/G33DisplayPlane.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/Intel/Plane/G33DisplayPlane.h b/Kernel/Devices/GPU/Intel/Plane/G33DisplayPlane.h
similarity index 92%
rename from Kernel/Graphics/Intel/Plane/G33DisplayPlane.h
rename to Kernel/Devices/GPU/Intel/Plane/G33DisplayPlane.h
index 4c1ae3a540..200b3ee495 100644
--- a/Kernel/Graphics/Intel/Plane/G33DisplayPlane.h
+++ b/Kernel/Devices/GPU/Intel/Plane/G33DisplayPlane.h
@@ -9,7 +9,7 @@
 #include <AK/RefPtr.h>
 #include <AK/Try.h>
 #include <AK/Types.h>
-#include <Kernel/Graphics/Intel/Plane/DisplayPlane.h>
+#include <Kernel/Devices/GPU/Intel/Plane/DisplayPlane.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.cpp b/Kernel/Devices/GPU/Intel/Transcoder/AnalogDisplayTranscoder.cpp
similarity index 98%
rename from Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.cpp
rename to Kernel/Devices/GPU/Intel/Transcoder/AnalogDisplayTranscoder.cpp
index 206af11437..26e2ba49b7 100644
--- a/Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.cpp
+++ b/Kernel/Devices/GPU/Intel/Transcoder/AnalogDisplayTranscoder.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Arch/Delay.h>
-#include <Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.h>
+#include <Kernel/Devices/GPU/Intel/Transcoder/AnalogDisplayTranscoder.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.h b/Kernel/Devices/GPU/Intel/Transcoder/AnalogDisplayTranscoder.h
similarity index 96%
rename from Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.h
rename to Kernel/Devices/GPU/Intel/Transcoder/AnalogDisplayTranscoder.h
index 32c1cf0cbc..11c0caffec 100644
--- a/Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.h
+++ b/Kernel/Devices/GPU/Intel/Transcoder/AnalogDisplayTranscoder.h
@@ -9,7 +9,7 @@
 #include <AK/RefPtr.h>
 #include <AK/Try.h>
 #include <AK/Types.h>
-#include <Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.h>
+#include <Kernel/Devices/GPU/Intel/Transcoder/DisplayTranscoder.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.cpp b/Kernel/Devices/GPU/Intel/Transcoder/DisplayTranscoder.cpp
similarity index 98%
rename from Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.cpp
rename to Kernel/Devices/GPU/Intel/Transcoder/DisplayTranscoder.cpp
index 0ffa8bb8d8..f4cc5849c3 100644
--- a/Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.cpp
+++ b/Kernel/Devices/GPU/Intel/Transcoder/DisplayTranscoder.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Arch/Delay.h>
-#include <Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.h>
+#include <Kernel/Devices/GPU/Intel/Transcoder/DisplayTranscoder.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.h b/Kernel/Devices/GPU/Intel/Transcoder/DisplayTranscoder.h
similarity index 97%
rename from Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.h
rename to Kernel/Devices/GPU/Intel/Transcoder/DisplayTranscoder.h
index 9ad038ee76..3341740b53 100644
--- a/Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.h
+++ b/Kernel/Devices/GPU/Intel/Transcoder/DisplayTranscoder.h
@@ -9,8 +9,8 @@
 #include <AK/RefPtr.h>
 #include <AK/Try.h>
 #include <AK/Types.h>
-#include <Kernel/Graphics/DisplayConnector.h>
-#include <Kernel/Graphics/Intel/Definitions.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
+#include <Kernel/Devices/GPU/Intel/Definitions.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/TypedMapping.h>
 
diff --git a/Kernel/Graphics/Intel/Transcoder/PLL.cpp b/Kernel/Devices/GPU/Intel/Transcoder/PLL.cpp
similarity index 98%
rename from Kernel/Graphics/Intel/Transcoder/PLL.cpp
rename to Kernel/Devices/GPU/Intel/Transcoder/PLL.cpp
index e6a967a449..ce02419612 100644
--- a/Kernel/Graphics/Intel/Transcoder/PLL.cpp
+++ b/Kernel/Devices/GPU/Intel/Transcoder/PLL.cpp
@@ -6,7 +6,7 @@
 
 #include <AK/Format.h>
 #include <Kernel/Debug.h>
-#include <Kernel/Graphics/Intel/Transcoder/PLL.h>
+#include <Kernel/Devices/GPU/Intel/Transcoder/PLL.h>
 
 namespace Kernel::IntelGraphics {
 
diff --git a/Kernel/Graphics/Intel/Transcoder/PLL.h b/Kernel/Devices/GPU/Intel/Transcoder/PLL.h
similarity index 90%
rename from Kernel/Graphics/Intel/Transcoder/PLL.h
rename to Kernel/Devices/GPU/Intel/Transcoder/PLL.h
index 1d62f82da7..7f9488553a 100644
--- a/Kernel/Graphics/Intel/Transcoder/PLL.h
+++ b/Kernel/Devices/GPU/Intel/Transcoder/PLL.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Optional.h>
-#include <Kernel/Graphics/Intel/Definitions.h>
+#include <Kernel/Devices/GPU/Intel/Definitions.h>
 
 namespace Kernel::IntelGraphics {
 
diff --git a/Kernel/Graphics/GraphicsManagement.cpp b/Kernel/Devices/GPU/Management.cpp
similarity index 97%
rename from Kernel/Graphics/GraphicsManagement.cpp
rename to Kernel/Devices/GPU/Management.cpp
index 3e37293019..32e24031b0 100644
--- a/Kernel/Graphics/GraphicsManagement.cpp
+++ b/Kernel/Devices/GPU/Management.cpp
@@ -13,12 +13,12 @@
 #include <Kernel/Boot/Multiboot.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/IDs.h>
-#include <Kernel/Graphics/Bochs/GraphicsAdapter.h>
-#include <Kernel/Graphics/Console/BootFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
-#include <Kernel/Graphics/Intel/NativeGraphicsAdapter.h>
-#include <Kernel/Graphics/VMWare/GraphicsAdapter.h>
-#include <Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/Bochs/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/Console/BootFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Intel/NativeGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/Management.h>
+#include <Kernel/Devices/GPU/VMWare/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Sections.h>
 
diff --git a/Kernel/Graphics/GraphicsManagement.h b/Kernel/Devices/GPU/Management.h
similarity index 88%
rename from Kernel/Graphics/GraphicsManagement.h
rename to Kernel/Devices/GPU/Management.h
index c7432f639d..c25fb95e92 100644
--- a/Kernel/Graphics/GraphicsManagement.h
+++ b/Kernel/Devices/GPU/Management.h
@@ -13,11 +13,11 @@
 #    include <Kernel/Arch/x86_64/VGA/IOArbiter.h>
 #endif
 #include <Kernel/Bus/PCI/Definitions.h>
-#include <Kernel/Graphics/Console/Console.h>
-#include <Kernel/Graphics/DisplayConnector.h>
-#include <Kernel/Graphics/Generic/DisplayConnector.h>
-#include <Kernel/Graphics/GenericGraphicsAdapter.h>
-#include <Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/Console/Console.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
+#include <Kernel/Devices/GPU/Generic/DisplayConnector.h>
+#include <Kernel/Devices/GPU/GenericGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h>
 #include <Kernel/Library/NonnullLockRefPtr.h>
 #include <Kernel/Memory/Region.h>
 
diff --git a/Kernel/Graphics/VMWare/Console.cpp b/Kernel/Devices/GPU/VMWare/Console.cpp
similarity index 97%
rename from Kernel/Graphics/VMWare/Console.cpp
rename to Kernel/Devices/GPU/VMWare/Console.cpp
index a061b97918..76fc9bef20 100644
--- a/Kernel/Graphics/VMWare/Console.cpp
+++ b/Kernel/Devices/GPU/VMWare/Console.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Graphics/VMWare/Console.h>
+#include <Kernel/Devices/GPU/VMWare/Console.h>
 #include <Kernel/Tasks/WorkQueue.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/VMWare/Console.h b/Kernel/Devices/GPU/VMWare/Console.h
similarity index 88%
rename from Kernel/Graphics/VMWare/Console.h
rename to Kernel/Devices/GPU/VMWare/Console.h
index cb4e3d44df..c1e0366a04 100644
--- a/Kernel/Graphics/VMWare/Console.h
+++ b/Kernel/Devices/GPU/VMWare/Console.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/VMWare/DisplayConnector.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/VMWare/DisplayConnector.h>
 #include <Kernel/Time/TimerQueue.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/VMWare/Definitions.h b/Kernel/Devices/GPU/VMWare/Definitions.h
similarity index 100%
rename from Kernel/Graphics/VMWare/Definitions.h
rename to Kernel/Devices/GPU/VMWare/Definitions.h
diff --git a/Kernel/Graphics/VMWare/DisplayConnector.cpp b/Kernel/Devices/GPU/VMWare/DisplayConnector.cpp
similarity index 97%
rename from Kernel/Graphics/VMWare/DisplayConnector.cpp
rename to Kernel/Devices/GPU/VMWare/DisplayConnector.cpp
index 591e40bac5..07e76d217a 100644
--- a/Kernel/Graphics/VMWare/DisplayConnector.cpp
+++ b/Kernel/Devices/GPU/VMWare/DisplayConnector.cpp
@@ -5,9 +5,9 @@
  */
 
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
-#include <Kernel/Graphics/VMWare/Console.h>
-#include <Kernel/Graphics/VMWare/DisplayConnector.h>
+#include <Kernel/Devices/GPU/Management.h>
+#include <Kernel/Devices/GPU/VMWare/Console.h>
+#include <Kernel/Devices/GPU/VMWare/DisplayConnector.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Graphics/VMWare/DisplayConnector.h b/Kernel/Devices/GPU/VMWare/DisplayConnector.h
similarity index 92%
rename from Kernel/Graphics/VMWare/DisplayConnector.h
rename to Kernel/Devices/GPU/VMWare/DisplayConnector.h
index 8bda8cf174..5275e7e777 100644
--- a/Kernel/Graphics/VMWare/DisplayConnector.h
+++ b/Kernel/Devices/GPU/VMWare/DisplayConnector.h
@@ -7,9 +7,9 @@
 #pragma once
 
 #include <AK/Try.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/DisplayConnector.h>
-#include <Kernel/Graphics/VMWare/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
+#include <Kernel/Devices/GPU/VMWare/GraphicsAdapter.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/TypedMapping.h>
diff --git a/Kernel/Graphics/VMWare/GraphicsAdapter.cpp b/Kernel/Devices/GPU/VMWare/GraphicsAdapter.cpp
similarity index 96%
rename from Kernel/Graphics/VMWare/GraphicsAdapter.cpp
rename to Kernel/Devices/GPU/VMWare/GraphicsAdapter.cpp
index 00c5c8fb2d..c0a5921586 100644
--- a/Kernel/Graphics/VMWare/GraphicsAdapter.cpp
+++ b/Kernel/Devices/GPU/VMWare/GraphicsAdapter.cpp
@@ -9,11 +9,11 @@
 #include <AK/Try.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/IDs.h>
-#include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
-#include <Kernel/Graphics/VMWare/Definitions.h>
-#include <Kernel/Graphics/VMWare/DisplayConnector.h>
-#include <Kernel/Graphics/VMWare/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/Console/ContiguousFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Management.h>
+#include <Kernel/Devices/GPU/VMWare/Definitions.h>
+#include <Kernel/Devices/GPU/VMWare/DisplayConnector.h>
+#include <Kernel/Devices/GPU/VMWare/GraphicsAdapter.h>
 #include <Kernel/Library/IOWindow.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/Graphics/VMWare/GraphicsAdapter.h b/Kernel/Devices/GPU/VMWare/GraphicsAdapter.h
similarity index 95%
rename from Kernel/Graphics/VMWare/GraphicsAdapter.h
rename to Kernel/Devices/GPU/VMWare/GraphicsAdapter.h
index dc8e503a38..49a36785dc 100644
--- a/Kernel/Graphics/VMWare/GraphicsAdapter.h
+++ b/Kernel/Devices/GPU/VMWare/GraphicsAdapter.h
@@ -8,8 +8,8 @@
 
 #include <AK/Types.h>
 #include <Kernel/Bus/PCI/Device.h>
-#include <Kernel/Graphics/GenericGraphicsAdapter.h>
-#include <Kernel/Graphics/VMWare/Definitions.h>
+#include <Kernel/Devices/GPU/GenericGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/VMWare/Definitions.h>
 #include <Kernel/Library/IOWindow.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/PhysicalAddress.h>
diff --git a/Kernel/Graphics/VirtIOGPU/Console.cpp b/Kernel/Devices/GPU/VirtIO/Console.cpp
similarity index 98%
rename from Kernel/Graphics/VirtIOGPU/Console.cpp
rename to Kernel/Devices/GPU/VirtIO/Console.cpp
index a7e64bb0f5..729b4d6d56 100644
--- a/Kernel/Graphics/VirtIOGPU/Console.cpp
+++ b/Kernel/Devices/GPU/VirtIO/Console.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Graphics/VirtIOGPU/Console.h>
+#include <Kernel/Devices/GPU/VirtIO/Console.h>
 #include <Kernel/TTY/ConsoleManagement.h>
 #include <Kernel/Tasks/WorkQueue.h>
 
diff --git a/Kernel/Graphics/VirtIOGPU/Console.h b/Kernel/Devices/GPU/VirtIO/Console.h
similarity index 89%
rename from Kernel/Graphics/VirtIOGPU/Console.h
rename to Kernel/Devices/GPU/VirtIO/Console.h
index d1a994aaef..68802cb37e 100644
--- a/Kernel/Graphics/VirtIOGPU/Console.h
+++ b/Kernel/Devices/GPU/VirtIO/Console.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/VirtIOGPU/DisplayConnector.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/VirtIO/DisplayConnector.h>
 #include <Kernel/Time/TimerQueue.h>
 
 namespace Kernel::Graphics::VirtIOGPU {
diff --git a/Kernel/Graphics/VirtIOGPU/DisplayConnector.cpp b/Kernel/Devices/GPU/VirtIO/DisplayConnector.cpp
similarity index 96%
rename from Kernel/Graphics/VirtIOGPU/DisplayConnector.cpp
rename to Kernel/Devices/GPU/VirtIO/DisplayConnector.cpp
index d5acdb96d6..753764a064 100644
--- a/Kernel/Graphics/VirtIOGPU/DisplayConnector.cpp
+++ b/Kernel/Devices/GPU/VirtIO/DisplayConnector.cpp
@@ -6,11 +6,11 @@
 
 #include <Kernel/API/VirGL.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
-#include <Kernel/Graphics/VirtIOGPU/Console.h>
-#include <Kernel/Graphics/VirtIOGPU/DisplayConnector.h>
-#include <Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h>
-#include <Kernel/Graphics/VirtIOGPU/Protocol.h>
+#include <Kernel/Devices/GPU/Management.h>
+#include <Kernel/Devices/GPU/VirtIO/Console.h>
+#include <Kernel/Devices/GPU/VirtIO/DisplayConnector.h>
+#include <Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/VirtIO/Protocol.h>
 #include <Kernel/Security/Random.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/VirtIOGPU/DisplayConnector.h b/Kernel/Devices/GPU/VirtIO/DisplayConnector.h
similarity index 94%
rename from Kernel/Graphics/VirtIOGPU/DisplayConnector.h
rename to Kernel/Devices/GPU/VirtIO/DisplayConnector.h
index a8ee840aab..37c9b555ce 100644
--- a/Kernel/Graphics/VirtIOGPU/DisplayConnector.h
+++ b/Kernel/Devices/GPU/VirtIO/DisplayConnector.h
@@ -9,10 +9,10 @@
 #include <AK/BinaryBufferWriter.h>
 #include <AK/DistinctNumeric.h>
 #include <Kernel/Devices/CharacterDevice.h>
-#include <Kernel/Graphics/Console/Console.h>
-#include <Kernel/Graphics/DisplayConnector.h>
-#include <Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h>
-#include <Kernel/Graphics/VirtIOGPU/Protocol.h>
+#include <Kernel/Devices/GPU/Console/Console.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
+#include <Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/VirtIO/Protocol.h>
 #include <Kernel/Memory/Region.h>
 #include <LibEDID/EDID.h>
 
diff --git a/Kernel/Graphics/VirtIOGPU/GPU3DDevice.cpp b/Kernel/Devices/GPU/VirtIO/GPU3DDevice.cpp
similarity index 96%
rename from Kernel/Graphics/VirtIOGPU/GPU3DDevice.cpp
rename to Kernel/Devices/GPU/VirtIO/GPU3DDevice.cpp
index 0d9bcb0a93..a00a1651af 100644
--- a/Kernel/Graphics/VirtIOGPU/GPU3DDevice.cpp
+++ b/Kernel/Devices/GPU/VirtIO/GPU3DDevice.cpp
@@ -6,11 +6,11 @@
 
 #include <Kernel/API/Ioctl.h>
 #include <Kernel/API/VirGL.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
-#include <Kernel/Graphics/VirtIOGPU/Console.h>
-#include <Kernel/Graphics/VirtIOGPU/GPU3DDevice.h>
-#include <Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h>
-#include <Kernel/Graphics/VirtIOGPU/Protocol.h>
+#include <Kernel/Devices/GPU/Management.h>
+#include <Kernel/Devices/GPU/VirtIO/Console.h>
+#include <Kernel/Devices/GPU/VirtIO/GPU3DDevice.h>
+#include <Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/VirtIO/Protocol.h>
 #include <Kernel/Security/Random.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/VirtIOGPU/GPU3DDevice.h b/Kernel/Devices/GPU/VirtIO/GPU3DDevice.h
similarity index 99%
rename from Kernel/Graphics/VirtIOGPU/GPU3DDevice.h
rename to Kernel/Devices/GPU/VirtIO/GPU3DDevice.h
index 168896709b..171785ba39 100644
--- a/Kernel/Graphics/VirtIOGPU/GPU3DDevice.h
+++ b/Kernel/Devices/GPU/VirtIO/GPU3DDevice.h
@@ -10,7 +10,7 @@
 #include <AK/IntrusiveList.h>
 #include <Kernel/Devices/CharacterDevice.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/VirtIOGPU/Protocol.h>
+#include <Kernel/Devices/GPU/VirtIO/Protocol.h>
 #include <Kernel/Locking/SpinlockProtected.h>
 
 namespace Kernel::Graphics::VirtIOGPU {
diff --git a/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.cpp b/Kernel/Devices/GPU/VirtIO/GraphicsAdapter.cpp
similarity index 98%
rename from Kernel/Graphics/VirtIOGPU/GraphicsAdapter.cpp
rename to Kernel/Devices/GPU/VirtIO/GraphicsAdapter.cpp
index 7db5c318ff..a0f5dbcdbb 100644
--- a/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.cpp
+++ b/Kernel/Devices/GPU/VirtIO/GraphicsAdapter.cpp
@@ -9,12 +9,12 @@
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
-#include <Kernel/Graphics/VirtIOGPU/Console.h>
-#include <Kernel/Graphics/VirtIOGPU/DisplayConnector.h>
-#include <Kernel/Graphics/VirtIOGPU/GPU3DDevice.h>
-#include <Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h>
+#include <Kernel/Devices/GPU/Console/GenericFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Management.h>
+#include <Kernel/Devices/GPU/VirtIO/Console.h>
+#include <Kernel/Devices/GPU/VirtIO/DisplayConnector.h>
+#include <Kernel/Devices/GPU/VirtIO/GPU3DDevice.h>
+#include <Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h b/Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h
similarity index 98%
rename from Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h
rename to Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h
index 1bd845e271..fbd9387312 100644
--- a/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h
+++ b/Kernel/Devices/GPU/VirtIO/GraphicsAdapter.h
@@ -10,8 +10,8 @@
 #include <AK/DistinctNumeric.h>
 #include <Kernel/Bus/VirtIO/Device.h>
 #include <Kernel/Bus/VirtIO/Queue.h>
-#include <Kernel/Graphics/GenericGraphicsAdapter.h>
-#include <Kernel/Graphics/VirtIOGPU/Protocol.h>
+#include <Kernel/Devices/GPU/GenericGraphicsAdapter.h>
+#include <Kernel/Devices/GPU/VirtIO/Protocol.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Graphics/VirtIOGPU/Protocol.h b/Kernel/Devices/GPU/VirtIO/Protocol.h
similarity index 100%
rename from Kernel/Graphics/VirtIOGPU/Protocol.h
rename to Kernel/Devices/GPU/VirtIO/Protocol.h
diff --git a/Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceAttribute.h b/Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceAttribute.h
index a3fb1261ce..959a8d742a 100644
--- a/Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceAttribute.h
+++ b/Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceAttribute.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
+#include <Kernel/Devices/GPU/DisplayConnector.h>
 #include <Kernel/FileSystem/SysFS/Component.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.h>
-#include <Kernel/Graphics/DisplayConnector.h>
 #include <Kernel/Library/KBuffer.h>
 
 namespace Kernel {
diff --git a/Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.cpp b/Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.cpp
index 4c6d274f1b..1b33379b66 100644
--- a/Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.cpp
+++ b/Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.cpp
@@ -6,9 +6,9 @@
 
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Devices/GPU/DisplayConnector.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceAttribute.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.h>
-#include <Kernel/Graphics/DisplayConnector.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.h b/Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.h
index dc1c2208ae..6ed3cfc797 100644
--- a/Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.h
+++ b/Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include <Kernel/Devices/GPU/DisplayConnector.h>
 #include <Kernel/FileSystem/SysFS/Component.h>
-#include <Kernel/Graphics/DisplayConnector.h>
 #include <Kernel/Library/KString.h>
 
 namespace Kernel {
diff --git a/Kernel/TTY/ConsoleManagement.cpp b/Kernel/TTY/ConsoleManagement.cpp
index e648ac5679..c5c0cdee1c 100644
--- a/Kernel/TTY/ConsoleManagement.cpp
+++ b/Kernel/TTY/ConsoleManagement.cpp
@@ -8,7 +8,7 @@
 #include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Library/Panic.h>
 #include <Kernel/Sections.h>
 #include <Kernel/TTY/ConsoleManagement.h>
diff --git a/Kernel/TTY/VirtualConsole.cpp b/Kernel/TTY/VirtualConsole.cpp
index 563d5ed186..f7718a63fc 100644
--- a/Kernel/TTY/VirtualConsole.cpp
+++ b/Kernel/TTY/VirtualConsole.cpp
@@ -13,8 +13,8 @@
 #endif
 #include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Devices/DeviceManagement.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Devices/HID/Management.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Heap/kmalloc.h>
 #include <Kernel/Library/StdLib.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/TTY/VirtualConsole.h b/Kernel/TTY/VirtualConsole.h
index 530b98c1e6..beae1ddb22 100644
--- a/Kernel/TTY/VirtualConsole.h
+++ b/Kernel/TTY/VirtualConsole.h
@@ -10,9 +10,9 @@
 #include <AK/Noncopyable.h>
 #include <AK/Vector.h>
 #include <Kernel/API/KeyCode.h>
+#include <Kernel/Devices/GPU/Console/Console.h>
 #include <Kernel/Devices/Generic/ConsoleDevice.h>
 #include <Kernel/Devices/HID/Management.h>
-#include <Kernel/Graphics/Console/Console.h>
 #include <Kernel/TTY/TTY.h>
 #include <LibVT/Attribute.h>
 #include <LibVT/Color.h>
diff --git a/Kernel/kprintf.cpp b/Kernel/kprintf.cpp
index 8a4491c497..57a5465472 100644
--- a/Kernel/kprintf.cpp
+++ b/Kernel/kprintf.cpp
@@ -12,10 +12,10 @@
 #    include <Kernel/Arch/x86_64/BochsDebugOutput.h>
 #endif
 #include <Kernel/Devices/DeviceManagement.h>
+#include <Kernel/Devices/GPU/Console/BootFramebufferConsole.h>
+#include <Kernel/Devices/GPU/Management.h>
 #include <Kernel/Devices/Generic/ConsoleDevice.h>
 #include <Kernel/Devices/PCISerialDevice.h>
-#include <Kernel/Graphics/Console/BootFramebufferConsole.h>
-#include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/TTY/ConsoleManagement.h>
 #include <Kernel/kstdio.h>