diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt
index f97b6f07f60..477c6cdb340 100644
--- a/Installation/CMakeLists.txt
+++ b/Installation/CMakeLists.txt
@@ -199,7 +199,7 @@ if ( CGAL_BRANCH_BUILD )
 
   file(REMOVE ${CMAKE_BINARY_DIR}/include/CGAL/version.h)
   string(TIMESTAMP CGAL_CREATED_RELEASE_DATE "%Y%m%d")
-  configure_file(${CGAL_INSTALLATION_PACKAGE_DIR}/config/version.h.in ${CMAKE_BINARY_DIR}/include/CGAL/version.h @ONLY)
+  configure_file(${CGAL_INSTALLATION_PACKAGE_DIR}/cmake/modules/config/version.h.in ${CMAKE_BINARY_DIR}/include/CGAL/version.h @ONLY)
 
   #
   # Duplicate files
@@ -706,7 +706,7 @@ macro(add_config_flag flag)
 endmacro()
 
 if(NOT CMAKE_CROSSCOMPILING)
-  file(GLOB all_config_tests "${CGAL_INSTALLATION_PACKAGE_DIR}/config/testfiles/*.cpp")
+  file(GLOB all_config_tests "${CGAL_MODULES_DIR}/config/testfiles/*.cpp")
   list(SORT all_config_tests)
 
   file(WRITE ${CMAKE_BINARY_DIR}/include/CGAL/compiler_config.h "//\n// compiler_config.h is included by CGAL headers to load the needed compiler settings.\n//\n// DO NOT EDIT compiler_config.h. It is generated by CMake.\n//\n\n")
@@ -1109,7 +1109,7 @@ because IPE_FOUND is false.")
 
     if(NOT DEFINED CGAL_CHECK_SYNTAX_ONLY)
       execute_process(COMMAND 
-        ${CMAKE_CXX_COMPILER} -x c++ -fsyntax-only ${CMAKE_CURRENT_SOURCE_DIR}/config/support/test_syntaxonly.cpp
+        ${CMAKE_CXX_COMPILER} -x c++ -fsyntax-only ${CGAL_MODULES_DIR}/config/support/test_syntaxonly.cpp
         ERROR_QUIET
         RESULT_VARIABLE ok)
       if(ok EQUAL 0)
diff --git a/Installation/cmake/modules/CGAL_Macros.cmake b/Installation/cmake/modules/CGAL_Macros.cmake
index a08d14910b4..5836bde26b5 100644
--- a/Installation/cmake/modules/CGAL_Macros.cmake
+++ b/Installation/cmake/modules/CGAL_Macros.cmake
@@ -160,11 +160,11 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
       set ( ${LIB}_VERSION "unknown" )
 
       if(NOT CMAKE_CROSSCOMPILING)
-        if(EXISTS "${CGAL_INSTALLATION_PACKAGE_DIR}/config/support/print_${LIB}_version.cpp")
+        if(EXISTS "${CGAL_MODULES_DIR}/config/support/print_${LIB}_version.cpp")
           try_run( ${LIB}_RUN_RES
                    ${LIB}_COMPILE_RES
                    "${CMAKE_BINARY_DIR}"
-                   "${CGAL_INSTALLATION_PACKAGE_DIR}/config/support/print_${LIB}_version.cpp"
+                   "${CGAL_MODULES_DIR}/config/support/print_${LIB}_version.cpp"
                    CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${${PKG}_INCLUDE_DIR};${${PKG}_DEPENDENCY_INCLUDE_DIR}"
                                "-DLINK_LIBRARIES:STRING=${${PKG}_LIBRARIES};${${PKG}_DEPENDENCY_LIBRARIES}"
                                "-DLINK_DIRECTORIES:STRING=${${PKG}_LIBRARIES_DIR};${${PKG}_DEPENDENCY_LIBRARIES_DIR}"
diff --git a/Installation/cmake/modules/CGAL_SetupBoost.cmake b/Installation/cmake/modules/CGAL_SetupBoost.cmake
index 849fc7fcc7c..9c6da250b3c 100644
--- a/Installation/cmake/modules/CGAL_SetupBoost.cmake
+++ b/Installation/cmake/modules/CGAL_SetupBoost.cmake
@@ -23,7 +23,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/CGAL_TweakFindBoost.cmake)
   else()
     try_run( CGAL_test_cpp_version_RUN_RES CGAL_test_cpp_version_COMPILE_RES
       "${CMAKE_BINARY_DIR}"
-      "${CGAL_INSTALLATION_PACKAGE_DIR}/config/support/CGAL_test_cpp_version.cpp"
+      "${CGAL_MODULES_DIR}/config/support/CGAL_test_cpp_version.cpp"
       RUN_OUTPUT_VARIABLE CGAL_cplusplus)
     message(STATUS "__cplusplus is ${CGAL_cplusplus}")
     if(NOT CGAL_test_cpp_version_RUN_RES)
diff --git a/Installation/config/support/CGAL_test_cpp_version.cpp b/Installation/cmake/modules/config/support/CGAL_test_cpp_version.cpp
similarity index 100%
rename from Installation/config/support/CGAL_test_cpp_version.cpp
rename to Installation/cmake/modules/config/support/CGAL_test_cpp_version.cpp
diff --git a/Installation/config/support/print_BOOST_version.cpp b/Installation/cmake/modules/config/support/print_BOOST_version.cpp
similarity index 100%
rename from Installation/config/support/print_BOOST_version.cpp
rename to Installation/cmake/modules/config/support/print_BOOST_version.cpp
diff --git a/Installation/config/support/print_GCC_version.cpp b/Installation/cmake/modules/config/support/print_GCC_version.cpp
similarity index 100%
rename from Installation/config/support/print_GCC_version.cpp
rename to Installation/cmake/modules/config/support/print_GCC_version.cpp
diff --git a/Installation/config/support/print_GMP_version.cpp b/Installation/cmake/modules/config/support/print_GMP_version.cpp
similarity index 100%
rename from Installation/config/support/print_GMP_version.cpp
rename to Installation/cmake/modules/config/support/print_GMP_version.cpp
diff --git a/Installation/config/support/print_IntelCompiler_version.cpp b/Installation/cmake/modules/config/support/print_IntelCompiler_version.cpp
similarity index 100%
rename from Installation/config/support/print_IntelCompiler_version.cpp
rename to Installation/cmake/modules/config/support/print_IntelCompiler_version.cpp
diff --git a/Installation/config/support/print_LEDA_version.cpp b/Installation/cmake/modules/config/support/print_LEDA_version.cpp
similarity index 100%
rename from Installation/config/support/print_LEDA_version.cpp
rename to Installation/cmake/modules/config/support/print_LEDA_version.cpp
diff --git a/Installation/config/support/print_MPFI_version.cpp b/Installation/cmake/modules/config/support/print_MPFI_version.cpp
similarity index 100%
rename from Installation/config/support/print_MPFI_version.cpp
rename to Installation/cmake/modules/config/support/print_MPFI_version.cpp
diff --git a/Installation/config/support/print_MPFR_version.cpp b/Installation/cmake/modules/config/support/print_MPFR_version.cpp
similarity index 100%
rename from Installation/config/support/print_MPFR_version.cpp
rename to Installation/cmake/modules/config/support/print_MPFR_version.cpp
diff --git a/Installation/config/support/print_OPENGL_version.cpp b/Installation/cmake/modules/config/support/print_OPENGL_version.cpp
similarity index 100%
rename from Installation/config/support/print_OPENGL_version.cpp
rename to Installation/cmake/modules/config/support/print_OPENGL_version.cpp
diff --git a/Installation/config/support/print_QT4_version.cpp b/Installation/cmake/modules/config/support/print_QT4_version.cpp
similarity index 100%
rename from Installation/config/support/print_QT4_version.cpp
rename to Installation/cmake/modules/config/support/print_QT4_version.cpp
diff --git a/Installation/config/support/print_QT_version.cpp b/Installation/cmake/modules/config/support/print_QT_version.cpp
similarity index 100%
rename from Installation/config/support/print_QT_version.cpp
rename to Installation/cmake/modules/config/support/print_QT_version.cpp
diff --git a/Installation/config/support/print_ZLIB_version.cpp b/Installation/cmake/modules/config/support/print_ZLIB_version.cpp
similarity index 100%
rename from Installation/config/support/print_ZLIB_version.cpp
rename to Installation/cmake/modules/config/support/print_ZLIB_version.cpp
diff --git a/Installation/config/support/test_ATLAS.cpp b/Installation/cmake/modules/config/support/test_ATLAS.cpp
similarity index 100%
rename from Installation/config/support/test_ATLAS.cpp
rename to Installation/cmake/modules/config/support/test_ATLAS.cpp
diff --git a/Installation/config/support/test_BLAS.cpp b/Installation/cmake/modules/config/support/test_BLAS.cpp
similarity index 100%
rename from Installation/config/support/test_BLAS.cpp
rename to Installation/cmake/modules/config/support/test_BLAS.cpp
diff --git a/Installation/config/support/test_BOOST.cpp b/Installation/cmake/modules/config/support/test_BOOST.cpp
similarity index 100%
rename from Installation/config/support/test_BOOST.cpp
rename to Installation/cmake/modules/config/support/test_BOOST.cpp
diff --git a/Installation/config/support/test_BOOST_PROGRAM_OPTIONS.cpp b/Installation/cmake/modules/config/support/test_BOOST_PROGRAM_OPTIONS.cpp
similarity index 100%
rename from Installation/config/support/test_BOOST_PROGRAM_OPTIONS.cpp
rename to Installation/cmake/modules/config/support/test_BOOST_PROGRAM_OPTIONS.cpp
diff --git a/Installation/config/support/test_BOOST_THREAD.cpp b/Installation/cmake/modules/config/support/test_BOOST_THREAD.cpp
similarity index 100%
rename from Installation/config/support/test_BOOST_THREAD.cpp
rename to Installation/cmake/modules/config/support/test_BOOST_THREAD.cpp
diff --git a/Installation/config/support/test_GMP.cpp b/Installation/cmake/modules/config/support/test_GMP.cpp
similarity index 100%
rename from Installation/config/support/test_GMP.cpp
rename to Installation/cmake/modules/config/support/test_GMP.cpp
diff --git a/Installation/config/support/test_GMPXX.cpp b/Installation/cmake/modules/config/support/test_GMPXX.cpp
similarity index 100%
rename from Installation/config/support/test_GMPXX.cpp
rename to Installation/cmake/modules/config/support/test_GMPXX.cpp
diff --git a/Installation/config/support/test_LAPACK.cpp b/Installation/cmake/modules/config/support/test_LAPACK.cpp
similarity index 100%
rename from Installation/config/support/test_LAPACK.cpp
rename to Installation/cmake/modules/config/support/test_LAPACK.cpp
diff --git a/Installation/config/support/test_LEDA.cpp b/Installation/cmake/modules/config/support/test_LEDA.cpp
similarity index 100%
rename from Installation/config/support/test_LEDA.cpp
rename to Installation/cmake/modules/config/support/test_LEDA.cpp
diff --git a/Installation/config/support/test_LEDAWIN.cpp b/Installation/cmake/modules/config/support/test_LEDAWIN.cpp
similarity index 100%
rename from Installation/config/support/test_LEDAWIN.cpp
rename to Installation/cmake/modules/config/support/test_LEDAWIN.cpp
diff --git a/Installation/config/support/test_LIDIA.cpp b/Installation/cmake/modules/config/support/test_LIDIA.cpp
similarity index 100%
rename from Installation/config/support/test_LIDIA.cpp
rename to Installation/cmake/modules/config/support/test_LIDIA.cpp
diff --git a/Installation/config/support/test_MPFR.cpp b/Installation/cmake/modules/config/support/test_MPFR.cpp
similarity index 100%
rename from Installation/config/support/test_MPFR.cpp
rename to Installation/cmake/modules/config/support/test_MPFR.cpp
diff --git a/Installation/config/support/test_OPENGL.cpp b/Installation/cmake/modules/config/support/test_OPENGL.cpp
similarity index 100%
rename from Installation/config/support/test_OPENGL.cpp
rename to Installation/cmake/modules/config/support/test_OPENGL.cpp
diff --git a/Installation/config/support/test_QT.cpp b/Installation/cmake/modules/config/support/test_QT.cpp
similarity index 100%
rename from Installation/config/support/test_QT.cpp
rename to Installation/cmake/modules/config/support/test_QT.cpp
diff --git a/Installation/config/support/test_X11.cpp b/Installation/cmake/modules/config/support/test_X11.cpp
similarity index 100%
rename from Installation/config/support/test_X11.cpp
rename to Installation/cmake/modules/config/support/test_X11.cpp
diff --git a/Installation/config/support/test_ZLIB.cpp b/Installation/cmake/modules/config/support/test_ZLIB.cpp
similarity index 100%
rename from Installation/config/support/test_ZLIB.cpp
rename to Installation/cmake/modules/config/support/test_ZLIB.cpp
diff --git a/Installation/config/support/test_syntaxonly.cpp b/Installation/cmake/modules/config/support/test_syntaxonly.cpp
similarity index 100%
rename from Installation/config/support/test_syntaxonly.cpp
rename to Installation/cmake/modules/config/support/test_syntaxonly.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_DENORMALS_COMPILE_BUG.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_DENORMALS_COMPILE_BUG.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_DENORMALS_COMPILE_BUG.cpp
rename to Installation/cmake/modules/config/testfiles/CGAL_CFG_DENORMALS_COMPILE_BUG.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG.cpp
rename to Installation/cmake/modules/config/testfiles/CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_IEEE_754_BUG.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_IEEE_754_BUG.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_IEEE_754_BUG.cpp
rename to Installation/cmake/modules/config/testfiles/CGAL_CFG_IEEE_754_BUG.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_ISTREAM_INT_BUG.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_ISTREAM_INT_BUG.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_ISTREAM_INT_BUG.cpp
rename to Installation/cmake/modules/config/testfiles/CGAL_CFG_ISTREAM_INT_BUG.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_MATCHING_BUG_5.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_MATCHING_BUG_5.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_MATCHING_BUG_5.cpp
rename to Installation/cmake/modules/config/testfiles/CGAL_CFG_MATCHING_BUG_5.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_MATCHING_BUG_6.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_MATCHING_BUG_6.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_MATCHING_BUG_6.cpp
rename to Installation/cmake/modules/config/testfiles/CGAL_CFG_MATCHING_BUG_6.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_MATCHING_BUG_7.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_MATCHING_BUG_7.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_MATCHING_BUG_7.cpp
rename to Installation/cmake/modules/config/testfiles/CGAL_CFG_MATCHING_BUG_7.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_MATCHING_BUG_8.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_MATCHING_BUG_8.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_MATCHING_BUG_8.cpp
rename to Installation/cmake/modules/config/testfiles/CGAL_CFG_MATCHING_BUG_8.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_NO_LIMITS.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_NO_LIMITS.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_NO_LIMITS.cpp
rename to Installation/cmake/modules/config/testfiles/CGAL_CFG_NO_LIMITS.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_NO_NEXTAFTER.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_NO_NEXTAFTER.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_NO_NEXTAFTER.cpp
rename to Installation/cmake/modules/config/testfiles/CGAL_CFG_NO_NEXTAFTER.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_NO_STL.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_NO_STL.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_NO_STL.cpp
rename to Installation/cmake/modules/config/testfiles/CGAL_CFG_NO_STL.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_NUMERIC_LIMITS_BUG.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_NUMERIC_LIMITS_BUG.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_NUMERIC_LIMITS_BUG.cpp
rename to Installation/cmake/modules/config/testfiles/CGAL_CFG_NUMERIC_LIMITS_BUG.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG.cpp
rename to Installation/cmake/modules/config/testfiles/CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG.cpp
rename to Installation/cmake/modules/config/testfiles/CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG.cpp
rename to Installation/cmake/modules/config/testfiles/CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_USING_BASE_MEMBER_BUG_2.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_USING_BASE_MEMBER_BUG_2.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_USING_BASE_MEMBER_BUG_2.cpp
rename to Installation/cmake/modules/config/testfiles/CGAL_CFG_USING_BASE_MEMBER_BUG_2.cpp
diff --git a/Installation/config/version.h.in b/Installation/cmake/modules/config/version.h.in
similarity index 100%
rename from Installation/config/version.h.in
rename to Installation/cmake/modules/config/version.h.in
diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h
index f476f4d0d56..420e7311ddd 100644
--- a/Installation/include/CGAL/config.h
+++ b/Installation/include/CGAL/config.h
@@ -549,7 +549,7 @@ using std::max;
 #if __has_feature(cxx_thread_local) || \
     ( (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L ) || \
     ( _MSC_VER >= 1900 )
-// see also Installation/config/support/CGAL_test_cpp_version.cpp
+// see also Installation/cmake/modules/config/support/CGAL_test_cpp_version.cpp
 #define CGAL_CAN_USE_CXX11_THREAD_LOCAL
 #endif