diff --git a/32blit-pico/CMakeLists.txt b/32blit-pico/CMakeLists.txt
index 280f9539a..92c93ad6d 100644
--- a/32blit-pico/CMakeLists.txt
+++ b/32blit-pico/CMakeLists.txt
@@ -157,11 +157,11 @@ endif()
 
 # driver sources
 target_sources(BlitHalPico INTERFACE
-    ${CMAKE_CURRENT_LIST_DIR}/audio_${BLIT_AUDIO_DRIVER}.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/display_${BLIT_DISPLAY_DRIVER}.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/input_${BLIT_INPUT_DRIVER}.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/storage_${BLIT_STORAGE_DRIVER}.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/usb_${BLIT_USB_DRIVER}.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/audio/${BLIT_AUDIO_DRIVER}.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/display/${BLIT_DISPLAY_DRIVER}.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/input/${BLIT_INPUT_DRIVER}.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/storage/${BLIT_STORAGE_DRIVER}.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/usb/${BLIT_USB_DRIVER}.cpp
 )
 
 if(BLIT_ENABLE_CORE1)
diff --git a/32blit-pico/audio_beep.cpp b/32blit-pico/audio/beep.cpp
similarity index 100%
rename from 32blit-pico/audio_beep.cpp
rename to 32blit-pico/audio/beep.cpp
diff --git a/32blit-pico/audio_i2s.cpp b/32blit-pico/audio/i2s.cpp
similarity index 100%
rename from 32blit-pico/audio_i2s.cpp
rename to 32blit-pico/audio/i2s.cpp
diff --git a/32blit-pico/audio_none.cpp b/32blit-pico/audio/none.cpp
similarity index 100%
rename from 32blit-pico/audio_none.cpp
rename to 32blit-pico/audio/none.cpp
diff --git a/32blit-pico/audio_pwm.cpp b/32blit-pico/audio/pwm.cpp
similarity index 100%
rename from 32blit-pico/audio_pwm.cpp
rename to 32blit-pico/audio/pwm.cpp
diff --git a/32blit-pico/display_none.cpp b/32blit-pico/display/none.cpp
similarity index 100%
rename from 32blit-pico/display_none.cpp
rename to 32blit-pico/display/none.cpp
diff --git a/32blit-pico/display_picovision.cpp b/32blit-pico/display/picovision.cpp
similarity index 100%
rename from 32blit-pico/display_picovision.cpp
rename to 32blit-pico/display/picovision.cpp
diff --git a/32blit-pico/display_scanvideo.cpp b/32blit-pico/display/scanvideo.cpp
similarity index 100%
rename from 32blit-pico/display_scanvideo.cpp
rename to 32blit-pico/display/scanvideo.cpp
diff --git a/32blit-pico/display_st7789.cpp b/32blit-pico/display/st7789.cpp
similarity index 100%
rename from 32blit-pico/display_st7789.cpp
rename to 32blit-pico/display/st7789.cpp
diff --git a/32blit-pico/input_gpio.cpp b/32blit-pico/input/gpio.cpp
similarity index 100%
rename from 32blit-pico/input_gpio.cpp
rename to 32blit-pico/input/gpio.cpp
diff --git a/32blit-pico/input_none.cpp b/32blit-pico/input/none.cpp
similarity index 100%
rename from 32blit-pico/input_none.cpp
rename to 32blit-pico/input/none.cpp
diff --git a/32blit-pico/input_usb_hid.cpp b/32blit-pico/input/usb_hid.cpp
similarity index 100%
rename from 32blit-pico/input_usb_hid.cpp
rename to 32blit-pico/input/usb_hid.cpp
diff --git a/32blit-pico/storage_flash.cpp b/32blit-pico/storage/flash.cpp
similarity index 100%
rename from 32blit-pico/storage_flash.cpp
rename to 32blit-pico/storage/flash.cpp
diff --git a/32blit-pico/storage_sd_spi.cpp b/32blit-pico/storage/sd_spi.cpp
similarity index 100%
rename from 32blit-pico/storage_sd_spi.cpp
rename to 32blit-pico/storage/sd_spi.cpp
diff --git a/32blit-pico/usb_device.cpp b/32blit-pico/usb/device.cpp
similarity index 100%
rename from 32blit-pico/usb_device.cpp
rename to 32blit-pico/usb/device.cpp
diff --git a/32blit-pico/usb_host.cpp b/32blit-pico/usb/host.cpp
similarity index 100%
rename from 32blit-pico/usb_host.cpp
rename to 32blit-pico/usb/host.cpp