diff --git a/Kernel/ACPI/Parser.cpp b/Kernel/ACPI/Parser.cpp
index e86f27f33a..804b00f2f5 100644
--- a/Kernel/ACPI/Parser.cpp
+++ b/Kernel/ACPI/Parser.cpp
@@ -10,9 +10,9 @@
 #include <Kernel/ACPI/Parser.h>
 #include <Kernel/Arch/PC/BIOS.h>
 #include <Kernel/Arch/x86/InterruptDisabler.h>
+#include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Debug.h>
 #include <Kernel/IO.h>
-#include <Kernel/PCI/Access.h>
 #include <Kernel/Sections.h>
 #include <Kernel/StdLib.h>
 #include <Kernel/VM/TypedMapping.h>
diff --git a/Kernel/PCI/Access.cpp b/Kernel/Bus/PCI/Access.cpp
similarity index 99%
rename from Kernel/PCI/Access.cpp
rename to Kernel/Bus/PCI/Access.cpp
index 0796dd0233..f30b461a94 100644
--- a/Kernel/PCI/Access.cpp
+++ b/Kernel/Bus/PCI/Access.cpp
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/IOAccess.h>
 #include <Kernel/Debug.h>
 #include <Kernel/IO.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/IOAccess.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/PCI/Access.h b/Kernel/Bus/PCI/Access.h
similarity index 98%
rename from Kernel/PCI/Access.h
rename to Kernel/Bus/PCI/Access.h
index 3b42db6fd7..14fb4be299 100644
--- a/Kernel/PCI/Access.h
+++ b/Kernel/Bus/PCI/Access.h
@@ -9,8 +9,8 @@
 #include <AK/Bitmap.h>
 #include <AK/String.h>
 #include <AK/Vector.h>
+#include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/FileSystem/SysFS.h>
-#include <Kernel/PCI/Definitions.h>
 
 namespace Kernel::PCI {
 
diff --git a/Kernel/PCI/Definitions.h b/Kernel/Bus/PCI/Definitions.h
similarity index 100%
rename from Kernel/PCI/Definitions.h
rename to Kernel/Bus/PCI/Definitions.h
diff --git a/Kernel/PCI/Device.cpp b/Kernel/Bus/PCI/Device.cpp
similarity index 93%
rename from Kernel/PCI/Device.cpp
rename to Kernel/Bus/PCI/Device.cpp
index a38fed2eaa..ecb30d9c96 100644
--- a/Kernel/PCI/Device.cpp
+++ b/Kernel/Bus/PCI/Device.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/PCI/Device.h>
+#include <Kernel/Bus/PCI/Device.h>
 
 namespace Kernel {
 namespace PCI {
diff --git a/Kernel/PCI/Device.h b/Kernel/Bus/PCI/Device.h
similarity index 92%
rename from Kernel/PCI/Device.h
rename to Kernel/Bus/PCI/Device.h
index 5569461ff5..a2fc714501 100644
--- a/Kernel/PCI/Device.h
+++ b/Kernel/Bus/PCI/Device.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #include <AK/Types.h>
+#include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/Interrupts/IRQHandler.h>
-#include <Kernel/PCI/Definitions.h>
 
 namespace Kernel {
 class PCI::Device : public IRQHandler {
diff --git a/Kernel/PCI/DeviceController.cpp b/Kernel/Bus/PCI/DeviceController.cpp
similarity index 96%
rename from Kernel/PCI/DeviceController.cpp
rename to Kernel/Bus/PCI/DeviceController.cpp
index 5c974b818a..7dd396dc0b 100644
--- a/Kernel/PCI/DeviceController.cpp
+++ b/Kernel/Bus/PCI/DeviceController.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/PCI/DeviceController.h>
+#include <Kernel/Bus/PCI/DeviceController.h>
 
 namespace Kernel {
 namespace PCI {
diff --git a/Kernel/PCI/DeviceController.h b/Kernel/Bus/PCI/DeviceController.h
similarity index 95%
rename from Kernel/PCI/DeviceController.h
rename to Kernel/Bus/PCI/DeviceController.h
index 5d24edb1a7..ced0b67ad1 100644
--- a/Kernel/PCI/DeviceController.h
+++ b/Kernel/Bus/PCI/DeviceController.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/PCI/Definitions.h>
+#include <Kernel/Bus/PCI/Definitions.h>
 
 namespace Kernel {
 class PCI::DeviceController {
diff --git a/Kernel/PCI/IDs.h b/Kernel/Bus/PCI/IDs.h
similarity index 100%
rename from Kernel/PCI/IDs.h
rename to Kernel/Bus/PCI/IDs.h
diff --git a/Kernel/PCI/IOAccess.cpp b/Kernel/Bus/PCI/IOAccess.cpp
similarity index 98%
rename from Kernel/PCI/IOAccess.cpp
rename to Kernel/Bus/PCI/IOAccess.cpp
index 663f4f5e3a..37beb6db22 100644
--- a/Kernel/PCI/IOAccess.cpp
+++ b/Kernel/Bus/PCI/IOAccess.cpp
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Bus/PCI/IOAccess.h>
 #include <Kernel/Debug.h>
 #include <Kernel/IO.h>
-#include <Kernel/PCI/IOAccess.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/PCI/IOAccess.h b/Kernel/Bus/PCI/IOAccess.h
similarity index 96%
rename from Kernel/PCI/IOAccess.h
rename to Kernel/Bus/PCI/IOAccess.h
index 0473d53071..806eba549b 100644
--- a/Kernel/PCI/IOAccess.h
+++ b/Kernel/Bus/PCI/IOAccess.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Kernel/PCI/Access.h>
+#include <Kernel/Bus/PCI/Access.h>
 
 namespace Kernel {
 namespace PCI {
diff --git a/Kernel/PCI/Initializer.cpp b/Kernel/Bus/PCI/Initializer.cpp
similarity index 91%
rename from Kernel/PCI/Initializer.cpp
rename to Kernel/Bus/PCI/Initializer.cpp
index 338c6cfc81..466ea84f31 100644
--- a/Kernel/PCI/Initializer.cpp
+++ b/Kernel/Bus/PCI/Initializer.cpp
@@ -5,12 +5,12 @@
  */
 
 #include <Kernel/ACPI/Parser.h>
+#include <Kernel/Bus/PCI/IOAccess.h>
+#include <Kernel/Bus/PCI/Initializer.h>
+#include <Kernel/Bus/PCI/MMIOAccess.h>
+#include <Kernel/Bus/PCI/WindowedMMIOAccess.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/IO.h>
-#include <Kernel/PCI/IOAccess.h>
-#include <Kernel/PCI/Initializer.h>
-#include <Kernel/PCI/MMIOAccess.h>
-#include <Kernel/PCI/WindowedMMIOAccess.h>
 #include <Kernel/Panic.h>
 #include <Kernel/Sections.h>
 
diff --git a/Kernel/PCI/Initializer.h b/Kernel/Bus/PCI/Initializer.h
similarity index 100%
rename from Kernel/PCI/Initializer.h
rename to Kernel/Bus/PCI/Initializer.h
diff --git a/Kernel/PCI/MMIOAccess.cpp b/Kernel/Bus/PCI/MMIOAccess.cpp
similarity index 99%
rename from Kernel/PCI/MMIOAccess.cpp
rename to Kernel/Bus/PCI/MMIOAccess.cpp
index 55bd097d2a..4bf0f6f996 100644
--- a/Kernel/PCI/MMIOAccess.cpp
+++ b/Kernel/Bus/PCI/MMIOAccess.cpp
@@ -7,8 +7,8 @@
 #include <AK/Optional.h>
 #include <AK/StringView.h>
 #include <Kernel/Arch/x86/InterruptDisabler.h>
+#include <Kernel/Bus/PCI/MMIOAccess.h>
 #include <Kernel/Debug.h>
-#include <Kernel/PCI/MMIOAccess.h>
 #include <Kernel/Sections.h>
 #include <Kernel/VM/MemoryManager.h>
 
diff --git a/Kernel/PCI/MMIOAccess.h b/Kernel/Bus/PCI/MMIOAccess.h
similarity index 98%
rename from Kernel/PCI/MMIOAccess.h
rename to Kernel/Bus/PCI/MMIOAccess.h
index 0a93f3ba08..d804479746 100644
--- a/Kernel/PCI/MMIOAccess.h
+++ b/Kernel/Bus/PCI/MMIOAccess.h
@@ -11,7 +11,7 @@
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
 #include <Kernel/ACPI/Definitions.h>
-#include <Kernel/PCI/Access.h>
+#include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/SpinLock.h>
 #include <Kernel/VM/AnonymousVMObject.h>
 #include <Kernel/VM/PhysicalRegion.h>
diff --git a/Kernel/PCI/WindowedMMIOAccess.cpp b/Kernel/Bus/PCI/WindowedMMIOAccess.cpp
similarity index 99%
rename from Kernel/PCI/WindowedMMIOAccess.cpp
rename to Kernel/Bus/PCI/WindowedMMIOAccess.cpp
index 4eeef08bf5..221bf55d3e 100644
--- a/Kernel/PCI/WindowedMMIOAccess.cpp
+++ b/Kernel/Bus/PCI/WindowedMMIOAccess.cpp
@@ -7,8 +7,8 @@
 #include <AK/Optional.h>
 #include <AK/StringView.h>
 #include <Kernel/Arch/x86/InterruptDisabler.h>
+#include <Kernel/Bus/PCI/WindowedMMIOAccess.h>
 #include <Kernel/Debug.h>
-#include <Kernel/PCI/WindowedMMIOAccess.h>
 #include <Kernel/Sections.h>
 #include <Kernel/VM/MemoryManager.h>
 
diff --git a/Kernel/PCI/WindowedMMIOAccess.h b/Kernel/Bus/PCI/WindowedMMIOAccess.h
similarity index 95%
rename from Kernel/PCI/WindowedMMIOAccess.h
rename to Kernel/Bus/PCI/WindowedMMIOAccess.h
index a91c92e566..115407d1fe 100644
--- a/Kernel/PCI/WindowedMMIOAccess.h
+++ b/Kernel/Bus/PCI/WindowedMMIOAccess.h
@@ -11,8 +11,8 @@
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
 #include <Kernel/ACPI/Definitions.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/MMIOAccess.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/MMIOAccess.h>
 #include <Kernel/VM/AnonymousVMObject.h>
 #include <Kernel/VM/PhysicalRegion.h>
 #include <Kernel/VM/Region.h>
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index d50f8dc940..499b202fa2 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -26,6 +26,13 @@ set(KERNEL_SOURCES
     AddressSanitizer.cpp
     Arch/PC/BIOS.cpp
     Arch/x86/SmapDisabler.h
+    Bus/PCI/Access.cpp
+    Bus/PCI/Device.cpp
+    Bus/PCI/DeviceController.cpp
+    Bus/PCI/IOAccess.cpp
+    Bus/PCI/MMIOAccess.cpp
+    Bus/PCI/Initializer.cpp
+    Bus/PCI/WindowedMMIOAccess.cpp
     CMOS.cpp
     CommandLine.cpp
     ConsoleDevice.cpp
@@ -139,13 +146,6 @@ set(KERNEL_SOURCES
     Net/Socket.cpp
     Net/TCPSocket.cpp
     Net/UDPSocket.cpp
-    PCI/Access.cpp
-    PCI/Device.cpp
-    PCI/DeviceController.cpp
-    PCI/IOAccess.cpp
-    PCI/MMIOAccess.cpp
-    PCI/Initializer.cpp
-    PCI/WindowedMMIOAccess.cpp
     Panic.cpp
     PerformanceEventBuffer.cpp
     Process.cpp
diff --git a/Kernel/Devices/PCISerialDevice.h b/Kernel/Devices/PCISerialDevice.h
index f2f7206cba..864941ed70 100644
--- a/Kernel/Devices/PCISerialDevice.h
+++ b/Kernel/Devices/PCISerialDevice.h
@@ -6,10 +6,10 @@
 
 #pragma once
 
+#include <Kernel/Bus/PCI/Device.h>
+#include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/Devices/CharacterDevice.h>
 #include <Kernel/Devices/SerialDevice.h>
-#include <Kernel/PCI/Device.h>
-#include <Kernel/PCI/IDs.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Devices/USB/UHCIController.h b/Kernel/Devices/USB/UHCIController.h
index 9731877372..54cb8cf3c0 100644
--- a/Kernel/Devices/USB/UHCIController.h
+++ b/Kernel/Devices/USB/UHCIController.h
@@ -10,11 +10,11 @@
 #include <AK/Platform.h>
 
 #include <AK/NonnullOwnPtr.h>
+#include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/Devices/USB/UHCIDescriptorTypes.h>
 #include <Kernel/Devices/USB/USBDevice.h>
 #include <Kernel/Devices/USB/USBTransfer.h>
 #include <Kernel/IO.h>
-#include <Kernel/PCI/Device.h>
 #include <Kernel/Process.h>
 #include <Kernel/Time/TimeManagement.h>
 #include <Kernel/VM/ContiguousVMObject.h>
diff --git a/Kernel/GlobalProcessExposed.cpp b/Kernel/GlobalProcessExposed.cpp
index 4f76959a81..71f73b71a3 100644
--- a/Kernel/GlobalProcessExposed.cpp
+++ b/Kernel/GlobalProcessExposed.cpp
@@ -9,6 +9,7 @@
 #include <Kernel/Arch/x86/CPU.h>
 #include <Kernel/Arch/x86/InterruptDisabler.h>
 #include <Kernel/Arch/x86/ProcessorInfo.h>
+#include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/ConsoleDevice.h>
 #include <Kernel/Devices/HID/HIDManagement.h>
@@ -26,7 +27,6 @@
 #include <Kernel/Net/Routing.h>
 #include <Kernel/Net/TCPSocket.h>
 #include <Kernel/Net/UDPSocket.h>
-#include <Kernel/PCI/Access.h>
 #include <Kernel/ProcessExposed.h>
 #include <Kernel/Sections.h>
 
diff --git a/Kernel/Graphics/BochsGraphicsAdapter.cpp b/Kernel/Graphics/BochsGraphicsAdapter.cpp
index bf8aa1300a..c957e58dae 100644
--- a/Kernel/Graphics/BochsGraphicsAdapter.cpp
+++ b/Kernel/Graphics/BochsGraphicsAdapter.cpp
@@ -7,13 +7,13 @@
 #include <AK/Atomic.h>
 #include <AK/Checked.h>
 #include <AK/Singleton.h>
+#include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Graphics/Bochs.h>
 #include <Kernel/Graphics/BochsGraphicsAdapter.h>
 #include <Kernel/Graphics/Console/ContiguousFramebufferConsole.h>
 #include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/IO.h>
-#include <Kernel/PCI/Access.h>
 #include <Kernel/Process.h>
 #include <Kernel/Sections.h>
 #include <Kernel/VM/AnonymousVMObject.h>
diff --git a/Kernel/Graphics/BochsGraphicsAdapter.h b/Kernel/Graphics/BochsGraphicsAdapter.h
index 663c098c53..deef1bb4ca 100644
--- a/Kernel/Graphics/BochsGraphicsAdapter.h
+++ b/Kernel/Graphics/BochsGraphicsAdapter.h
@@ -8,10 +8,10 @@
 
 #include <AK/String.h>
 #include <AK/Types.h>
+#include <Kernel/Bus/PCI/DeviceController.h>
 #include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
 #include <Kernel/Graphics/FramebufferDevice.h>
 #include <Kernel/Graphics/GraphicsDevice.h>
-#include <Kernel/PCI/DeviceController.h>
 #include <Kernel/PhysicalAddress.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/GraphicsDevice.h b/Kernel/Graphics/GraphicsDevice.h
index ed409188dc..f730f32667 100644
--- a/Kernel/Graphics/GraphicsDevice.h
+++ b/Kernel/Graphics/GraphicsDevice.h
@@ -8,8 +8,8 @@
 
 #include <AK/String.h>
 #include <AK/Types.h>
+#include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/Devices/BlockDevice.h>
-#include <Kernel/PCI/Definitions.h>
 #include <Kernel/PhysicalAddress.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/GraphicsManagement.cpp b/Kernel/Graphics/GraphicsManagement.cpp
index 39bb6866d5..567b2ea2f1 100644
--- a/Kernel/Graphics/GraphicsManagement.cpp
+++ b/Kernel/Graphics/GraphicsManagement.cpp
@@ -6,6 +6,7 @@
 
 #include <AK/Checked.h>
 #include <AK/Singleton.h>
+#include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Graphics/BochsGraphicsAdapter.h>
@@ -16,7 +17,6 @@
 #include <Kernel/Graphics/VirtIOGPU/VirtIOGraphicsAdapter.h>
 #include <Kernel/IO.h>
 #include <Kernel/Multiboot.h>
-#include <Kernel/PCI/IDs.h>
 #include <Kernel/Panic.h>
 #include <Kernel/Sections.h>
 #include <Kernel/VM/AnonymousVMObject.h>
diff --git a/Kernel/Graphics/GraphicsManagement.h b/Kernel/Graphics/GraphicsManagement.h
index e4b41558e4..7ccb56dc09 100644
--- a/Kernel/Graphics/GraphicsManagement.h
+++ b/Kernel/Graphics/GraphicsManagement.h
@@ -10,11 +10,11 @@
 #include <AK/NonnullRefPtr.h>
 #include <AK/NonnullRefPtrVector.h>
 #include <AK/Types.h>
+#include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/Graphics/Console/Console.h>
 #include <Kernel/Graphics/GraphicsDevice.h>
 #include <Kernel/Graphics/VGACompatibleAdapter.h>
 #include <Kernel/Graphics/VirtIOGPU/VirtIOGraphicsAdapter.h>
-#include <Kernel/PCI/Definitions.h>
 #include <Kernel/VM/Region.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/IntelNativeGraphicsAdapter.h b/Kernel/Graphics/IntelNativeGraphicsAdapter.h
index a58bae009f..2cd87ad440 100644
--- a/Kernel/Graphics/IntelNativeGraphicsAdapter.h
+++ b/Kernel/Graphics/IntelNativeGraphicsAdapter.h
@@ -8,10 +8,10 @@
 
 #include <AK/String.h>
 #include <AK/Types.h>
+#include <Kernel/Bus/PCI/DeviceController.h>
 #include <Kernel/Graphics/Definitions.h>
 #include <Kernel/Graphics/FramebufferDevice.h>
 #include <Kernel/Graphics/VGACompatibleAdapter.h>
-#include <Kernel/PCI/DeviceController.h>
 #include <Kernel/PhysicalAddress.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/VGACompatibleAdapter.h b/Kernel/Graphics/VGACompatibleAdapter.h
index bc74be0e30..239ab287ed 100644
--- a/Kernel/Graphics/VGACompatibleAdapter.h
+++ b/Kernel/Graphics/VGACompatibleAdapter.h
@@ -8,10 +8,10 @@
 
 #include <AK/String.h>
 #include <AK/Types.h>
+#include <Kernel/Bus/PCI/DeviceController.h>
 #include <Kernel/Graphics/Console/Console.h>
 #include <Kernel/Graphics/FramebufferDevice.h>
 #include <Kernel/Graphics/GraphicsDevice.h>
-#include <Kernel/PCI/DeviceController.h>
 #include <Kernel/PhysicalAddress.h>
 
 namespace Kernel {
diff --git a/Kernel/Net/E1000ENetworkAdapter.cpp b/Kernel/Net/E1000ENetworkAdapter.cpp
index fcd092e1ae..d9cfe06c6f 100644
--- a/Kernel/Net/E1000ENetworkAdapter.cpp
+++ b/Kernel/Net/E1000ENetworkAdapter.cpp
@@ -5,9 +5,9 @@
  */
 
 #include <AK/MACAddress.h>
+#include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Net/E1000ENetworkAdapter.h>
-#include <Kernel/PCI/IDs.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Net/E1000ENetworkAdapter.h b/Kernel/Net/E1000ENetworkAdapter.h
index a6e84f37fc..5d3ee68710 100644
--- a/Kernel/Net/E1000ENetworkAdapter.h
+++ b/Kernel/Net/E1000ENetworkAdapter.h
@@ -8,12 +8,12 @@
 
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/OwnPtr.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/IO.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Net/E1000NetworkAdapter.h>
 #include <Kernel/Net/NetworkAdapter.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/Device.h>
 #include <Kernel/Random.h>
 
 namespace Kernel {
diff --git a/Kernel/Net/E1000NetworkAdapter.cpp b/Kernel/Net/E1000NetworkAdapter.cpp
index 64991cd72b..16324e728a 100644
--- a/Kernel/Net/E1000NetworkAdapter.cpp
+++ b/Kernel/Net/E1000NetworkAdapter.cpp
@@ -5,9 +5,9 @@
  */
 
 #include <AK/MACAddress.h>
+#include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Net/E1000NetworkAdapter.h>
-#include <Kernel/PCI/IDs.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Net/E1000NetworkAdapter.h b/Kernel/Net/E1000NetworkAdapter.h
index b2533f7995..71d5566b47 100644
--- a/Kernel/Net/E1000NetworkAdapter.h
+++ b/Kernel/Net/E1000NetworkAdapter.h
@@ -8,11 +8,11 @@
 
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/OwnPtr.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/IO.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Net/NetworkAdapter.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/Device.h>
 #include <Kernel/Random.h>
 
 namespace Kernel {
diff --git a/Kernel/Net/NE2000NetworkAdapter.h b/Kernel/Net/NE2000NetworkAdapter.h
index e923707bb7..555deaff54 100644
--- a/Kernel/Net/NE2000NetworkAdapter.h
+++ b/Kernel/Net/NE2000NetworkAdapter.h
@@ -7,10 +7,10 @@
 #pragma once
 
 #include <AK/OwnPtr.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/IO.h>
 #include <Kernel/Net/NetworkAdapter.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/Device.h>
 #include <Kernel/Random.h>
 
 namespace Kernel {
diff --git a/Kernel/Net/NetworkAdapter.h b/Kernel/Net/NetworkAdapter.h
index 4ddee225e6..945c40784c 100644
--- a/Kernel/Net/NetworkAdapter.h
+++ b/Kernel/Net/NetworkAdapter.h
@@ -13,12 +13,12 @@
 #include <AK/Types.h>
 #include <AK/WeakPtr.h>
 #include <AK/Weakable.h>
+#include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/KBuffer.h>
 #include <Kernel/Net/ARP.h>
 #include <Kernel/Net/EthernetFrameHeader.h>
 #include <Kernel/Net/ICMP.h>
 #include <Kernel/Net/IPv4.h>
-#include <Kernel/PCI/Definitions.h>
 #include <Kernel/UserOrKernelBuffer.h>
 
 namespace Kernel {
diff --git a/Kernel/Net/NetworkingManagement.h b/Kernel/Net/NetworkingManagement.h
index f8be65a6c8..f16a8a5fc6 100644
--- a/Kernel/Net/NetworkingManagement.h
+++ b/Kernel/Net/NetworkingManagement.h
@@ -11,7 +11,7 @@
 #include <AK/NonnullRefPtr.h>
 #include <AK/NonnullRefPtrVector.h>
 #include <AK/Types.h>
-#include <Kernel/PCI/Definitions.h>
+#include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/VM/Region.h>
 
 namespace Kernel {
diff --git a/Kernel/Net/RTL8139NetworkAdapter.h b/Kernel/Net/RTL8139NetworkAdapter.h
index 751c8e5234..3b4b8ca3b7 100644
--- a/Kernel/Net/RTL8139NetworkAdapter.h
+++ b/Kernel/Net/RTL8139NetworkAdapter.h
@@ -7,10 +7,10 @@
 #pragma once
 
 #include <AK/OwnPtr.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/IO.h>
 #include <Kernel/Net/NetworkAdapter.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/Device.h>
 #include <Kernel/Random.h>
 
 namespace Kernel {
diff --git a/Kernel/Net/RTL8168NetworkAdapter.cpp b/Kernel/Net/RTL8168NetworkAdapter.cpp
index 6a31096d7a..039ab521ac 100644
--- a/Kernel/Net/RTL8168NetworkAdapter.cpp
+++ b/Kernel/Net/RTL8168NetworkAdapter.cpp
@@ -5,10 +5,10 @@
  */
 
 #include <AK/MACAddress.h>
+#include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/Debug.h>
 #include <Kernel/IO.h>
 #include <Kernel/Net/RTL8168NetworkAdapter.h>
-#include <Kernel/PCI/IDs.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Net/RTL8168NetworkAdapter.h b/Kernel/Net/RTL8168NetworkAdapter.h
index 24d093bb4e..180279c3d3 100644
--- a/Kernel/Net/RTL8168NetworkAdapter.h
+++ b/Kernel/Net/RTL8168NetworkAdapter.h
@@ -8,10 +8,10 @@
 
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/OwnPtr.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/IO.h>
 #include <Kernel/Net/NetworkAdapter.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/Device.h>
 #include <Kernel/Random.h>
 
 namespace Kernel {
diff --git a/Kernel/Storage/StorageController.h b/Kernel/Storage/StorageController.h
index 99cbcec362..358516d5ac 100644
--- a/Kernel/Storage/StorageController.h
+++ b/Kernel/Storage/StorageController.h
@@ -8,11 +8,11 @@
 
 #include <AK/OwnPtr.h>
 #include <AK/RefPtr.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/DeviceController.h>
 #include <Kernel/Devices/Device.h>
 #include <Kernel/IO.h>
 #include <Kernel/Lock.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/DeviceController.h>
 #include <Kernel/PhysicalAddress.h>
 #include <Kernel/Random.h>
 #include <Kernel/VM/PhysicalPage.h>
diff --git a/Kernel/Storage/StorageManagement.cpp b/Kernel/Storage/StorageManagement.cpp
index ac14eb0094..281702ae4b 100644
--- a/Kernel/Storage/StorageManagement.cpp
+++ b/Kernel/Storage/StorageManagement.cpp
@@ -5,10 +5,10 @@
  */
 
 #include <AK/UUID.h>
+#include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/FileSystem/Ext2FileSystem.h>
-#include <Kernel/PCI/Access.h>
 #include <Kernel/Panic.h>
 #include <Kernel/Storage/AHCIController.h>
 #include <Kernel/Storage/IDEController.h>
diff --git a/Kernel/VirtIO/VirtIO.cpp b/Kernel/VirtIO/VirtIO.cpp
index c544c1eae8..0137faf418 100644
--- a/Kernel/VirtIO/VirtIO.cpp
+++ b/Kernel/VirtIO/VirtIO.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/CommandLine.h>
-#include <Kernel/PCI/IDs.h>
 #include <Kernel/Sections.h>
 #include <Kernel/VirtIO/VirtIO.h>
 #include <Kernel/VirtIO/VirtIOConsole.h>
diff --git a/Kernel/VirtIO/VirtIO.h b/Kernel/VirtIO/VirtIO.h
index 9b49926722..8ba6f1cf3e 100644
--- a/Kernel/VirtIO/VirtIO.h
+++ b/Kernel/VirtIO/VirtIO.h
@@ -7,10 +7,10 @@
 #pragma once
 
 #include <AK/NonnullOwnPtrVector.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/IO.h>
 #include <Kernel/Interrupts/IRQHandler.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/Device.h>
 #include <Kernel/VM/MemoryManager.h>
 #include <Kernel/VirtIO/VirtIOQueue.h>
 
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index 39760f7c7b..106800382e 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -10,6 +10,8 @@
 #include <Kernel/ACPI/MultiProcessorParser.h>
 #include <Kernel/Arch/PC/BIOS.h>
 #include <Kernel/Arch/x86/Processor.h>
+#include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Bus/PCI/Initializer.h>
 #include <Kernel/CMOS.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Devices/FullDevice.h>
@@ -36,8 +38,6 @@
 #include <Kernel/Multiboot.h>
 #include <Kernel/Net/NetworkTask.h>
 #include <Kernel/Net/NetworkingManagement.h>
-#include <Kernel/PCI/Access.h>
-#include <Kernel/PCI/Initializer.h>
 #include <Kernel/Panic.h>
 #include <Kernel/Process.h>
 #include <Kernel/ProcessExposed.h>