diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68d7426e..0490883c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,14 @@
 cmake_minimum_required(VERSION 3.0)
+cmake_policy(SET CMP0017 NEW) # need include() with .cmake
 project(pip)
 
+if ("x${CMAKE_MODULE_PATH}" STREQUAL "x")
+	set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+endif()
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 set(PIP_BUILD 1)
 include(CheckFunctionExists)
-include(PIPMacros.cmake)
+include(PIPMacros)
 
 set(_ICU_DEFAULT OFF)
 if((NOT DEFINED WIN32) AND (NOT DEFINED ANDROID_PLATFORM) AND (NOT DEFINED APPLE))
@@ -86,7 +90,6 @@ else()
 	message(STATUS "Building PIP shared library")
 endif()
 
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 if(MINGW)
 	find_package(MinGW REQUIRED)
 	list(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIB})
@@ -270,7 +273,7 @@ else()
 endif()
 
 if (TESTS)
-	include(DownloadGTest.cmake)
+	include(DownloadGTest)
 	set(CONCURRENT_TESTS 1) #"Enable tests for concurrent library"
 else()
 	set(CONCURRENT_TESTS 0)
@@ -612,7 +615,7 @@ if(LIB)
 	# Precompiled header
 	#add_custom_target(pip_pch ALL COMMAND ${CMAKE_CXX_COMPILER} -O2 -fPIC -g3 ${CMAKE_INSTALL_PREFIX}/include/pip/pip.h DEPENDS pip SOURCES ${HDRS})
 	#list(APPEND HDRS "pip.h.gch")
-	file(GLOB CMAKES "*.cmake")
+	file(GLOB CMAKES "cmake/*.cmake")
 	install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules)
 else()
 	if(NOT PIP_FREERTOS)
@@ -695,7 +698,7 @@ endif()
 	# install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc)
 # endif()
 if (NOT PIP_FREERTOS)
-	include(PIPDocumentation.cmake)
+	include(PIPDocumentation)
 	find_package(Doxygen)
 	if(DOXYGEN_FOUND)
 		set(DOXY_PROJECT_NUMBER "${_PIP_FULL_VERSION}")
diff --git a/DownloadGTest.cmake b/cmake/DownloadGTest.cmake
similarity index 100%
rename from DownloadGTest.cmake
rename to cmake/DownloadGTest.cmake
diff --git a/FindMinGW.cmake b/cmake/FindMinGW.cmake
similarity index 100%
rename from FindMinGW.cmake
rename to cmake/FindMinGW.cmake
diff --git a/FindPIP.cmake b/cmake/FindPIP.cmake
similarity index 100%
rename from FindPIP.cmake
rename to cmake/FindPIP.cmake
diff --git a/PIPDocumentation.cmake b/cmake/PIPDocumentation.cmake
similarity index 100%
rename from PIPDocumentation.cmake
rename to cmake/PIPDocumentation.cmake
diff --git a/PIPMacros.cmake b/cmake/PIPMacros.cmake
similarity index 100%
rename from PIPMacros.cmake
rename to cmake/PIPMacros.cmake