diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 0208a58e50..8a3bdcaf1e 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -32,7 +32,7 @@ set(KERNEL_SOURCES
     Devices/RandomDevice.cpp
     Devices/SB16.cpp
     Devices/SerialDevice.cpp
-    Devices/UHCIController.cpp
+    Devices/USB/UHCIController.cpp
     Devices/VMWareBackdoor.cpp
     Devices/ZeroDevice.cpp
     Storage/Partition/DiskPartition.cpp
diff --git a/Kernel/Devices/UHCIController.cpp b/Kernel/Devices/USB/UHCIController.cpp
similarity index 98%
rename from Kernel/Devices/UHCIController.cpp
rename to Kernel/Devices/USB/UHCIController.cpp
index a76be53296..9fb51ba0eb 100644
--- a/Kernel/Devices/UHCIController.cpp
+++ b/Kernel/Devices/USB/UHCIController.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <Kernel/Devices/UHCIController.h>
+#include <Kernel/Devices/USB/UHCIController.h>
 
 #define UHCI_ENABLED 0
 
diff --git a/Kernel/Devices/UHCIController.h b/Kernel/Devices/USB/UHCIController.h
similarity index 100%
rename from Kernel/Devices/UHCIController.h
rename to Kernel/Devices/USB/UHCIController.h
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index f261bbd575..c279265fb4 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -39,7 +39,7 @@
 #include <Kernel/Devices/RandomDevice.h>
 #include <Kernel/Devices/SB16.h>
 #include <Kernel/Devices/SerialDevice.h>
-#include <Kernel/Devices/UHCIController.h>
+#include <Kernel/Devices/USB/UHCIController.h>
 #include <Kernel/Devices/VMWareBackdoor.h>
 #include <Kernel/Devices/ZeroDevice.h>
 #include <Kernel/FileSystem/Ext2FileSystem.h>