diff --git a/Kernel/Bus/PCI/Initializer.cpp b/Kernel/Bus/PCI/Initializer.cpp
index 159948484e..fd51bdd488 100644
--- a/Kernel/Bus/PCI/Initializer.cpp
+++ b/Kernel/Bus/PCI/Initializer.cpp
@@ -8,8 +8,8 @@
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Bus/PCI/Initializer.h>
-#include <Kernel/Bus/PCI/SysFSPCI.h>
 #include <Kernel/CommandLine.h>
+#include <Kernel/FileSystem/SysFS/Subsystems/Bus/PCI/SysFSPCI.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/Panic.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/Bus/USB/USBHub.cpp b/Kernel/Bus/USB/USBHub.cpp
index f5684858fc..c2c94df961 100644
--- a/Kernel/Bus/USB/USBHub.cpp
+++ b/Kernel/Bus/USB/USBHub.cpp
@@ -5,11 +5,11 @@
  */
 
 #include <Kernel/Arch/x86/IO.h>
-#include <Kernel/Bus/USB/SysFSUSB.h>
 #include <Kernel/Bus/USB/USBClasses.h>
 #include <Kernel/Bus/USB/USBController.h>
 #include <Kernel/Bus/USB/USBHub.h>
 #include <Kernel/Bus/USB/USBRequest.h>
+#include <Kernel/FileSystem/SysFS/Subsystems/Bus/USB/SysFSUSB.h>
 #include <Kernel/StdLib.h>
 
 namespace Kernel::USB {
diff --git a/Kernel/Bus/USB/USBManagement.cpp b/Kernel/Bus/USB/USBManagement.cpp
index 8b59a1a4e3..5130654fd8 100644
--- a/Kernel/Bus/USB/USBManagement.cpp
+++ b/Kernel/Bus/USB/USBManagement.cpp
@@ -6,10 +6,10 @@
 
 #include <AK/Singleton.h>
 #include <Kernel/Bus/PCI/API.h>
-#include <Kernel/Bus/USB/SysFSUSB.h>
 #include <Kernel/Bus/USB/UHCI/UHCIController.h>
 #include <Kernel/Bus/USB/USBManagement.h>
 #include <Kernel/CommandLine.h>
+#include <Kernel/FileSystem/SysFS/Subsystems/Bus/USB/SysFSUSB.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel::USB {
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 2e4bfe317c..13c75f1ae0 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -26,8 +26,6 @@ set(KERNEL_SOURCES
     Bus/PCI/API.cpp
     Bus/PCI/Device.cpp
     Bus/PCI/Initializer.cpp
-    Bus/PCI/SysFSPCI.cpp
-    Bus/USB/SysFSUSB.cpp
     Bus/USB/UHCI/UHCIController.cpp
     Bus/USB/UHCI/UHCIRootHub.cpp
     Bus/USB/USBConfiguration.cpp
@@ -144,16 +142,18 @@ set(KERNEL_SOURCES
     FileSystem/Plan9FileSystem.cpp
     FileSystem/ProcFS.cpp
     FileSystem/SysFS.cpp
-    FileSystem/SysFSComponent.cpp
+    FileSystem/SysFS/Component.cpp
+    FileSystem/SysFS/Subsystems/Bus/PCI/SysFSPCI.cpp
+    FileSystem/SysFS/Subsystems/Bus/USB/SysFSUSB.cpp
+    FileSystem/SysFS/Subsystems/Firmware/BIOS.cpp
+    FileSystem/SysFS/Subsystems/Firmware/Directory.cpp
+    FileSystem/SysFS/Subsystems/Firmware/PowerStateSwitch.cpp
     FileSystem/TmpFS.cpp
     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
-    Firmware/SysFSFirmware.cpp
     FutexQueue.cpp
     Interrupts/APIC.cpp
     Interrupts/GenericInterruptHandler.cpp
diff --git a/Kernel/Devices/MemoryDevice.cpp b/Kernel/Devices/MemoryDevice.cpp
index 3494248525..357bd2e02c 100644
--- a/Kernel/Devices/MemoryDevice.cpp
+++ b/Kernel/Devices/MemoryDevice.cpp
@@ -8,7 +8,7 @@
 #include <AK/StdLibExtras.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/MemoryDevice.h>
-#include <Kernel/Firmware/BIOS.h>
+#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/FileSystem/SysFS.h b/Kernel/FileSystem/SysFS.h
index 1d600bcdae..6fc19018c7 100644
--- a/Kernel/FileSystem/SysFS.h
+++ b/Kernel/FileSystem/SysFS.h
@@ -8,7 +8,7 @@
 
 #include <Kernel/FileSystem/FileSystem.h>
 #include <Kernel/FileSystem/Inode.h>
-#include <Kernel/FileSystem/SysFSComponent.h>
+#include <Kernel/FileSystem/SysFS/Component.h>
 #include <Kernel/Locking/MutexProtected.h>
 
 namespace Kernel {
diff --git a/Kernel/FileSystem/SysFSComponent.cpp b/Kernel/FileSystem/SysFS/Component.cpp
similarity index 97%
rename from Kernel/FileSystem/SysFSComponent.cpp
rename to Kernel/FileSystem/SysFS/Component.cpp
index df8be7646d..4e5fa752ff 100644
--- a/Kernel/FileSystem/SysFSComponent.cpp
+++ b/Kernel/FileSystem/SysFS/Component.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/FileSystem/SysFS.h>
-#include <Kernel/FileSystem/SysFSComponent.h>
+#include <Kernel/FileSystem/SysFS/Component.h>
 
 namespace Kernel {
 
diff --git a/Kernel/FileSystem/SysFSComponent.h b/Kernel/FileSystem/SysFS/Component.h
similarity index 100%
rename from Kernel/FileSystem/SysFSComponent.h
rename to Kernel/FileSystem/SysFS/Component.h
diff --git a/Kernel/Bus/PCI/SysFSPCI.cpp b/Kernel/FileSystem/SysFS/Subsystems/Bus/PCI/SysFSPCI.cpp
similarity index 98%
rename from Kernel/Bus/PCI/SysFSPCI.cpp
rename to Kernel/FileSystem/SysFS/Subsystems/Bus/PCI/SysFSPCI.cpp
index 069ae33804..90948c5cb8 100644
--- a/Kernel/Bus/PCI/SysFSPCI.cpp
+++ b/Kernel/FileSystem/SysFS/Subsystems/Bus/PCI/SysFSPCI.cpp
@@ -6,8 +6,8 @@
 
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/Access.h>
-#include <Kernel/Bus/PCI/SysFSPCI.h>
 #include <Kernel/Debug.h>
+#include <Kernel/FileSystem/SysFS/Subsystems/Bus/PCI/SysFSPCI.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel::PCI {
diff --git a/Kernel/Bus/PCI/SysFSPCI.h b/Kernel/FileSystem/SysFS/Subsystems/Bus/PCI/SysFSPCI.h
similarity index 100%
rename from Kernel/Bus/PCI/SysFSPCI.h
rename to Kernel/FileSystem/SysFS/Subsystems/Bus/PCI/SysFSPCI.h
diff --git a/Kernel/Bus/USB/SysFSUSB.cpp b/Kernel/FileSystem/SysFS/Subsystems/Bus/USB/SysFSUSB.cpp
similarity index 99%
rename from Kernel/Bus/USB/SysFSUSB.cpp
rename to Kernel/FileSystem/SysFS/Subsystems/Bus/USB/SysFSUSB.cpp
index 568bda9b6a..361cb7ea22 100644
--- a/Kernel/Bus/USB/SysFSUSB.cpp
+++ b/Kernel/FileSystem/SysFS/Subsystems/Bus/USB/SysFSUSB.cpp
@@ -7,7 +7,7 @@
 
 #include <AK/JsonArraySerializer.h>
 #include <AK/JsonObjectSerializer.h>
-#include <Kernel/Bus/USB/SysFSUSB.h>
+#include <Kernel/FileSystem/SysFS/Subsystems/Bus/USB/SysFSUSB.h>
 #include <Kernel/KBufferBuilder.h>
 
 namespace Kernel::USB {
diff --git a/Kernel/Bus/USB/SysFSUSB.h b/Kernel/FileSystem/SysFS/Subsystems/Bus/USB/SysFSUSB.h
similarity index 100%
rename from Kernel/Bus/USB/SysFSUSB.h
rename to Kernel/FileSystem/SysFS/Subsystems/Bus/USB/SysFSUSB.h
diff --git a/Kernel/Firmware/BIOS.cpp b/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.cpp
similarity index 99%
rename from Kernel/Firmware/BIOS.cpp
rename to Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.cpp
index e63b8b4c5c..ad42d1336a 100644
--- a/Kernel/Firmware/BIOS.cpp
+++ b/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.cpp
@@ -7,7 +7,7 @@
 
 #include <AK/StringView.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
-#include <Kernel/Firmware/BIOS.h>
+#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.h>
 #include <Kernel/KBufferBuilder.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/TypedMapping.h>
diff --git a/Kernel/Firmware/BIOS.h b/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.h
similarity index 98%
rename from Kernel/Firmware/BIOS.h
rename to Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.h
index 0be5ad40aa..19a1dd5224 100644
--- a/Kernel/Firmware/BIOS.h
+++ b/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.h
@@ -11,7 +11,7 @@
 #include <AK/Types.h>
 #include <AK/Vector.h>
 #include <Kernel/FileSystem/SysFS.h>
-#include <Kernel/Firmware/SysFSFirmware.h>
+#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h>
 #include <Kernel/KBuffer.h>
 #include <Kernel/Memory/MappedROM.h>
 #include <Kernel/Memory/Region.h>
diff --git a/Kernel/Firmware/SysFSFirmware.cpp b/Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.cpp
similarity index 82%
rename from Kernel/Firmware/SysFSFirmware.cpp
rename to Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.cpp
index b0ee02e562..294cb7625e 100644
--- a/Kernel/Firmware/SysFSFirmware.cpp
+++ b/Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.cpp
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.h>
+#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h>
+#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/PowerStateSwitch.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
-#include <Kernel/Firmware/BIOS.h>
-#include <Kernel/Firmware/PowerStateSwitch.h>
-#include <Kernel/Firmware/SysFSFirmware.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Firmware/SysFSFirmware.h b/Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h
similarity index 100%
rename from Kernel/Firmware/SysFSFirmware.h
rename to Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h
diff --git a/Kernel/Firmware/PowerStateSwitch.cpp b/Kernel/FileSystem/SysFS/Subsystems/Firmware/PowerStateSwitch.cpp
similarity index 97%
rename from Kernel/Firmware/PowerStateSwitch.cpp
rename to Kernel/FileSystem/SysFS/Subsystems/Firmware/PowerStateSwitch.cpp
index 8e33ce5a5e..31e51608bc 100644
--- a/Kernel/Firmware/PowerStateSwitch.cpp
+++ b/Kernel/FileSystem/SysFS/Subsystems/Firmware/PowerStateSwitch.cpp
@@ -7,8 +7,8 @@
 
 #include <Kernel/Arch/x86/IO.h>
 #include <Kernel/FileSystem/FileSystem.h>
+#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/PowerStateSwitch.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
-#include <Kernel/Firmware/PowerStateSwitch.h>
 #include <Kernel/Process.h>
 #include <Kernel/Sections.h>
 #include <Kernel/TTY/ConsoleManagement.h>
diff --git a/Kernel/Firmware/PowerStateSwitch.h b/Kernel/FileSystem/SysFS/Subsystems/Firmware/PowerStateSwitch.h
similarity index 94%
rename from Kernel/Firmware/PowerStateSwitch.h
rename to Kernel/FileSystem/SysFS/Subsystems/Firmware/PowerStateSwitch.h
index 03cff3e82a..771455dc84 100644
--- a/Kernel/Firmware/PowerStateSwitch.h
+++ b/Kernel/FileSystem/SysFS/Subsystems/Firmware/PowerStateSwitch.h
@@ -11,7 +11,7 @@
 #include <AK/Types.h>
 #include <AK/Vector.h>
 #include <Kernel/FileSystem/SysFS.h>
-#include <Kernel/Firmware/SysFSFirmware.h>
+#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h>
 #include <Kernel/KBuffer.h>
 #include <Kernel/Memory/MappedROM.h>
 #include <Kernel/Memory/Region.h>
diff --git a/Kernel/Firmware/ACPI/Parser.cpp b/Kernel/Firmware/ACPI/Parser.cpp
index 406275bffb..ae064f843a 100644
--- a/Kernel/Firmware/ACPI/Parser.cpp
+++ b/Kernel/Firmware/ACPI/Parser.cpp
@@ -13,8 +13,8 @@
 #include <Kernel/Arch/x86/IO.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Debug.h>
+#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
-#include <Kernel/Firmware/BIOS.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <Kernel/Sections.h>
 #include <Kernel/StdLib.h>
diff --git a/Kernel/Firmware/ACPI/Parser.h b/Kernel/Firmware/ACPI/Parser.h
index 05356fd73e..e345db6a1f 100644
--- a/Kernel/Firmware/ACPI/Parser.h
+++ b/Kernel/Firmware/ACPI/Parser.h
@@ -9,10 +9,10 @@
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <Kernel/CommandLine.h>
-#include <Kernel/FileSystem/SysFSComponent.h>
+#include <Kernel/FileSystem/SysFS/Component.h>
+#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h>
 #include <Kernel/Firmware/ACPI/Definitions.h>
 #include <Kernel/Firmware/ACPI/Initialize.h>
-#include <Kernel/Firmware/SysFSFirmware.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Memory/Region.h>
 #include <Kernel/Memory/TypedMapping.h>
diff --git a/Kernel/Firmware/MultiProcessor/Parser.cpp b/Kernel/Firmware/MultiProcessor/Parser.cpp
index 1883afc775..75b7a75b95 100644
--- a/Kernel/Firmware/MultiProcessor/Parser.cpp
+++ b/Kernel/Firmware/MultiProcessor/Parser.cpp
@@ -8,7 +8,7 @@
 
 #include <AK/StringView.h>
 #include <Kernel/Debug.h>
-#include <Kernel/Firmware/BIOS.h>
+#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS.h>
 #include <Kernel/Firmware/MultiProcessor/Parser.h>
 #include <Kernel/Interrupts/IOAPIC.h>
 #include <Kernel/Memory/TypedMapping.h>
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index fd8ca7ee5a..cf15035cbd 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -29,11 +29,11 @@
 #include <Kernel/Devices/ZeroDevice.h>
 #include <Kernel/FileSystem/Ext2FileSystem.h>
 #include <Kernel/FileSystem/SysFS.h>
+#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.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>
 #include <Kernel/Graphics/GraphicsManagement.h>