diff --git a/CMakeLists.txt b/CMakeLists.txt
index 381954790..82def8a42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ IF(POLICY CMP0054)
 ENDIF()
 
 # Add find modules to the path
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${libgit2_SOURCE_DIR}/cmake/Modules/")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${libgit2_SOURCE_DIR}/cmake/")
 
 INCLUDE(CheckLibraryExists)
 INCLUDE(CheckFunctionExists)
diff --git a/cmake/Modules/AddCFlagIfSupported.cmake b/cmake/AddCFlagIfSupported.cmake
similarity index 100%
rename from cmake/Modules/AddCFlagIfSupported.cmake
rename to cmake/AddCFlagIfSupported.cmake
diff --git a/cmake/Modules/CheckPrototypeDefinition.c.in b/cmake/CheckPrototypeDefinition.c.in
similarity index 100%
rename from cmake/Modules/CheckPrototypeDefinition.c.in
rename to cmake/CheckPrototypeDefinition.c.in
diff --git a/cmake/Modules/CheckPrototypeDefinition.cmake b/cmake/CheckPrototypeDefinition.cmake
similarity index 100%
rename from cmake/Modules/CheckPrototypeDefinition.cmake
rename to cmake/CheckPrototypeDefinition.cmake
diff --git a/cmake/Modules/EnableWarnings.cmake b/cmake/EnableWarnings.cmake
similarity index 100%
rename from cmake/Modules/EnableWarnings.cmake
rename to cmake/EnableWarnings.cmake
diff --git a/cmake/Modules/FindCoreFoundation.cmake b/cmake/FindCoreFoundation.cmake
similarity index 100%
rename from cmake/Modules/FindCoreFoundation.cmake
rename to cmake/FindCoreFoundation.cmake
diff --git a/cmake/Modules/FindGSSAPI.cmake b/cmake/FindGSSAPI.cmake
similarity index 100%
rename from cmake/Modules/FindGSSAPI.cmake
rename to cmake/FindGSSAPI.cmake
diff --git a/cmake/Modules/FindGSSFramework.cmake b/cmake/FindGSSFramework.cmake
similarity index 100%
rename from cmake/Modules/FindGSSFramework.cmake
rename to cmake/FindGSSFramework.cmake
diff --git a/cmake/Modules/FindHTTP_Parser.cmake b/cmake/FindHTTP_Parser.cmake
similarity index 100%
rename from cmake/Modules/FindHTTP_Parser.cmake
rename to cmake/FindHTTP_Parser.cmake
diff --git a/cmake/Modules/FindIconv.cmake b/cmake/FindIconv.cmake
similarity index 100%
rename from cmake/Modules/FindIconv.cmake
rename to cmake/FindIconv.cmake
diff --git a/cmake/Modules/FindPCRE.cmake b/cmake/FindPCRE.cmake
similarity index 100%
rename from cmake/Modules/FindPCRE.cmake
rename to cmake/FindPCRE.cmake
diff --git a/cmake/Modules/FindPCRE2.cmake b/cmake/FindPCRE2.cmake
similarity index 100%
rename from cmake/Modules/FindPCRE2.cmake
rename to cmake/FindPCRE2.cmake
diff --git a/cmake/Modules/FindPkgLibraries.cmake b/cmake/FindPkgLibraries.cmake
similarity index 100%
rename from cmake/Modules/FindPkgLibraries.cmake
rename to cmake/FindPkgLibraries.cmake
diff --git a/cmake/Modules/FindSecurity.cmake b/cmake/FindSecurity.cmake
similarity index 100%
rename from cmake/Modules/FindSecurity.cmake
rename to cmake/FindSecurity.cmake
diff --git a/cmake/Modules/FindStatNsec.cmake b/cmake/FindStatNsec.cmake
similarity index 100%
rename from cmake/Modules/FindStatNsec.cmake
rename to cmake/FindStatNsec.cmake
diff --git a/cmake/Modules/FindmbedTLS.cmake b/cmake/FindmbedTLS.cmake
similarity index 100%
rename from cmake/Modules/FindmbedTLS.cmake
rename to cmake/FindmbedTLS.cmake
diff --git a/cmake/Modules/IdeSplitSources.cmake b/cmake/IdeSplitSources.cmake
similarity index 100%
rename from cmake/Modules/IdeSplitSources.cmake
rename to cmake/IdeSplitSources.cmake
diff --git a/cmake/Modules/PkgBuildConfig.cmake b/cmake/PkgBuildConfig.cmake
similarity index 100%
rename from cmake/Modules/PkgBuildConfig.cmake
rename to cmake/PkgBuildConfig.cmake
diff --git a/cmake/Modules/SanitizeBool.cmake b/cmake/SanitizeBool.cmake
similarity index 100%
rename from cmake/Modules/SanitizeBool.cmake
rename to cmake/SanitizeBool.cmake
diff --git a/cmake/Modules/SelectGSSAPI.cmake b/cmake/SelectGSSAPI.cmake
similarity index 100%
rename from cmake/Modules/SelectGSSAPI.cmake
rename to cmake/SelectGSSAPI.cmake
diff --git a/cmake/Modules/SelectHTTPSBackend.cmake b/cmake/SelectHTTPSBackend.cmake
similarity index 100%
rename from cmake/Modules/SelectHTTPSBackend.cmake
rename to cmake/SelectHTTPSBackend.cmake
diff --git a/cmake/Modules/SelectHashes.cmake b/cmake/SelectHashes.cmake
similarity index 100%
rename from cmake/Modules/SelectHashes.cmake
rename to cmake/SelectHashes.cmake