diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 6acd0d645f..8461f7e715 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -64,7 +64,6 @@ set(KERNEL_SOURCES
     Devices/RandomDevice.cpp
     Devices/SelfTTYDevice.cpp
     Devices/SerialDevice.cpp
-    Devices/VMWareBackdoor.cpp
     Devices/ZeroDevice.cpp
     Devices/HID/I8042Controller.cpp
     Devices/HID/HIDManagement.cpp
@@ -142,6 +141,7 @@ set(KERNEL_SOURCES
     FileSystem/VirtualFileSystem.cpp
     Firmware/ACPI/Initialize.cpp
     Firmware/ACPI/Parser.cpp
+    Firmware/Hypervisor/VMWareBackdoor.cpp
     Firmware/MultiProcessor/Parser.cpp
     Firmware/BIOS.cpp
     Firmware/PowerStateSwitch.cpp
diff --git a/Kernel/Devices/HID/PS2MouseDevice.cpp b/Kernel/Devices/HID/PS2MouseDevice.cpp
index da70343295..a84c3877b8 100644
--- a/Kernel/Devices/HID/PS2MouseDevice.cpp
+++ b/Kernel/Devices/HID/PS2MouseDevice.cpp
@@ -9,7 +9,7 @@
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/HID/PS2MouseDevice.h>
-#include <Kernel/Devices/VMWareBackdoor.h>
+#include <Kernel/Firmware/Hypervisor/VMWareBackdoor.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Devices/HID/VMWareMouseDevice.cpp b/Kernel/Devices/HID/VMWareMouseDevice.cpp
index ccc66d684d..9a02c12a97 100644
--- a/Kernel/Devices/HID/VMWareMouseDevice.cpp
+++ b/Kernel/Devices/HID/VMWareMouseDevice.cpp
@@ -6,7 +6,7 @@
 
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/HID/VMWareMouseDevice.h>
-#include <Kernel/Devices/VMWareBackdoor.h>
+#include <Kernel/Firmware/Hypervisor/VMWareBackdoor.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Devices/VMWareBackdoor.cpp b/Kernel/Firmware/Hypervisor/VMWareBackdoor.cpp
similarity index 99%
rename from Kernel/Devices/VMWareBackdoor.cpp
rename to Kernel/Firmware/Hypervisor/VMWareBackdoor.cpp
index bceec4e01c..5df1b8d61d 100644
--- a/Kernel/Devices/VMWareBackdoor.cpp
+++ b/Kernel/Firmware/Hypervisor/VMWareBackdoor.cpp
@@ -10,7 +10,7 @@
 #include <Kernel/Arch/x86/InterruptDisabler.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Debug.h>
-#include <Kernel/Devices/VMWareBackdoor.h>
+#include <Kernel/Firmware/Hypervisor/VMWareBackdoor.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Devices/VMWareBackdoor.h b/Kernel/Firmware/Hypervisor/VMWareBackdoor.h
similarity index 100%
rename from Kernel/Devices/VMWareBackdoor.h
rename to Kernel/Firmware/Hypervisor/VMWareBackdoor.h
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index 3ac16761e6..19cf69139a 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -25,13 +25,13 @@
 #include <Kernel/Devices/RandomDevice.h>
 #include <Kernel/Devices/SelfTTYDevice.h>
 #include <Kernel/Devices/SerialDevice.h>
-#include <Kernel/Devices/VMWareBackdoor.h>
 #include <Kernel/Devices/ZeroDevice.h>
 #include <Kernel/FileSystem/Ext2FileSystem.h>
 #include <Kernel/FileSystem/SysFS.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/Firmware/ACPI/Initialize.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
+#include <Kernel/Firmware/Hypervisor/VMWareBackdoor.h>
 #include <Kernel/Firmware/SysFSFirmware.h>
 #include <Kernel/Graphics/Console/BootFramebufferConsole.h>
 #include <Kernel/Graphics/Console/TextModeConsole.h>