diff --git a/Kernel/Arch/aarch64/PageDirectory.cpp b/Kernel/Arch/aarch64/PageDirectory.cpp
index e27f831ba9f..a9424f9dcfa 100644
--- a/Kernel/Arch/aarch64/PageDirectory.cpp
+++ b/Kernel/Arch/aarch64/PageDirectory.cpp
@@ -9,7 +9,7 @@
 #include <Kernel/Arch/CPU.h>
 #include <Kernel/Arch/PageDirectory.h>
 #include <Kernel/Arch/aarch64/ASM_wrapper.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Prekernel/Prekernel.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/Arch/aarch64/Processor.cpp b/Kernel/Arch/aarch64/Processor.cpp
index b049ac4b9ba..97015792abe 100644
--- a/Kernel/Arch/aarch64/Processor.cpp
+++ b/Kernel/Arch/aarch64/Processor.cpp
@@ -13,7 +13,7 @@
 #include <Kernel/Arch/aarch64/ASM_wrapper.h>
 #include <Kernel/Arch/aarch64/CPU.h>
 #include <Kernel/Arch/aarch64/CPUID.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Security/Random.h>
 #include <Kernel/Tasks/Process.h>
 #include <Kernel/Tasks/Scheduler.h>
diff --git a/Kernel/Arch/aarch64/TrapFrame.cpp b/Kernel/Arch/aarch64/TrapFrame.cpp
index 6455dcbfbad..c5fa7079054 100644
--- a/Kernel/Arch/aarch64/TrapFrame.cpp
+++ b/Kernel/Arch/aarch64/TrapFrame.cpp
@@ -6,7 +6,7 @@
 
 #include <Kernel/Arch/Processor.h>
 #include <Kernel/Arch/aarch64/TrapFrame.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Arch/x86_64/Hypervisor/VMWareBackdoor.cpp b/Kernel/Arch/x86_64/Hypervisor/VMWareBackdoor.cpp
index 9f86a0ce3eb..34810ff8368 100644
--- a/Kernel/Arch/x86_64/Hypervisor/VMWareBackdoor.cpp
+++ b/Kernel/Arch/x86_64/Hypervisor/VMWareBackdoor.cpp
@@ -10,7 +10,7 @@
 #include <Kernel/Arch/x86_64/Hypervisor/VMWareBackdoor.h>
 #include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Debug.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Arch/x86_64/InterruptManagement.cpp b/Kernel/Arch/x86_64/InterruptManagement.cpp
index 245e6593a97..f392eff4673 100644
--- a/Kernel/Arch/x86_64/InterruptManagement.cpp
+++ b/Kernel/Arch/x86_64/InterruptManagement.cpp
@@ -13,7 +13,7 @@
 #include <Kernel/Arch/x86_64/Interrupts/PIC.h>
 #include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Firmware/MultiProcessor/Parser.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Interrupts/SharedIRQHandler.h>
 #include <Kernel/Interrupts/SpuriousInterruptHandler.h>
 #include <Kernel/Memory/TypedMapping.h>
diff --git a/Kernel/Arch/x86_64/Interrupts/IOAPIC.cpp b/Kernel/Arch/x86_64/Interrupts/IOAPIC.cpp
index 5b63d4b56fb..92eda676839 100644
--- a/Kernel/Arch/x86_64/Interrupts/IOAPIC.cpp
+++ b/Kernel/Arch/x86_64/Interrupts/IOAPIC.cpp
@@ -9,7 +9,7 @@
 #include <Kernel/Arch/x86_64/Interrupts/APIC.h>
 #include <Kernel/Arch/x86_64/Interrupts/IOAPIC.h>
 #include <Kernel/Debug.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Sections.h>
 
 #define IOAPIC_REDIRECTION_ENTRY_OFFSET 0x10
diff --git a/Kernel/Arch/x86_64/Interrupts/PIC.cpp b/Kernel/Arch/x86_64/Interrupts/PIC.cpp
index 77c567d97bb..48c282c9322 100644
--- a/Kernel/Arch/x86_64/Interrupts/PIC.cpp
+++ b/Kernel/Arch/x86_64/Interrupts/PIC.cpp
@@ -8,8 +8,8 @@
 #include <AK/Types.h>
 #include <Kernel/Arch/x86_64/IO.h>
 #include <Kernel/Arch/x86_64/Interrupts/PIC.h>
-#include <Kernel/InterruptDisabler.h>
 #include <Kernel/Interrupts/GenericInterruptHandler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Arch/x86_64/PCI/MSI.cpp b/Kernel/Arch/x86_64/PCI/MSI.cpp
index 874f9aae941..e6a991c620f 100644
--- a/Kernel/Arch/x86_64/PCI/MSI.cpp
+++ b/Kernel/Arch/x86_64/PCI/MSI.cpp
@@ -8,7 +8,7 @@
 #include <Kernel/Arch/PCIMSI.h>
 #include <Kernel/Arch/x86_64/Interrupts/APIC.h>
 #include <Kernel/Arch/x86_64/PCI/MSI.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 
 namespace Kernel {
 u64 msi_address_register(u8 destination_id, bool redirection_hint, bool destination_mode)
diff --git a/Kernel/Arch/x86_64/PageDirectory.cpp b/Kernel/Arch/x86_64/PageDirectory.cpp
index 22b8381f257..ae3e7a7e269 100644
--- a/Kernel/Arch/x86_64/PageDirectory.cpp
+++ b/Kernel/Arch/x86_64/PageDirectory.cpp
@@ -8,7 +8,7 @@
 #include <AK/Singleton.h>
 #include <Kernel/Arch/CPU.h>
 #include <Kernel/Arch/PageDirectory.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Prekernel/Prekernel.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/Arch/x86_64/Processor.cpp b/Kernel/Arch/x86_64/Processor.cpp
index 34656f0273b..06069eef6bd 100644
--- a/Kernel/Arch/x86_64/Processor.cpp
+++ b/Kernel/Arch/x86_64/Processor.cpp
@@ -13,7 +13,7 @@
 #include <AK/Types.h>
 
 #include <Kernel/Arch/x86_64/Interrupts/APIC.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Library/StdLib.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Security/Random.h>
diff --git a/Kernel/Arch/x86_64/Time/HPETComparator.cpp b/Kernel/Arch/x86_64/Time/HPETComparator.cpp
index 45e0c67590d..213ad1071f6 100644
--- a/Kernel/Arch/x86_64/Time/HPETComparator.cpp
+++ b/Kernel/Arch/x86_64/Time/HPETComparator.cpp
@@ -6,7 +6,7 @@
 
 #include <Kernel/Arch/x86_64/Time/HPETComparator.h>
 #include <Kernel/Debug.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Library/Assertions.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Time/TimeManagement.h>
diff --git a/Kernel/Arch/x86_64/Time/PIT.cpp b/Kernel/Arch/x86_64/Time/PIT.cpp
index 4626de85968..5a2f2536c5b 100644
--- a/Kernel/Arch/x86_64/Time/PIT.cpp
+++ b/Kernel/Arch/x86_64/Time/PIT.cpp
@@ -6,8 +6,8 @@
 
 #include <Kernel/Arch/x86_64/IO.h>
 #include <Kernel/Arch/x86_64/Time/PIT.h>
-#include <Kernel/InterruptDisabler.h>
 #include <Kernel/Interrupts/GenericInterruptHandler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Tasks/Scheduler.h>
 #include <Kernel/Tasks/Thread.h>
diff --git a/Kernel/Arch/x86_64/Time/RTC.cpp b/Kernel/Arch/x86_64/Time/RTC.cpp
index eb372beb052..85ba8a5ad78 100644
--- a/Kernel/Arch/x86_64/Time/RTC.cpp
+++ b/Kernel/Arch/x86_64/Time/RTC.cpp
@@ -8,7 +8,7 @@
 #include <Kernel/Arch/x86_64/IO.h>
 #include <Kernel/Arch/x86_64/NonMaskableInterruptDisabler.h>
 #include <Kernel/Arch/x86_64/Time/RTC.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Time/TimeManagement.h>
 
 namespace Kernel {
diff --git a/Kernel/Arch/x86_64/TrapFrame.cpp b/Kernel/Arch/x86_64/TrapFrame.cpp
index ba363c306ec..cab1a6e100b 100644
--- a/Kernel/Arch/x86_64/TrapFrame.cpp
+++ b/Kernel/Arch/x86_64/TrapFrame.cpp
@@ -6,7 +6,7 @@
 
 #include <Kernel/Arch/Processor.h>
 #include <Kernel/Arch/x86_64/TrapFrame.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Devices/Audio/AC97.cpp b/Kernel/Devices/Audio/AC97.cpp
index 75bc7e7125b..3bffa78596d 100644
--- a/Kernel/Devices/Audio/AC97.cpp
+++ b/Kernel/Devices/Audio/AC97.cpp
@@ -8,7 +8,7 @@
 #include <Kernel/Arch/Delay.h>
 #include <Kernel/Devices/Audio/AC97.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 
 namespace Kernel {
diff --git a/Kernel/FileSystem/FileSystem.cpp b/Kernel/FileSystem/FileSystem.cpp
index 47d88ef4855..9657382a6a7 100644
--- a/Kernel/FileSystem/FileSystem.cpp
+++ b/Kernel/FileSystem/FileSystem.cpp
@@ -10,7 +10,7 @@
 #include <Kernel/FileSystem/FileSystem.h>
 #include <Kernel/FileSystem/Inode.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Net/LocalSocket.h>
 
diff --git a/Kernel/FileSystem/ProcFS/ProcessExposed.cpp b/Kernel/FileSystem/ProcFS/ProcessExposed.cpp
index 34b563907d9..27c17bd1663 100644
--- a/Kernel/FileSystem/ProcFS/ProcessExposed.cpp
+++ b/Kernel/FileSystem/ProcFS/ProcessExposed.cpp
@@ -9,7 +9,7 @@
 #include <AK/JsonValue.h>
 #include <Kernel/FileSystem/Custody.h>
 #include <Kernel/FileSystem/ProcFS/Inode.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Library/KBufferBuilder.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Memory/MemoryManager.h>
diff --git a/Kernel/Firmware/ACPI/Parser.cpp b/Kernel/Firmware/ACPI/Parser.cpp
index 9d7c1d6aa46..81a3358580c 100644
--- a/Kernel/Firmware/ACPI/Parser.cpp
+++ b/Kernel/Firmware/ACPI/Parser.cpp
@@ -10,7 +10,7 @@
 #include <AK/Platform.h>
 #include <AK/StringView.h>
 #include <AK/Try.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #if ARCH(X86_64)
 #    include <Kernel/Arch/x86_64/IO.h>
 #endif
diff --git a/Kernel/Interrupts/IRQHandler.cpp b/Kernel/Interrupts/IRQHandler.cpp
index 8dadec145ec..8ea82011a83 100644
--- a/Kernel/Interrupts/IRQHandler.cpp
+++ b/Kernel/Interrupts/IRQHandler.cpp
@@ -6,8 +6,8 @@
 
 #include <Kernel/Arch/InterruptManagement.h>
 #include <Kernel/Debug.h>
-#include <Kernel/InterruptDisabler.h>
 #include <Kernel/Interrupts/IRQHandler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 
 namespace Kernel {
 
diff --git a/Kernel/InterruptDisabler.h b/Kernel/Interrupts/InterruptDisabler.h
similarity index 100%
rename from Kernel/InterruptDisabler.h
rename to Kernel/Interrupts/InterruptDisabler.h
diff --git a/Kernel/Library/DoubleBuffer.cpp b/Kernel/Library/DoubleBuffer.cpp
index b0624acaff0..f471c1f9c91 100644
--- a/Kernel/Library/DoubleBuffer.cpp
+++ b/Kernel/Library/DoubleBuffer.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <AK/StringView.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Library/DoubleBuffer.h>
 
 namespace Kernel {
diff --git a/Kernel/Memory/MemoryManager.cpp b/Kernel/Memory/MemoryManager.cpp
index 1c8c40e4d59..6c1469b84fb 100644
--- a/Kernel/Memory/MemoryManager.cpp
+++ b/Kernel/Memory/MemoryManager.cpp
@@ -14,7 +14,7 @@
 #include <Kernel/Boot/Multiboot.h>
 #include <Kernel/FileSystem/Inode.h>
 #include <Kernel/Heap/kmalloc.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/KSyms.h>
 #include <Kernel/Library/Panic.h>
 #include <Kernel/Library/StdLib.h>
diff --git a/Kernel/Memory/Region.cpp b/Kernel/Memory/Region.cpp
index 373914b0b09..c68a55b5f7c 100644
--- a/Kernel/Memory/Region.cpp
+++ b/Kernel/Memory/Region.cpp
@@ -9,7 +9,7 @@
 #include <Kernel/Arch/PageFault.h>
 #include <Kernel/Debug.h>
 #include <Kernel/FileSystem/Inode.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Library/Panic.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Memory/MemoryManager.h>
diff --git a/Kernel/Memory/ScopedAddressSpaceSwitcher.cpp b/Kernel/Memory/ScopedAddressSpaceSwitcher.cpp
index 5abd6b04b56..2bf7465ab5f 100644
--- a/Kernel/Memory/ScopedAddressSpaceSwitcher.cpp
+++ b/Kernel/Memory/ScopedAddressSpaceSwitcher.cpp
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/ScopedAddressSpaceSwitcher.h>
 
diff --git a/Kernel/Net/NetworkAdapter.cpp b/Kernel/Net/NetworkAdapter.cpp
index b8d078087cd..452da1a091e 100644
--- a/Kernel/Net/NetworkAdapter.cpp
+++ b/Kernel/Net/NetworkAdapter.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Heap/kmalloc.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Library/StdLib.h>
 #include <Kernel/Net/EtherType.h>
 #include <Kernel/Net/NetworkAdapter.h>
diff --git a/Kernel/Syscalls/sigaction.cpp b/Kernel/Syscalls/sigaction.cpp
index 47dc72f50af..a72d3a04729 100644
--- a/Kernel/Syscalls/sigaction.cpp
+++ b/Kernel/Syscalls/sigaction.cpp
@@ -6,7 +6,7 @@
  */
 
 #include <Kernel/Arch/SmapDisabler.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Tasks/Process.h>
 
 namespace Kernel {
diff --git a/Kernel/TTY/MasterPTY.cpp b/Kernel/TTY/MasterPTY.cpp
index 2fdba628a50..f4c8652a8b7 100644
--- a/Kernel/TTY/MasterPTY.cpp
+++ b/Kernel/TTY/MasterPTY.cpp
@@ -8,7 +8,7 @@
 #include <Kernel/API/POSIX/errno.h>
 #include <Kernel/API/POSIX/signal_numbers.h>
 #include <Kernel/Debug.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/TTY/MasterPTY.h>
 #include <Kernel/TTY/PTYMultiplexer.h>
 #include <Kernel/TTY/SlavePTY.h>
diff --git a/Kernel/TTY/TTY.cpp b/Kernel/TTY/TTY.cpp
index b172a148d76..419a528a28d 100644
--- a/Kernel/TTY/TTY.cpp
+++ b/Kernel/TTY/TTY.cpp
@@ -13,7 +13,7 @@
 #include <Kernel/API/ttydefaults.h>
 #include <Kernel/API/ttydefaultschars.h>
 #include <Kernel/Debug.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/TTY/TTY.h>
 #include <Kernel/UnixTypes.h>
 
diff --git a/Kernel/Tasks/Process.cpp b/Kernel/Tasks/Process.cpp
index fcc74c5b86e..ffeb4a00556 100644
--- a/Kernel/Tasks/Process.cpp
+++ b/Kernel/Tasks/Process.cpp
@@ -12,7 +12,7 @@
 #include <Kernel/API/Syscall.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Security/Credentials.h>
 #include <Kernel/Tasks/Coredump.h>
 #ifdef ENABLE_KERNEL_COVERAGE_COLLECTION
diff --git a/Kernel/Tasks/Scheduler.cpp b/Kernel/Tasks/Scheduler.cpp
index c5cd5539c04..9bb7821b5c8 100644
--- a/Kernel/Tasks/Scheduler.cpp
+++ b/Kernel/Tasks/Scheduler.cpp
@@ -10,7 +10,7 @@
 #include <AK/Time.h>
 #include <Kernel/Arch/TrapFrame.h>
 #include <Kernel/Debug.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Library/Panic.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Tasks/PerformanceManager.h>
diff --git a/Kernel/Tasks/Thread.cpp b/Kernel/Tasks/Thread.cpp
index 3dd20af5db9..f0a9b6bf6ba 100644
--- a/Kernel/Tasks/Thread.cpp
+++ b/Kernel/Tasks/Thread.cpp
@@ -16,7 +16,7 @@
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/KCOVDevice.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/KSyms.h>
 #include <Kernel/Library/Panic.h>
 #include <Kernel/Memory/MemoryManager.h>
diff --git a/Kernel/Time/TimeManagement.cpp b/Kernel/Time/TimeManagement.cpp
index 003bc3fca57..24c6869d7e8 100644
--- a/Kernel/Time/TimeManagement.cpp
+++ b/Kernel/Time/TimeManagement.cpp
@@ -25,7 +25,7 @@
 #include <Kernel/Arch/CurrentTime.h>
 #include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
-#include <Kernel/InterruptDisabler.h>
+#include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Tasks/PerformanceManager.h>
 #include <Kernel/Tasks/Scheduler.h>