diff --git a/.gitmodules b/.gitmodules
index 1cff8b0..7a06610 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "FreeRTOS-Kernel"]
-	path = FreeRTOS-Kernel
+	path = contrib/FreeRTOS-Kernel
 	url = https://github.com/FreeRTOS/FreeRTOS-Kernel
 [submodule "contrib/lwip"]
 	path = contrib/lwip
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a61652..6c39eef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(romeo-obsw C ASM)
 
 # Set path names
 set(OBSW_NAME romeo-obsw)
-set(FreeRTOS_PATH FreeRTOS-Kernel/)
+set(FreeRTOS_PATH contrib/FreeRTOS-Kernel/)
 
 # Compiler Options
 set(ROMEO_Z7_COMPILE_OPTIONS -c -fmessage-length=0 -g -O0 -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard -ffunction-sections -fdata-sections)
diff --git a/FreeRTOS-Kernel b/contrib/FreeRTOS-Kernel
similarity index 100%
rename from FreeRTOS-Kernel
rename to contrib/FreeRTOS-Kernel