diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 8ab65a88..9514c228 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -32,10 +32,10 @@ set(KERNEL_SOURCES
 	kernel/FS/TmpFS/FileSystem.cpp
 	kernel/FS/TmpFS/Inode.cpp
 	kernel/FS/VirtualFileSystem.cpp
-	kernel/Input/PS2Controller.cpp
-	kernel/Input/PS2Device.cpp
-	kernel/Input/PS2Keyboard.cpp
-	kernel/Input/PS2Keymap.cpp
+	kernel/Input/PS2/Controller.cpp
+	kernel/Input/PS2/Device.cpp
+	kernel/Input/PS2/Keyboard.cpp
+	kernel/Input/PS2/Keymap.cpp
 	kernel/InterruptController.cpp
 	kernel/kernel.cpp
 	kernel/Memory/DMARegion.cpp
diff --git a/kernel/include/kernel/Input/PS2Config.h b/kernel/include/kernel/Input/PS2/Config.h
similarity index 99%
rename from kernel/include/kernel/Input/PS2Config.h
rename to kernel/include/kernel/Input/PS2/Config.h
index b7c708ec..6a23b101 100644
--- a/kernel/include/kernel/Input/PS2Config.h
+++ b/kernel/include/kernel/Input/PS2/Config.h
@@ -92,4 +92,4 @@ namespace Kernel::Input::PS2
 		CAPS_LOCK	= (1 << 2),
 	};
 
-}
\ No newline at end of file
+}
diff --git a/kernel/include/kernel/Input/PS2Controller.h b/kernel/include/kernel/Input/PS2/Controller.h
similarity index 100%
rename from kernel/include/kernel/Input/PS2Controller.h
rename to kernel/include/kernel/Input/PS2/Controller.h
diff --git a/kernel/include/kernel/Input/PS2Device.h b/kernel/include/kernel/Input/PS2/Device.h
similarity index 93%
rename from kernel/include/kernel/Input/PS2Device.h
rename to kernel/include/kernel/Input/PS2/Device.h
index db1ecb8b..71051a6e 100644
--- a/kernel/include/kernel/Input/PS2Device.h
+++ b/kernel/include/kernel/Input/PS2/Device.h
@@ -1,4 +1,6 @@
-#include <kernel/Input/PS2Controller.h>
+#pragma once
+
+#include <kernel/Input/PS2/Controller.h>
 
 namespace Kernel::Input
 {
@@ -40,4 +42,4 @@ namespace Kernel::Input
 		BAN::CircularQueue<uint8_t, 10>	m_command_queue;
 	};
 
-}
\ No newline at end of file
+}
diff --git a/kernel/include/kernel/Input/PS2Keyboard.h b/kernel/include/kernel/Input/PS2/Keyboard.h
similarity index 92%
rename from kernel/include/kernel/Input/PS2Keyboard.h
rename to kernel/include/kernel/Input/PS2/Keyboard.h
index 3ee2fa46..b6c49af4 100644
--- a/kernel/include/kernel/Input/PS2Keyboard.h
+++ b/kernel/include/kernel/Input/PS2/Keyboard.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <kernel/Input/KeyEvent.h>
-#include <kernel/Input/PS2Device.h>
-#include <kernel/Input/PS2Keymap.h>
+#include <kernel/Input/PS2/Device.h>
+#include <kernel/Input/PS2/Keymap.h>
 #include <kernel/Semaphore.h>
 
 namespace Kernel::Input
@@ -46,4 +46,4 @@ namespace Kernel::Input
 		virtual bool has_data_impl() const override;
 	};
 
-}
\ No newline at end of file
+}
diff --git a/kernel/include/kernel/Input/PS2Keymap.h b/kernel/include/kernel/Input/PS2/Keymap.h
similarity index 99%
rename from kernel/include/kernel/Input/PS2Keymap.h
rename to kernel/include/kernel/Input/PS2/Keymap.h
index aab0c86f..b70c5321 100644
--- a/kernel/include/kernel/Input/PS2Keymap.h
+++ b/kernel/include/kernel/Input/PS2/Keymap.h
@@ -20,4 +20,4 @@ namespace Kernel::Input
 		BAN::Vector<Key> m_extended_keymap;
 	};
 
-}
\ No newline at end of file
+}
diff --git a/kernel/kernel/Input/PS2Controller.cpp b/kernel/kernel/Input/PS2/Controller.cpp
similarity index 98%
rename from kernel/kernel/Input/PS2Controller.cpp
rename to kernel/kernel/Input/PS2/Controller.cpp
index 626adc34..e533850f 100644
--- a/kernel/kernel/Input/PS2Controller.cpp
+++ b/kernel/kernel/Input/PS2/Controller.cpp
@@ -2,9 +2,9 @@
 #include <kernel/ACPI.h>
 #include <kernel/FS/DevFS/FileSystem.h>
 #include <kernel/IDT.h>
-#include <kernel/Input/PS2Config.h>
-#include <kernel/Input/PS2Controller.h>
-#include <kernel/Input/PS2Keyboard.h>
+#include <kernel/Input/PS2/Config.h>
+#include <kernel/Input/PS2/Controller.h>
+#include <kernel/Input/PS2/Keyboard.h>
 #include <kernel/InterruptController.h>
 #include <kernel/IO.h>
 #include <kernel/Timer/Timer.h>
@@ -248,4 +248,4 @@ namespace Kernel::Input
 		return {};
 	}
 
-}
\ No newline at end of file
+}
diff --git a/kernel/kernel/Input/PS2Device.cpp b/kernel/kernel/Input/PS2/Device.cpp
similarity index 95%
rename from kernel/kernel/Input/PS2Device.cpp
rename to kernel/kernel/Input/PS2/Device.cpp
index 9534c58f..5682ba28 100644
--- a/kernel/kernel/Input/PS2Device.cpp
+++ b/kernel/kernel/Input/PS2/Device.cpp
@@ -1,6 +1,6 @@
 #include <kernel/FS/DevFS/FileSystem.h>
-#include <kernel/Input/PS2Config.h>
-#include <kernel/Input/PS2Device.h>
+#include <kernel/Input/PS2/Config.h>
+#include <kernel/Input/PS2/Device.h>
 #include <kernel/IO.h>
 
 #include <sys/sysmacros.h>
@@ -85,4 +85,4 @@ namespace Kernel::Input
 		m_controller.send_byte(this, m_command_queue.front());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/kernel/kernel/Input/PS2Keyboard.cpp b/kernel/kernel/Input/PS2/Keyboard.cpp
similarity index 98%
rename from kernel/kernel/Input/PS2Keyboard.cpp
rename to kernel/kernel/Input/PS2/Keyboard.cpp
index 311fbcd4..bb2948ec 100644
--- a/kernel/kernel/Input/PS2Keyboard.cpp
+++ b/kernel/kernel/Input/PS2/Keyboard.cpp
@@ -1,8 +1,8 @@
 #include <BAN/ScopeGuard.h>
 #include <kernel/CriticalScope.h>
 #include <kernel/FS/DevFS/FileSystem.h>
-#include <kernel/Input/PS2Config.h>
-#include <kernel/Input/PS2Keyboard.h>
+#include <kernel/Input/PS2/Config.h>
+#include <kernel/Input/PS2/Keyboard.h>
 
 #define SET_MASK(byte, mask, on_off) ((on_off) ? ((byte) | (mask)) : ((byte) & ~(mask)))
 #define TOGGLE_MASK(byte, mask) ((byte) ^ (mask))
@@ -177,4 +177,4 @@ namespace Kernel::Input
 		return !m_event_queue.empty();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/kernel/kernel/Input/PS2Keymap.cpp b/kernel/kernel/Input/PS2/Keymap.cpp
similarity index 99%
rename from kernel/kernel/Input/PS2Keymap.cpp
rename to kernel/kernel/Input/PS2/Keymap.cpp
index 015f07fe..0f512b8f 100644
--- a/kernel/kernel/Input/PS2Keymap.cpp
+++ b/kernel/kernel/Input/PS2/Keymap.cpp
@@ -1,4 +1,4 @@
-#include <kernel/Input/PS2Keymap.h>
+#include <kernel/Input/PS2/Keymap.h>
 
 namespace Kernel::Input
 {
@@ -357,4 +357,4 @@ namespace Kernel::Input
 		return key;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/kernel/kernel/kernel.cpp b/kernel/kernel/kernel.cpp
index 19903560..2e88d14d 100644
--- a/kernel/kernel/kernel.cpp
+++ b/kernel/kernel/kernel.cpp
@@ -8,7 +8,7 @@
 #include <kernel/FS/VirtualFileSystem.h>
 #include <kernel/GDT.h>
 #include <kernel/IDT.h>
-#include <kernel/Input/PS2Controller.h>
+#include <kernel/Input/PS2/Controller.h>
 #include <kernel/InterruptController.h>
 #include <kernel/kprint.h>
 #include <kernel/Memory/Heap.h>