diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4de1d047f..d4b402326 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ if( COMMAND cmake_policy )
 	endif()
 endif()
 
-list( APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} )
+list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
 include( CreateLaunchers )
 include( FindPackageHandleStandardArgs )
 
@@ -148,8 +148,6 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
 	set( PROFILE 0 CACHE BOOL "Enable profiling with gprof for Debug and RelWithDebInfo build types." )
 endif()
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
-
 option( NO_OPENAL "Disable OpenAL sound support" OFF )
 
 find_package( BZip2 )
diff --git a/CleanDirectoryList.cmake b/cmake/CleanDirectoryList.cmake
similarity index 100%
rename from CleanDirectoryList.cmake
rename to cmake/CleanDirectoryList.cmake
diff --git a/CreateLaunchers.cmake b/cmake/CreateLaunchers.cmake
similarity index 100%
rename from CreateLaunchers.cmake
rename to cmake/CreateLaunchers.cmake
diff --git a/FindFluidSynth.cmake b/cmake/FindFluidSynth.cmake
similarity index 100%
rename from FindFluidSynth.cmake
rename to cmake/FindFluidSynth.cmake
diff --git a/FindMPG123.cmake b/cmake/FindMPG123.cmake
similarity index 100%
rename from FindMPG123.cmake
rename to cmake/FindMPG123.cmake
diff --git a/FindSDL2.cmake b/cmake/FindSDL2.cmake
similarity index 100%
rename from FindSDL2.cmake
rename to cmake/FindSDL2.cmake
diff --git a/FindSndFile.cmake b/cmake/FindSndFile.cmake
similarity index 100%
rename from FindSndFile.cmake
rename to cmake/FindSndFile.cmake
diff --git a/launcher-templates/genericlauncher.cmd.in b/cmake/launcher-templates/genericlauncher.cmd.in
similarity index 100%
rename from launcher-templates/genericlauncher.cmd.in
rename to cmake/launcher-templates/genericlauncher.cmd.in
diff --git a/launcher-templates/launcher.env.cmd.in b/cmake/launcher-templates/launcher.env.cmd.in
similarity index 100%
rename from launcher-templates/launcher.env.cmd.in
rename to cmake/launcher-templates/launcher.env.cmd.in
diff --git a/launcher-templates/perconfig.vcproj.user.in b/cmake/launcher-templates/perconfig.vcproj.user.in
similarity index 100%
rename from launcher-templates/perconfig.vcproj.user.in
rename to cmake/launcher-templates/perconfig.vcproj.user.in
diff --git a/launcher-templates/perconfig.vcxproj.user.in b/cmake/launcher-templates/perconfig.vcxproj.user.in
similarity index 100%
rename from launcher-templates/perconfig.vcxproj.user.in
rename to cmake/launcher-templates/perconfig.vcxproj.user.in
diff --git a/launcher-templates/targetlauncher.cmd.in b/cmake/launcher-templates/targetlauncher.cmd.in
similarity index 100%
rename from launcher-templates/targetlauncher.cmd.in
rename to cmake/launcher-templates/targetlauncher.cmd.in
diff --git a/launcher-templates/vcproj.user.in b/cmake/launcher-templates/vcproj.user.in
similarity index 100%
rename from launcher-templates/vcproj.user.in
rename to cmake/launcher-templates/vcproj.user.in
diff --git a/launcher-templates/vcxproj.user.in b/cmake/launcher-templates/vcxproj.user.in
similarity index 100%
rename from launcher-templates/vcxproj.user.in
rename to cmake/launcher-templates/vcxproj.user.in
diff --git a/precompiled_headers.cmake b/cmake/precompiled_headers.cmake
similarity index 100%
rename from precompiled_headers.cmake
rename to cmake/precompiled_headers.cmake
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9d7582e9f..58a7e44d0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required( VERSION 2.8.7 )
 
-include(../precompiled_headers.cmake)
+include(precompiled_headers)
 
 if( COMMAND cmake_policy )
 	cmake_policy( SET CMP0003 NEW )