diff --git a/examples/device/device_composite/ses/device_composite.emProject b/examples/device/device_composite/ses/device_composite.emProject
deleted file mode 100644
index f8168b7d3..000000000
--- a/examples/device/device_composite/ses/device_composite.emProject
+++ /dev/null
@@ -1,292 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/device/device_composite/ses/ses_nrf5x/nrf5x.emProject b/examples/device/device_composite/ses/ses_nrf5x/nrf5x.emProject
deleted file mode 100644
index 377ae4347..000000000
--- a/examples/device/device_composite/ses/ses_nrf5x/nrf5x.emProject
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/device_composite/ses/device_composite.emSession b/examples/device_composite/ses/device_composite.emSession
new file mode 100644
index 000000000..86dfea211
--- /dev/null
+++ b/examples/device_composite/ses/device_composite.emSession
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/device/device_composite/ses/ses_nrf5x/flash_placement.xml b/examples/device_composite/ses/nrf5x/flash_placement.xml
similarity index 100%
rename from examples/device/device_composite/ses/ses_nrf5x/flash_placement.xml
rename to examples/device_composite/ses/nrf5x/flash_placement.xml
diff --git a/examples/device/device_composite/ses/ses_nrf5x/nRF52840_xxAA_MemoryMap.xml b/examples/device_composite/ses/nrf5x/nRF52840_xxAA_MemoryMap.xml
similarity index 100%
rename from examples/device/device_composite/ses/ses_nrf5x/nRF52840_xxAA_MemoryMap.xml
rename to examples/device_composite/ses/nrf5x/nRF52840_xxAA_MemoryMap.xml
diff --git a/examples/device/device_composite/ses/ses_nrf5x/nRF_Target.js b/examples/device_composite/ses/nrf5x/nRF_Target.js
similarity index 100%
rename from examples/device/device_composite/ses/ses_nrf5x/nRF_Target.js
rename to examples/device_composite/ses/nrf5x/nRF_Target.js
diff --git a/examples/device/device_composite/ses/ses_nrf5x/nrf52840_Registers.xml b/examples/device_composite/ses/nrf5x/nrf52840_Registers.xml
similarity index 100%
rename from examples/device/device_composite/ses/ses_nrf5x/nrf52840_Registers.xml
rename to examples/device_composite/ses/nrf5x/nrf52840_Registers.xml
diff --git a/examples/device_composite/ses/nrf5x/nrf5x.emProject b/examples/device_composite/ses/nrf5x/nrf5x.emProject
new file mode 100644
index 000000000..c785e4287
--- /dev/null
+++ b/examples/device_composite/ses/nrf5x/nrf5x.emProject
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/device/device_composite/ses/ses_nrf5x/thumb_crt0.s b/examples/device_composite/ses/nrf5x/thumb_crt0.s
similarity index 100%
rename from examples/device/device_composite/ses/ses_nrf5x/thumb_crt0.s
rename to examples/device_composite/ses/nrf5x/thumb_crt0.s
diff --git a/examples/device/device_composite/ses/ses_samd21/ATSAMD21G18A_MemoryMap.xml b/examples/device_composite/ses/samd21/ATSAMD21G18A_MemoryMap.xml
similarity index 100%
rename from examples/device/device_composite/ses/ses_samd21/ATSAMD21G18A_MemoryMap.xml
rename to examples/device_composite/ses/samd21/ATSAMD21G18A_MemoryMap.xml
diff --git a/examples/device/device_composite/ses/ses_samd21/ATSAMD21G18A_Registers.xml b/examples/device_composite/ses/samd21/ATSAMD21G18A_Registers.xml
similarity index 100%
rename from examples/device/device_composite/ses/ses_samd21/ATSAMD21G18A_Registers.xml
rename to examples/device_composite/ses/samd21/ATSAMD21G18A_Registers.xml
diff --git a/examples/device/device_composite/ses/ses_samd21/ATSAMD21G18A_Vectors.s b/examples/device_composite/ses/samd21/ATSAMD21G18A_Vectors.s
similarity index 100%
rename from examples/device/device_composite/ses/ses_samd21/ATSAMD21G18A_Vectors.s
rename to examples/device_composite/ses/samd21/ATSAMD21G18A_Vectors.s
diff --git a/examples/device/device_composite/ses/ses_samd21/SAMD21_Startup.s b/examples/device_composite/ses/samd21/SAMD21_Startup.s
similarity index 100%
rename from examples/device/device_composite/ses/ses_samd21/SAMD21_Startup.s
rename to examples/device_composite/ses/samd21/SAMD21_Startup.s
diff --git a/examples/device/device_composite/ses/ses_samd21/SAMD21_Target.js b/examples/device_composite/ses/samd21/SAMD21_Target.js
similarity index 100%
rename from examples/device/device_composite/ses/ses_samd21/SAMD21_Target.js
rename to examples/device_composite/ses/samd21/SAMD21_Target.js
diff --git a/examples/device/device_composite/ses/ses_samd21/flash_placement.xml b/examples/device_composite/ses/samd21/flash_placement.xml
similarity index 100%
rename from examples/device/device_composite/ses/ses_samd21/flash_placement.xml
rename to examples/device_composite/ses/samd21/flash_placement.xml
diff --git a/examples/device_composite/ses/samd21/samd21.emProject b/examples/device_composite/ses/samd21/samd21.emProject
new file mode 100644
index 000000000..54767199a
--- /dev/null
+++ b/examples/device_composite/ses/samd21/samd21.emProject
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/device/device_composite/ses/ses_samd21/thumb_crt0.s b/examples/device_composite/ses/samd21/thumb_crt0.s
similarity index 100%
rename from examples/device/device_composite/ses/ses_samd21/thumb_crt0.s
rename to examples/device_composite/ses/samd21/thumb_crt0.s
diff --git a/examples/device/device_composite/ses/ses_samd51/ATSAMD51J19A_MemoryMap.xml b/examples/device_composite/ses/samd51/ATSAMD51J19A_MemoryMap.xml
similarity index 100%
rename from examples/device/device_composite/ses/ses_samd51/ATSAMD51J19A_MemoryMap.xml
rename to examples/device_composite/ses/samd51/ATSAMD51J19A_MemoryMap.xml
diff --git a/examples/device/device_composite/ses/ses_samd51/ATSAMD51J19A_Registers.xml b/examples/device_composite/ses/samd51/ATSAMD51J19A_Registers.xml
similarity index 100%
rename from examples/device/device_composite/ses/ses_samd51/ATSAMD51J19A_Registers.xml
rename to examples/device_composite/ses/samd51/ATSAMD51J19A_Registers.xml
diff --git a/examples/device/device_composite/ses/ses_samd51/ATSAMD51J19A_Vectors.s b/examples/device_composite/ses/samd51/ATSAMD51J19A_Vectors.s
similarity index 100%
rename from examples/device/device_composite/ses/ses_samd51/ATSAMD51J19A_Vectors.s
rename to examples/device_composite/ses/samd51/ATSAMD51J19A_Vectors.s
diff --git a/examples/device/device_composite/ses/ses_samd51/SAMD51_Startup.s b/examples/device_composite/ses/samd51/SAMD51_Startup.s
similarity index 100%
rename from examples/device/device_composite/ses/ses_samd51/SAMD51_Startup.s
rename to examples/device_composite/ses/samd51/SAMD51_Startup.s
diff --git a/examples/device/device_composite/ses/ses_samd51/SAMD51_Target.js b/examples/device_composite/ses/samd51/SAMD51_Target.js
similarity index 100%
rename from examples/device/device_composite/ses/ses_samd51/SAMD51_Target.js
rename to examples/device_composite/ses/samd51/SAMD51_Target.js
diff --git a/examples/device/device_composite/ses/ses_samd51/flash_placement.xml b/examples/device_composite/ses/samd51/flash_placement.xml
similarity index 100%
rename from examples/device/device_composite/ses/ses_samd51/flash_placement.xml
rename to examples/device_composite/ses/samd51/flash_placement.xml
diff --git a/examples/device_composite/ses/samd51/samd51.emProject b/examples/device_composite/ses/samd51/samd51.emProject
new file mode 100644
index 000000000..76be9cf5e
--- /dev/null
+++ b/examples/device_composite/ses/samd51/samd51.emProject
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/device/device_composite/ses/ses_samd51/thumb_crt0.s b/examples/device_composite/ses/samd51/thumb_crt0.s
similarity index 100%
rename from examples/device/device_composite/ses/ses_samd51/thumb_crt0.s
rename to examples/device_composite/ses/samd51/thumb_crt0.s
diff --git a/examples/device/device_composite/src/main.c b/examples/device_composite/src/main.c
similarity index 100%
rename from examples/device/device_composite/src/main.c
rename to examples/device_composite/src/main.c
diff --git a/examples/device/device_composite/src/msc_app.c b/examples/device_composite/src/msc_app.c
similarity index 100%
rename from examples/device/device_composite/src/msc_app.c
rename to examples/device_composite/src/msc_app.c
diff --git a/examples/device/device_composite/src/msc_app.h b/examples/device_composite/src/msc_app.h
similarity index 100%
rename from examples/device/device_composite/src/msc_app.h
rename to examples/device_composite/src/msc_app.h
diff --git a/examples/device/device_composite/src/msc_flash_qspi.c b/examples/device_composite/src/msc_flash_qspi.c
similarity index 100%
rename from examples/device/device_composite/src/msc_flash_qspi.c
rename to examples/device_composite/src/msc_flash_qspi.c
diff --git a/examples/device/device_composite/src/msc_flash_ram.c b/examples/device_composite/src/msc_flash_ram.c
similarity index 100%
rename from examples/device/device_composite/src/msc_flash_ram.c
rename to examples/device_composite/src/msc_flash_ram.c
diff --git a/examples/device/device_composite/src/tusb_config.h b/examples/device_composite/src/tusb_config.h
similarity index 100%
rename from examples/device/device_composite/src/tusb_config.h
rename to examples/device_composite/src/tusb_config.h
diff --git a/examples/device/device_composite/src/tusb_descriptors.c b/examples/device_composite/src/tusb_descriptors.c
similarity index 100%
rename from examples/device/device_composite/src/tusb_descriptors.c
rename to examples/device_composite/src/tusb_descriptors.c
diff --git a/examples/device/device_composite/src/segger_rtt/SEGGER_RTT.c b/lib/segger_rtt/SEGGER_RTT.c
similarity index 100%
rename from examples/device/device_composite/src/segger_rtt/SEGGER_RTT.c
rename to lib/segger_rtt/SEGGER_RTT.c
diff --git a/examples/device/device_composite/src/segger_rtt/SEGGER_RTT.h b/lib/segger_rtt/SEGGER_RTT.h
similarity index 100%
rename from examples/device/device_composite/src/segger_rtt/SEGGER_RTT.h
rename to lib/segger_rtt/SEGGER_RTT.h
diff --git a/examples/device/device_composite/src/segger_rtt/SEGGER_RTT_Conf.h b/lib/segger_rtt/SEGGER_RTT_Conf.h
similarity index 100%
rename from examples/device/device_composite/src/segger_rtt/SEGGER_RTT_Conf.h
rename to lib/segger_rtt/SEGGER_RTT_Conf.h
diff --git a/examples/device/device_composite/src/segger_rtt/SEGGER_RTT_SES.c b/lib/segger_rtt/SEGGER_RTT_SES.c
similarity index 100%
rename from examples/device/device_composite/src/segger_rtt/SEGGER_RTT_SES.c
rename to lib/segger_rtt/SEGGER_RTT_SES.c