diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
index e883481675..d357544965 100644
--- a/py/circuitpy_defns.mk
+++ b/py/circuitpy_defns.mk
@@ -524,8 +524,8 @@ SRC_SHARED_MODULE_ALL = \
 	bitops/__init__.c \
 	board/__init__.c \
 	adafruit_bus_device/__init__.c \
-	adafruit_bus_device/I2CDevice.c \
-	adafruit_bus_device/SPIDevice.c \
+	adafruit_bus_device/i2c_device/I2CDevice.c \
+	adafruit_bus_device/spi_device/SPIDevice.c \
 	canio/Match.c \
 	canio/Message.c \
 	canio/RemoteTransmissionRequest.c \
diff --git a/shared-bindings/adafruit_bus_device/__init__.c b/shared-bindings/adafruit_bus_device/__init__.c
index f25a882557..742cfc3480 100644
--- a/shared-bindings/adafruit_bus_device/__init__.c
+++ b/shared-bindings/adafruit_bus_device/__init__.c
@@ -32,8 +32,8 @@
 #include "py/objproperty.h"
 
 #include "shared-bindings/adafruit_bus_device/__init__.h"
-#include "shared-bindings/adafruit_bus_device/I2CDevice.h"
-#include "shared-bindings/adafruit_bus_device/SPIDevice.h"
+#include "shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.h"
+#include "shared-bindings/adafruit_bus_device/spi_device/SPIDevice.h"
 
 STATIC const mp_rom_map_elem_t adafruit_bus_device_i2c_device_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_i2c_device) },
diff --git a/shared-bindings/adafruit_bus_device/I2CDevice.c b/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c
similarity index 98%
rename from shared-bindings/adafruit_bus_device/I2CDevice.c
rename to shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c
index 98f2640483..327e8e72b4 100644
--- a/shared-bindings/adafruit_bus_device/I2CDevice.c
+++ b/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c
@@ -28,9 +28,9 @@
 // busio.I2C class.
 
 #include "shared-bindings/microcontroller/Pin.h"
-#include "shared-bindings/adafruit_bus_device/I2CDevice.h"
+#include "shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.h"
 #include "shared-bindings/util.h"
-#include "shared-module/adafruit_bus_device/I2CDevice.h"
+#include "shared-module/adafruit_bus_device/i2c_device/I2CDevice.h"
 
 #include "shared/runtime/buffer_helper.h"
 #include "shared/runtime/context_manager_helpers.h"
diff --git a/shared-bindings/adafruit_bus_device/I2CDevice.h b/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.h
similarity index 97%
rename from shared-bindings/adafruit_bus_device/I2CDevice.h
rename to shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.h
index 36a95b6a24..71c169a868 100644
--- a/shared-bindings/adafruit_bus_device/I2CDevice.h
+++ b/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.h
@@ -36,7 +36,7 @@
 
 #include "py/obj.h"
 
-#include "shared-module/adafruit_bus_device/I2CDevice.h"
+#include "shared-module/adafruit_bus_device/i2c_device/I2CDevice.h"
 // #include "shared-bindings/busio/I2C.h"
 
 // Type object used in Python. Should be shared between ports.
diff --git a/shared-bindings/adafruit_bus_device/SPIDevice.c b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
similarity index 97%
rename from shared-bindings/adafruit_bus_device/SPIDevice.c
rename to shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
index aee8882940..2c5708b831 100644
--- a/shared-bindings/adafruit_bus_device/SPIDevice.c
+++ b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c
@@ -25,9 +25,9 @@
  */
 
 #include "shared-bindings/microcontroller/Pin.h"
-#include "shared-bindings/adafruit_bus_device/SPIDevice.h"
+#include "shared-bindings/adafruit_bus_device/spi_device/SPIDevice.h"
 #include "shared-bindings/util.h"
-#include "shared-module/adafruit_bus_device/SPIDevice.h"
+#include "shared-module/adafruit_bus_device/spi_device/SPIDevice.h"
 #include "common-hal/digitalio/DigitalInOut.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
 
diff --git a/shared-bindings/adafruit_bus_device/SPIDevice.h b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.h
similarity index 97%
rename from shared-bindings/adafruit_bus_device/SPIDevice.h
rename to shared-bindings/adafruit_bus_device/spi_device/SPIDevice.h
index 43b9377f97..b92a5ebfae 100644
--- a/shared-bindings/adafruit_bus_device/SPIDevice.h
+++ b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.h
@@ -36,7 +36,7 @@
 
 #include "py/obj.h"
 
-#include "shared-module/adafruit_bus_device/SPIDevice.h"
+#include "shared-module/adafruit_bus_device/spi_device/SPIDevice.h"
 
 // Type object used in Python. Should be shared between ports.
 extern const mp_obj_type_t adafruit_bus_device_spidevice_type;
diff --git a/shared-module/adafruit_bus_device/I2CDevice.c b/shared-module/adafruit_bus_device/i2c_device/I2CDevice.c
similarity index 98%
rename from shared-module/adafruit_bus_device/I2CDevice.c
rename to shared-module/adafruit_bus_device/i2c_device/I2CDevice.c
index 942b132c3e..0b430d1ea2 100644
--- a/shared-module/adafruit_bus_device/I2CDevice.c
+++ b/shared-module/adafruit_bus_device/i2c_device/I2CDevice.c
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include "shared-bindings/adafruit_bus_device/I2CDevice.h"
+#include "shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.h"
 #include "shared-bindings/busio/I2C.h"
 #include "py/mperrno.h"
 #include "py/nlr.h"
diff --git a/shared-module/adafruit_bus_device/I2CDevice.h b/shared-module/adafruit_bus_device/i2c_device/I2CDevice.h
similarity index 100%
rename from shared-module/adafruit_bus_device/I2CDevice.h
rename to shared-module/adafruit_bus_device/i2c_device/I2CDevice.h
diff --git a/shared-module/adafruit_bus_device/SPIDevice.c b/shared-module/adafruit_bus_device/spi_device/SPIDevice.c
similarity index 98%
rename from shared-module/adafruit_bus_device/SPIDevice.c
rename to shared-module/adafruit_bus_device/spi_device/SPIDevice.c
index 20e4e76297..2f4ab4dddf 100644
--- a/shared-module/adafruit_bus_device/SPIDevice.c
+++ b/shared-module/adafruit_bus_device/spi_device/SPIDevice.c
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include "shared-bindings/adafruit_bus_device/SPIDevice.h"
+#include "shared-bindings/adafruit_bus_device/spi_device/SPIDevice.h"
 #include "shared-bindings/busio/SPI.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #include "py/mperrno.h"
diff --git a/shared-module/adafruit_bus_device/SPIDevice.h b/shared-module/adafruit_bus_device/spi_device/SPIDevice.h
similarity index 100%
rename from shared-module/adafruit_bus_device/SPIDevice.h
rename to shared-module/adafruit_bus_device/spi_device/SPIDevice.h