diff --git a/.gitattributes b/.gitattributes
index 3a81c03b075..df588ac2bf4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1666,6 +1666,43 @@ HalfedgeDS/examples/HalfedgeDS/hds_prog_default_with_ccb.cpp -text
 HalfedgeDS/examples/HalfedgeDS/hds_prog_graph_with_ccb.cpp -text
 Installation/INSTALL_via_cmake -text
 Installation/LICENSE.FREE_USE -text
+Installation/cmake/modules/CGALConfig_binary.cmake.in -text
+Installation/cmake/modules/CGALConfig_install.cmake.fhs.in -text
+Installation/cmake/modules/CGALConfig_install.cmake.source.in -text
+Installation/cmake/modules/CGAL_CheckCXXFileRuns.cmake -text
+Installation/cmake/modules/CGAL_Common.cmake -text
+Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake -text
+Installation/cmake/modules/CGAL_FindPackageHandleStandardArgs.cmake -text
+Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake -text
+Installation/cmake/modules/CGAL_Locate_CGAL_TAUCS.cmake -text
+Installation/cmake/modules/CGAL_Macros.cmake -text
+Installation/cmake/modules/CGAL_SetupBoost.cmake -text
+Installation/cmake/modules/CGAL_SetupDependencies.cmake -text
+Installation/cmake/modules/CGAL_SetupFlags.cmake -text
+Installation/cmake/modules/CGAL_SetupGMP.cmake -text
+Installation/cmake/modules/CGAL_SetupGMPXX.cmake -text
+Installation/cmake/modules/CGAL_SetupLEDA.cmake -text
+Installation/cmake/modules/CGAL_SetupMPFR.cmake -text
+Installation/cmake/modules/CGAL_UseBLAS.cmake -text
+Installation/cmake/modules/CGAL_UseLAPACK.cmake -text
+Installation/cmake/modules/CGAL_UseTAUCS.cmake -text
+Installation/cmake/modules/FindBLAS.cmake -text
+Installation/cmake/modules/FindBoost.cmake -text
+Installation/cmake/modules/FindCGAL.cmake -text
+Installation/cmake/modules/FindCGAL_CORE.cmake -text
+Installation/cmake/modules/FindCORE.cmake -text
+Installation/cmake/modules/FindF2C.cmake -text
+Installation/cmake/modules/FindGMP.cmake -text
+Installation/cmake/modules/FindGMPXX.cmake -text
+Installation/cmake/modules/FindLAPACK.cmake -text
+Installation/cmake/modules/FindLEDA.cmake -text
+Installation/cmake/modules/FindMPFR.cmake -text
+Installation/cmake/modules/FindOpenGL.cmake -text
+Installation/cmake/modules/FindQGLViewer.cmake -text
+Installation/cmake/modules/FindQt3-patched.cmake -text
+Installation/cmake/modules/FindTAUCS.cmake -text
+Installation/cmake/modules/Qt3Macros-patched.cmake -text
+Installation/cmake/modules/UseCGAL.cmake -text
 Installation/config/support/S05-BOOST -text
 Installation/config/support/S06a-BOOST_PROGRAM_OPTIONS -text
 Installation/config/support/S06b-MS_BOOST_PROGRAM_OPTIONS -text
@@ -1734,43 +1771,6 @@ Installation/config/support/print_TAUCS_version.cpp -text
 Installation/config/support/print_ZLIB_version.cpp -text
 Installation/config/support/test_BOOST_THREAD.cpp -text
 Installation/config/testfiles/CGAL_CFG_NO_CPP0X_ISFINITE.cpp -text
-Installation/lib/CGAL-3.4/CGALConfig_binary.cmake.in -text
-Installation/lib/CGAL-3.4/CGALConfig_install.cmake.fhs.in -text
-Installation/lib/CGAL-3.4/CGALConfig_install.cmake.source.in -text
-Installation/lib/CGAL-3.4/CGAL_CheckCXXFileRuns.cmake -text
-Installation/lib/CGAL-3.4/CGAL_Common.cmake -text
-Installation/lib/CGAL-3.4/CGAL_CreateSingleSourceCGALProgram.cmake -text
-Installation/lib/CGAL-3.4/CGAL_FindPackageHandleStandardArgs.cmake -text
-Installation/lib/CGAL-3.4/CGAL_GeneratorSpecificSettings.cmake -text
-Installation/lib/CGAL-3.4/CGAL_Locate_CGAL_TAUCS.cmake -text
-Installation/lib/CGAL-3.4/CGAL_Macros.cmake -text
-Installation/lib/CGAL-3.4/CGAL_SetupBoost.cmake -text
-Installation/lib/CGAL-3.4/CGAL_SetupDependencies.cmake -text
-Installation/lib/CGAL-3.4/CGAL_SetupFlags.cmake -text
-Installation/lib/CGAL-3.4/CGAL_SetupGMP.cmake -text
-Installation/lib/CGAL-3.4/CGAL_SetupGMPXX.cmake -text
-Installation/lib/CGAL-3.4/CGAL_SetupLEDA.cmake -text
-Installation/lib/CGAL-3.4/CGAL_SetupMPFR.cmake -text
-Installation/lib/CGAL-3.4/CGAL_UseBLAS.cmake -text
-Installation/lib/CGAL-3.4/CGAL_UseLAPACK.cmake -text
-Installation/lib/CGAL-3.4/CGAL_UseTAUCS.cmake -text
-Installation/lib/CGAL-3.4/FindBLAS.cmake -text
-Installation/lib/CGAL-3.4/FindBoost.cmake -text
-Installation/lib/CGAL-3.4/FindCGAL.cmake -text
-Installation/lib/CGAL-3.4/FindCGAL_CORE.cmake -text
-Installation/lib/CGAL-3.4/FindCORE.cmake -text
-Installation/lib/CGAL-3.4/FindF2C.cmake -text
-Installation/lib/CGAL-3.4/FindGMP.cmake -text
-Installation/lib/CGAL-3.4/FindGMPXX.cmake -text
-Installation/lib/CGAL-3.4/FindLAPACK.cmake -text
-Installation/lib/CGAL-3.4/FindLEDA.cmake -text
-Installation/lib/CGAL-3.4/FindMPFR.cmake -text
-Installation/lib/CGAL-3.4/FindOpenGL.cmake -text
-Installation/lib/CGAL-3.4/FindQGLViewer.cmake -text
-Installation/lib/CGAL-3.4/FindQt3-patched.cmake -text
-Installation/lib/CGAL-3.4/FindTAUCS.cmake -text
-Installation/lib/CGAL-3.4/Qt3Macros-patched.cmake -text
-Installation/lib/CGAL-3.4/UseCGAL.cmake -text
 Installation/src/CGAL/all_files.cpp -text
 Installation/src/CMakeLists.txt -text
 Installation/test/Installation/CMakeLists.txt -text
diff --git a/Installation/lib/CGAL-3.4/CGALConfig_binary.cmake.in b/Installation/cmake/modules/CGALConfig_binary.cmake.in
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGALConfig_binary.cmake.in
rename to Installation/cmake/modules/CGALConfig_binary.cmake.in
diff --git a/Installation/lib/CGAL-3.4/CGALConfig_install.cmake.fhs.in b/Installation/cmake/modules/CGALConfig_install.cmake.fhs.in
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGALConfig_install.cmake.fhs.in
rename to Installation/cmake/modules/CGALConfig_install.cmake.fhs.in
diff --git a/Installation/lib/CGAL-3.4/CGALConfig_install.cmake.source.in b/Installation/cmake/modules/CGALConfig_install.cmake.source.in
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGALConfig_install.cmake.source.in
rename to Installation/cmake/modules/CGALConfig_install.cmake.source.in
diff --git a/Installation/lib/CGAL-3.4/CGAL_CheckCXXFileRuns.cmake b/Installation/cmake/modules/CGAL_CheckCXXFileRuns.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_CheckCXXFileRuns.cmake
rename to Installation/cmake/modules/CGAL_CheckCXXFileRuns.cmake
diff --git a/Installation/lib/CGAL-3.4/CGAL_Common.cmake b/Installation/cmake/modules/CGAL_Common.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_Common.cmake
rename to Installation/cmake/modules/CGAL_Common.cmake
diff --git a/Installation/lib/CGAL-3.4/CGAL_CreateSingleSourceCGALProgram.cmake b/Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_CreateSingleSourceCGALProgram.cmake
rename to Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake
diff --git a/Installation/lib/CGAL-3.4/CGAL_FindPackageHandleStandardArgs.cmake b/Installation/cmake/modules/CGAL_FindPackageHandleStandardArgs.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_FindPackageHandleStandardArgs.cmake
rename to Installation/cmake/modules/CGAL_FindPackageHandleStandardArgs.cmake
diff --git a/Installation/lib/CGAL-3.4/CGAL_GeneratorSpecificSettings.cmake b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_GeneratorSpecificSettings.cmake
rename to Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
diff --git a/Installation/lib/CGAL-3.4/CGAL_Locate_CGAL_TAUCS.cmake b/Installation/cmake/modules/CGAL_Locate_CGAL_TAUCS.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_Locate_CGAL_TAUCS.cmake
rename to Installation/cmake/modules/CGAL_Locate_CGAL_TAUCS.cmake
diff --git a/Installation/lib/CGAL-3.4/CGAL_Macros.cmake b/Installation/cmake/modules/CGAL_Macros.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_Macros.cmake
rename to Installation/cmake/modules/CGAL_Macros.cmake
diff --git a/Installation/lib/CGAL-3.4/CGAL_SetupBoost.cmake b/Installation/cmake/modules/CGAL_SetupBoost.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_SetupBoost.cmake
rename to Installation/cmake/modules/CGAL_SetupBoost.cmake
diff --git a/Installation/lib/CGAL-3.4/CGAL_SetupDependencies.cmake b/Installation/cmake/modules/CGAL_SetupDependencies.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_SetupDependencies.cmake
rename to Installation/cmake/modules/CGAL_SetupDependencies.cmake
diff --git a/Installation/lib/CGAL-3.4/CGAL_SetupFlags.cmake b/Installation/cmake/modules/CGAL_SetupFlags.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_SetupFlags.cmake
rename to Installation/cmake/modules/CGAL_SetupFlags.cmake
diff --git a/Installation/lib/CGAL-3.4/CGAL_SetupGMP.cmake b/Installation/cmake/modules/CGAL_SetupGMP.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_SetupGMP.cmake
rename to Installation/cmake/modules/CGAL_SetupGMP.cmake
diff --git a/Installation/lib/CGAL-3.4/CGAL_SetupGMPXX.cmake b/Installation/cmake/modules/CGAL_SetupGMPXX.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_SetupGMPXX.cmake
rename to Installation/cmake/modules/CGAL_SetupGMPXX.cmake
diff --git a/Installation/lib/CGAL-3.4/CGAL_SetupLEDA.cmake b/Installation/cmake/modules/CGAL_SetupLEDA.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_SetupLEDA.cmake
rename to Installation/cmake/modules/CGAL_SetupLEDA.cmake
diff --git a/Installation/lib/CGAL-3.4/CGAL_SetupMPFR.cmake b/Installation/cmake/modules/CGAL_SetupMPFR.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_SetupMPFR.cmake
rename to Installation/cmake/modules/CGAL_SetupMPFR.cmake
diff --git a/Installation/lib/CGAL-3.4/CGAL_UseBLAS.cmake b/Installation/cmake/modules/CGAL_UseBLAS.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_UseBLAS.cmake
rename to Installation/cmake/modules/CGAL_UseBLAS.cmake
diff --git a/Installation/lib/CGAL-3.4/CGAL_UseLAPACK.cmake b/Installation/cmake/modules/CGAL_UseLAPACK.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_UseLAPACK.cmake
rename to Installation/cmake/modules/CGAL_UseLAPACK.cmake
diff --git a/Installation/lib/CGAL-3.4/CGAL_UseTAUCS.cmake b/Installation/cmake/modules/CGAL_UseTAUCS.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/CGAL_UseTAUCS.cmake
rename to Installation/cmake/modules/CGAL_UseTAUCS.cmake
diff --git a/Installation/lib/CGAL-3.4/FindBLAS.cmake b/Installation/cmake/modules/FindBLAS.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/FindBLAS.cmake
rename to Installation/cmake/modules/FindBLAS.cmake
diff --git a/Installation/lib/CGAL-3.4/FindBoost.cmake b/Installation/cmake/modules/FindBoost.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/FindBoost.cmake
rename to Installation/cmake/modules/FindBoost.cmake
diff --git a/Installation/lib/CGAL-3.4/FindCGAL.cmake b/Installation/cmake/modules/FindCGAL.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/FindCGAL.cmake
rename to Installation/cmake/modules/FindCGAL.cmake
diff --git a/Installation/lib/CGAL-3.4/FindCGAL_CORE.cmake b/Installation/cmake/modules/FindCGAL_CORE.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/FindCGAL_CORE.cmake
rename to Installation/cmake/modules/FindCGAL_CORE.cmake
diff --git a/Installation/lib/CGAL-3.4/FindCORE.cmake b/Installation/cmake/modules/FindCORE.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/FindCORE.cmake
rename to Installation/cmake/modules/FindCORE.cmake
diff --git a/Installation/lib/CGAL-3.4/FindF2C.cmake b/Installation/cmake/modules/FindF2C.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/FindF2C.cmake
rename to Installation/cmake/modules/FindF2C.cmake
diff --git a/Installation/lib/CGAL-3.4/FindGMP.cmake b/Installation/cmake/modules/FindGMP.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/FindGMP.cmake
rename to Installation/cmake/modules/FindGMP.cmake
diff --git a/Installation/lib/CGAL-3.4/FindGMPXX.cmake b/Installation/cmake/modules/FindGMPXX.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/FindGMPXX.cmake
rename to Installation/cmake/modules/FindGMPXX.cmake
diff --git a/Installation/lib/CGAL-3.4/FindLAPACK.cmake b/Installation/cmake/modules/FindLAPACK.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/FindLAPACK.cmake
rename to Installation/cmake/modules/FindLAPACK.cmake
diff --git a/Installation/lib/CGAL-3.4/FindLEDA.cmake b/Installation/cmake/modules/FindLEDA.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/FindLEDA.cmake
rename to Installation/cmake/modules/FindLEDA.cmake
diff --git a/Installation/lib/CGAL-3.4/FindMPFR.cmake b/Installation/cmake/modules/FindMPFR.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/FindMPFR.cmake
rename to Installation/cmake/modules/FindMPFR.cmake
diff --git a/Installation/lib/CGAL-3.4/FindOpenGL.cmake b/Installation/cmake/modules/FindOpenGL.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/FindOpenGL.cmake
rename to Installation/cmake/modules/FindOpenGL.cmake
diff --git a/Installation/lib/CGAL-3.4/FindQGLViewer.cmake b/Installation/cmake/modules/FindQGLViewer.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/FindQGLViewer.cmake
rename to Installation/cmake/modules/FindQGLViewer.cmake
diff --git a/Installation/lib/CGAL-3.4/FindQt3-patched.cmake b/Installation/cmake/modules/FindQt3-patched.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/FindQt3-patched.cmake
rename to Installation/cmake/modules/FindQt3-patched.cmake
diff --git a/Installation/lib/CGAL-3.4/FindTAUCS.cmake b/Installation/cmake/modules/FindTAUCS.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/FindTAUCS.cmake
rename to Installation/cmake/modules/FindTAUCS.cmake
diff --git a/Installation/lib/CGAL-3.4/Qt3Macros-patched.cmake b/Installation/cmake/modules/Qt3Macros-patched.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/Qt3Macros-patched.cmake
rename to Installation/cmake/modules/Qt3Macros-patched.cmake
diff --git a/Installation/lib/CGAL-3.4/UseCGAL.cmake b/Installation/cmake/modules/UseCGAL.cmake
similarity index 100%
rename from Installation/lib/CGAL-3.4/UseCGAL.cmake
rename to Installation/cmake/modules/UseCGAL.cmake