diff --git a/minmea/COPYING b/lib/minmea/COPYING
similarity index 100%
rename from minmea/COPYING
rename to lib/minmea/COPYING
diff --git a/minmea/include/minmea.h b/lib/minmea/include/minmea.h
similarity index 100%
rename from minmea/include/minmea.h
rename to lib/minmea/include/minmea.h
diff --git a/minmea/minmea.c b/lib/minmea/minmea.c
similarity index 100%
rename from minmea/minmea.c
rename to lib/minmea/minmea.c
diff --git a/rtos/uC-CPU/ARM-Cortex-M/ARMv6-M/cpu.h b/lib/rtos/uC-CPU/ARM-Cortex-M/ARMv6-M/cpu.h
similarity index 100%
rename from rtos/uC-CPU/ARM-Cortex-M/ARMv6-M/cpu.h
rename to lib/rtos/uC-CPU/ARM-Cortex-M/ARMv6-M/cpu.h
diff --git a/rtos/uC-CPU/ARM-Cortex-M/ARMv6-M/cpu_a.s b/lib/rtos/uC-CPU/ARM-Cortex-M/ARMv6-M/cpu_a.s
similarity index 100%
rename from rtos/uC-CPU/ARM-Cortex-M/ARMv6-M/cpu_a.s
rename to lib/rtos/uC-CPU/ARM-Cortex-M/ARMv6-M/cpu_a.s
diff --git a/rtos/uC-CPU/ARM-Cortex-M/ARMv6-M/cpu_c.c b/lib/rtos/uC-CPU/ARM-Cortex-M/ARMv6-M/cpu_c.c
similarity index 100%
rename from rtos/uC-CPU/ARM-Cortex-M/ARMv6-M/cpu_c.c
rename to lib/rtos/uC-CPU/ARM-Cortex-M/ARMv6-M/cpu_c.c
diff --git a/rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu.h b/lib/rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu.h
similarity index 100%
rename from rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu.h
rename to lib/rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu.h
diff --git a/rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu_a.s b/lib/rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu_a.s
similarity index 100%
rename from rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu_a.s
rename to lib/rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu_a.s
diff --git a/rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu_c.c b/lib/rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu_c.c
similarity index 100%
rename from rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu_c.c
rename to lib/rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu_c.c
diff --git a/rtos/uC-CPU/Cfg/cpu_cfg.h b/lib/rtos/uC-CPU/Cfg/cpu_cfg.h
similarity index 100%
rename from rtos/uC-CPU/Cfg/cpu_cfg.h
rename to lib/rtos/uC-CPU/Cfg/cpu_cfg.h
diff --git a/rtos/uC-CPU/LICENSE b/lib/rtos/uC-CPU/LICENSE
similarity index 100%
rename from rtos/uC-CPU/LICENSE
rename to lib/rtos/uC-CPU/LICENSE
diff --git a/rtos/uC-CPU/NOTICE b/lib/rtos/uC-CPU/NOTICE
similarity index 100%
rename from rtos/uC-CPU/NOTICE
rename to lib/rtos/uC-CPU/NOTICE
diff --git a/rtos/uC-CPU/Posix/cpu.h b/lib/rtos/uC-CPU/Posix/cpu.h
similarity index 100%
rename from rtos/uC-CPU/Posix/cpu.h
rename to lib/rtos/uC-CPU/Posix/cpu.h
diff --git a/rtos/uC-CPU/Posix/cpu_c.c b/lib/rtos/uC-CPU/Posix/cpu_c.c
similarity index 100%
rename from rtos/uC-CPU/Posix/cpu_c.c
rename to lib/rtos/uC-CPU/Posix/cpu_c.c
diff --git a/rtos/uC-CPU/cpu_cache.h b/lib/rtos/uC-CPU/cpu_cache.h
similarity index 100%
rename from rtos/uC-CPU/cpu_cache.h
rename to lib/rtos/uC-CPU/cpu_cache.h
diff --git a/rtos/uC-CPU/cpu_core.c b/lib/rtos/uC-CPU/cpu_core.c
similarity index 100%
rename from rtos/uC-CPU/cpu_core.c
rename to lib/rtos/uC-CPU/cpu_core.c
diff --git a/rtos/uC-CPU/cpu_core.h b/lib/rtos/uC-CPU/cpu_core.h
similarity index 100%
rename from rtos/uC-CPU/cpu_core.h
rename to lib/rtos/uC-CPU/cpu_core.h
diff --git a/rtos/uC-CPU/cpu_def.h b/lib/rtos/uC-CPU/cpu_def.h
similarity index 100%
rename from rtos/uC-CPU/cpu_def.h
rename to lib/rtos/uC-CPU/cpu_def.h
diff --git a/rtos/uC-CPU/readme.md b/lib/rtos/uC-CPU/readme.md
similarity index 100%
rename from rtos/uC-CPU/readme.md
rename to lib/rtos/uC-CPU/readme.md
diff --git a/rtos/uC-LIB/Cfg/lib_cfg.h b/lib/rtos/uC-LIB/Cfg/lib_cfg.h
similarity index 100%
rename from rtos/uC-LIB/Cfg/lib_cfg.h
rename to lib/rtos/uC-LIB/Cfg/lib_cfg.h
diff --git a/rtos/uC-LIB/LICENSE b/lib/rtos/uC-LIB/LICENSE
similarity index 100%
rename from rtos/uC-LIB/LICENSE
rename to lib/rtos/uC-LIB/LICENSE
diff --git a/rtos/uC-LIB/NOTICE b/lib/rtos/uC-LIB/NOTICE
similarity index 100%
rename from rtos/uC-LIB/NOTICE
rename to lib/rtos/uC-LIB/NOTICE
diff --git a/rtos/uC-LIB/Ports/ARM-Cortex-M3/lib_mem_a.s b/lib/rtos/uC-LIB/Ports/ARM-Cortex-M3/lib_mem_a.s
similarity index 100%
rename from rtos/uC-LIB/Ports/ARM-Cortex-M3/lib_mem_a.s
rename to lib/rtos/uC-LIB/Ports/ARM-Cortex-M3/lib_mem_a.s
diff --git a/rtos/uC-LIB/Ports/ARM-Cortex-M4/lib_mem_a.s b/lib/rtos/uC-LIB/Ports/ARM-Cortex-M4/lib_mem_a.s
similarity index 100%
rename from rtos/uC-LIB/Ports/ARM-Cortex-M4/lib_mem_a.s
rename to lib/rtos/uC-LIB/Ports/ARM-Cortex-M4/lib_mem_a.s
diff --git a/rtos/uC-LIB/lib_ascii.c b/lib/rtos/uC-LIB/lib_ascii.c
similarity index 100%
rename from rtos/uC-LIB/lib_ascii.c
rename to lib/rtos/uC-LIB/lib_ascii.c
diff --git a/rtos/uC-LIB/lib_ascii.h b/lib/rtos/uC-LIB/lib_ascii.h
similarity index 100%
rename from rtos/uC-LIB/lib_ascii.h
rename to lib/rtos/uC-LIB/lib_ascii.h
diff --git a/rtos/uC-LIB/lib_def.h b/lib/rtos/uC-LIB/lib_def.h
similarity index 100%
rename from rtos/uC-LIB/lib_def.h
rename to lib/rtos/uC-LIB/lib_def.h
diff --git a/rtos/uC-LIB/lib_math.c b/lib/rtos/uC-LIB/lib_math.c
similarity index 100%
rename from rtos/uC-LIB/lib_math.c
rename to lib/rtos/uC-LIB/lib_math.c
diff --git a/rtos/uC-LIB/lib_math.h b/lib/rtos/uC-LIB/lib_math.h
similarity index 100%
rename from rtos/uC-LIB/lib_math.h
rename to lib/rtos/uC-LIB/lib_math.h
diff --git a/rtos/uC-LIB/lib_mem.c b/lib/rtos/uC-LIB/lib_mem.c
similarity index 100%
rename from rtos/uC-LIB/lib_mem.c
rename to lib/rtos/uC-LIB/lib_mem.c
diff --git a/rtos/uC-LIB/lib_mem.h b/lib/rtos/uC-LIB/lib_mem.h
similarity index 100%
rename from rtos/uC-LIB/lib_mem.h
rename to lib/rtos/uC-LIB/lib_mem.h
diff --git a/rtos/uC-LIB/lib_str.c b/lib/rtos/uC-LIB/lib_str.c
similarity index 100%
rename from rtos/uC-LIB/lib_str.c
rename to lib/rtos/uC-LIB/lib_str.c
diff --git a/rtos/uC-LIB/lib_str.h b/lib/rtos/uC-LIB/lib_str.h
similarity index 100%
rename from rtos/uC-LIB/lib_str.h
rename to lib/rtos/uC-LIB/lib_str.h
diff --git a/rtos/uC-LIB/readme.md b/lib/rtos/uC-LIB/readme.md
similarity index 100%
rename from rtos/uC-LIB/readme.md
rename to lib/rtos/uC-LIB/readme.md
diff --git a/rtos/uC-OS3/Cfg/app_cfg.h b/lib/rtos/uC-OS3/Cfg/app_cfg.h
similarity index 100%
rename from rtos/uC-OS3/Cfg/app_cfg.h
rename to lib/rtos/uC-OS3/Cfg/app_cfg.h
diff --git a/rtos/uC-OS3/Cfg/os_app_hooks.c b/lib/rtos/uC-OS3/Cfg/os_app_hooks.c
similarity index 100%
rename from rtos/uC-OS3/Cfg/os_app_hooks.c
rename to lib/rtos/uC-OS3/Cfg/os_app_hooks.c
diff --git a/rtos/uC-OS3/Cfg/os_app_hooks.h b/lib/rtos/uC-OS3/Cfg/os_app_hooks.h
similarity index 100%
rename from rtos/uC-OS3/Cfg/os_app_hooks.h
rename to lib/rtos/uC-OS3/Cfg/os_app_hooks.h
diff --git a/rtos/uC-OS3/Cfg/os_cfg.h b/lib/rtos/uC-OS3/Cfg/os_cfg.h
similarity index 100%
rename from rtos/uC-OS3/Cfg/os_cfg.h
rename to lib/rtos/uC-OS3/Cfg/os_cfg.h
diff --git a/rtos/uC-OS3/Cfg/os_cfg_app.h b/lib/rtos/uC-OS3/Cfg/os_cfg_app.h
similarity index 100%
rename from rtos/uC-OS3/Cfg/os_cfg_app.h
rename to lib/rtos/uC-OS3/Cfg/os_cfg_app.h
diff --git a/rtos/uC-OS3/Cfg/os_cfg_arm.h b/lib/rtos/uC-OS3/Cfg/os_cfg_arm.h
similarity index 100%
rename from rtos/uC-OS3/Cfg/os_cfg_arm.h
rename to lib/rtos/uC-OS3/Cfg/os_cfg_arm.h
diff --git a/rtos/uC-OS3/Cfg/os_cfg_x64.h b/lib/rtos/uC-OS3/Cfg/os_cfg_x64.h
similarity index 100%
rename from rtos/uC-OS3/Cfg/os_cfg_x64.h
rename to lib/rtos/uC-OS3/Cfg/os_cfg_x64.h
diff --git a/rtos/uC-OS3/LICENSE b/lib/rtos/uC-OS3/LICENSE
similarity index 100%
rename from rtos/uC-OS3/LICENSE
rename to lib/rtos/uC-OS3/LICENSE
diff --git a/rtos/uC-OS3/NOTICE b/lib/rtos/uC-OS3/NOTICE
similarity index 100%
rename from rtos/uC-OS3/NOTICE
rename to lib/rtos/uC-OS3/NOTICE
diff --git a/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv6-M/os_cpu.h b/lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv6-M/os_cpu.h
similarity index 100%
rename from rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv6-M/os_cpu.h
rename to lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv6-M/os_cpu.h
diff --git a/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv6-M/os_cpu_a.s b/lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv6-M/os_cpu_a.s
similarity index 100%
rename from rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv6-M/os_cpu_a.s
rename to lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv6-M/os_cpu_a.s
diff --git a/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv6-M/os_cpu_c.c b/lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv6-M/os_cpu_c.c
similarity index 100%
rename from rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv6-M/os_cpu_c.c
rename to lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv6-M/os_cpu_c.c
diff --git a/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu.h b/lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu.h
similarity index 100%
rename from rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu.h
rename to lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu.h
diff --git a/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu_a.s b/lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu_a.s
similarity index 100%
rename from rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu_a.s
rename to lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu_a.s
diff --git a/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu_c.c b/lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu_c.c
similarity index 100%
rename from rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu_c.c
rename to lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu_c.c
diff --git a/rtos/uC-OS3/Ports/POSIX/os_cpu.h b/lib/rtos/uC-OS3/Ports/POSIX/os_cpu.h
similarity index 100%
rename from rtos/uC-OS3/Ports/POSIX/os_cpu.h
rename to lib/rtos/uC-OS3/Ports/POSIX/os_cpu.h
diff --git a/rtos/uC-OS3/Ports/POSIX/os_cpu_c.c b/lib/rtos/uC-OS3/Ports/POSIX/os_cpu_c.c
similarity index 100%
rename from rtos/uC-OS3/Ports/POSIX/os_cpu_c.c
rename to lib/rtos/uC-OS3/Ports/POSIX/os_cpu_c.c
diff --git a/rtos/uC-OS3/Source/__dbg_uCOS-III.c b/lib/rtos/uC-OS3/Source/__dbg_uCOS-III.c
similarity index 100%
rename from rtos/uC-OS3/Source/__dbg_uCOS-III.c
rename to lib/rtos/uC-OS3/Source/__dbg_uCOS-III.c
diff --git a/rtos/uC-OS3/Source/os.h b/lib/rtos/uC-OS3/Source/os.h
similarity index 100%
rename from rtos/uC-OS3/Source/os.h
rename to lib/rtos/uC-OS3/Source/os.h
diff --git a/rtos/uC-OS3/Source/os_cfg_app.c b/lib/rtos/uC-OS3/Source/os_cfg_app.c
similarity index 100%
rename from rtos/uC-OS3/Source/os_cfg_app.c
rename to lib/rtos/uC-OS3/Source/os_cfg_app.c
diff --git a/rtos/uC-OS3/Source/os_core.c b/lib/rtos/uC-OS3/Source/os_core.c
similarity index 100%
rename from rtos/uC-OS3/Source/os_core.c
rename to lib/rtos/uC-OS3/Source/os_core.c
diff --git a/rtos/uC-OS3/Source/os_dbg.c b/lib/rtos/uC-OS3/Source/os_dbg.c
similarity index 100%
rename from rtos/uC-OS3/Source/os_dbg.c
rename to lib/rtos/uC-OS3/Source/os_dbg.c
diff --git a/rtos/uC-OS3/Source/os_flag.c b/lib/rtos/uC-OS3/Source/os_flag.c
similarity index 100%
rename from rtos/uC-OS3/Source/os_flag.c
rename to lib/rtos/uC-OS3/Source/os_flag.c
diff --git a/rtos/uC-OS3/Source/os_mem.c b/lib/rtos/uC-OS3/Source/os_mem.c
similarity index 100%
rename from rtos/uC-OS3/Source/os_mem.c
rename to lib/rtos/uC-OS3/Source/os_mem.c
diff --git a/rtos/uC-OS3/Source/os_msg.c b/lib/rtos/uC-OS3/Source/os_msg.c
similarity index 100%
rename from rtos/uC-OS3/Source/os_msg.c
rename to lib/rtos/uC-OS3/Source/os_msg.c
diff --git a/rtos/uC-OS3/Source/os_mutex.c b/lib/rtos/uC-OS3/Source/os_mutex.c
similarity index 100%
rename from rtos/uC-OS3/Source/os_mutex.c
rename to lib/rtos/uC-OS3/Source/os_mutex.c
diff --git a/rtos/uC-OS3/Source/os_prio.c b/lib/rtos/uC-OS3/Source/os_prio.c
similarity index 100%
rename from rtos/uC-OS3/Source/os_prio.c
rename to lib/rtos/uC-OS3/Source/os_prio.c
diff --git a/rtos/uC-OS3/Source/os_q.c b/lib/rtos/uC-OS3/Source/os_q.c
similarity index 100%
rename from rtos/uC-OS3/Source/os_q.c
rename to lib/rtos/uC-OS3/Source/os_q.c
diff --git a/rtos/uC-OS3/Source/os_sem.c b/lib/rtos/uC-OS3/Source/os_sem.c
similarity index 100%
rename from rtos/uC-OS3/Source/os_sem.c
rename to lib/rtos/uC-OS3/Source/os_sem.c
diff --git a/rtos/uC-OS3/Source/os_stat.c b/lib/rtos/uC-OS3/Source/os_stat.c
similarity index 100%
rename from rtos/uC-OS3/Source/os_stat.c
rename to lib/rtos/uC-OS3/Source/os_stat.c
diff --git a/rtos/uC-OS3/Source/os_task.c b/lib/rtos/uC-OS3/Source/os_task.c
similarity index 100%
rename from rtos/uC-OS3/Source/os_task.c
rename to lib/rtos/uC-OS3/Source/os_task.c
diff --git a/rtos/uC-OS3/Source/os_tick.c b/lib/rtos/uC-OS3/Source/os_tick.c
similarity index 100%
rename from rtos/uC-OS3/Source/os_tick.c
rename to lib/rtos/uC-OS3/Source/os_tick.c
diff --git a/rtos/uC-OS3/Source/os_time.c b/lib/rtos/uC-OS3/Source/os_time.c
similarity index 100%
rename from rtos/uC-OS3/Source/os_time.c
rename to lib/rtos/uC-OS3/Source/os_time.c
diff --git a/rtos/uC-OS3/Source/os_tmr.c b/lib/rtos/uC-OS3/Source/os_tmr.c
similarity index 100%
rename from rtos/uC-OS3/Source/os_tmr.c
rename to lib/rtos/uC-OS3/Source/os_tmr.c
diff --git a/rtos/uC-OS3/Source/os_trace.h b/lib/rtos/uC-OS3/Source/os_trace.h
similarity index 100%
rename from rtos/uC-OS3/Source/os_trace.h
rename to lib/rtos/uC-OS3/Source/os_trace.h
diff --git a/rtos/uC-OS3/Source/os_type.h b/lib/rtos/uC-OS3/Source/os_type.h
similarity index 100%
rename from rtos/uC-OS3/Source/os_type.h
rename to lib/rtos/uC-OS3/Source/os_type.h
diff --git a/rtos/uC-OS3/Source/os_var.c b/lib/rtos/uC-OS3/Source/os_var.c
similarity index 100%
rename from rtos/uC-OS3/Source/os_var.c
rename to lib/rtos/uC-OS3/Source/os_var.c
diff --git a/rtos/uC-OS3/readme.md b/lib/rtos/uC-OS3/readme.md
similarity index 100%
rename from rtos/uC-OS3/readme.md
rename to lib/rtos/uC-OS3/readme.md
diff --git a/meson.build b/meson.build
index df10efdf..9bb5357f 100644
--- a/meson.build
+++ b/meson.build
@@ -45,42 +45,42 @@ openrtx_inc = ['openrtx/include',
                'platform/drivers/baseband']
 
 ## RTOS
-rtos_src = ['rtos/uC-OS3/Source/__dbg_uCOS-III.c',
-            'rtos/uC-OS3/Source/os_cfg_app.c',
-            'rtos/uC-OS3/Source/os_core.c',
-            'rtos/uC-OS3/Source/os_dbg.c',
-            'rtos/uC-OS3/Source/os_flag.c',
-            'rtos/uC-OS3/Source/os_mem.c',
-            'rtos/uC-OS3/Source/os_msg.c',
-            'rtos/uC-OS3/Source/os_mutex.c',
-            'rtos/uC-OS3/Source/os_prio.c',
-            'rtos/uC-OS3/Source/os_q.c',
-            'rtos/uC-OS3/Source/os_sem.c',
-            'rtos/uC-OS3/Source/os_stat.c',
-            'rtos/uC-OS3/Source/os_task.c',
-            'rtos/uC-OS3/Source/os_tick.c',
-            'rtos/uC-OS3/Source/os_time.c',
-            'rtos/uC-OS3/Source/os_tmr.c',
-            'rtos/uC-OS3/Source/os_var.c',
-            'rtos/uC-OS3/Cfg/os_app_hooks.c',
-            'rtos/uC-CPU/cpu_core.c',
-            'rtos/uC-LIB/lib_ascii.c',
-            'rtos/uC-LIB/lib_math.c',
-            'rtos/uC-LIB/lib_mem.c',
-            'rtos/uC-LIB/lib_str.c']
+rtos_src = ['lib/rtos/uC-OS3/Source/__dbg_uCOS-III.c',
+            'lib/rtos/uC-OS3/Source/os_cfg_app.c',
+            'lib/rtos/uC-OS3/Source/os_core.c',
+            'lib/rtos/uC-OS3/Source/os_dbg.c',
+            'lib/rtos/uC-OS3/Source/os_flag.c',
+            'lib/rtos/uC-OS3/Source/os_mem.c',
+            'lib/rtos/uC-OS3/Source/os_msg.c',
+            'lib/rtos/uC-OS3/Source/os_mutex.c',
+            'lib/rtos/uC-OS3/Source/os_prio.c',
+            'lib/rtos/uC-OS3/Source/os_q.c',
+            'lib/rtos/uC-OS3/Source/os_sem.c',
+            'lib/rtos/uC-OS3/Source/os_stat.c',
+            'lib/rtos/uC-OS3/Source/os_task.c',
+            'lib/rtos/uC-OS3/Source/os_tick.c',
+            'lib/rtos/uC-OS3/Source/os_time.c',
+            'lib/rtos/uC-OS3/Source/os_tmr.c',
+            'lib/rtos/uC-OS3/Source/os_var.c',
+            'lib/rtos/uC-OS3/Cfg/os_app_hooks.c',
+            'lib/rtos/uC-CPU/cpu_core.c',
+            'lib/rtos/uC-LIB/lib_ascii.c',
+            'lib/rtos/uC-LIB/lib_math.c',
+            'lib/rtos/uC-LIB/lib_mem.c',
+            'lib/rtos/uC-LIB/lib_str.c']
 
-rtos_inc = ['rtos/uC-OS3/Source',
-            'rtos/uC-OS3/Cfg',
-            'rtos/uC-CPU',
-            'rtos/uC-CPU/Cfg',
-            'rtos/uC-LIB',
-            'rtos/uC-LIB/Cfg']
+rtos_inc = ['lib/rtos/uC-OS3/Source',
+            'lib/rtos/uC-OS3/Cfg',
+            'lib/rtos/uC-CPU',
+            'lib/rtos/uC-CPU/Cfg',
+            'lib/rtos/uC-LIB',
+            'lib/rtos/uC-LIB/Cfg']
 
 ## minmea, a lightweight GPS NMEA 0183 parser library
 
-minmea_src = ['minmea/minmea.c']
+minmea_src = ['lib/minmea/minmea.c']
 
-minmea_inc = ['minmea/include']
+minmea_inc = ['lib/minmea/include']
 
 src = openrtx_src + rtos_src + minmea_src
 inc = openrtx_inc + rtos_inc + minmea_inc
@@ -112,18 +112,18 @@ stm32f405_src = ['platform/mcu/STM32F4xx/boot/startup.c',
                  'platform/mcu/STM32F4xx/drivers/delays.c',
                  'platform/mcu/STM32F4xx/drivers/rtc.c',
                  'platform/mcu/CMSIS/Device/ST/STM32F4xx/Source/system_stm32f4xx.c',
-                 'rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu_c.c',
-                 'rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu_a.s',
-                 'rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu_c.c',
-                 'rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu_a.s']
+                 'lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu_c.c',
+                 'lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu_a.s',
+                 'lib/rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu_c.c',
+                 'lib/rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu_a.s']
 
 stm32f405_inc = ['platform/mcu/CMSIS/Include',
                  'platform/mcu/CMSIS/Device/ST/STM32F4xx/Include',
                  'platform/mcu/STM32F4xx',
                  'platform/mcu/STM32F4xx/drivers',
                  'platform/mcu/STM32F4xx/drivers/usb',
-                 'rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M',
-                 'rtos/uC-CPU/ARM-Cortex-M/ARMv7-M']
+                 'lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M',
+                 'lib/rtos/uC-CPU/ARM-Cortex-M/ARMv7-M']
 
 stm32f405_def = {'STM32F40_41xxx': '', 'HSE_VALUE':'8000000'}
 
@@ -143,16 +143,16 @@ mk22fn512_src = ['platform/mcu/MK22FN512xxx12/boot/startup.c',
                  'platform/mcu/MK22FN512xxx12/drivers/usb/usb_osa_bm.c',
                  'platform/mcu/MK22FN512xxx12/drivers/usb_vcom.c',
                  'platform/mcu/CMSIS/Device/NXP/MK22FN512xxx12/Source/system_MK22F51212.c',
-                 'rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu_c.c',
-                 'rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu_a.s',
-                 'rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu_c.c',
-                 'rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu_a.s']
+                 'lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu_c.c',
+                 'lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M/os_cpu_a.s',
+                 'lib/rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu_c.c',
+                 'lib/rtos/uC-CPU/ARM-Cortex-M/ARMv7-M/cpu_a.s']
 
 mk22fn512_inc = ['platform/mcu/CMSIS/Include',
                  'platform/mcu/CMSIS/Device/NXP/MK22FN512xxx12/Include',
                  'platform/mcu/MK22FN512xxx12/drivers',
-                 'rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M',
-                 'rtos/uC-CPU/ARM-Cortex-M/ARMv7-M']
+                 'lib/rtos/uC-OS3/Ports/ARM-Cortex-M/ARMv7-M',
+                 'lib/rtos/uC-CPU/ARM-Cortex-M/ARMv7-M']
 
 mk22fn512_def = {}
 
@@ -171,8 +171,8 @@ linux_src = src + ['platform/targets/linux/emulator/emulator.c',
                    'platform/mcu/x86_64/drivers/rtc.c',
                    'platform/drivers/baseband/radio_linux.c',
                    'platform/targets/linux/platform.c',
-                   'rtos/uC-OS3/Ports/POSIX/os_cpu_c.c',
-                   'rtos/uC-CPU/Posix/cpu_c.c']
+                   'lib/rtos/uC-OS3/Ports/POSIX/os_cpu_c.c',
+                   'lib/rtos/uC-CPU/Posix/cpu_c.c']
 
 
 # GDx family display emulation
@@ -180,8 +180,8 @@ linux_src = src + ['platform/targets/linux/emulator/emulator.c',
 # MDx family display emulation
 linux_def = def + {'SCREEN_WIDTH': '160', 'SCREEN_HEIGHT': '128', 'PIX_FMT_RGB565': ''}
 
-linux_inc = inc + ['rtos/uC-OS3/Ports/POSIX',
-                   'rtos/uC-CPU/Posix',
+linux_inc = inc + ['lib/rtos/uC-OS3/Ports/POSIX',
+                   'lib/rtos/uC-CPU/Posix',
                    'platform/targets/linux',
                    'platform/targets/linux/emulator']