diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.atsuo b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.atsuo
index b2cce4a678..d6467076a5 100644
Binary files a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.atsuo and b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.atsuo differ
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.cproj b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.cproj
index ec02a17b5f..9cc4c2e607 100644
--- a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.cproj
+++ b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/RTOSDemo.cproj
@@ -251,6 +251,9 @@
       <Value>ARM_MATH_CM4=true</Value>
       <Value>BOARD=SAM4S_EK</Value>
       <Value>__SAM4S16C__</Value>
+      <Value>XMEGA=0</Value>
+      <Value>MEGA=0</Value>
+      <Value>UC3=0</Value>
     </ListValues>
   </armgcc.compiler.symbols.DefSymbols>
   <armgcc.compiler.directories.IncludePaths>
@@ -271,17 +274,16 @@
       <Value>../src/asf/thirdparty/CMSIS/Include</Value>
       <Value>../src/asf/thirdparty/CMSIS/Lib/GCC</Value>
       <Value>../src/config</Value>
-      <Value>../src/FreeRTOS-Source/include</Value>
-      <Value>../src/FreeRTOS-Source/portable/GCC/ARM_CM3</Value>
+      <Value>../src/asf/thirdparty/FreeRTOS/include</Value>
+      <Value>../src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3</Value>
       <Value>../src/Common-Demo-Source/include</Value>
     </ListValues>
   </armgcc.compiler.directories.IncludePaths>
-  <armgcc.compiler.optimization.level>Optimize (-O1)</armgcc.compiler.optimization.level>
   <armgcc.compiler.optimization.OtherFlags>-fdata-sections</armgcc.compiler.optimization.OtherFlags>
   <armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>
   <armgcc.compiler.optimization.DebugLevel>Maximum (-g3)</armgcc.compiler.optimization.DebugLevel>
   <armgcc.compiler.warnings.AllWarnings>True</armgcc.compiler.warnings.AllWarnings>
-  <armgcc.compiler.miscellaneous.OtherFlags>-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -std=gnu99 -ffunction-sections -fdata-sections -Wchar-subscripts -Wcomment -Wformat=2 -Wimplicit-int -Wmain -Wparentheses -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef -Wshadow -Wbad-function-cast -Wwrite-strings -Wsign-compare -Waggregate-return  -Wmissing-declarations -Wformat -Wmissing-format-attribute -Wno-deprecated-declarations -Wpacked -Wredundant-decls -Wnested-externs -Winline -Wlong-long -Wunreachable-code -Wcast-align --param max-inline-insns-single=500 -Dprintf=iprintf</armgcc.compiler.miscellaneous.OtherFlags>
+  <armgcc.compiler.miscellaneous.OtherFlags>-pipe -Wall -Wextra -std=gnu99 -ffunction-sections -fdata-sections --param max-inline-insns-single=500 -Dprintf=iprintf</armgcc.compiler.miscellaneous.OtherFlags>
   <armgcc.linker.libraries.Libraries>
     <ListValues>
       <Value>arm_cortexM4l_math</Value>
@@ -364,6 +366,60 @@
     <Compile Include="src\asf\sam\utils\cmsis\sam4s\source\templates\system_sam4s.c">
       <SubType>compile</SubType>
     </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\croutine.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\FreeRTOS.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\list.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\mpu_wrappers.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\portable.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\projdefs.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\queue.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\semphr.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\StackMacros.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\task.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\include\timers.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\list.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3\port.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3\portmacro.h">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\portable\MemMang\heap_2.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\queue.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\tasks.c">
+      <SubType>compile</SubType>
+    </Compile>
+    <Compile Include="src\asf\thirdparty\FreeRTOS\timers.c">
+      <SubType>compile</SubType>
+    </Compile>
     <Compile Include="src\Common-Demo-Source\BlockQ.c">
       <SubType>compile</SubType>
     </Compile>
@@ -427,37 +483,7 @@
     <Compile Include="src\Common-Demo-Source\semtest.c">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="src\FreeRTOS-Source\include\FreeRTOS.h">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\include\queue.h">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\include\semphr.h">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\include\task.h">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\include\timers.h">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\list.c">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\portable\GCC\ARM_CM3\port.c">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\portable\MemMang\heap_2.c">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\queue.c">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\tasks.c">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="src\FreeRTOS-Source\timers.c">
+    <Compile Include="src\FreeRTOSConfig.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="src\main.c">
@@ -783,15 +809,15 @@
     <Folder Include="src\asf\thirdparty\CMSIS\Include\" />
     <Folder Include="src\asf\thirdparty\CMSIS\Lib\" />
     <Folder Include="src\asf\thirdparty\CMSIS\Lib\GCC\" />
+    <Folder Include="src\asf\thirdparty\FreeRTOS\" />
+    <Folder Include="src\asf\thirdparty\FreeRTOS\include\" />
+    <Folder Include="src\asf\thirdparty\FreeRTOS\portable\" />
+    <Folder Include="src\asf\thirdparty\FreeRTOS\portable\GCC\" />
+    <Folder Include="src\asf\thirdparty\FreeRTOS\portable\GCC\ARM_CM3\" />
+    <Folder Include="src\asf\thirdparty\FreeRTOS\portable\MemMang\" />
     <Folder Include="src\Common-Demo-Source\include" />
     <Folder Include="src\config\" />
-    <Folder Include="src\FreeRTOS-Source" />
-    <Folder Include="src\FreeRTOS-Source\include" />
-    <Folder Include="src\FreeRTOS-Source\portable" />
-    <Folder Include="src\FreeRTOS-Source\portable\GCC" />
-    <Folder Include="src\FreeRTOS-Source\portable\GCC\ARM_CM3" />
     <Folder Include="src\Common-Demo-Source" />
-    <Folder Include="src\FreeRTOS-Source\portable\MemMang" />
   </ItemGroup>
   <Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />
 </Project>
\ No newline at end of file
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOSConfig.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOSConfig.h
index ff6deb110c..217b7bb8cb 100644
--- a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOSConfig.h
+++ b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOSConfig.h
@@ -73,7 +73,7 @@
  * executed prior to this project being built.  Once it has been executed 
  * remove the #error line below.
  */
-#error Ensure CreateProjectDirectoryStructure.bat has been executed before building.  See comment immediately above.
+//#error Ensure CreateProjectDirectoryStructure.bat has been executed before building.  See comment immediately above.
 
 /*-----------------------------------------------------------
  * Application specific definitions.
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/ParTest.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/ParTest.c
index 690cf3f6c6..b9e602a238 100644
--- a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/ParTest.c
+++ b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/ParTest.c
@@ -98,7 +98,7 @@ static const uint32_t ulLED[] = { LED2_GPIO, LED0_GPIO, LED1_GPIO };
 
 void vParTestInitialise( void )
 {
-long l;
+unsigned long ul;
 
 	for( l = 0; l < partestNUM_LEDS; l++ )
 	{
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/FreeRTOS.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/FreeRTOS.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/FreeRTOS.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/FreeRTOS.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/StackMacros.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/StackMacros.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/StackMacros.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/StackMacros.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/croutine.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/croutine.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/croutine.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/croutine.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/list.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/list.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/list.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/list.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/mpu_wrappers.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/mpu_wrappers.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/mpu_wrappers.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/mpu_wrappers.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/portable.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/portable.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/portable.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/portable.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/projdefs.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/projdefs.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/projdefs.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/projdefs.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/queue.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/queue.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/queue.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/queue.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/semphr.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/semphr.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/semphr.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/semphr.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/task.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/task.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/task.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/task.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/timers.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/timers.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/timers.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/include/timers.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/list.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/list.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/list.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/list.c
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/GCC/ARM_CM3/port.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/port.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/GCC/ARM_CM3/port.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/port.c
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/GCC/ARM_CM3/portmacro.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/portmacro.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/GCC/ARM_CM3/portmacro.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/GCC/ARM_CM3/portmacro.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/MemMang/heap_2.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/MemMang/heap_2.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/MemMang/heap_2.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/portable/MemMang/heap_2.c
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/queue.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/queue.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/queue.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/queue.c
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/tasks.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/tasks.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/tasks.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/tasks.c
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/timers.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/timers.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/timers.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/asf/thirdparty/FreeRTOS/timers.c