diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6dcf2b2..feaffff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,17 @@
 cmake_minimum_required(VERSION 3.0)
 
 # Check to see where cmake is located.
-if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
-    LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-elseif( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../cmake )
-    LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
+if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/submodules/cmake )
+    LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/submodules/cmake)
+elseif( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/cmake )
+    LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/cmake)
 else()
     return()
 endif()
 
 # Check to see if there is versioning information available
-if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/osdev_versioning/cmake)
-    LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/osdev_versioning/cmake)
+if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/submodules/osdev_versioning/cmake)
+    LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/submodules/osdev_versioning/cmake)
     include(osdevversion)
 endif()
 
diff --git a/scripts/setup_submodules b/scripts/setup_submodules
index 7b5e7d8..5c19076 100755
--- a/scripts/setup_submodules
+++ b/scripts/setup_submodules
@@ -107,10 +107,10 @@ function add_submodules()
         echo -e "< ${SUB_MODULE} >"
         if [[ "${OPEN_REPOS[*]}" =~ "${SUB_MODULE}" ]];
         then
-            git submodule add -f ${GIT_URL_SUBS}/${SUB_MODULE}.git ${SUB_MODULE}
+            git submodule add -f ${GIT_URL_SUBS}/${SUB_MODULE}.git submodules/${SUB_MODULE}
             git config submodule.${SUB_MODULE}.url ${GIT_URL_SUBS}/${SUB_MODULE}.git
         else
-            git submodule add -f ${GIT_URL_SUBS_CLOSED}/${SUB_MODULE}.git ${SUB_MODULE}
+            git submodule add -f ${GIT_URL_SUBS_CLOSED}/${SUB_MODULE}.git submodules/${SUB_MODULE}
             git config submodule.${SUB_MODULE}.url ${GIT_URL_SUBS_CLOSED}/${SUB_MODULE}.git
         fi
     done
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6a654ed..fa3ab09 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.12)
+
 LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../external/hsoa_create_version_include/cmake)
 include(projectheader)
 project_header(jobscheduler)
@@ -13,9 +14,9 @@ include_directories( SYSTEM
 include(compiler)
 
 include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/../logutils/src/
-    ${CMAKE_CURRENT_SOURCE_DIR}/../config/src/
-    ${CMAKE_CURRENT_SOURCE_DIR}/../global/src/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/logutils/src/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/config/src/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/global/src/
 )
 
 set(SRC_LIST
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3635320..6952599 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
+LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/cmake)
 
 include(projectheader)
 project_header(test_logutils)