diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject
index b1a634498..31558f61d 100644
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject
@@ -40,7 +40,7 @@
 								</option>
 								<option id="xilinx.gnu.compiler.dircategory.includes.788537379" name="Include Paths" superClass="xilinx.gnu.compiler.dircategory.includes" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Demo_Source/Common_Demo_Files/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Demo_Source/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/portable/GCC/MicroBlaze}&quot;"/>
 								</option>
@@ -1010,7 +1010,7 @@
 								</option>
 								<option id="xilinx.gnu.compiler.dircategory.includes.1539819216" name="Include Paths" superClass="xilinx.gnu.compiler.dircategory.includes" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Demo_Source/Common_Demo_Files/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Demo_Source/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/portable/GCC/MicroBlaze}&quot;"/>
 								</option>
@@ -1045,7 +1045,7 @@
 								</option>
 								<option id="xilinx.gnu.c.linker.option.lscript.1073578867" name="Linker Script" superClass="xilinx.gnu.c.linker.option.lscript" value="../src/lscript.ld" valueType="string"/>
 								<option id="xilinx.gnu.c.link.option.ldflags.471396681" name="Linker Flags" superClass="xilinx.gnu.c.link.option.ldflags" value="-Map=output.map" valueType="string"/>
-								<option id="xilinx.gnu.c.link.option.other.791541632" name="Other options (-XLinker [option])" superClass="xilinx.gnu.c.link.option.other" valueType="stringList"/>
+								<option id="xilinx.gnu.c.link.option.other.791541632" name="Other options (-XLinker [option])" superClass="xilinx.gnu.c.link.option.other"/>
 								<inputType id="xilinx.gnu.linker.input.1399699093" superClass="xilinx.gnu.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat
index 8d418c2f5..f4399ac77 100644
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat
@@ -16,8 +16,8 @@ IF EXIST FreeRTOS_Source Goto END
 	MD FreeRTOS_Source\portable\GCC
 	MD FreeRTOS_Source\portable\GCC\MicroBlaze
 	MD FreeRTOS_Source\portable\MemMang	
-	MD Demo_Source\Common_Demo_Files
-	MD Demo_Source\Common_Demo_Files\include
+	MD Demo_Source
+	MD Demo_Source\include
 	
 	REM Copy the core kernel files.
 	copy ..\..\..\..\Source\tasks.c FreeRTOS_Source
@@ -36,30 +36,30 @@ IF EXIST FreeRTOS_Source Goto END
 	copy ..\..\..\..\Source\portable\MemMang\heap_2.c FreeRTOS_Source\portable\MemMang
 
 	REM Copy the files that define the common demo tasks.
-    copy ..\..\..\Common\minimal\dynamic.c      Demo_Source\Common_Demo_Files
-    copy ..\..\..\Common\minimal\BlockQ.c       Demo_Source\Common_Demo_Files
-    copy ..\..\..\Common\minimal\death.c        Demo_Source\Common_Demo_Files
-    copy ..\..\..\Common\minimal\blocktim.c     Demo_Source\Common_Demo_Files
-    copy ..\..\..\Common\minimal\semtest.c      Demo_Source\Common_Demo_Files
-    copy ..\..\..\Common\minimal\PollQ.c        Demo_Source\Common_Demo_Files
-    copy ..\..\..\Common\minimal\GenQTest.c     Demo_Source\Common_Demo_Files
-    copy ..\..\..\Common\minimal\QPeek.c        Demo_Source\Common_Demo_Files
-    copy ..\..\..\Common\minimal\recmutex.c     Demo_Source\Common_Demo_Files
-    copy ..\..\..\Common\minimal\sp_flop.c      Demo_Source\Common_Demo_Files
-    copy ..\..\..\Common\minimal\flash.c        Demo_Source\Common_Demo_Files
+    copy ..\..\..\Common\minimal\dynamic.c      Demo_Source
+    copy ..\..\..\Common\minimal\BlockQ.c       Demo_Source
+    copy ..\..\..\Common\minimal\death.c        Demo_Source
+    copy ..\..\..\Common\minimal\blocktim.c     Demo_Source
+    copy ..\..\..\Common\minimal\semtest.c      Demo_Source
+    copy ..\..\..\Common\minimal\PollQ.c        Demo_Source
+    copy ..\..\..\Common\minimal\GenQTest.c     Demo_Source
+    copy ..\..\..\Common\minimal\QPeek.c        Demo_Source
+    copy ..\..\..\Common\minimal\recmutex.c     Demo_Source
+    copy ..\..\..\Common\minimal\sp_flop.c      Demo_Source
+    copy ..\..\..\Common\minimal\flash.c        Demo_Source
 	
 	REM Copy the common demo file headers.
-    copy ..\..\..\Common\include\dynamic.h      Demo_Source\Common_Demo_Files\include
-    copy ..\..\..\Common\include\partest.h      Demo_Source\Common_Demo_Files\include
-    copy ..\..\..\Common\include\BlockQ.h       Demo_Source\Common_Demo_Files\include
-    copy ..\..\..\Common\include\death.h        Demo_Source\Common_Demo_Files\include
-    copy ..\..\..\Common\include\blocktim.h     Demo_Source\Common_Demo_Files\include
-    copy ..\..\..\Common\include\semtest.h      Demo_Source\Common_Demo_Files\include
-    copy ..\..\..\Common\include\PollQ.h        Demo_Source\Common_Demo_Files\include
-    copy ..\..\..\Common\include\GenQTest.h     Demo_Source\Common_Demo_Files\include
-    copy ..\..\..\Common\include\QPeek.h        Demo_Source\Common_Demo_Files\include
-    copy ..\..\..\Common\include\recmutex.h     Demo_Source\Common_Demo_Files\include
-    copy ..\..\..\Common\include\flop.h         Demo_Source\Common_Demo_Files\include
-    copy ..\..\..\Common\include\flash.h        Demo_Source\Common_Demo_Files\include
+    copy ..\..\..\Common\include\dynamic.h      Demo_Source\include
+    copy ..\..\..\Common\include\partest.h      Demo_Source\include
+    copy ..\..\..\Common\include\BlockQ.h       Demo_Source\include
+    copy ..\..\..\Common\include\death.h        Demo_Source\include
+    copy ..\..\..\Common\include\blocktim.h     Demo_Source\include
+    copy ..\..\..\Common\include\semtest.h      Demo_Source\include
+    copy ..\..\..\Common\include\PollQ.h        Demo_Source\include
+    copy ..\..\..\Common\include\GenQTest.h     Demo_Source\include
+    copy ..\..\..\Common\include\QPeek.h        Demo_Source\include
+    copy ..\..\..\Common\include\recmutex.h     Demo_Source\include
+    copy ..\..\..\Common\include\flop.h         Demo_Source\include
+    copy ..\..\..\Common\include\flash.h        Demo_Source\include
     
 : END