diff --git a/src/modules/users/CMakeModules/FindCrypt.cmake b/CMakeModules/FindCrypt.cmake
similarity index 100%
rename from src/modules/users/CMakeModules/FindCrypt.cmake
rename to CMakeModules/FindCrypt.cmake
diff --git a/src/modules/welcome/CMakeModules/FindLIBPARTED.cmake b/CMakeModules/FindLIBPARTED.cmake
similarity index 100%
rename from src/modules/welcome/CMakeModules/FindLIBPARTED.cmake
rename to CMakeModules/FindLIBPARTED.cmake
diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt
index bd3798b8a..116da68e4 100644
--- a/src/modules/users/CMakeLists.txt
+++ b/src/modules/users/CMakeLists.txt
@@ -5,8 +5,6 @@ if( ECM_FOUND )
 endif()
 
 find_package( Qt5 COMPONENTS Core Test REQUIRED )
-
-list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
 find_package( Crypt )
 
 include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
diff --git a/src/modules/welcome/CMakeLists.txt b/src/modules/welcome/CMakeLists.txt
index 552ed39a8..b087164fa 100644
--- a/src/modules/welcome/CMakeLists.txt
+++ b/src/modules/welcome/CMakeLists.txt
@@ -1,5 +1,5 @@
 include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
-set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules )
+
 find_package( LIBPARTED REQUIRED )
 find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network )