diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 1bfaec8160..f70bd36091 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -14,7 +14,7 @@ set(KERNEL_SOURCES
 	kernel/APIC.cpp
 	kernel/CPUID.cpp
 	kernel/Debug.cpp
-	kernel/Device.cpp
+	kernel/Device/Device.cpp
 	kernel/Errors.cpp
 	kernel/Font.cpp
 	kernel/FS/DevFS/FileSystem.cpp
diff --git a/kernel/include/kernel/Device.h b/kernel/include/kernel/Device/Device.h
similarity index 95%
rename from kernel/include/kernel/Device.h
rename to kernel/include/kernel/Device/Device.h
index 7a2a0f9b55..f05f4be939 100644
--- a/kernel/include/kernel/Device.h
+++ b/kernel/include/kernel/Device/Device.h
@@ -8,7 +8,6 @@ namespace Kernel
 	class Device : public RamInode
 	{
 	public:
-		Device(mode_t, uid_t, gid_t);
 		virtual ~Device() = default;
 		virtual void update() {}
 
@@ -16,11 +15,14 @@ namespace Kernel
 		virtual bool is_partition() const { return false; }
 
 		virtual dev_t rdev() const override = 0;
+
+	protected:
+		Device(mode_t, uid_t, gid_t);
 	};
 
 	class BlockDevice : public Device
 	{
-	public:
+	protected:
 		BlockDevice(mode_t mode, uid_t uid, gid_t gid)
 			: Device(Mode::IFBLK | mode, uid, gid)
 		{
@@ -30,7 +32,7 @@ namespace Kernel
 
 	class CharacterDevice : public Device
 	{
-	public:
+	protected:
 		CharacterDevice(mode_t mode, uid_t uid, gid_t gid)
 			: Device(Mode::IFCHR | mode, uid, gid)
 		{
diff --git a/kernel/include/kernel/FS/DevFS/FileSystem.h b/kernel/include/kernel/FS/DevFS/FileSystem.h
index 232810c3e1..97ec1fa1de 100644
--- a/kernel/include/kernel/FS/DevFS/FileSystem.h
+++ b/kernel/include/kernel/FS/DevFS/FileSystem.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <kernel/Device.h>
+#include <kernel/Device/Device.h>
 #include <kernel/FS/RamFS/FileSystem.h>
 
 namespace Kernel
diff --git a/kernel/include/kernel/Input/PS2Controller.h b/kernel/include/kernel/Input/PS2Controller.h
index 5c4e149586..9a2dc030b9 100644
--- a/kernel/include/kernel/Input/PS2Controller.h
+++ b/kernel/include/kernel/Input/PS2Controller.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <kernel/Device.h>
+#include <kernel/Device/Device.h>
 
 namespace Kernel::Input
 {
diff --git a/kernel/include/kernel/Storage/StorageDevice.h b/kernel/include/kernel/Storage/StorageDevice.h
index 0b3f77f561..78ec699f2a 100644
--- a/kernel/include/kernel/Storage/StorageDevice.h
+++ b/kernel/include/kernel/Storage/StorageDevice.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <BAN/Vector.h>
-#include <kernel/Device.h>
+#include <kernel/Device/Device.h>
 #include <kernel/Storage/DiskCache.h>
 
 namespace Kernel
diff --git a/kernel/include/kernel/Terminal/TTY.h b/kernel/include/kernel/Terminal/TTY.h
index 3ddaadcc80..29cddf3db1 100644
--- a/kernel/include/kernel/Terminal/TTY.h
+++ b/kernel/include/kernel/Terminal/TTY.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <BAN/Array.h>
-#include <kernel/Device.h>
+#include <kernel/Device/Device.h>
 #include <kernel/Input/KeyEvent.h>
 #include <kernel/SpinLock.h>
 #include <kernel/Terminal/TerminalDriver.h>
diff --git a/kernel/kernel/Device.cpp b/kernel/kernel/Device/Device.cpp
similarity index 82%
rename from kernel/kernel/Device.cpp
rename to kernel/kernel/Device/Device.cpp
index d35250622a..f79ac05b2f 100644
--- a/kernel/kernel/Device.cpp
+++ b/kernel/kernel/Device/Device.cpp
@@ -1,4 +1,4 @@
-#include <kernel/Device.h>
+#include <kernel/Device/Device.h>
 #include <kernel/FS/DevFS/FileSystem.h>
 
 namespace Kernel