diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65a34e7e55..4fed36beab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ mark_as_advanced(build_config_file)
 
 include(${CMAKE_BINARY_DIR}/${build_config})
 
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 ##
 ## Project Configuration
diff --git a/cmake/modules/CheckFunctions.cmake b/cmake/CheckFunctions.cmake
similarity index 100%
rename from cmake/modules/CheckFunctions.cmake
rename to cmake/CheckFunctions.cmake
diff --git a/cmake/modules/CheckHeaders.cmake b/cmake/CheckHeaders.cmake
similarity index 100%
rename from cmake/modules/CheckHeaders.cmake
rename to cmake/CheckHeaders.cmake
diff --git a/cmake/modules/CheckTypes.cmake b/cmake/CheckTypes.cmake
similarity index 100%
rename from cmake/modules/CheckTypes.cmake
rename to cmake/CheckTypes.cmake
diff --git a/cmake/modules/FindBISON.cmake b/cmake/FindBISON.cmake
similarity index 100%
rename from cmake/modules/FindBISON.cmake
rename to cmake/FindBISON.cmake
diff --git a/cmake/modules/FindPCAP.cmake b/cmake/FindPCAP.cmake
similarity index 100%
rename from cmake/modules/FindPCAP.cmake
rename to cmake/FindPCAP.cmake
diff --git a/cmake/modules/MiscTests.cmake b/cmake/MiscTests.cmake
similarity index 100%
rename from cmake/modules/MiscTests.cmake
rename to cmake/MiscTests.cmake
diff --git a/cmake/modules/OSSpecific.cmake b/cmake/OSSpecific.cmake
similarity index 100%
rename from cmake/modules/OSSpecific.cmake
rename to cmake/OSSpecific.cmake
diff --git a/cmake/modules/OpenSSLTests.cmake b/cmake/OpenSSLTests.cmake
similarity index 100%
rename from cmake/modules/OpenSSLTests.cmake
rename to cmake/OpenSSLTests.cmake
diff --git a/cmake/modules/PCAPTests.cmake b/cmake/PCAPTests.cmake
similarity index 100%
rename from cmake/modules/PCAPTests.cmake
rename to cmake/PCAPTests.cmake