diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a8ed916..d865b06 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,26 +1,4 @@
 cmake_minimum_required(VERSION 3.12)
-# ==============================================================================
-# Check to see if we're a submodule or top-repo.
-if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/cmake)
-    message( STATUS "Looks like we're a single module" )
-    LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/cmake)
-elseif(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../submodules/cmake)
-    message( STATUS "Looks like we're a submodule" )
-    LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../submodules/cmake)
-else()
-    message( FATAL_ERROR "No cmake directory found. Did you run the submodules script?" )
-endif()
-
-# ==============================================================================
-# Check to see if there is versioning information available
-if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/versioning)
-    LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/versioning/cmake)
-elseif(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../submodules/versioning)
-    LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../submodules/versioning/cmake)
-else()
-    message( FATAL_ERROR "No ${CURRENT_SOURCE_DIR}/osdev_versioning directory found. Did you run the submodules script?" )
-endif()
-# ==============================================================================
 
 include(projectheader)
 project_header(dbconnector)
@@ -36,10 +14,10 @@ include_directories( SYSTEM
 include(compiler)
 
 include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/../pugixml/src/
-    ${CMAKE_CURRENT_SOURCE_DIR}/../logutils/src/
-    ${CMAKE_CURRENT_SOURCE_DIR}/../config/src/
-    ${CMAKE_CURRENT_SOURCE_DIR}/../global/src/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../submodules/pugixml/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