diff --git a/lib/tinyusb b/lib/tinyusb
index 424735d..f8e7695 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 424735d44041fc478b572f973d997829b402153d
+Subproject commit f8e7695fe932e79dfb590d96762db68cca1daf0c
diff --git a/src/main.c b/src/main.c
index fbcfbef..ac2c049 100644
--- a/src/main.c
+++ b/src/main.c
@@ -58,10 +58,10 @@
 #include "pstorage.h"
 
 #include "nrf_usbd.h"
-#include "tusb.h"
-#include "tusb_descriptors.h"
 
-#include "msc/msc_flash.h"
+#include "tusb.h"
+#include "usb/tusb_descriptors.h"
+#include "usb/msc_flash.h"
 
 
 #define BOOTLOADER_VERSION_REGISTER         NRF_TIMER2->CC[0]
diff --git a/src/make_common.mk b/src/make_common.mk
index 1c545ec..5984685 100644
--- a/src/make_common.mk
+++ b/src/make_common.mk
@@ -83,8 +83,8 @@ remduplicates = $(strip $(if $1,$(firstword $1) $(call remduplicates,$(filter-ou
 
 C_SOURCE_FILES += $(SRC_PATH)/main.c
 C_SOURCE_FILES += $(SRC_PATH)/dfu_ble_svc.c
-C_SOURCE_FILES += $(SRC_PATH)/tusb_descriptors.c
-C_SOURCE_FILES += $(SRC_PATH)/msc/msc_flash.c
+C_SOURCE_FILES += $(SRC_PATH)/usb/tusb_descriptors.c
+C_SOURCE_FILES += $(SRC_PATH)/usb/msc_flash.c
 
 # SDK 11 files
 C_SOURCE_FILES += $(SDK11_PATH)/libraries/bootloader_dfu/bootloader.c
@@ -137,6 +137,7 @@ ASM_SOURCE_FILES  = $(SDK_PATH)/toolchain/gcc/gcc_startup_nrf52840.S
 # INCLUDE PATH
 #******************************************************************************
 INC_PATHS += -I$(SRC_PATH)/
+INC_PATHS += -I$(SRC_PATH)/usb
 INC_PATHS += -I$(TUSB_PATH)/
 
 INC_PATHS += -I$(SDK11_PATH)/libraries/bootloader_dfu/hci_transport
diff --git a/src/segger/nrf52840_bootloader.emProject b/src/segger/nrf52840_bootloader.emProject
index c9d4e67..cabbaca 100644
--- a/src/segger/nrf52840_bootloader.emProject
+++ b/src/segger/nrf52840_bootloader.emProject
@@ -19,7 +19,7 @@
       arm_target_device_name="nRF52840_xxAA"
       arm_target_interface_type="SWD"
       c_preprocessor_definitions="NRF52840_XXAA;__nRF_FAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;NO_VTOR_CONFIG;BOARD_FEATHER52840;BOOTLOADER_VERSION=0x06000001;MK_DIS_FIRMWARE="S140 6.0.0, 6.0.0";S140;CONFIG_GPIO_AS_PINRESET;BLE_STACK_SUPPORT_REQD;SWI_DISABLE0;SOFTDEVICE_PRESENT;FLOAT_ABI_HARD"
-      c_user_include_directories="../;$(TusbDir);$(SdDir)/s140/headers;$(SdDir)/s140/headers/nrf52;$(Sdk11Dir)/drivers_nrf/pstorage;$(Sdk11Dir)/ble/common/;$(Sdk11Dir)/ble/ble_services/ble_dfu;$(Sdk11Dir)/ble/ble_services/ble_dis;$(Sdk11Dir)/libraries/bootloader_dfu;$(Sdk11Dir)/libraries/bootloader_dfu/hci_transport;$(Sdk11Dir)/libraries/util;$(SdkDir)/toolchain/cmsis/include;$(SdkDir)/device;$(SdkDir)/toolchain;$(SdkDir)/drivers_nrf/hal;$(SdkDir)/drivers_nrf/systick;$(SdkDir)/drivers_nrf/uart;$(SdkDir)/drivers_nrf/usbd;$(SdkDir)/drivers_nrf/common;$(SdkDir)/drivers_nrf/delay;$(SdkDir)/drivers_nrf/power;$(SdkDir)/drivers_nrf/clock;$(SdkDir)/libraries/util;$(SdkDir)/libraries/timer;$(SdkDir)/libraries/scheduler;$(SdkDir)/libraries/crc16;$(SdkDir)/libraries/util;$(SdkDir)/libraries/hci/config;$(SdkDir)/libraries/uart;$(SdkDir)/libraries/hci;$(SdkDir)/external/fprintf;$(SdkDir)/libraries/strerror;$(SdkDir)/libraries/atomic;$(SdkDir)/libraries/balloc;$(SdkDir)/libraries/experimental_log/src;$(SdkDir)/libraries/experimental_log;$(SdkDir)/libraries/experimental_section_vars;$(SdkDir)/libraries/experimental_memobj"
+      c_user_include_directories="../;../usb;$(TusbDir);$(SdDir)/s140/headers;$(SdDir)/s140/headers/nrf52;$(Sdk11Dir)/drivers_nrf/pstorage;$(Sdk11Dir)/ble/common/;$(Sdk11Dir)/ble/ble_services/ble_dfu;$(Sdk11Dir)/ble/ble_services/ble_dis;$(Sdk11Dir)/libraries/bootloader_dfu;$(Sdk11Dir)/libraries/bootloader_dfu/hci_transport;$(Sdk11Dir)/libraries/util;$(SdkDir)/toolchain/cmsis/include;$(SdkDir)/device;$(SdkDir)/toolchain;$(SdkDir)/drivers_nrf/hal;$(SdkDir)/drivers_nrf/systick;$(SdkDir)/drivers_nrf/uart;$(SdkDir)/drivers_nrf/usbd;$(SdkDir)/drivers_nrf/common;$(SdkDir)/drivers_nrf/delay;$(SdkDir)/drivers_nrf/power;$(SdkDir)/drivers_nrf/clock;$(SdkDir)/libraries/util;$(SdkDir)/libraries/timer;$(SdkDir)/libraries/scheduler;$(SdkDir)/libraries/crc16;$(SdkDir)/libraries/util;$(SdkDir)/libraries/hci/config;$(SdkDir)/libraries/uart;$(SdkDir)/libraries/hci;$(SdkDir)/external/fprintf;$(SdkDir)/libraries/strerror;$(SdkDir)/libraries/atomic;$(SdkDir)/libraries/balloc;$(SdkDir)/libraries/experimental_log/src;$(SdkDir)/libraries/experimental_log;$(SdkDir)/libraries/experimental_section_vars;$(SdkDir)/libraries/experimental_memobj"
       debug_register_definition_file="$(ProjectDir)/nrf52840_Registers.xml"
       debug_target_connection="J-Link"
       gcc_entry_point="Reset_Handler"
@@ -57,12 +57,12 @@
       <file file_name="../metro52.h" />
       <file file_name="../pstorage_platform.h" />
       <file file_name="../sdk_config.h" />
-      <file file_name="../tusb_config.h" />
-      <file file_name="../tusb_descriptors.c" />
-      <file file_name="../tusb_descriptors.h" />
-      <folder Name="msc">
-        <file file_name="../msc/msc_flash.c" />
-        <file file_name="../msc/msc_flash.h" />
+      <folder Name="usb">
+        <file file_name="../usb/msc_flash.c" />
+        <file file_name="../usb/msc_flash.h" />
+        <file file_name="../usb/tusb_config.h" />
+        <file file_name="../usb/tusb_descriptors.c" />
+        <file file_name="../usb/tusb_descriptors.h" />
       </folder>
     </folder>
     <configuration
diff --git a/src/msc/msc_flash.c b/src/usb/msc_flash.c
similarity index 100%
rename from src/msc/msc_flash.c
rename to src/usb/msc_flash.c
diff --git a/src/msc/msc_flash.h b/src/usb/msc_flash.h
similarity index 100%
rename from src/msc/msc_flash.h
rename to src/usb/msc_flash.h
diff --git a/src/tusb_config.h b/src/usb/tusb_config.h
similarity index 100%
rename from src/tusb_config.h
rename to src/usb/tusb_config.h
diff --git a/src/tusb_descriptors.c b/src/usb/tusb_descriptors.c
similarity index 100%
rename from src/tusb_descriptors.c
rename to src/usb/tusb_descriptors.c
diff --git a/src/tusb_descriptors.h b/src/usb/tusb_descriptors.h
similarity index 100%
rename from src/tusb_descriptors.h
rename to src/usb/tusb_descriptors.h