diff --git a/hw/mcu/nordic/FreeRTOSConfig.h b/examples/device_composite_freertos/ses/nrf5x/FreeRTOSConfig.h
similarity index 100%
rename from hw/mcu/nordic/FreeRTOSConfig.h
rename to examples/device_composite_freertos/ses/nrf5x/FreeRTOSConfig.h
diff --git a/examples/device_composite_freertos/ses/nrf5x/nrf5x.emProject b/examples/device_composite_freertos/ses/nrf5x/nrf5x.emProject
index 705d0c015..978116988 100644
--- a/examples/device_composite_freertos/ses/nrf5x/nrf5x.emProject
+++ b/examples/device_composite_freertos/ses/nrf5x/nrf5x.emProject
@@ -20,7 +20,7 @@
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="Yes"
       c_preprocessor_definitions="NRF52840_XXAA;__nRF_FAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;BOARD_PCA10056;CFG_TUSB_MCU=OPT_MCU_NRF5X"
-      c_user_include_directories="../../src;$(rootDir)/hw/cmsis/Include;$(rootDir)/hw;$(rootDir)/src;$(nrfxDir)/..;$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include;$(freertosDir)/Source/include;$(freertosDir)/Source/portable/GCC/ARM_CM4F"
+      c_user_include_directories="./;../../src;$(rootDir)/hw/cmsis/Include;$(rootDir)/hw;$(rootDir)/src;$(nrfxDir)/..;$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include;$(freertosDir)/Source/include;$(freertosDir)/Source/portable/GCC/ARM_CM4F"
       debug_register_definition_file="nrf52840_Registers.xml"
       debug_target_connection="J-Link"
       gcc_entry_point="Reset_Handler"
diff --git a/examples/device_composite_freertos/ses/samd21/samd21.emProject b/examples/device_composite_freertos/ses/samd21/samd21.emProject
index 54767199a..cb9cee4f5 100644
--- a/examples/device_composite_freertos/ses/samd21/samd21.emProject
+++ b/examples/device_composite_freertos/ses/samd21/samd21.emProject
@@ -19,7 +19,7 @@
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="Yes"
       c_preprocessor_definitions="__SAMD21G18A__;__SAMD21_FAMILY;__SAM_D21_SUBFAMILY;ARM_MATH_CM0PLUS;FLASH_PLACEMENT=1;USE_SIMPLE_ASSERT;CONF_XOSC32K_CONFIG=1;CONF_OSC32K_ENABLE=1;CONF_OSC32K_EN32K=1;CONF_XOSC32K_STARTUP=CONF_XOSC32K_STARTUP_TIME_2000092MCS;CONF_DFLL_ONDEMAND=0;CONF_DFLL_OVERWRITE_CALIBRATION=0;BOARD_METRO_M0_EXPRESS;CFG_TUSB_MCU=OPT_MCU_SAMD21"
-      c_user_include_directories="../../src;$(rootDir)/hw/cmsis/Include;$(rootDir)/hw;$(rootDir)/src;$(asf4Dir);$(asf4Dir)/include;$(asf4Dir)/config;$(asf4Dir)/hri;$(asf4Dir)/hal/include;$(asf4Dir)/hal/utils/include;$(asf4Dir)/hpl/port;$(asf4Dir)/hpl/gclk;$(asf4Dir)/hpl/pm"
+      c_user_include_directories="./;../../src;$(rootDir)/hw/cmsis/Include;$(rootDir)/hw;$(rootDir)/src;$(asf4Dir);$(asf4Dir)/include;$(asf4Dir)/config;$(asf4Dir)/hri;$(asf4Dir)/hal/include;$(asf4Dir)/hal/utils/include;$(asf4Dir)/hpl/port;$(asf4Dir)/hpl/gclk;$(asf4Dir)/hpl/pm"
       debug_register_definition_file="ATSAMD21G18A_Registers.xml"
       debug_target_connection="J-Link"
       gcc_entry_point="Reset_Handler"
@@ -27,7 +27,7 @@
       linker_memory_map_file="$(ProjectDir)/ATSAMD21G18A_MemoryMap.xml"
       linker_section_placement_file="flash_placement.xml"
       linker_section_placements_segments="FLASH RX 0x00000000 0x00080000;RAM RWX 0x20000000 0x00030000"
-      macros="DeviceFamily=SAMD21;Target=ATSAMD21G18A;Placement=Flash;rootDir=../../../..;asf4Dir=../../../../hw/mcu/microchip/samd/asf4/samd21"
+      macros="DeviceFamily=SAMD21;Target=ATSAMD21G18A;Placement=Flash;rootDir=../../../..;asf4Dir=../../../../hw/mcu/microchip/samd/asf4/samd21;freertosDir=../../../../lib/FreeRTOS"
       project_directory=""
       project_type="Executable"
       target_reset_script="Reset();"
@@ -98,6 +98,49 @@
       filter="*.c;*.h"
       path="../../../../lib/segger_rtt"
       recurse="No" />
+    <folder Name="lib">
+      <folder Name="FreeRTOS">
+        <folder Name="Source">
+          <folder Name="include">
+            <file file_name="../../../../lib/FreeRTOS/Source/include/croutine.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/deprecated_definitions.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/event_groups.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/FreeRTOS.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/list.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/message_buffer.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/mpu_prototypes.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/mpu_wrappers.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/portable.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/projdefs.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/queue.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/semphr.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/stack_macros.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/StackMacros.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/stream_buffer.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/task.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/timers.h" />
+          </folder>
+          <folder Name="portable">
+            <folder Name="Common" />
+            <folder Name="GCC">
+              <folder Name="ARM_CM0">
+                <file file_name="../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c" />
+                <file file_name="../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM0/portmacro.h" />
+              </folder>
+            </folder>
+            <folder Name="MemMang">
+              <file file_name="../../../../lib/FreeRTOS/Source/portable/MemMang/heap_4.c" />
+            </folder>
+          </folder>
+          <file file_name="../../../../lib/FreeRTOS/Source/list.c" />
+          <file file_name="../../../../lib/FreeRTOS/Source/queue.c" />
+          <file file_name="../../../../lib/FreeRTOS/Source/tasks.c" />
+          <file file_name="../../../../lib/FreeRTOS/Source/timers.c" />
+        </folder>
+        <file file_name="../../../../lib/FreeRTOS/FreeRTOSConfig.h" />
+        <file file_name="../../../../lib/FreeRTOS/freertos_hook.c" />
+      </folder>
+    </folder>
   </project>
   <configuration Name="Metro M0 Express" />
 </solution>
diff --git a/examples/device_composite_freertos/ses/samd51/samd51.emProject b/examples/device_composite_freertos/ses/samd51/samd51.emProject
index 76be9cf5e..222190a90 100644
--- a/examples/device_composite_freertos/ses/samd51/samd51.emProject
+++ b/examples/device_composite_freertos/ses/samd51/samd51.emProject
@@ -20,7 +20,7 @@
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="Yes"
       c_preprocessor_definitions="__SAMD51_FAMILY;__SAMD51J19A__;ARM_MATH_CM4;FLASH_PLACEMENT=1;USE_SIMPLE_ASSERT;BOARD_METRO_M4_EXPRESS;CFG_TUSB_MCU=OPT_MCU_SAMD51"
-      c_user_include_directories="../../src;$(rootDir)/hw/cmsis/Include;$(rootDir)/hw;$(rootDir)/src;$(asf4Dir);$(asf4Dir)/include;$(asf4Dir)/config;$(asf4Dir)/hri;$(asf4Dir)/hal/include;$(asf4Dir)/hal/utils/include;$(asf4Dir)/hpl/port;$(asf4Dir)/hpl/gclk"
+      c_user_include_directories="./;../../src;$(rootDir)/hw/cmsis/Include;$(rootDir)/hw;$(rootDir)/src;$(asf4Dir);$(asf4Dir)/include;$(asf4Dir)/config;$(asf4Dir)/hri;$(asf4Dir)/hal/include;$(asf4Dir)/hal/utils/include;$(asf4Dir)/hpl/port;$(asf4Dir)/hpl/gclk;$(freertosDir)/Source/include;$(freertosDir)/Source/portable/GCC/ARM_CM4F"
       debug_register_definition_file="ATSAMD51J19A_Registers.xml"
       debug_target_connection="J-Link"
       gcc_entry_point="Reset_Handler"
@@ -28,7 +28,7 @@
       linker_memory_map_file="ATSAMD51J19A_MemoryMap.xml"
       linker_section_placement_file="flash_placement.xml"
       linker_section_placements_segments="FLASH RX 0x00000000 0x00080000;RAM RWX 0x20000000 0x00030000"
-      macros="DeviceFamily=SAMD51;Target=ATSAMD51J19A;Placement=Flash;rootDir=../../../..;asf4Dir=../../../../hw/mcu/microchip/samd/asf4/samd51"
+      macros="DeviceFamily=SAMD51;Target=ATSAMD51J19A;Placement=Flash;rootDir=../../../..;asf4Dir=../../../../hw/mcu/microchip/samd/asf4/samd51;freertosDir=../../../../lib/FreeRTOS"
       project_directory=""
       project_type="Executable"
       target_reset_script="Reset();"
@@ -102,6 +102,49 @@
       filter="*.c;*.h"
       path="../../../../lib/segger_rtt"
       recurse="No" />
+    <folder Name="lib">
+      <folder Name="FreeRTOS">
+        <folder Name="Source">
+          <folder Name="include">
+            <file file_name="../../../../lib/FreeRTOS/Source/include/croutine.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/deprecated_definitions.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/event_groups.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/FreeRTOS.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/list.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/message_buffer.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/mpu_prototypes.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/mpu_wrappers.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/portable.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/projdefs.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/queue.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/semphr.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/stack_macros.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/StackMacros.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/stream_buffer.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/task.h" />
+            <file file_name="../../../../lib/FreeRTOS/Source/include/timers.h" />
+          </folder>
+          <folder Name="portable">
+            <folder Name="Common" />
+            <folder Name="GCC">
+              <folder Name="ARM_CM4F">
+                <file file_name="../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c" />
+                <file file_name="../../../../lib/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h" />
+              </folder>
+            </folder>
+            <folder Name="MemMang">
+              <file file_name="../../../../lib/FreeRTOS/Source/portable/MemMang/heap_4.c" />
+            </folder>
+          </folder>
+          <file file_name="../../../../lib/FreeRTOS/Source/list.c" />
+          <file file_name="../../../../lib/FreeRTOS/Source/queue.c" />
+          <file file_name="../../../../lib/FreeRTOS/Source/tasks.c" />
+          <file file_name="../../../../lib/FreeRTOS/Source/timers.c" />
+        </folder>
+        <file file_name="../../../../lib/FreeRTOS/FreeRTOSConfig.h" />
+        <file file_name="../../../../lib/FreeRTOS/freertos_hook.c" />
+      </folder>
+    </folder>
   </project>
   <configuration Name="Metro M4 Express" />
 </solution>
diff --git a/examples/device_composite_freertos/src/tusb_config.h b/examples/device_composite_freertos/src/tusb_config.h
index 9641f7bde..4c8635fc0 100644
--- a/examples/device_composite_freertos/src/tusb_config.h
+++ b/examples/device_composite_freertos/src/tusb_config.h
@@ -48,7 +48,11 @@
 //--------------------------------------------------------------------
 // COMMON CONFIGURATION
 //--------------------------------------------------------------------
-#define CFG_TUSB_MCU                OPT_MCU_NRF5X
+// defined by compiler flags for flexibility
+#ifndef CFG_TUSB_MCU
+  #error CFG_TUSB_MCU should be defined using compiler flags
+#endif
+
 #define CFG_TUSB_RHPORT0_MODE       OPT_MODE_DEVICE
 
 #define CFG_TUSB_DEBUG              2