diff --git a/HySoP/CMake b/HySoP/CMake
deleted file mode 120000
index 6126c513081cd9c08d0031ea93410931a228d572..0000000000000000000000000000000000000000
--- a/HySoP/CMake
+++ /dev/null
@@ -1 +0,0 @@
-../CMake/
\ No newline at end of file
diff --git a/HySoP/CMakeLists.txt b/HySoP/CMakeLists.txt
index 709016523f3fd857a08c2a93d59b47b6bfe6a1bc..a2aa26daaf18ee73e2da50894df9156ffc18a337 100755
--- a/HySoP/CMakeLists.txt
+++ b/HySoP/CMakeLists.txt
@@ -21,7 +21,7 @@ if(POLICY CMP0053)
 endif()
 
 # Set cmake modules directory (i.e. the one which contains all user-defined FindXXX.cmake files among other things)
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 # Force out-of-source build
 include(OutOfSourceBuild)
 # Some usefull macros
diff --git a/HySoP/DoxyConf/mainpage.doxygen b/HySoP/DoxyConf/mainpage.doxygen
index fa8352f1fb5d5267ddebaa9a06cd0236d3a99005..c267d5085ed6c9dd88edddb6b142bb621122f0e5 100644
--- a/HySoP/DoxyConf/mainpage.doxygen
+++ b/HySoP/DoxyConf/mainpage.doxygen
@@ -78,7 +78,7 @@ After install completed, new files are located as follows :
   - python package in USER_BASE/lib/pythonX.Y/site-packages/hysop/
   - library in USER_BASE/lib/pythonX.Y/site-packages/hysop/lib
   - fortran modules in USER_BASE/lib/pythonX.Y/site-packages/hysop/include/Modules
-  - CMake configuration files in USER_BASE/lib/pythonX.Y/site-packages/hysop/share/CMake
+  - CMake configuration files in USER_BASE/lib/pythonX.Y/site-packages/hysop/share/cmake
 
 \subsubsection installDirConfigCustom Custom configuration
 The other available setup is based on the Python 'Prefix scheme installation' : <a href="http://docs.python.org/2/install/#alternate-installation-unix-the-prefix-scheme">http://docs.python.org/2/install/#alternate-installation-unix-the-prefix-scheme</a>. You need to specify your prefix that replace the default USER_BASE. This prefix is passed to cmake through the variable PREFIX.
@@ -91,7 +91,8 @@ After install completed, new files are located as follows :
   - python package in PREFIX/lib/pythonX.Y/site-packages/hysop/
   - library in PREFIX/lib/pythonX.Y/site-packages/hysop/lib
   - fortran modules in PREFIX/lib/pythonX.Y/site-packages/hysop/include/Modules
-  - CMake configuration files in PREFIX/lib/pythonX.Y/site-packages/hysop/share/CMake
+  - CMake configuration files in PREFIX/lib/pythonX.Y/site-packages/hysop/share/cmake
+
 
 \subsection buildhysop Build
 
diff --git a/CMake/FindFFTW.cmake b/HySoP/cmake/FindFFTW.cmake
similarity index 100%
rename from CMake/FindFFTW.cmake
rename to HySoP/cmake/FindFFTW.cmake
diff --git a/CMake/FindPythonFull.cmake b/HySoP/cmake/FindPythonFull.cmake
similarity index 100%
rename from CMake/FindPythonFull.cmake
rename to HySoP/cmake/FindPythonFull.cmake
diff --git a/CMake/FindPythonModule.cmake b/HySoP/cmake/FindPythonModule.cmake
similarity index 100%
rename from CMake/FindPythonModule.cmake
rename to HySoP/cmake/FindPythonModule.cmake
diff --git a/CMake/FindSWIG.cmake b/HySoP/cmake/FindSWIG.cmake
similarity index 100%
rename from CMake/FindSWIG.cmake
rename to HySoP/cmake/FindSWIG.cmake
diff --git a/CMake/GoogleTestHelper.cmake b/HySoP/cmake/GoogleTestHelper.cmake
similarity index 100%
rename from CMake/GoogleTestHelper.cmake
rename to HySoP/cmake/GoogleTestHelper.cmake
diff --git a/CMake/HySoPInstallSetup.cmake b/HySoP/cmake/HySoPInstallSetup.cmake
similarity index 100%
rename from CMake/HySoPInstallSetup.cmake
rename to HySoP/cmake/HySoPInstallSetup.cmake
diff --git a/CMake/HySoPTests.cmake b/HySoP/cmake/HySoPTests.cmake
similarity index 100%
rename from CMake/HySoPTests.cmake
rename to HySoP/cmake/HySoPTests.cmake
diff --git a/CMake/HysopVersion.cmake b/HySoP/cmake/HysopVersion.cmake
similarity index 100%
rename from CMake/HysopVersion.cmake
rename to HySoP/cmake/HysopVersion.cmake
diff --git a/CMake/LibFindMacros.cmake b/HySoP/cmake/LibFindMacros.cmake
similarity index 100%
rename from CMake/LibFindMacros.cmake
rename to HySoP/cmake/LibFindMacros.cmake
diff --git a/CMake/MyTools.cmake b/HySoP/cmake/MyTools.cmake
similarity index 100%
rename from CMake/MyTools.cmake
rename to HySoP/cmake/MyTools.cmake
diff --git a/CMake/OutOfSourceBuild.cmake b/HySoP/cmake/OutOfSourceBuild.cmake
similarity index 100%
rename from CMake/OutOfSourceBuild.cmake
rename to HySoP/cmake/OutOfSourceBuild.cmake
diff --git a/CMake/PythonInstallSetup.cmake b/HySoP/cmake/PythonInstallSetup.cmake
similarity index 100%
rename from CMake/PythonInstallSetup.cmake
rename to HySoP/cmake/PythonInstallSetup.cmake
diff --git a/CMake/cmake_uninstall.cmake.in b/HySoP/cmake/cmake_uninstall.cmake.in
similarity index 100%
rename from CMake/cmake_uninstall.cmake.in
rename to HySoP/cmake/cmake_uninstall.cmake.in
diff --git a/CMake/explore_python_config.py b/HySoP/cmake/explore_python_config.py
similarity index 100%
rename from CMake/explore_python_config.py
rename to HySoP/cmake/explore_python_config.py
diff --git a/CMake/fake/__init__.py b/HySoP/cmake/fake/__init__.py
similarity index 100%
rename from CMake/fake/__init__.py
rename to HySoP/cmake/fake/__init__.py
diff --git a/CMake/fake/setup.py b/HySoP/cmake/fake/setup.py
similarity index 100%
rename from CMake/fake/setup.py
rename to HySoP/cmake/fake/setup.py
diff --git a/CMake/find_python_install.py b/HySoP/cmake/find_python_install.py
similarity index 100%
rename from CMake/find_python_install.py
rename to HySoP/cmake/find_python_install.py
diff --git a/CMake/fortran_utils.cmake b/HySoP/cmake/fortran_utils.cmake
similarity index 100%
rename from CMake/fortran_utils.cmake
rename to HySoP/cmake/fortran_utils.cmake
diff --git a/HySoP/src/hysop++/tests/CMakeLists.txt b/HySoP/src/hysop++/tests/CMakeLists.txt
index e16d2d63c31dfb62856c04ea233266894d40cdd3..30668e041d732cb6b3820658669454cf265c05c5 100644
--- a/HySoP/src/hysop++/tests/CMakeLists.txt
+++ b/HySoP/src/hysop++/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-include("${CMAKE_SOURCE_DIR}/CMake/GoogleTestHelper.cmake")
+include("${CMAKE_SOURCE_DIR}/cmake/GoogleTestHelper.cmake")
 
 add_subdirectory("testPolynoms")
 add_subdirectory("testPlanner")