diff --git a/src/Makefile.am b/src/Makefile.am
index 2ab635565..d4a728324 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1820,7 +1820,7 @@ module_bluetooth_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_bluetooth_discover_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluetooth-util.la
 module_bluetooth_discover_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 
-libbluetooth_sbc_la_SOURCES = modules/bluetooth/sbc.c modules/bluetooth/sbc.h modules/bluetooth/sbc_tables.h modules/bluetooth/sbc_math.h modules/bluetooth/sbc_primitives.h modules/bluetooth/sbc_primitives.c modules/bluetooth/sbc_primitives_mmx.h modules/bluetooth/sbc_primitives_neon.h modules/bluetooth/sbc_primitives_mmx.c modules/bluetooth/sbc_primitives_neon.c
+libbluetooth_sbc_la_SOURCES = modules/bluetooth/sbc/sbc.c modules/bluetooth/sbc/sbc.h modules/bluetooth/sbc/sbc_tables.h modules/bluetooth/sbc/sbc_math.h modules/bluetooth/sbc/sbc_primitives.h modules/bluetooth/sbc/sbc_primitives.c modules/bluetooth/sbc/sbc_primitives_mmx.h modules/bluetooth/sbc/sbc_primitives_neon.h modules/bluetooth/sbc/sbc_primitives_mmx.c modules/bluetooth/sbc/sbc_primitives_neon.c
 libbluetooth_sbc_la_LDFLAGS = -avoid-version
 libbluetooth_sbc_la_LIBADD = $(MODULE_LIBADD)
 libbluetooth_sbc_la_CFLAGS = $(AM_CFLAGS)
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 86aaa4619..d29e29b8d 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -51,7 +51,7 @@
 
 #include "module-bluetooth-device-symdef.h"
 #include "ipc.h"
-#include "sbc.h"
+#include "sbc/sbc.h"
 #include "rtp.h"
 #include "bluetooth-util.h"
 
diff --git a/src/modules/bluetooth/sbc.c b/src/modules/bluetooth/sbc/sbc.c
similarity index 100%
rename from src/modules/bluetooth/sbc.c
rename to src/modules/bluetooth/sbc/sbc.c
diff --git a/src/modules/bluetooth/sbc.h b/src/modules/bluetooth/sbc/sbc.h
similarity index 100%
rename from src/modules/bluetooth/sbc.h
rename to src/modules/bluetooth/sbc/sbc.h
diff --git a/src/modules/bluetooth/sbc_math.h b/src/modules/bluetooth/sbc/sbc_math.h
similarity index 100%
rename from src/modules/bluetooth/sbc_math.h
rename to src/modules/bluetooth/sbc/sbc_math.h
diff --git a/src/modules/bluetooth/sbc_primitives.c b/src/modules/bluetooth/sbc/sbc_primitives.c
similarity index 100%
rename from src/modules/bluetooth/sbc_primitives.c
rename to src/modules/bluetooth/sbc/sbc_primitives.c
diff --git a/src/modules/bluetooth/sbc_primitives.h b/src/modules/bluetooth/sbc/sbc_primitives.h
similarity index 100%
rename from src/modules/bluetooth/sbc_primitives.h
rename to src/modules/bluetooth/sbc/sbc_primitives.h
diff --git a/src/modules/bluetooth/sbc_primitives_mmx.c b/src/modules/bluetooth/sbc/sbc_primitives_mmx.c
similarity index 100%
rename from src/modules/bluetooth/sbc_primitives_mmx.c
rename to src/modules/bluetooth/sbc/sbc_primitives_mmx.c
diff --git a/src/modules/bluetooth/sbc_primitives_mmx.h b/src/modules/bluetooth/sbc/sbc_primitives_mmx.h
similarity index 100%
rename from src/modules/bluetooth/sbc_primitives_mmx.h
rename to src/modules/bluetooth/sbc/sbc_primitives_mmx.h
diff --git a/src/modules/bluetooth/sbc_primitives_neon.c b/src/modules/bluetooth/sbc/sbc_primitives_neon.c
similarity index 100%
rename from src/modules/bluetooth/sbc_primitives_neon.c
rename to src/modules/bluetooth/sbc/sbc_primitives_neon.c
diff --git a/src/modules/bluetooth/sbc_primitives_neon.h b/src/modules/bluetooth/sbc/sbc_primitives_neon.h
similarity index 100%
rename from src/modules/bluetooth/sbc_primitives_neon.h
rename to src/modules/bluetooth/sbc/sbc_primitives_neon.h
diff --git a/src/modules/bluetooth/sbc_tables.h b/src/modules/bluetooth/sbc/sbc_tables.h
similarity index 100%
rename from src/modules/bluetooth/sbc_tables.h
rename to src/modules/bluetooth/sbc/sbc_tables.h