diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 3dba00ce69..1b79a362f8 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -42,7 +42,7 @@ set(KERNEL_SOURCES
     Bus/VirtIO/Queue.cpp
     Bus/VirtIO/RNG.cpp
     Devices/AsyncDeviceRequest.cpp
-    Devices/Audio/AC97.cpp
+    Devices/Audio/AC97/AC97.cpp
     Devices/Audio/Channel.cpp
     Devices/Audio/IntelHDA/Codec.cpp
     Devices/Audio/IntelHDA/Controller.cpp
diff --git a/Kernel/Devices/Audio/AC97.cpp b/Kernel/Devices/Audio/AC97/AC97.cpp
similarity index 99%
rename from Kernel/Devices/Audio/AC97.cpp
rename to Kernel/Devices/Audio/AC97/AC97.cpp
index 36a263a453..aef78e5aab 100644
--- a/Kernel/Devices/Audio/AC97.cpp
+++ b/Kernel/Devices/Audio/AC97/AC97.cpp
@@ -6,7 +6,7 @@
 
 #include <AK/Format.h>
 #include <Kernel/Arch/Delay.h>
-#include <Kernel/Devices/Audio/AC97.h>
+#include <Kernel/Devices/Audio/AC97/AC97.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Interrupts/InterruptDisabler.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
diff --git a/Kernel/Devices/Audio/AC97.h b/Kernel/Devices/Audio/AC97/AC97.h
similarity index 100%
rename from Kernel/Devices/Audio/AC97.h
rename to Kernel/Devices/Audio/AC97/AC97.h
diff --git a/Kernel/Devices/Audio/Management.cpp b/Kernel/Devices/Audio/Management.cpp
index 076df65d28..74a1581c9f 100644
--- a/Kernel/Devices/Audio/Management.cpp
+++ b/Kernel/Devices/Audio/Management.cpp
@@ -7,7 +7,7 @@
 #include <AK/Singleton.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/IDs.h>
-#include <Kernel/Devices/Audio/AC97.h>
+#include <Kernel/Devices/Audio/AC97/AC97.h>
 #include <Kernel/Devices/Audio/IntelHDA/Controller.h>
 #include <Kernel/Devices/Audio/Management.h>
 #include <Kernel/Sections.h>