diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index d2e37b94bb..0b67105f3d 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -42,11 +42,11 @@ set(KERNEL_SOURCES
     Bus/VirtIO/RNG.cpp
     CMOS.cpp
     CommandLine.cpp
-    ConsoleDevice.cpp
     Coredump.cpp
     Devices/AsyncDeviceRequest.cpp
     Devices/BlockDevice.cpp
     Devices/CharacterDevice.cpp
+    Devices/ConsoleDevice.cpp
     Devices/Device.cpp
     Devices/DeviceManagement.cpp
     Devices/FullDevice.cpp
diff --git a/Kernel/ConsoleDevice.cpp b/Kernel/Devices/ConsoleDevice.cpp
similarity index 97%
rename from Kernel/ConsoleDevice.cpp
rename to Kernel/Devices/ConsoleDevice.cpp
index 2bb5569a0c..d782848f0e 100644
--- a/Kernel/ConsoleDevice.cpp
+++ b/Kernel/Devices/ConsoleDevice.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <AK/Singleton.h>
-#include <Kernel/ConsoleDevice.h>
+#include <Kernel/Devices/ConsoleDevice.h>
 #include <Kernel/IO.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/ConsoleDevice.h b/Kernel/Devices/ConsoleDevice.h
similarity index 100%
rename from Kernel/ConsoleDevice.h
rename to Kernel/Devices/ConsoleDevice.h
diff --git a/Kernel/GlobalProcessExposed.cpp b/Kernel/GlobalProcessExposed.cpp
index 3b6f567d11..0cbd3538a6 100644
--- a/Kernel/GlobalProcessExposed.cpp
+++ b/Kernel/GlobalProcessExposed.cpp
@@ -11,7 +11,7 @@
 #include <Kernel/Arch/x86/ProcessorInfo.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/CommandLine.h>
-#include <Kernel/ConsoleDevice.h>
+#include <Kernel/Devices/ConsoleDevice.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/HID/HIDManagement.h>
 #include <Kernel/FileSystem/Custody.h>
diff --git a/Kernel/TTY/VirtualConsole.h b/Kernel/TTY/VirtualConsole.h
index fd0047cdcd..512c51c536 100644
--- a/Kernel/TTY/VirtualConsole.h
+++ b/Kernel/TTY/VirtualConsole.h
@@ -12,7 +12,7 @@
 #include <AK/String.h>
 #include <AK/Vector.h>
 #include <Kernel/API/KeyCode.h>
-#include <Kernel/ConsoleDevice.h>
+#include <Kernel/Devices/ConsoleDevice.h>
 #include <Kernel/Devices/HID/HIDManagement.h>
 #include <Kernel/Graphics/Console/Console.h>
 #include <Kernel/TTY/TTY.h>
diff --git a/Kernel/kprintf.cpp b/Kernel/kprintf.cpp
index a4107e557f..4d3583d9a6 100644
--- a/Kernel/kprintf.cpp
+++ b/Kernel/kprintf.cpp
@@ -7,7 +7,7 @@
 #include <AK/PrintfImplementation.h>
 #include <AK/StringView.h>
 #include <AK/Types.h>
-#include <Kernel/ConsoleDevice.h>
+#include <Kernel/Devices/ConsoleDevice.h>
 #include <Kernel/Devices/PCISerialDevice.h>
 #include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/IO.h>