diff --git a/common_features.mk b/common_features.mk
index 4633ccce1..8b5ee071d 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -767,19 +767,20 @@ ifeq ($(strip $(USBPD_ENABLE)), yes)
 endif
 
 BLUETOOTH_ENABLE ?= no
-VALID_BLUETOOTH_DRIVER_TYPES = AdafruitBLE RN42 custom
+VALID_BLUETOOTH_DRIVER_TYPES := AdafruitBLE RN42 custom
 ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     ifeq ($(filter $(strip $(BLUETOOTH_DRIVER)),$(VALID_BLUETOOTH_DRIVER_TYPES)),)
         $(error "$(BLUETOOTH_DRIVER)" is not a valid Bluetooth driver type)
     endif
     OPT_DEFS += -DBLUETOOTH_ENABLE
     NO_USB_STARTUP_CHECK := yes
+    COMMON_VPATH += $(DRIVER_PATH)/bluetooth
     SRC += outputselect.c
 
     ifeq ($(strip $(BLUETOOTH_DRIVER)), AdafruitBLE)
         OPT_DEFS += -DMODULE_ADAFRUIT_BLE
         SRC += analog.c
-        SRC += $(LUFA_DIR)/adafruit_ble.cpp
+        SRC += $(DRIVER_PATH)/bluetooth/adafruit_ble.cpp
         QUANTUM_LIB_SRC += spi_master.c
     endif
 
diff --git a/tmk_core/protocol/lufa/adafruit_ble.cpp b/drivers/bluetooth/adafruit_ble.cpp
similarity index 100%
rename from tmk_core/protocol/lufa/adafruit_ble.cpp
rename to drivers/bluetooth/adafruit_ble.cpp
diff --git a/tmk_core/protocol/lufa/adafruit_ble.h b/drivers/bluetooth/adafruit_ble.h
similarity index 100%
rename from tmk_core/protocol/lufa/adafruit_ble.h
rename to drivers/bluetooth/adafruit_ble.h
diff --git a/tmk_core/protocol/lufa/outputselect.c b/drivers/bluetooth/outputselect.c
similarity index 100%
rename from tmk_core/protocol/lufa/outputselect.c
rename to drivers/bluetooth/outputselect.c
diff --git a/tmk_core/protocol/lufa/outputselect.h b/drivers/bluetooth/outputselect.h
similarity index 100%
rename from tmk_core/protocol/lufa/outputselect.h
rename to drivers/bluetooth/outputselect.h
diff --git a/tmk_core/protocol/lufa/ringbuffer.hpp b/drivers/bluetooth/ringbuffer.hpp
similarity index 100%
rename from tmk_core/protocol/lufa/ringbuffer.hpp
rename to drivers/bluetooth/ringbuffer.hpp