diff --git a/src/segger/nrf52840_bootloader.emProject b/src/segger/nrf52840_bootloader.emProject
index cabbaca..e067c8e 100644
--- a/src/segger/nrf52840_bootloader.emProject
+++ b/src/segger/nrf52840_bootloader.emProject
@@ -63,6 +63,11 @@
         <file file_name="../usb/tusb_config.h" />
         <file file_name="../usb/tusb_descriptors.c" />
         <file file_name="../usb/tusb_descriptors.h" />
+        <folder Name="uf2">
+          <file file_name="../usb/uf2/ghostfat.c" />
+          <file file_name="../usb/uf2/uf2cfg.h" />
+          <file file_name="../usb/uf2/uf2.h" />
+        </folder>
       </folder>
     </folder>
     <configuration
diff --git a/src/uf2/LICENSE b/src/usb/uf2/LICENSE
similarity index 100%
rename from src/uf2/LICENSE
rename to src/usb/uf2/LICENSE
diff --git a/src/uf2/ghostfat.c b/src/usb/uf2/ghostfat.c
similarity index 100%
rename from src/uf2/ghostfat.c
rename to src/usb/uf2/ghostfat.c
diff --git a/src/uf2/nrf_block_dev_uf2.c b/src/usb/uf2/nrf_block_dev_uf2.c
similarity index 100%
rename from src/uf2/nrf_block_dev_uf2.c
rename to src/usb/uf2/nrf_block_dev_uf2.c
diff --git a/src/uf2/nrf_block_dev_uf2.h b/src/usb/uf2/nrf_block_dev_uf2.h
similarity index 100%
rename from src/uf2/nrf_block_dev_uf2.h
rename to src/usb/uf2/nrf_block_dev_uf2.h
diff --git a/src/uf2/uf2.h b/src/usb/uf2/uf2.h
similarity index 100%
rename from src/uf2/uf2.h
rename to src/usb/uf2/uf2.h
diff --git a/src/uf2/uf2cfg.h b/src/usb/uf2/uf2cfg.h
similarity index 100%
rename from src/uf2/uf2cfg.h
rename to src/usb/uf2/uf2cfg.h