diff --git a/firmware/FILES b/firmware/FILES
index f68e0cbb01..8c46940f14 100644
--- a/firmware/FILES
+++ b/firmware/FILES
@@ -10,6 +10,7 @@ decompressor/Makefile
 decompressor/*.[chS]
 decompressor/*.lds
 drivers/*.[chS]
+drivers/audio/*.[chS]
 drivers/rtc/*.[chS]
 export/*.h
 include/*.h
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 84ff23cae2..90ec640476 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -196,17 +196,17 @@ drivers/mas.c
 /* Audio codec */
 #ifndef SIMULATOR
 #if defined(HAVE_UDA1380)
-drivers/uda1380.c
+drivers/audio/uda1380.c
 #elif defined(HAVE_WM8975) || defined(HAVE_WM8751)
-drivers/wm8975.c
+drivers/audio/wm8975.c
 #elif defined(HAVE_WM8758)
-drivers/wm8758.c
+drivers/audio/wm8758.c
 #elif defined(HAVE_WM8731) || defined(HAVE_WM8721)
-drivers/wm8731l.c
+drivers/audio/wm8731l.c
 #elif defined(HAVE_AS3514)
-drivers/as3514.c
+drivers/audio/as3514.c
 #elif defined(HAVE_TLV320)
-drivers/tlv320.c
+drivers/audio/tlv320.c
 #endif /* defined(HAVE_*) */
 #endif /* SIMULATOR */
 
diff --git a/firmware/drivers/as3514.c b/firmware/drivers/audio/as3514.c
similarity index 100%
rename from firmware/drivers/as3514.c
rename to firmware/drivers/audio/as3514.c
diff --git a/firmware/drivers/tlv320.c b/firmware/drivers/audio/tlv320.c
similarity index 100%
rename from firmware/drivers/tlv320.c
rename to firmware/drivers/audio/tlv320.c
diff --git a/firmware/drivers/uda1380.c b/firmware/drivers/audio/uda1380.c
similarity index 100%
rename from firmware/drivers/uda1380.c
rename to firmware/drivers/audio/uda1380.c
diff --git a/firmware/drivers/wm8731l.c b/firmware/drivers/audio/wm8731l.c
similarity index 100%
rename from firmware/drivers/wm8731l.c
rename to firmware/drivers/audio/wm8731l.c
diff --git a/firmware/drivers/wm8758.c b/firmware/drivers/audio/wm8758.c
similarity index 100%
rename from firmware/drivers/wm8758.c
rename to firmware/drivers/audio/wm8758.c
diff --git a/firmware/drivers/wm8975.c b/firmware/drivers/audio/wm8975.c
similarity index 100%
rename from firmware/drivers/wm8975.c
rename to firmware/drivers/audio/wm8975.c