diff --git a/cmake/Modules/FindCURL.cmake b/cmake/Modules/common/FindCURL.cmake
similarity index 100%
rename from cmake/Modules/FindCURL.cmake
rename to cmake/Modules/common/FindCURL.cmake
diff --git a/cmake/Modules/Findjsoncpp.cmake b/cmake/Modules/common/Findjsoncpp.cmake
similarity index 100%
rename from cmake/Modules/Findjsoncpp.cmake
rename to cmake/Modules/common/Findjsoncpp.cmake
diff --git a/cmake/Modules/Findtinyxml2.cmake b/cmake/Modules/common/Findtinyxml2.cmake
similarity index 100%
rename from cmake/Modules/Findtinyxml2.cmake
rename to cmake/Modules/common/Findtinyxml2.cmake
diff --git a/cmake/Modules/FindOpenSSL.cmake b/cmake/Modules/non-msvc/FindOpenSSL.cmake
similarity index 100%
rename from cmake/Modules/FindOpenSSL.cmake
rename to cmake/Modules/non-msvc/FindOpenSSL.cmake
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e95b4bd571..72acd16395 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,7 +32,11 @@ include(../cmake/compiler_flags.cmake)
 find_package(Threads REQUIRED)
 
 if(NOT HUNTER_ENABLED)
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules")
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules/common")
+
+    if(NOT MSVC)
+        list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules/non-msvc")
+    endif()
 endif()
 
 # This will noop if hunter is not enabled
diff --git a/third_party/curl/CMakeLists.txt b/third_party/curl/CMakeLists.txt
index ca39388b27..e42e716a6f 100644
--- a/third_party/curl/CMakeLists.txt
+++ b/third_party/curl/CMakeLists.txt
@@ -40,7 +40,7 @@ elseif(CMAKE_CROSSCOMPILING) # This assumes we use dockcross
 endif()
 
 if(NOT MSVC)
-    set(MODULES_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/Modules")
+    set(MODULES_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/Modules/non-msvc")
     message(STATUS "cmake modules path: ${MODULES_PATH}")
 
     list(APPEND CMAKE_ARGS