diff --git a/FreeRTOS/Demo/CORTEX_M2S050_Starter_Kit_SoftConsole/CreateProjectDirectoryStructure.bat b/FreeRTOS/Demo/CORTEX_M2S050_Starter_Kit_SoftConsole/CreateProjectDirectoryStructure.bat
index 7a628ed35..efc8b8efb 100644
--- a/FreeRTOS/Demo/CORTEX_M2S050_Starter_Kit_SoftConsole/CreateProjectDirectoryStructure.bat
+++ b/FreeRTOS/Demo/CORTEX_M2S050_Starter_Kit_SoftConsole/CreateProjectDirectoryStructure.bat
@@ -11,49 +11,55 @@ REM Standard paths
SET FREERTOS_SOURCE=..\..\Source
SET COMMON_SOURCE=..\Common\minimal
SET COMMON_INCLUDE=..\Common\include
+SET CLI_SOURCE=..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-CLI
+SET FAT_SOURCE=..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-FAT-SL
REM Have the files already been copied?
-IF EXIST RTOSDemo\FreeRTOS_Source Goto END
+IF EXIST RTOSDemo\FreeRTOS-Source Goto END
REM Create the required directory structure.
- MD RTOSDemo\FreeRTOS_Source
- MD RTOSDemo\FreeRTOS_Source\include
- MD RTOSDemo\FreeRTOS_Source\portable
- MD RTOSDemo\FreeRTOS_Source\portable\GCC
- MD RTOSDemo\FreeRTOS_Source\portable\GCC\ARM_CM3
- MD RTOSDemo\FreeRTOS_Source\portable\MemMang
- MD RTOSDemo\Common-Demo-Source
- MD RTOSDemo\Common-Demo-Source\include
+ MD RTOSDemo\FreeRTOS-Source
+ MD RTOSDemo\FreeRTOS-Source\include
+ MD RTOSDemo\FreeRTOS-Source\portable
+ MD RTOSDemo\FreeRTOS-Source\portable\GCC
+ MD RTOSDemo\FreeRTOS-Source\portable\GCC\ARM_CM3
+ MD RTOSDemo\FreeRTOS-Source\portable\MemMang
REM Copy the core kernel files into the project directory
- copy %FREERTOS_SOURCE%\tasks.c RTOSDemo\FreeRTOS_Source
- copy %FREERTOS_SOURCE%\queue.c RTOSDemo\FreeRTOS_Source
- copy %FREERTOS_SOURCE%\list.c RTOSDemo\FreeRTOS_Source
- copy %FREERTOS_SOURCE%\timers.c RTOSDemo\FreeRTOS_Source
+ copy %FREERTOS_SOURCE%\tasks.c RTOSDemo\FreeRTOS-Source
+ copy %FREERTOS_SOURCE%\queue.c RTOSDemo\FreeRTOS-Source
+ copy %FREERTOS_SOURCE%\list.c RTOSDemo\FreeRTOS-Source
+ copy %FREERTOS_SOURCE%\timers.c RTOSDemo\FreeRTOS-Source
REM Copy the common header files into the project directory
- copy %FREERTOS_SOURCE%\include\*.* RTOSDemo\FreeRTOS_Source\include
+ copy %FREERTOS_SOURCE%\include\*.* RTOSDemo\FreeRTOS-Source\include
REM Copy the portable layer files into the project directory
- copy %FREERTOS_SOURCE%\portable\GCC\ARM_CM3\*.* RTOSDemo\FreeRTOS_Source\portable\GCC\ARM_CM3
+ copy %FREERTOS_SOURCE%\portable\GCC\ARM_CM3\*.* RTOSDemo\FreeRTOS-Source\portable\GCC\ARM_CM3
REM Copy the memory allocation files into the project directory
- copy %FREERTOS_SOURCE%\portable\MemMang\heap_4.c RTOSDemo\FreeRTOS_Source\portable\MemMang
+ copy %FREERTOS_SOURCE%\portable\MemMang\heap_4.c RTOSDemo\FreeRTOS-Source\portable\MemMang
REM Copy the files that define the common demo tasks.
- copy %COMMON_SOURCE%\dynamic.c RTOSDemo\Common-Demo-Source
- copy %COMMON_SOURCE%\BlockQ.c RTOSDemo\Common-Demo-Source
- copy %COMMON_SOURCE%\flash_timer.c RTOSDemo\Common-Demo-Source
- copy %COMMON_SOURCE%\death.c RTOSDemo\Common-Demo-Source
- copy %COMMON_SOURCE%\blocktim.c RTOSDemo\Common-Demo-Source
- copy %COMMON_SOURCE%\semtest.c RTOSDemo\Common-Demo-Source
- copy %COMMON_SOURCE%\PollQ.c RTOSDemo\Common-Demo-Source
- copy %COMMON_SOURCE%\GenQTest.c RTOSDemo\Common-Demo-Source
- copy %COMMON_SOURCE%\recmutex.c RTOSDemo\Common-Demo-Source
- copy %COMMON_SOURCE%\countsem.c RTOSDemo\Common-Demo-Source
- copy %COMMON_SOURCE%\integer.c RTOSDemo\Common-Demo-Source
+ copy %COMMON_SOURCE%\dynamic.c RTOSDemo\Full-Demo\Common-Demo-Source
+ copy %COMMON_SOURCE%\BlockQ.c RTOSDemo\Full-Demo\Common-Demo-Source
+ copy %COMMON_SOURCE%\flash_timer.c RTOSDemo\Full-Demo\Common-Demo-Source
+ copy %COMMON_SOURCE%\death.c RTOSDemo\Full-Demo\Common-Demo-Source
+ copy %COMMON_SOURCE%\blocktim.c RTOSDemo\Full-Demo\Common-Demo-Source
+ copy %COMMON_SOURCE%\semtest.c RTOSDemo\Full-Demo\Common-Demo-Source
+ copy %COMMON_SOURCE%\PollQ.c RTOSDemo\Full-Demo\Common-Demo-Source
+ copy %COMMON_SOURCE%\GenQTest.c RTOSDemo\Full-Demo\Common-Demo-Source
+ copy %COMMON_SOURCE%\recmutex.c RTOSDemo\Full-Demo\Common-Demo-Source
+ copy %COMMON_SOURCE%\countsem.c RTOSDemo\Full-Demo\Common-Demo-Source
+ copy %COMMON_SOURCE%\integer.c RTOSDemo\Full-Demo\Common-Demo-Source
REM Copy the common demo file headers.
- copy %COMMON_INCLUDE%\*.h RTOSDemo\Common-Demo-Source\include
+ copy %COMMON_INCLUDE%\*.h RTOSDemo\Full-Demo\Common-Demo-Source\include
+
+ REM Copy the FreeRTOS+CLI source.
+ copy %CLI_SOURCE%\*.* RTOSDemo\Full-Demo\FreeRTOS-Plus-CLI-Source
+
+ REM Copy the FreeRTOS+FAT SL source.
+ xcopy %FAT_SOURCE%\*.* RTOSDemo\Full-Demo\FreeRTOS-Plus-FAT-SL-Source /S
: END
diff --git a/FreeRTOS/Demo/CORTEX_M2S050_Starter_Kit_SoftConsole/RTOSDemo/.cproject b/FreeRTOS/Demo/CORTEX_M2S050_Starter_Kit_SoftConsole/RTOSDemo/.cproject
index 95eadcc36..321f82be8 100644
--- a/FreeRTOS/Demo/CORTEX_M2S050_Starter_Kit_SoftConsole/RTOSDemo/.cproject
+++ b/FreeRTOS/Demo/CORTEX_M2S050_Starter_Kit_SoftConsole/RTOSDemo/.cproject
@@ -21,13 +21,16 @@
-
+
-
+