diff --git a/Kernel/BlockDevice.cpp b/Kernel/BlockDevice.cpp
deleted file mode 100644
index d81d2bbc344..00000000000
--- a/Kernel/BlockDevice.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <Kernel/BlockDevice.h>
-
-BlockDevice::~BlockDevice()
-{
-}
diff --git a/Kernel/CharacterDevice.cpp b/Kernel/CharacterDevice.cpp
deleted file mode 100644
index a783e80d7d3..00000000000
--- a/Kernel/CharacterDevice.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <Kernel/CharacterDevice.h>
-
-CharacterDevice::~CharacterDevice()
-{
-}
diff --git a/Kernel/Console.h b/Kernel/Console.h
index c670d8640b9..b7e19d53afd 100644
--- a/Kernel/Console.h
+++ b/Kernel/Console.h
@@ -2,7 +2,7 @@
 
 #include <AK/CircularQueue.h>
 #include <AK/Vector.h>
-#include <Kernel/CharacterDevice.h>
+#include <Kernel/Devices/CharacterDevice.h>
 
 class ConsoleImplementation {
 public:
diff --git a/Kernel/BXVGADevice.cpp b/Kernel/Devices/BXVGADevice.cpp
similarity index 99%
rename from Kernel/BXVGADevice.cpp
rename to Kernel/Devices/BXVGADevice.cpp
index 4c3dc827005..8ff72b7fee6 100644
--- a/Kernel/BXVGADevice.cpp
+++ b/Kernel/Devices/BXVGADevice.cpp
@@ -1,4 +1,4 @@
-#include <Kernel/BXVGADevice.h>
+#include <Kernel/Devices/BXVGADevice.h>
 #include <Kernel/IO.h>
 #include <Kernel/PCI.h>
 #include <Kernel/MemoryManager.h>
diff --git a/Kernel/BXVGADevice.h b/Kernel/Devices/BXVGADevice.h
similarity index 96%
rename from Kernel/BXVGADevice.h
rename to Kernel/Devices/BXVGADevice.h
index 212ce6a9636..0025ac07a52 100644
--- a/Kernel/BXVGADevice.h
+++ b/Kernel/Devices/BXVGADevice.h
@@ -4,7 +4,7 @@
 #include <AK/AKString.h>
 #include <SharedGraphics/Size.h>
 #include <Kernel/types.h>
-#include <Kernel/BlockDevice.h>
+#include <Kernel/Devices/BlockDevice.h>
 
 class BXVGADevice final : public BlockDevice {
     AK_MAKE_ETERNAL
diff --git a/Kernel/Devices/BlockDevice.cpp b/Kernel/Devices/BlockDevice.cpp
new file mode 100644
index 00000000000..d1911a18c97
--- /dev/null
+++ b/Kernel/Devices/BlockDevice.cpp
@@ -0,0 +1,5 @@
+#include <Kernel/Devices/BlockDevice.h>
+
+BlockDevice::~BlockDevice()
+{
+}
diff --git a/Kernel/BlockDevice.h b/Kernel/Devices/BlockDevice.h
similarity index 91%
rename from Kernel/BlockDevice.h
rename to Kernel/Devices/BlockDevice.h
index 1a17a201fd8..1161f7cbf8f 100644
--- a/Kernel/BlockDevice.h
+++ b/Kernel/Devices/BlockDevice.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/Device.h>
+#include <Kernel/Devices/Device.h>
 
 class BlockDevice : public Device {
 public:
diff --git a/Kernel/Devices/CharacterDevice.cpp b/Kernel/Devices/CharacterDevice.cpp
new file mode 100644
index 00000000000..44ce9eb7d36
--- /dev/null
+++ b/Kernel/Devices/CharacterDevice.cpp
@@ -0,0 +1,5 @@
+#include <Kernel/Devices/CharacterDevice.h>
+
+CharacterDevice::~CharacterDevice()
+{
+}
diff --git a/Kernel/CharacterDevice.h b/Kernel/Devices/CharacterDevice.h
similarity index 88%
rename from Kernel/CharacterDevice.h
rename to Kernel/Devices/CharacterDevice.h
index b81f1187fce..6dedf20743f 100644
--- a/Kernel/CharacterDevice.h
+++ b/Kernel/Devices/CharacterDevice.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/Device.h>
+#include <Kernel/Devices/Device.h>
 
 class CharacterDevice : public Device {
 public:
diff --git a/Kernel/Device.cpp b/Kernel/Devices/Device.cpp
similarity index 100%
rename from Kernel/Device.cpp
rename to Kernel/Devices/Device.cpp
diff --git a/Kernel/Device.h b/Kernel/Devices/Device.h
similarity index 100%
rename from Kernel/Device.h
rename to Kernel/Devices/Device.h
diff --git a/Kernel/DiskDevice.cpp b/Kernel/Devices/DiskDevice.cpp
similarity index 96%
rename from Kernel/DiskDevice.cpp
rename to Kernel/Devices/DiskDevice.cpp
index d7157485add..3c2b2106410 100644
--- a/Kernel/DiskDevice.cpp
+++ b/Kernel/Devices/DiskDevice.cpp
@@ -1,4 +1,4 @@
-#include "DiskDevice.h"
+#include <Kernel/Devices/DiskDevice.h>
 
 DiskDevice::DiskDevice()
 {
diff --git a/Kernel/DiskDevice.h b/Kernel/Devices/DiskDevice.h
similarity index 100%
rename from Kernel/DiskDevice.h
rename to Kernel/Devices/DiskDevice.h
diff --git a/Kernel/FileBackedDiskDevice.cpp b/Kernel/Devices/FileBackedDiskDevice.cpp
similarity index 97%
rename from Kernel/FileBackedDiskDevice.cpp
rename to Kernel/Devices/FileBackedDiskDevice.cpp
index 34ed7e17d3f..6e936fb7782 100644
--- a/Kernel/FileBackedDiskDevice.cpp
+++ b/Kernel/Devices/FileBackedDiskDevice.cpp
@@ -1,6 +1,6 @@
 #define _FILE_OFFSET_BITS 64
 
-#include "FileBackedDiskDevice.h"
+#include <Kernel/Devices/FileBackedDiskDevice.h>
 #include <cstring>
 #include <sys/stat.h>
 
diff --git a/Kernel/FileBackedDiskDevice.h b/Kernel/Devices/FileBackedDiskDevice.h
similarity index 96%
rename from Kernel/FileBackedDiskDevice.h
rename to Kernel/Devices/FileBackedDiskDevice.h
index 9fd630ecad9..c16c848f8b1 100644
--- a/Kernel/FileBackedDiskDevice.h
+++ b/Kernel/Devices/FileBackedDiskDevice.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DiskDevice.h"
+#include <Kernel/Devices/DiskDevice.h>
 #include <AK/RetainPtr.h>
 #include <AK/AKString.h>
 #include <AK/Types.h>
diff --git a/Kernel/FullDevice.cpp b/Kernel/Devices/FullDevice.cpp
similarity index 100%
rename from Kernel/FullDevice.cpp
rename to Kernel/Devices/FullDevice.cpp
diff --git a/Kernel/FullDevice.h b/Kernel/Devices/FullDevice.h
similarity index 100%
rename from Kernel/FullDevice.h
rename to Kernel/Devices/FullDevice.h
diff --git a/Kernel/IDEDiskDevice.cpp b/Kernel/Devices/IDEDiskDevice.cpp
similarity index 100%
rename from Kernel/IDEDiskDevice.cpp
rename to Kernel/Devices/IDEDiskDevice.cpp
diff --git a/Kernel/IDEDiskDevice.h b/Kernel/Devices/IDEDiskDevice.h
similarity index 96%
rename from Kernel/IDEDiskDevice.h
rename to Kernel/Devices/IDEDiskDevice.h
index 60a23507d8b..250889f964e 100644
--- a/Kernel/IDEDiskDevice.h
+++ b/Kernel/Devices/IDEDiskDevice.h
@@ -2,7 +2,7 @@
 
 #include <Kernel/Lock.h>
 #include <AK/RetainPtr.h>
-#include <Kernel/DiskDevice.h>
+#include <Kernel/Devices/DiskDevice.h>
 #include "IRQHandler.h"
 
 class IDEDiskDevice final : public IRQHandler, public DiskDevice {
diff --git a/Kernel/KeyboardDevice.cpp b/Kernel/Devices/KeyboardDevice.cpp
similarity index 99%
rename from Kernel/KeyboardDevice.cpp
rename to Kernel/Devices/KeyboardDevice.cpp
index 942cfac6b0d..e5b57b7f848 100644
--- a/Kernel/KeyboardDevice.cpp
+++ b/Kernel/Devices/KeyboardDevice.cpp
@@ -2,7 +2,7 @@
 #include "i386.h"
 #include "IO.h"
 #include "PIC.h"
-#include "KeyboardDevice.h"
+#include <Kernel/Devices/KeyboardDevice.h>
 #include <Kernel/TTY/VirtualConsole.h>
 #include <AK/Assertions.h>
 
diff --git a/Kernel/KeyboardDevice.h b/Kernel/Devices/KeyboardDevice.h
similarity index 96%
rename from Kernel/KeyboardDevice.h
rename to Kernel/Devices/KeyboardDevice.h
index aebc6b6d930..8931deab125 100644
--- a/Kernel/KeyboardDevice.h
+++ b/Kernel/Devices/KeyboardDevice.h
@@ -3,7 +3,7 @@
 #include <AK/Types.h>
 #include <AK/DoublyLinkedList.h>
 #include <AK/CircularQueue.h>
-#include <Kernel/CharacterDevice.h>
+#include <Kernel/Devices/CharacterDevice.h>
 #include "IRQHandler.h"
 #include "KeyCode.h"
 
diff --git a/Kernel/NullDevice.cpp b/Kernel/Devices/NullDevice.cpp
similarity index 100%
rename from Kernel/NullDevice.cpp
rename to Kernel/Devices/NullDevice.cpp
diff --git a/Kernel/NullDevice.h b/Kernel/Devices/NullDevice.h
similarity index 100%
rename from Kernel/NullDevice.h
rename to Kernel/Devices/NullDevice.h
diff --git a/Kernel/PS2MouseDevice.cpp b/Kernel/Devices/PS2MouseDevice.cpp
similarity index 100%
rename from Kernel/PS2MouseDevice.cpp
rename to Kernel/Devices/PS2MouseDevice.cpp
diff --git a/Kernel/PS2MouseDevice.h b/Kernel/Devices/PS2MouseDevice.h
similarity index 95%
rename from Kernel/PS2MouseDevice.h
rename to Kernel/Devices/PS2MouseDevice.h
index 330d71c6e48..2410a344f32 100644
--- a/Kernel/PS2MouseDevice.h
+++ b/Kernel/Devices/PS2MouseDevice.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/CharacterDevice.h>
+#include <Kernel/Devices/CharacterDevice.h>
 #include <Kernel/MousePacket.h>
 #include <Kernel/IRQHandler.h>
 
diff --git a/Kernel/RandomDevice.cpp b/Kernel/Devices/RandomDevice.cpp
similarity index 100%
rename from Kernel/RandomDevice.cpp
rename to Kernel/Devices/RandomDevice.cpp
diff --git a/Kernel/RandomDevice.h b/Kernel/Devices/RandomDevice.h
similarity index 100%
rename from Kernel/RandomDevice.h
rename to Kernel/Devices/RandomDevice.h
diff --git a/Kernel/ZeroDevice.cpp b/Kernel/Devices/ZeroDevice.cpp
similarity index 100%
rename from Kernel/ZeroDevice.cpp
rename to Kernel/Devices/ZeroDevice.cpp
diff --git a/Kernel/ZeroDevice.h b/Kernel/Devices/ZeroDevice.h
similarity index 100%
rename from Kernel/ZeroDevice.h
rename to Kernel/Devices/ZeroDevice.h
diff --git a/Kernel/FileDescriptor.cpp b/Kernel/FileDescriptor.cpp
index 3f131fe1350..940978abe91 100644
--- a/Kernel/FileDescriptor.cpp
+++ b/Kernel/FileDescriptor.cpp
@@ -1,6 +1,6 @@
 #include "FileDescriptor.h"
 #include <Kernel/FileSystem/FileSystem.h>
-#include "CharacterDevice.h"
+#include <Kernel/Devices/CharacterDevice.h>
 #include <LibC/errno_numbers.h>
 #include "UnixTypes.h"
 #include <AK/BufferStream.h>
@@ -9,7 +9,7 @@
 #include <Kernel/TTY/MasterPTY.h>
 #include <Kernel/Socket.h>
 #include <Kernel/Process.h>
-#include <Kernel/BlockDevice.h>
+#include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/MemoryManager.h>
 
 Retained<FileDescriptor> FileDescriptor::create(RetainPtr<Inode>&& inode)
diff --git a/Kernel/FileSystem/FileSystem.h b/Kernel/FileSystem/FileSystem.h
index 4c16ba05c0f..7a33c17d2c3 100644
--- a/Kernel/FileSystem/FileSystem.h
+++ b/Kernel/FileSystem/FileSystem.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DiskDevice.h"
+#include <Kernel/Devices/DiskDevice.h>
 #include "InodeIdentifier.h"
 #include "InodeMetadata.h"
 #include "Limits.h"
diff --git a/Kernel/FileSystem/VirtualFileSystem.cpp b/Kernel/FileSystem/VirtualFileSystem.cpp
index 4a6d985b398..8def1c799e9 100644
--- a/Kernel/FileSystem/VirtualFileSystem.cpp
+++ b/Kernel/FileSystem/VirtualFileSystem.cpp
@@ -3,7 +3,7 @@
 #include "FileSystem.h"
 #include <AK/FileSystemPath.h>
 #include <AK/StringBuilder.h>
-#include "CharacterDevice.h"
+#include <Kernel/Devices/CharacterDevice.h>
 #include <LibC/errno_numbers.h>
 #include <Kernel/Process.h>
 
diff --git a/Kernel/Makefile b/Kernel/Makefile
index f19d45cf6cb..d13b8ad291f 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -6,11 +6,11 @@ KERNEL_OBJS = \
        Process.o \
        Thread.o \
        i8253.o \
-       KeyboardDevice.o \
+       Devices/KeyboardDevice.o \
        CMOS.o \
        PIC.o \
        Syscall.o \
-       IDEDiskDevice.o \
+       Devices/IDEDiskDevice.o \
        MemoryManager.o \
        Console.o \
        IRQHandler.o \
@@ -28,9 +28,9 @@ KERNEL_OBJS = \
        ELF/ELFLoader.o \
        KSyms.o \
        FileSystem/DevPtsFS.o \
-       BXVGADevice.o \
+       Devices/BXVGADevice.o \
        PCI.o \
-       PS2MouseDevice.o \
+       Devices/PS2MouseDevice.o \
        Socket.o \
        LocalSocket.o \
        Net/IPv4Socket.o \
@@ -44,14 +44,14 @@ KERNEL_OBJS = \
 
 VFS_OBJS = \
     FileSystem/ProcFS.o \
-    DiskDevice.o \
-    Device.o \
-    CharacterDevice.o \
-    BlockDevice.o \
-    NullDevice.o \
-    FullDevice.o \
-    ZeroDevice.o \
-    RandomDevice.o \
+    Devices/DiskDevice.o \
+    Devices/Device.o \
+    Devices/CharacterDevice.o \
+    Devices/BlockDevice.o \
+    Devices/NullDevice.o \
+    Devices/FullDevice.o \
+    Devices/ZeroDevice.o \
+    Devices/RandomDevice.o \
     FileSystem/FileSystem.o \
     FileSystem/DiskBackedFileSystem.o \
     FileSystem/Ext2FileSystem.o \
diff --git a/Kernel/Net/TCPSocket.cpp b/Kernel/Net/TCPSocket.cpp
index af37186395f..6356b8566d2 100644
--- a/Kernel/Net/TCPSocket.cpp
+++ b/Kernel/Net/TCPSocket.cpp
@@ -3,7 +3,7 @@
 #include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/Net/Routing.h>
 #include <Kernel/Process.h>
-#include <Kernel/RandomDevice.h>
+#include <Kernel/Devices/RandomDevice.h>
 
 Lockable<HashMap<word, TCPSocket*>>& TCPSocket::sockets_by_port()
 {
diff --git a/Kernel/Net/UDPSocket.cpp b/Kernel/Net/UDPSocket.cpp
index ff8c2baa82f..6c4170d3e64 100644
--- a/Kernel/Net/UDPSocket.cpp
+++ b/Kernel/Net/UDPSocket.cpp
@@ -2,7 +2,7 @@
 #include <Kernel/Net/UDP.h>
 #include <Kernel/Net/NetworkAdapter.h>
 #include <Kernel/Process.h>
-#include <Kernel/RandomDevice.h>
+#include <Kernel/Devices/RandomDevice.h>
 #include <Kernel/Net/Routing.h>
 
 Lockable<HashMap<word, UDPSocket*>>& UDPSocket::sockets_by_port()
diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp
index 0ea53ec1727..3e8db5bb88e 100644
--- a/Kernel/Process.cpp
+++ b/Kernel/Process.cpp
@@ -6,7 +6,7 @@
 #include "system.h"
 #include <Kernel/FileDescriptor.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
-#include <Kernel/NullDevice.h>
+#include <Kernel/Devices/NullDevice.h>
 #include <Kernel/ELF/ELFLoader.h>
 #include "MemoryManager.h"
 #include "i8253.h"
diff --git a/Kernel/TTY/MasterPTY.h b/Kernel/TTY/MasterPTY.h
index e189cd7eef1..fa65522dea2 100644
--- a/Kernel/TTY/MasterPTY.h
+++ b/Kernel/TTY/MasterPTY.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <AK/Badge.h>
-#include <Kernel/CharacterDevice.h>
+#include <Kernel/Devices/CharacterDevice.h>
 #include <Kernel/DoubleBuffer.h>
 
 class SlavePTY;
diff --git a/Kernel/TTY/PTYMultiplexer.h b/Kernel/TTY/PTYMultiplexer.h
index 05b7c80eb26..ec801456c5d 100644
--- a/Kernel/TTY/PTYMultiplexer.h
+++ b/Kernel/TTY/PTYMultiplexer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Kernel/CharacterDevice.h>
+#include <Kernel/Devices/CharacterDevice.h>
 #include <AK/Badge.h>
 #include <Kernel/Lock.h>
 
diff --git a/Kernel/TTY/TTY.h b/Kernel/TTY/TTY.h
index b3ae8336b7b..0c8b2a43812 100644
--- a/Kernel/TTY/TTY.h
+++ b/Kernel/TTY/TTY.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "DoubleBuffer.h"
-#include <Kernel/CharacterDevice.h>
+#include <Kernel/Devices/CharacterDevice.h>
 #include <Kernel/UnixTypes.h>
 
 class Process;
diff --git a/Kernel/TTY/VirtualConsole.cpp b/Kernel/TTY/VirtualConsole.cpp
index acaf14686ec..96d8eee7ce9 100644
--- a/Kernel/TTY/VirtualConsole.cpp
+++ b/Kernel/TTY/VirtualConsole.cpp
@@ -3,7 +3,6 @@
 #include "i386.h"
 #include "IO.h"
 #include "StdLib.h"
-#include "KeyboardDevice.h"
 #include <AK/AKString.h>
 
 static byte* s_vga_buffer;
diff --git a/Kernel/TTY/VirtualConsole.h b/Kernel/TTY/VirtualConsole.h
index 3a2f9f0513c..cafd7fbc3c4 100644
--- a/Kernel/TTY/VirtualConsole.h
+++ b/Kernel/TTY/VirtualConsole.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Kernel/TTY/TTY.h>
-#include "KeyboardDevice.h"
+#include <Kernel/Devices/KeyboardDevice.h>
 #include "Console.h"
 
 class VirtualConsole final : public TTY, public KeyboardClient, public ConsoleImplementation {
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index a5c5e53ad2d..209ea71552d 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -2,16 +2,16 @@
 #include "kmalloc.h"
 #include "i386.h"
 #include "i8253.h"
-#include "KeyboardDevice.h"
+#include <Kernel/Devices/KeyboardDevice.h>
 #include "Process.h"
 #include "system.h"
 #include "PIC.h"
-#include "IDEDiskDevice.h"
+#include <Kernel/Devices/IDEDiskDevice.h>
 #include "KSyms.h"
-#include <Kernel/NullDevice.h>
-#include <Kernel/ZeroDevice.h>
-#include <Kernel/FullDevice.h>
-#include <Kernel/RandomDevice.h>
+#include <Kernel/Devices/NullDevice.h>
+#include <Kernel/Devices/ZeroDevice.h>
+#include <Kernel/Devices/FullDevice.h>
+#include <Kernel/Devices/RandomDevice.h>
 #include <Kernel/FileSystem/Ext2FileSystem.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include "MemoryManager.h"
@@ -19,10 +19,10 @@
 #include "RTC.h"
 #include <Kernel/TTY/VirtualConsole.h>
 #include "Scheduler.h"
-#include "PS2MouseDevice.h"
+#include <Kernel/Devices/PS2MouseDevice.h>
 #include <Kernel/TTY/PTYMultiplexer.h>
 #include <Kernel/FileSystem/DevPtsFS.h>
-#include "BXVGADevice.h"
+#include <Kernel/Devices/BXVGADevice.h>
 #include <Kernel/Net/E1000NetworkAdapter.h>
 #include <Kernel/Net/NetworkTask.h>