diff --git a/demo/non_os/stm32f10x/EWARM/.gitignore b/demos/non_os/stm32f10x/EWARM/.gitignore
similarity index 100%
rename from demo/non_os/stm32f10x/EWARM/.gitignore
rename to demos/non_os/stm32f10x/EWARM/.gitignore
diff --git a/demo/non_os/stm32f10x/EWARM/CmBacktrace.ewp b/demos/non_os/stm32f10x/EWARM/CmBacktrace.ewp
similarity index 100%
rename from demo/non_os/stm32f10x/EWARM/CmBacktrace.ewp
rename to demos/non_os/stm32f10x/EWARM/CmBacktrace.ewp
diff --git a/demo/non_os/stm32f10x/EWARM/CmBacktrace.ewt b/demos/non_os/stm32f10x/EWARM/CmBacktrace.ewt
similarity index 100%
rename from demo/non_os/stm32f10x/EWARM/CmBacktrace.ewt
rename to demos/non_os/stm32f10x/EWARM/CmBacktrace.ewt
diff --git a/demo/non_os/stm32f10x/EWARM/CmBacktrace.eww b/demos/non_os/stm32f10x/EWARM/CmBacktrace.eww
similarity index 100%
rename from demo/non_os/stm32f10x/EWARM/CmBacktrace.eww
rename to demos/non_os/stm32f10x/EWARM/CmBacktrace.eww
diff --git a/demo/non_os/stm32f10x/EWARM/settings/CmBacktrace.crun b/demos/non_os/stm32f10x/EWARM/settings/CmBacktrace.crun
similarity index 100%
rename from demo/non_os/stm32f10x/EWARM/settings/CmBacktrace.crun
rename to demos/non_os/stm32f10x/EWARM/settings/CmBacktrace.crun
diff --git a/demo/non_os/stm32f10x/EWARM/settings/CmBacktrace.wspos b/demos/non_os/stm32f10x/EWARM/settings/CmBacktrace.wspos
similarity index 100%
rename from demo/non_os/stm32f10x/EWARM/settings/CmBacktrace.wspos
rename to demos/non_os/stm32f10x/EWARM/settings/CmBacktrace.wspos
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CMSIS END USER LICENCE AGREEMENT.pdf b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CMSIS END USER LICENCE AGREEMENT.pdf
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CMSIS END USER LICENCE AGREEMENT.pdf
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CMSIS END USER LICENCE AGREEMENT.pdf
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CMSIS debug support.htm b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CMSIS debug support.htm
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CMSIS debug support.htm
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CMSIS debug support.htm
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CMSIS_changes.htm b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CMSIS_changes.htm
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/CMSIS_changes.htm
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/CMSIS_changes.htm
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Documentation/CMSIS_Core.htm b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Documentation/CMSIS_Core.htm
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Documentation/CMSIS_Core.htm
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Documentation/CMSIS_Core.htm
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/arm_common_tables.h b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/arm_common_tables.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/arm_common_tables.h
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/arm_common_tables.h
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/arm_math.h b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/arm_math.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/arm_math.h
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/arm_math.h
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm0.h b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm0.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm0.h
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm0.h
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm0plus.h b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm0plus.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm0plus.h
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm0plus.h
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm3.h b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm3.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm3.h
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm3.h
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm4.h b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm4.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm4.h
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm4.h
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm4_simd.h b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm4_simd.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm4_simd.h
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cm4_simd.h
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cmFunc.h b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cmFunc.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cmFunc.h
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cmFunc.h
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cmInstr.h b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cmInstr.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cmInstr.h
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_cmInstr.h
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_sc000.h b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_sc000.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_sc000.h
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_sc000.h
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_sc300.h b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_sc300.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_sc300.h
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/Include/core_sc300.h
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/License.doc b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/License.doc
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/License.doc
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/License.doc
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/README.txt b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/README.txt
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/README.txt
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/README.txt
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/index.htm b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/index.htm
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/index.htm
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/index.htm
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/readme_patch.txt b/demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/readme_patch.txt
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_EWARM/readme_patch.txt
rename to demos/non_os/stm32f10x/Libraries/CMSIS_EWARM/readme_patch.txt
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.c b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.c
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.c
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.h b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.h
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/CoreSupport/core_cm3.h
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/Release_Notes_for_STM32F10x_CMSIS.html b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/Release_Notes_for_STM32F10x_CMSIS.html
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/Release_Notes_for_STM32F10x_CMSIS.html
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/Release_Notes_for_STM32F10x_CMSIS.html
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CMSIS debug support.htm b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CMSIS debug support.htm
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CMSIS debug support.htm
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CMSIS debug support.htm
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CMSIS_changes.htm b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CMSIS_changes.htm
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CMSIS_changes.htm
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/CMSIS_changes.htm
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/Documentation/CMSIS_Core.htm b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/Documentation/CMSIS_Core.htm
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/Documentation/CMSIS_Core.htm
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/Documentation/CMSIS_Core.htm
diff --git a/demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/License.doc b/demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/License.doc
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/CMSIS_RVMDK/License.doc
rename to demos/non_os/stm32f10x/Libraries/CMSIS_RVMDK/License.doc
diff --git a/demo/non_os/stm32f10x/Libraries/SConscript b/demos/non_os/stm32f10x/Libraries/SConscript
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/SConscript
rename to demos/non_os/stm32f10x/Libraries/SConscript
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes.html b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes.html
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes.html
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes.html
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes_for_STM32F10x_StdPeriph_Driver.html b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes_for_STM32F10x_StdPeriph_Driver.html
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes_for_STM32F10x_StdPeriph_Driver.html
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes_for_STM32F10x_StdPeriph_Driver.html
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c
diff --git a/demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c b/demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c
similarity index 100%
rename from demo/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c
rename to demos/non_os/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c
diff --git a/demo/non_os/stm32f10x/README.md b/demos/non_os/stm32f10x/README.md
similarity index 100%
rename from demo/non_os/stm32f10x/README.md
rename to demos/non_os/stm32f10x/README.md
diff --git a/demo/non_os/stm32f10x/RVMDK/.gitignore b/demos/non_os/stm32f10x/RVMDK/.gitignore
similarity index 100%
rename from demo/non_os/stm32f10x/RVMDK/.gitignore
rename to demos/non_os/stm32f10x/RVMDK/.gitignore
diff --git a/demo/non_os/stm32f10x/RVMDK/CmBacktrace.uvopt b/demos/non_os/stm32f10x/RVMDK/CmBacktrace.uvopt
similarity index 100%
rename from demo/non_os/stm32f10x/RVMDK/CmBacktrace.uvopt
rename to demos/non_os/stm32f10x/RVMDK/CmBacktrace.uvopt
diff --git a/demo/non_os/stm32f10x/RVMDK/CmBacktrace.uvproj b/demos/non_os/stm32f10x/RVMDK/CmBacktrace.uvproj
similarity index 100%
rename from demo/non_os/stm32f10x/RVMDK/CmBacktrace.uvproj
rename to demos/non_os/stm32f10x/RVMDK/CmBacktrace.uvproj
diff --git a/demo/non_os/stm32f10x/RVMDK/JLink Regs CM3.txt b/demos/non_os/stm32f10x/RVMDK/JLink Regs CM3.txt
similarity index 100%
rename from demo/non_os/stm32f10x/RVMDK/JLink Regs CM3.txt
rename to demos/non_os/stm32f10x/RVMDK/JLink Regs CM3.txt
diff --git a/demo/non_os/stm32f10x/RVMDK/JLinkLog.txt b/demos/non_os/stm32f10x/RVMDK/JLinkLog.txt
similarity index 100%
rename from demo/non_os/stm32f10x/RVMDK/JLinkLog.txt
rename to demos/non_os/stm32f10x/RVMDK/JLinkLog.txt
diff --git a/demo/non_os/stm32f10x/RVMDK/JLinkSettings.ini b/demos/non_os/stm32f10x/RVMDK/JLinkSettings.ini
similarity index 100%
rename from demo/non_os/stm32f10x/RVMDK/JLinkSettings.ini
rename to demos/non_os/stm32f10x/RVMDK/JLinkSettings.ini
diff --git a/demo/non_os/stm32f10x/app/inc/stm32f10x_conf.h b/demos/non_os/stm32f10x/app/inc/stm32f10x_conf.h
similarity index 100%
rename from demo/non_os/stm32f10x/app/inc/stm32f10x_conf.h
rename to demos/non_os/stm32f10x/app/inc/stm32f10x_conf.h
diff --git a/demo/non_os/stm32f10x/app/inc/stm32f10x_it.h b/demos/non_os/stm32f10x/app/inc/stm32f10x_it.h
similarity index 100%
rename from demo/non_os/stm32f10x/app/inc/stm32f10x_it.h
rename to demos/non_os/stm32f10x/app/inc/stm32f10x_it.h
diff --git a/demo/non_os/stm32f10x/app/src/app.c b/demos/non_os/stm32f10x/app/src/app.c
similarity index 100%
rename from demo/non_os/stm32f10x/app/src/app.c
rename to demos/non_os/stm32f10x/app/src/app.c
diff --git a/demo/non_os/stm32f10x/app/src/fault_test.c b/demos/non_os/stm32f10x/app/src/fault_test.c
similarity index 100%
rename from demo/non_os/stm32f10x/app/src/fault_test.c
rename to demos/non_os/stm32f10x/app/src/fault_test.c
diff --git a/demo/non_os/stm32f10x/app/src/stm32f10x_it.c b/demos/non_os/stm32f10x/app/src/stm32f10x_it.c
similarity index 100%
rename from demo/non_os/stm32f10x/app/src/stm32f10x_it.c
rename to demos/non_os/stm32f10x/app/src/stm32f10x_it.c
diff --git a/demo/non_os/stm32f10x/components/cm_backtrace/cmb_cfg.h b/demos/non_os/stm32f10x/components/cm_backtrace/cmb_cfg.h
similarity index 100%
rename from demo/non_os/stm32f10x/components/cm_backtrace/cmb_cfg.h
rename to demos/non_os/stm32f10x/components/cm_backtrace/cmb_cfg.h
diff --git a/demo/non_os/stm32f10x/components/others/bsp.c b/demos/non_os/stm32f10x/components/others/bsp.c
similarity index 100%
rename from demo/non_os/stm32f10x/components/others/bsp.c
rename to demos/non_os/stm32f10x/components/others/bsp.c
diff --git a/demo/non_os/stm32f10x/components/others/bsp.h b/demos/non_os/stm32f10x/components/others/bsp.h
similarity index 100%
rename from demo/non_os/stm32f10x/components/others/bsp.h
rename to demos/non_os/stm32f10x/components/others/bsp.h
diff --git a/demo/non_os/stm32f10x/components/others/stm32f103xB.icf b/demos/non_os/stm32f10x/components/others/stm32f103xB.icf
similarity index 100%
rename from demo/non_os/stm32f10x/components/others/stm32f103xB.icf
rename to demos/non_os/stm32f10x/components/others/stm32f103xB.icf
diff --git a/demo/non_os/stm32f10x/components/others/stm32f103xE.icf b/demos/non_os/stm32f10x/components/others/stm32f103xE.icf
similarity index 100%
rename from demo/non_os/stm32f10x/components/others/stm32f103xE.icf
rename to demos/non_os/stm32f10x/components/others/stm32f103xE.icf
diff --git a/demo/non_os/stm32f10x/components/others/types.h b/demos/non_os/stm32f10x/components/others/types.h
similarity index 100%
rename from demo/non_os/stm32f10x/components/others/types.h
rename to demos/non_os/stm32f10x/components/others/types.h
diff --git a/demo/os/freertos/stm32f10x/README.md b/demos/os/freertos/stm32f10x/README.md
similarity index 100%
rename from demo/os/freertos/stm32f10x/README.md
rename to demos/os/freertos/stm32f10x/README.md
diff --git a/demo/os/rtthread/stm32f4xx/README.md b/demos/os/rtthread/stm32f4xx/README.md
similarity index 100%
rename from demo/os/rtthread/stm32f4xx/README.md
rename to demos/os/rtthread/stm32f4xx/README.md
diff --git a/demo/os/ucosii/stm32f20x/README.md b/demos/os/ucosii/stm32f20x/README.md
similarity index 100%
rename from demo/os/ucosii/stm32f20x/README.md
rename to demos/os/ucosii/stm32f20x/README.md