diff --git a/tinyusb/class/cdc.h b/tinyusb/class/cdc/cdc.h
similarity index 100%
rename from tinyusb/class/cdc.h
rename to tinyusb/class/cdc/cdc.h
diff --git a/tinyusb/class/cdc_device.c b/tinyusb/class/cdc/cdc_device.c
similarity index 100%
rename from tinyusb/class/cdc_device.c
rename to tinyusb/class/cdc/cdc_device.c
diff --git a/tinyusb/class/cdc_device.h b/tinyusb/class/cdc/cdc_device.h
similarity index 100%
rename from tinyusb/class/cdc_device.h
rename to tinyusb/class/cdc/cdc_device.h
diff --git a/tinyusb/class/cdc_host.c b/tinyusb/class/cdc/cdc_host.c
similarity index 100%
rename from tinyusb/class/cdc_host.c
rename to tinyusb/class/cdc/cdc_host.c
diff --git a/tinyusb/class/cdc_host.h b/tinyusb/class/cdc/cdc_host.h
similarity index 100%
rename from tinyusb/class/cdc_host.h
rename to tinyusb/class/cdc/cdc_host.h
diff --git a/tinyusb/class/cdc_rndis.h b/tinyusb/class/cdc/cdc_rndis.h
similarity index 100%
rename from tinyusb/class/cdc_rndis.h
rename to tinyusb/class/cdc/cdc_rndis.h
diff --git a/tinyusb/class/cdc_rndis_host.c b/tinyusb/class/cdc/cdc_rndis_host.c
similarity index 100%
rename from tinyusb/class/cdc_rndis_host.c
rename to tinyusb/class/cdc/cdc_rndis_host.c
diff --git a/tinyusb/class/cdc_rndis_host.h b/tinyusb/class/cdc/cdc_rndis_host.h
similarity index 100%
rename from tinyusb/class/cdc_rndis_host.h
rename to tinyusb/class/cdc/cdc_rndis_host.h
diff --git a/tinyusb/class/hid.h b/tinyusb/class/hid/hid.h
similarity index 100%
rename from tinyusb/class/hid.h
rename to tinyusb/class/hid/hid.h
diff --git a/tinyusb/class/hid_device.c b/tinyusb/class/hid/hid_device.c
similarity index 100%
rename from tinyusb/class/hid_device.c
rename to tinyusb/class/hid/hid_device.c
diff --git a/tinyusb/class/hid_device.h b/tinyusb/class/hid/hid_device.h
similarity index 100%
rename from tinyusb/class/hid_device.h
rename to tinyusb/class/hid/hid_device.h
diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid/hid_host.c
similarity index 100%
rename from tinyusb/class/hid_host.c
rename to tinyusb/class/hid/hid_host.c
diff --git a/tinyusb/class/hid_host.h b/tinyusb/class/hid/hid_host.h
similarity index 100%
rename from tinyusb/class/hid_host.h
rename to tinyusb/class/hid/hid_host.h
diff --git a/tinyusb/class/msc.h b/tinyusb/class/msc/msc.h
similarity index 100%
rename from tinyusb/class/msc.h
rename to tinyusb/class/msc/msc.h
diff --git a/tinyusb/class/msc_device.c b/tinyusb/class/msc/msc_device.c
similarity index 100%
rename from tinyusb/class/msc_device.c
rename to tinyusb/class/msc/msc_device.c
diff --git a/tinyusb/class/msc_device.h b/tinyusb/class/msc/msc_device.h
similarity index 100%
rename from tinyusb/class/msc_device.h
rename to tinyusb/class/msc/msc_device.h
diff --git a/tinyusb/class/msc_host.c b/tinyusb/class/msc/msc_host.c
similarity index 100%
rename from tinyusb/class/msc_host.c
rename to tinyusb/class/msc/msc_host.c
diff --git a/tinyusb/class/msc_host.h b/tinyusb/class/msc/msc_host.h
similarity index 100%
rename from tinyusb/class/msc_host.h
rename to tinyusb/class/msc/msc_host.h
diff --git a/tinyusb/tusb.h b/tinyusb/tusb.h
index 84ab07a3..ba082247 100644
--- a/tinyusb/tusb.h
+++ b/tinyusb/tusb.h
@@ -55,15 +55,15 @@
   #include "host/usbh.h"
 
   #if HOST_CLASS_HID
-    #include "class/hid_host.h"
+    #include "class/hid/hid_host.h"
   #endif
 
   #if TUSB_CFG_HOST_MSC
-    #include "class/msc_host.h"
+    #include "class/msc/msc_host.h"
   #endif
 
   #if TUSB_CFG_HOST_CDC
-    #include "class/cdc_host.h"
+    #include "class/cdc/cdc_host.h"
   #endif
 
   #if TUSB_CFG_HOST_CUSTOM_CLASS
@@ -77,15 +77,15 @@
   #include "device/usbd.h"
 
   #if DEVICE_CLASS_HID
-    #include "class/hid_device.h"
+    #include "class/hid/hid_device.h"
   #endif
 
   #if TUSB_CFG_DEVICE_CDC
-    #include "class/cdc_device.h"
+    #include "class/cdc/cdc_device.h"
   #endif
 
   #if TUSB_CFG_DEVICE_MSC
-    #include "class/msc_device.h"
+    #include "class/msc/msc_device.h"
   #endif
 #endif