diff --git a/.astyleignore b/.astyleignore
index 0c3c33cdb8..6cdfd57e4f 100644
--- a/.astyleignore
+++ b/.astyleignore
@@ -21,8 +21,8 @@
 ^features/unsupported/
 ^hal/storage_abstraction
 ^platform/cxxsupport
-^rtos/TARGET_CORTEX/rtx4
-^rtos/TARGET_CORTEX/rtx5
+^rtos/source/TARGET_CORTEX/rtx4
+^rtos/source/TARGET_CORTEX/rtx5
 ^targets
 ^TESTS/mbed_hal/trng/pithy
 ^TESTS/mbed_hal/trng/pithy
diff --git a/platform/TARGET_CORTEX_M/TOOLCHAIN_ARM/except.S b/platform/source/TARGET_CORTEX_M/TOOLCHAIN_ARM/except.S
similarity index 100%
rename from platform/TARGET_CORTEX_M/TOOLCHAIN_ARM/except.S
rename to platform/source/TARGET_CORTEX_M/TOOLCHAIN_ARM/except.S
diff --git a/platform/TARGET_CORTEX_M/TOOLCHAIN_GCC/except.S b/platform/source/TARGET_CORTEX_M/TOOLCHAIN_GCC/except.S
similarity index 100%
rename from platform/TARGET_CORTEX_M/TOOLCHAIN_GCC/except.S
rename to platform/source/TARGET_CORTEX_M/TOOLCHAIN_GCC/except.S
diff --git a/platform/TARGET_CORTEX_M/TOOLCHAIN_IAR/cmain.S b/platform/source/TARGET_CORTEX_M/TOOLCHAIN_IAR/cmain.S
similarity index 100%
rename from platform/TARGET_CORTEX_M/TOOLCHAIN_IAR/cmain.S
rename to platform/source/TARGET_CORTEX_M/TOOLCHAIN_IAR/cmain.S
diff --git a/platform/TARGET_CORTEX_M/TOOLCHAIN_IAR/except.S b/platform/source/TARGET_CORTEX_M/TOOLCHAIN_IAR/except.S
similarity index 100%
rename from platform/TARGET_CORTEX_M/TOOLCHAIN_IAR/except.S
rename to platform/source/TARGET_CORTEX_M/TOOLCHAIN_IAR/except.S
diff --git a/platform/TARGET_CORTEX_M/mbed_fault_handler.c b/platform/source/TARGET_CORTEX_M/mbed_fault_handler.c
similarity index 100%
rename from platform/TARGET_CORTEX_M/mbed_fault_handler.c
rename to platform/source/TARGET_CORTEX_M/mbed_fault_handler.c
diff --git a/platform/TARGET_CORTEX_M/mbed_fault_handler.h b/platform/source/TARGET_CORTEX_M/mbed_fault_handler.h
similarity index 100%
rename from platform/TARGET_CORTEX_M/mbed_fault_handler.h
rename to platform/source/TARGET_CORTEX_M/mbed_fault_handler.h
diff --git a/rtos/TARGET_CORTEX/TOOLCHAIN_ARM_MICRO/mbed_boot_arm_micro.c b/rtos/source/TARGET_CORTEX/TOOLCHAIN_ARM_MICRO/mbed_boot_arm_micro.c
similarity index 100%
rename from rtos/TARGET_CORTEX/TOOLCHAIN_ARM_MICRO/mbed_boot_arm_micro.c
rename to rtos/source/TARGET_CORTEX/TOOLCHAIN_ARM_MICRO/mbed_boot_arm_micro.c
diff --git a/rtos/TARGET_CORTEX/TOOLCHAIN_ARM_STD/mbed_boot_arm_std.c b/rtos/source/TARGET_CORTEX/TOOLCHAIN_ARM_STD/mbed_boot_arm_std.c
similarity index 100%
rename from rtos/TARGET_CORTEX/TOOLCHAIN_ARM_STD/mbed_boot_arm_std.c
rename to rtos/source/TARGET_CORTEX/TOOLCHAIN_ARM_STD/mbed_boot_arm_std.c
diff --git a/rtos/TARGET_CORTEX/TOOLCHAIN_GCC_ARM/mbed_boot_gcc_arm.c b/rtos/source/TARGET_CORTEX/TOOLCHAIN_GCC_ARM/mbed_boot_gcc_arm.c
similarity index 100%
rename from rtos/TARGET_CORTEX/TOOLCHAIN_GCC_ARM/mbed_boot_gcc_arm.c
rename to rtos/source/TARGET_CORTEX/TOOLCHAIN_GCC_ARM/mbed_boot_gcc_arm.c
diff --git a/rtos/TARGET_CORTEX/TOOLCHAIN_IAR/mbed_boot_iar.c b/rtos/source/TARGET_CORTEX/TOOLCHAIN_IAR/mbed_boot_iar.c
similarity index 100%
rename from rtos/TARGET_CORTEX/TOOLCHAIN_IAR/mbed_boot_iar.c
rename to rtos/source/TARGET_CORTEX/TOOLCHAIN_IAR/mbed_boot_iar.c
diff --git a/rtos/TARGET_CORTEX/mbed_boot.c b/rtos/source/TARGET_CORTEX/mbed_boot.c
similarity index 100%
rename from rtos/TARGET_CORTEX/mbed_boot.c
rename to rtos/source/TARGET_CORTEX/mbed_boot.c
diff --git a/rtos/TARGET_CORTEX/mbed_boot.h b/rtos/source/TARGET_CORTEX/mbed_boot.h
similarity index 100%
rename from rtos/TARGET_CORTEX/mbed_boot.h
rename to rtos/source/TARGET_CORTEX/mbed_boot.h
diff --git a/rtos/TARGET_CORTEX/mbed_lib.json b/rtos/source/TARGET_CORTEX/mbed_lib.json
similarity index 100%
rename from rtos/TARGET_CORTEX/mbed_lib.json
rename to rtos/source/TARGET_CORTEX/mbed_lib.json
diff --git a/rtos/TARGET_CORTEX/mbed_rtos_rtx.c b/rtos/source/TARGET_CORTEX/mbed_rtos_rtx.c
similarity index 100%
rename from rtos/TARGET_CORTEX/mbed_rtos_rtx.c
rename to rtos/source/TARGET_CORTEX/mbed_rtos_rtx.c
diff --git a/rtos/TARGET_CORTEX/mbed_rtx_conf.h b/rtos/source/TARGET_CORTEX/mbed_rtx_conf.h
similarity index 100%
rename from rtos/TARGET_CORTEX/mbed_rtx_conf.h
rename to rtos/source/TARGET_CORTEX/mbed_rtx_conf.h
diff --git a/rtos/TARGET_CORTEX/mbed_rtx_handlers.c b/rtos/source/TARGET_CORTEX/mbed_rtx_handlers.c
similarity index 100%
rename from rtos/TARGET_CORTEX/mbed_rtx_handlers.c
rename to rtos/source/TARGET_CORTEX/mbed_rtx_handlers.c
diff --git a/rtos/TARGET_CORTEX/mbed_rtx_idle.cpp b/rtos/source/TARGET_CORTEX/mbed_rtx_idle.cpp
similarity index 100%
rename from rtos/TARGET_CORTEX/mbed_rtx_idle.cpp
rename to rtos/source/TARGET_CORTEX/mbed_rtx_idle.cpp
diff --git a/rtos/TARGET_CORTEX/mbed_rtx_storage.h b/rtos/source/TARGET_CORTEX/mbed_rtx_storage.h
similarity index 100%
rename from rtos/TARGET_CORTEX/mbed_rtx_storage.h
rename to rtos/source/TARGET_CORTEX/mbed_rtx_storage.h
diff --git a/rtos/TARGET_CORTEX/rtx4/cmsis_os.h b/rtos/source/TARGET_CORTEX/rtx4/cmsis_os.h
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx4/cmsis_os.h
rename to rtos/source/TARGET_CORTEX/rtx4/cmsis_os.h
diff --git a/rtos/TARGET_CORTEX/rtx4/cmsis_os1.c b/rtos/source/TARGET_CORTEX/rtx4/cmsis_os1.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx4/cmsis_os1.c
rename to rtos/source/TARGET_CORTEX/rtx4/cmsis_os1.c
diff --git a/rtos/TARGET_CORTEX/rtx5/Include/cmsis_os2.h b/rtos/source/TARGET_CORTEX/rtx5/Include/cmsis_os2.h
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/Include/cmsis_os2.h
rename to rtos/source/TARGET_CORTEX/rtx5/Include/cmsis_os2.h
diff --git a/rtos/TARGET_CORTEX/rtx5/Include/os_tick.h b/rtos/source/TARGET_CORTEX/rtx5/Include/os_tick.h
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/Include/os_tick.h
rename to rtos/source/TARGET_CORTEX/rtx5/Include/os_tick.h
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Config/RTX_Config.c b/rtos/source/TARGET_CORTEX/rtx5/RTX/Config/RTX_Config.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Config/RTX_Config.c
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Config/RTX_Config.c
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Config/RTX_Config.h b/rtos/source/TARGET_CORTEX/rtx5/RTX/Config/RTX_Config.h
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Config/RTX_Config.h
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Config/RTX_Config.h
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Config/TARGET_CORTEX_A/handlers.c b/rtos/source/TARGET_CORTEX/rtx5/RTX/Config/TARGET_CORTEX_A/handlers.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Config/TARGET_CORTEX_A/handlers.c
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Config/TARGET_CORTEX_A/handlers.c
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Include/rtx_evr.h b/rtos/source/TARGET_CORTEX/rtx5/RTX/Include/rtx_evr.h
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Include/rtx_evr.h
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Include/rtx_evr.h
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Include/rtx_os.h b/rtos/source/TARGET_CORTEX/rtx5/RTX/Include/rtx_os.h
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Include/rtx_os.h
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Include/rtx_os.h
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_CORTEX_A/irq_ca.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_CORTEX_A/irq_ca.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_CORTEX_A/irq_ca.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_CORTEX_A/irq_ca.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M0/irq_cm0.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M0/irq_cm0.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M0/irq_cm0.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M0/irq_cm0.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M0P/irq_cm0.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M0P/irq_cm0.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M0P/irq_cm0.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M0P/irq_cm0.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M23/irq_armv8mbl.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M3/irq_cm3.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M3/irq_cm3.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M3/irq_cm3.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M3/irq_cm3.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_M33/irq_armv8mml.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_RTOS_M4_M7/irq_cm4f.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_RTOS_M4_M7/irq_cm4f.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_RTOS_M4_M7/irq_cm4f.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_ARM/TARGET_RTOS_M4_M7/irq_cm4f.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_CORTEX_A/irq_ca.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_CORTEX_A/irq_ca.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_CORTEX_A/irq_ca.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_CORTEX_A/irq_ca.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M0/irq_cm0.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M0/irq_cm0.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M0/irq_cm0.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M0/irq_cm0.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M0P/irq_cm0.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M0P/irq_cm0.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M0P/irq_cm0.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M0P/irq_cm0.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M23/irq_armv8mbl.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M3/irq_cm3.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M3/irq_cm3.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M3/irq_cm3.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M3/irq_cm3.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M33/irq_armv8mml.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_RTOS_M4_M7/irq_cm4f.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_RTOS_M4_M7/irq_cm4f.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_RTOS_M4_M7/irq_cm4f.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_RTOS_M4_M7/irq_cm4f.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_CORTEX_A/irq_ca.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_CORTEX_A/irq_ca.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_CORTEX_A/irq_ca.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_CORTEX_A/irq_ca.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M0/irq_cm0.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M0/irq_cm0.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M0/irq_cm0.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M0/irq_cm0.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M0P/irq_cm0.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M0P/irq_cm0.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M0P/irq_cm0.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M0P/irq_cm0.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M23/irq_armv8mbl_common.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M3/irq_cm3.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M3/irq_cm3.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M3/irq_cm3.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M3/irq_cm3.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_M33/irq_armv8mml_common.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_RTOS_M4_M7/irq_cm4f.S b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_RTOS_M4_M7/irq_cm4f.S
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_RTOS_M4_M7/irq_cm4f.S
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_IAR/TARGET_RTOS_M4_M7/irq_cm4f.S
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_core_c.h b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_core_c.h
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_core_c.h
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_core_c.h
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_core_ca.h b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_core_ca.h
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_core_ca.h
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_core_ca.h
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_core_cm.h b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_core_cm.h
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_core_cm.h
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_core_cm.h
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_delay.c b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_delay.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_delay.c
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_delay.c
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_evflags.c b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_evflags.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_evflags.c
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_evflags.c
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_evr.c b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_evr.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_evr.c
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_evr.c
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_kernel.c b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_kernel.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_kernel.c
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_kernel.c
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_lib.c b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_lib.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_lib.c
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_lib.c
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_lib.h b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_lib.h
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_lib.h
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_lib.h
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_memory.c b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_memory.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_memory.c
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_memory.c
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_mempool.c b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_mempool.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_mempool.c
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_mempool.c
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_msgqueue.c b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_msgqueue.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_msgqueue.c
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_msgqueue.c
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_mutex.c b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_mutex.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_mutex.c
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_mutex.c
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_semaphore.c b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_semaphore.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_semaphore.c
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_semaphore.c
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_system.c b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_system.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_system.c
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_system.c
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_thread.c b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_thread.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_thread.c
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_thread.c
diff --git a/rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_timer.c b/rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_timer.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/RTX/Source/rtx_timer.c
rename to rtos/source/TARGET_CORTEX/rtx5/RTX/Source/rtx_timer.c
diff --git a/rtos/TARGET_CORTEX/rtx5/Source/os_systick.c b/rtos/source/TARGET_CORTEX/rtx5/Source/os_systick.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/Source/os_systick.c
rename to rtos/source/TARGET_CORTEX/rtx5/Source/os_systick.c
diff --git a/rtos/TARGET_CORTEX/rtx5/Source/os_tick_ptim.c b/rtos/source/TARGET_CORTEX/rtx5/Source/os_tick_ptim.c
similarity index 100%
rename from rtos/TARGET_CORTEX/rtx5/Source/os_tick_ptim.c
rename to rtos/source/TARGET_CORTEX/rtx5/Source/os_tick_ptim.c