diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/FreeRTOS.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/FreeRTOS.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/FreeRTOS.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/FreeRTOS.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/StackMacros.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/StackMacros.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/StackMacros.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/StackMacros.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/croutine.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/croutine.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/croutine.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/croutine.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/list.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/list.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/list.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/list.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/mpu_wrappers.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/mpu_wrappers.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/mpu_wrappers.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/mpu_wrappers.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/portable.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/portable.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/portable.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/portable.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/projdefs.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/projdefs.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/projdefs.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/projdefs.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/queue.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/queue.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/queue.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/queue.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/semphr.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/semphr.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/semphr.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/semphr.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/task.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/task.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/task.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/task.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/timers.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/timers.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/include/timers.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/include/timers.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/list.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/list.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/list.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/list.c
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/portable/GCC/ARM_CM3/port.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/GCC/ARM_CM3/port.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/portable/GCC/ARM_CM3/port.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/GCC/ARM_CM3/port.c
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/portable/GCC/ARM_CM3/portmacro.h b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/GCC/ARM_CM3/portmacro.h
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/portable/GCC/ARM_CM3/portmacro.h
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/GCC/ARM_CM3/portmacro.h
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/portable/MemMang/heap_2.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/MemMang/heap_2.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/portable/MemMang/heap_2.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/portable/MemMang/heap_2.c
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/queue.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/queue.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/queue.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/queue.c
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/tasks.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/tasks.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/tasks.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/tasks.c
diff --git a/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/timers.c b/Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/timers.c
similarity index 100%
rename from Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS-Source/timers.c
rename to Demo/CORTEX_M4_ATSAM4S_AVR_Studio/src/FreeRTOS/timers.c