diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bf5607a..a367dc3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,27 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.12)
+# ==============================================================================
+# Check to see if we're a submodule or top-repo.
+if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
+    message( STATUS "Looks like we're a single module" )
+    LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
+elseif(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake)
+    message( STATUS "Looks like we're a submodule" )
+    LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../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}/../versioning)
+    LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../versioning/cmake)
+elseif(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../versioning)
+    LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../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)
 
@@ -13,11 +36,10 @@ include_directories( SYSTEM
 include(compiler)
 
 include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/../pugixml
-    ${CMAKE_CURRENT_SOURCE_DIR}/../logutils
-    ${CMAKE_CURRENT_SOURCE_DIR}/../config
-    ${CMAKE_CURRENT_SOURCE_DIR}/../dcxml
-    ${CMAKE_CURRENT_SOURCE_DIR}/../global
+    ${CMAKE_CURRENT_SOURCE_DIR}/../pugixml/src/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../logutils/src/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../config/src/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../global/src/
 )
 
 set(SRC_LIST
@@ -47,8 +69,6 @@ include(library)
 add_libraries(
     ${Qt5Core_LIBRARIES}
     ${Qt5Sql_LIBRARIES}
-    logutils
-    global
     pugixml
 )