diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1302a4..f470cf0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,28 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 project(osdev_pugixml)
-# ==============================================================================
-# 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()
+LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/submodules/cmake)
 
-# ==============================================================================
-# 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(osdev_pugixml)
@@ -30,5 +9,5 @@ project_header(osdev_pugixml)
 add_subdirectory(src)
 add_subdirectory(tests)
 
-# include(packaging)
-# package_component()
+include(packaging)
+package_component()
diff --git a/scripts/submodules.list b/scripts/submodules.list
index 32253f2..e324929 100644
--- a/scripts/submodules.list
+++ b/scripts/submodules.list
@@ -1,4 +1,3 @@
-SUB_MODULES_OPEN="versioning
-cmake"
+SUB_MODULES_OPEN="cmake"
 
 SUB_MODULES_CLOSED=""