diff --git a/examples/obsolete/device/device_freertos/.cproject b/examples/obsolete/device/device_freertos/.cproject
index c109cb4ef..eb09f25e7 100644
--- a/examples/obsolete/device/device_freertos/.cproject
+++ b/examples/obsolete/device/device_freertos/.cproject
@@ -89,7 +89,7 @@
-
+
@@ -186,7 +186,7 @@
-
+
@@ -241,9 +241,9 @@
-
-
-
+
+
+
@@ -290,8 +290,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -387,7 +413,7 @@
-
+
@@ -487,7 +513,7 @@
-
+
@@ -583,7 +609,7 @@
-
+
diff --git a/examples/obsolete/device/device_freertos/.project b/examples/obsolete/device/device_freertos/.project
index 65e76f1a7..80d14f756 100644
--- a/examples/obsolete/device/device_freertos/.project
+++ b/examples/obsolete/device/device_freertos/.project
@@ -81,9 +81,9 @@
- freertos
+ FreeRTOS2
- PARENT-4-PROJECT_LOC/vendor/freertos
+ PARENT-4-PROJECT_LOC/lib/FreeRTOShw
diff --git a/vendor/freertos/FreeRTOSConfig.h b/lib/FreeRTOS/FreeRTOSConfig.h
similarity index 100%
rename from vendor/freertos/FreeRTOSConfig.h
rename to lib/FreeRTOS/FreeRTOSConfig.h
diff --git a/vendor/freertos/freertos/License/license.txt b/lib/FreeRTOS/License/license.txt
similarity index 100%
rename from vendor/freertos/freertos/License/license.txt
rename to lib/FreeRTOS/License/license.txt
diff --git a/vendor/freertos/freertos/Source/croutine.c b/lib/FreeRTOS/Source/croutine.c
similarity index 100%
rename from vendor/freertos/freertos/Source/croutine.c
rename to lib/FreeRTOS/Source/croutine.c
diff --git a/vendor/freertos/freertos/Source/event_groups.c b/lib/FreeRTOS/Source/event_groups.c
similarity index 100%
rename from vendor/freertos/freertos/Source/event_groups.c
rename to lib/FreeRTOS/Source/event_groups.c
diff --git a/vendor/freertos/freertos/Source/include/FreeRTOS.h b/lib/FreeRTOS/Source/include/FreeRTOS.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/FreeRTOS.h
rename to lib/FreeRTOS/Source/include/FreeRTOS.h
diff --git a/vendor/freertos/freertos/Source/include/StackMacros.h b/lib/FreeRTOS/Source/include/StackMacros.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/StackMacros.h
rename to lib/FreeRTOS/Source/include/StackMacros.h
diff --git a/vendor/freertos/freertos/Source/include/croutine.h b/lib/FreeRTOS/Source/include/croutine.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/croutine.h
rename to lib/FreeRTOS/Source/include/croutine.h
diff --git a/vendor/freertos/freertos/Source/include/deprecated_definitions.h b/lib/FreeRTOS/Source/include/deprecated_definitions.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/deprecated_definitions.h
rename to lib/FreeRTOS/Source/include/deprecated_definitions.h
diff --git a/vendor/freertos/freertos/Source/include/event_groups.h b/lib/FreeRTOS/Source/include/event_groups.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/event_groups.h
rename to lib/FreeRTOS/Source/include/event_groups.h
diff --git a/vendor/freertos/freertos/Source/include/list.h b/lib/FreeRTOS/Source/include/list.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/list.h
rename to lib/FreeRTOS/Source/include/list.h
diff --git a/vendor/freertos/freertos/Source/include/message_buffer.h b/lib/FreeRTOS/Source/include/message_buffer.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/message_buffer.h
rename to lib/FreeRTOS/Source/include/message_buffer.h
diff --git a/vendor/freertos/freertos/Source/include/mpu_prototypes.h b/lib/FreeRTOS/Source/include/mpu_prototypes.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/mpu_prototypes.h
rename to lib/FreeRTOS/Source/include/mpu_prototypes.h
diff --git a/vendor/freertos/freertos/Source/include/mpu_wrappers.h b/lib/FreeRTOS/Source/include/mpu_wrappers.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/mpu_wrappers.h
rename to lib/FreeRTOS/Source/include/mpu_wrappers.h
diff --git a/vendor/freertos/freertos/Source/include/portable.h b/lib/FreeRTOS/Source/include/portable.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/portable.h
rename to lib/FreeRTOS/Source/include/portable.h
diff --git a/vendor/freertos/freertos/Source/include/projdefs.h b/lib/FreeRTOS/Source/include/projdefs.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/projdefs.h
rename to lib/FreeRTOS/Source/include/projdefs.h
diff --git a/vendor/freertos/freertos/Source/include/queue.h b/lib/FreeRTOS/Source/include/queue.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/queue.h
rename to lib/FreeRTOS/Source/include/queue.h
diff --git a/vendor/freertos/freertos/Source/include/semphr.h b/lib/FreeRTOS/Source/include/semphr.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/semphr.h
rename to lib/FreeRTOS/Source/include/semphr.h
diff --git a/vendor/freertos/freertos/Source/include/stack_macros.h b/lib/FreeRTOS/Source/include/stack_macros.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/stack_macros.h
rename to lib/FreeRTOS/Source/include/stack_macros.h
diff --git a/vendor/freertos/freertos/Source/include/stdint.readme b/lib/FreeRTOS/Source/include/stdint.readme
similarity index 100%
rename from vendor/freertos/freertos/Source/include/stdint.readme
rename to lib/FreeRTOS/Source/include/stdint.readme
diff --git a/vendor/freertos/freertos/Source/include/stream_buffer.h b/lib/FreeRTOS/Source/include/stream_buffer.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/stream_buffer.h
rename to lib/FreeRTOS/Source/include/stream_buffer.h
diff --git a/vendor/freertos/freertos/Source/include/task.h b/lib/FreeRTOS/Source/include/task.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/task.h
rename to lib/FreeRTOS/Source/include/task.h
diff --git a/vendor/freertos/freertos/Source/include/timers.h b/lib/FreeRTOS/Source/include/timers.h
similarity index 100%
rename from vendor/freertos/freertos/Source/include/timers.h
rename to lib/FreeRTOS/Source/include/timers.h
diff --git a/vendor/freertos/freertos/Source/list.c b/lib/FreeRTOS/Source/list.c
similarity index 100%
rename from vendor/freertos/freertos/Source/list.c
rename to lib/FreeRTOS/Source/list.c
diff --git a/vendor/freertos/freertos/Source/portable/Common/mpu_wrappers.c b/lib/FreeRTOS/Source/portable/Common/mpu_wrappers.c
similarity index 100%
rename from vendor/freertos/freertos/Source/portable/Common/mpu_wrappers.c
rename to lib/FreeRTOS/Source/portable/Common/mpu_wrappers.c
diff --git a/vendor/freertos/freertos/Source/portable/GCC/ARM_CM0/port.c b/lib/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c
similarity index 100%
rename from vendor/freertos/freertos/Source/portable/GCC/ARM_CM0/port.c
rename to lib/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c
diff --git a/vendor/freertos/freertos/Source/portable/GCC/ARM_CM0/portmacro.h b/lib/FreeRTOS/Source/portable/GCC/ARM_CM0/portmacro.h
similarity index 100%
rename from vendor/freertos/freertos/Source/portable/GCC/ARM_CM0/portmacro.h
rename to lib/FreeRTOS/Source/portable/GCC/ARM_CM0/portmacro.h
diff --git a/vendor/freertos/freertos/Source/portable/GCC/ARM_CM3/port.c b/lib/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c
similarity index 100%
rename from vendor/freertos/freertos/Source/portable/GCC/ARM_CM3/port.c
rename to lib/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c
diff --git a/vendor/freertos/freertos/Source/portable/GCC/ARM_CM3/portmacro.h b/lib/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h
similarity index 100%
rename from vendor/freertos/freertos/Source/portable/GCC/ARM_CM3/portmacro.h
rename to lib/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h
diff --git a/vendor/freertos/freertos/Source/portable/GCC/ARM_CM4F/port.c b/lib/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c
similarity index 100%
rename from vendor/freertos/freertos/Source/portable/GCC/ARM_CM4F/port.c
rename to lib/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c
diff --git a/vendor/freertos/freertos/Source/portable/GCC/ARM_CM4F/portmacro.h b/lib/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h
similarity index 100%
rename from vendor/freertos/freertos/Source/portable/GCC/ARM_CM4F/portmacro.h
rename to lib/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h
diff --git a/vendor/freertos/freertos/Source/portable/MemMang/ReadMe.url b/lib/FreeRTOS/Source/portable/MemMang/ReadMe.url
similarity index 100%
rename from vendor/freertos/freertos/Source/portable/MemMang/ReadMe.url
rename to lib/FreeRTOS/Source/portable/MemMang/ReadMe.url
diff --git a/vendor/freertos/freertos/Source/portable/MemMang/heap_4.c b/lib/FreeRTOS/Source/portable/MemMang/heap_4.c
similarity index 100%
rename from vendor/freertos/freertos/Source/portable/MemMang/heap_4.c
rename to lib/FreeRTOS/Source/portable/MemMang/heap_4.c
diff --git a/vendor/freertos/freertos/Source/portable/readme.txt b/lib/FreeRTOS/Source/portable/readme.txt
similarity index 100%
rename from vendor/freertos/freertos/Source/portable/readme.txt
rename to lib/FreeRTOS/Source/portable/readme.txt
diff --git a/vendor/freertos/freertos/Source/queue.c b/lib/FreeRTOS/Source/queue.c
similarity index 100%
rename from vendor/freertos/freertos/Source/queue.c
rename to lib/FreeRTOS/Source/queue.c
diff --git a/vendor/freertos/freertos/Source/readme.txt b/lib/FreeRTOS/Source/readme.txt
similarity index 100%
rename from vendor/freertos/freertos/Source/readme.txt
rename to lib/FreeRTOS/Source/readme.txt
diff --git a/vendor/freertos/freertos/Source/stream_buffer.c b/lib/FreeRTOS/Source/stream_buffer.c
similarity index 100%
rename from vendor/freertos/freertos/Source/stream_buffer.c
rename to lib/FreeRTOS/Source/stream_buffer.c
diff --git a/vendor/freertos/freertos/Source/tasks.c b/lib/FreeRTOS/Source/tasks.c
similarity index 100%
rename from vendor/freertos/freertos/Source/tasks.c
rename to lib/FreeRTOS/Source/tasks.c
diff --git a/vendor/freertos/freertos/Source/timers.c b/lib/FreeRTOS/Source/timers.c
similarity index 100%
rename from vendor/freertos/freertos/Source/timers.c
rename to lib/FreeRTOS/Source/timers.c
diff --git a/vendor/freertos/freertos_hook.c b/lib/FreeRTOS/freertos_hook.c
similarity index 100%
rename from vendor/freertos/freertos_hook.c
rename to lib/FreeRTOS/freertos_hook.c
diff --git a/vendor/freertos/readme.md b/lib/FreeRTOS/readme.md
similarity index 100%
rename from vendor/freertos/readme.md
rename to lib/FreeRTOS/readme.md
diff --git a/vendor/fatfs/00readme.txt b/lib/fatfs/00readme.txt
similarity index 100%
rename from vendor/fatfs/00readme.txt
rename to lib/fatfs/00readme.txt
diff --git a/vendor/fatfs/ccsbcs.c b/lib/fatfs/ccsbcs.c
similarity index 100%
rename from vendor/fatfs/ccsbcs.c
rename to lib/fatfs/ccsbcs.c
diff --git a/vendor/fatfs/diskio.c b/lib/fatfs/diskio.c
similarity index 100%
rename from vendor/fatfs/diskio.c
rename to lib/fatfs/diskio.c
diff --git a/vendor/fatfs/diskio.h b/lib/fatfs/diskio.h
similarity index 100%
rename from vendor/fatfs/diskio.h
rename to lib/fatfs/diskio.h
diff --git a/vendor/fatfs/ff.c b/lib/fatfs/ff.c
similarity index 100%
rename from vendor/fatfs/ff.c
rename to lib/fatfs/ff.c
diff --git a/vendor/fatfs/ff.h b/lib/fatfs/ff.h
similarity index 100%
rename from vendor/fatfs/ff.h
rename to lib/fatfs/ff.h
diff --git a/vendor/fatfs/ffconf.h b/lib/fatfs/ffconf.h
similarity index 100%
rename from vendor/fatfs/ffconf.h
rename to lib/fatfs/ffconf.h
diff --git a/vendor/fatfs/integer.h b/lib/fatfs/integer.h
similarity index 100%
rename from vendor/fatfs/integer.h
rename to lib/fatfs/integer.h
diff --git a/vendor/freertos/freertos/readme.txt b/vendor/freertos/freertos/readme.txt
deleted file mode 100644
index 7fa63a753..000000000
--- a/vendor/freertos/freertos/readme.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Directories:
-
-+ The FreeRTOS/Source directory contains the FreeRTOS source code, and contains
- its own readme file.
-
-+ The FreeRTOS/Demo directory contains a demo application for every official
-FreeRTOS port, and contains its own readme file.
-
-+ See http://www.freertos.org/a00017.html for full details of the directory
- structure and information on locating the files you require.
-
-The easiest way to use FreeRTOS is to start with one of the pre-configured demo
-application projects (found in the FreeRTOS/Demo directory). That way you will
-have the correct FreeRTOS source files included, and the correct include paths
-configured. Once a demo application is building and executing you can remove
-the demo application file, and start to add in your own application source
-files.
-
-See also -
-http://www.freertos.org/FreeRTOS-quick-start-guide.html
-http://www.freertos.org/FAQHelp.html