diff --git a/CMakeLists.txt b/CMakeLists.txt
index 175d3fb4781208d32be4ec16f4b6a4a3f79bfdb3..cf2f298164628566da23532b8339f2313ac57dab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,9 @@ cmake_minimum_required(VERSION 2.6)
 project( OGS-6 )
 
 # Set cmake module path 
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
-
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
+  "${CMAKE_SOURCE_DIR}/scripts/cmake/cmake"
+  "${CMAKE_SOURCE_DIR}/scripts/cmake")
 
 # Set cmake module path 
 #SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeConfiguration")
diff --git a/cmake/CleanDirectoryList.cmake b/scripts/cmake/cmake/CleanDirectoryList.cmake
similarity index 100%
rename from cmake/CleanDirectoryList.cmake
rename to scripts/cmake/cmake/CleanDirectoryList.cmake
diff --git a/cmake/CppcheckTargets.cmake b/scripts/cmake/cmake/CppcheckTargets.cmake
similarity index 100%
rename from cmake/CppcheckTargets.cmake
rename to scripts/cmake/cmake/CppcheckTargets.cmake
diff --git a/cmake/DoxygenTargets.cmake b/scripts/cmake/cmake/DoxygenTargets.cmake
similarity index 100%
rename from cmake/DoxygenTargets.cmake
rename to scripts/cmake/cmake/DoxygenTargets.cmake
diff --git a/cmake/DoxygenTargets.doxyfile.in b/scripts/cmake/cmake/DoxygenTargets.doxyfile.in
similarity index 100%
rename from cmake/DoxygenTargets.doxyfile.in
rename to scripts/cmake/cmake/DoxygenTargets.doxyfile.in
diff --git a/cmake/EnableExtraCompilerWarnings.cmake b/scripts/cmake/cmake/EnableExtraCompilerWarnings.cmake
similarity index 100%
rename from cmake/EnableExtraCompilerWarnings.cmake
rename to scripts/cmake/cmake/EnableExtraCompilerWarnings.cmake
diff --git a/cmake/EnableProfiling.cmake b/scripts/cmake/cmake/EnableProfiling.cmake
similarity index 100%
rename from cmake/EnableProfiling.cmake
rename to scripts/cmake/cmake/EnableProfiling.cmake
diff --git a/cmake/FileCopyTargets.cmake b/scripts/cmake/cmake/FileCopyTargets.cmake
similarity index 100%
rename from cmake/FileCopyTargets.cmake
rename to scripts/cmake/cmake/FileCopyTargets.cmake
diff --git a/cmake/FindBLAS.cmake b/scripts/cmake/cmake/FindBLAS.cmake
similarity index 100%
rename from cmake/FindBLAS.cmake
rename to scripts/cmake/cmake/FindBLAS.cmake
diff --git a/cmake/FindGDB.cmake b/scripts/cmake/cmake/FindGDB.cmake
similarity index 100%
rename from cmake/FindGDB.cmake
rename to scripts/cmake/cmake/FindGDB.cmake
diff --git a/cmake/FindLAPACK.cmake b/scripts/cmake/cmake/FindLAPACK.cmake
similarity index 100%
rename from cmake/FindLAPACK.cmake
rename to scripts/cmake/cmake/FindLAPACK.cmake
diff --git a/cmake/FindLAPACKLibs.cmake b/scripts/cmake/cmake/FindLAPACKLibs.cmake
similarity index 100%
rename from cmake/FindLAPACKLibs.cmake
rename to scripts/cmake/cmake/FindLAPACKLibs.cmake
diff --git a/cmake/FindMSVCRedist.cmake b/scripts/cmake/cmake/FindMSVCRedist.cmake
similarity index 100%
rename from cmake/FindMSVCRedist.cmake
rename to scripts/cmake/cmake/FindMSVCRedist.cmake
diff --git a/cmake/FindOpenSG.cmake b/scripts/cmake/cmake/FindOpenSG.cmake
similarity index 100%
rename from cmake/FindOpenSG.cmake
rename to scripts/cmake/cmake/FindOpenSG.cmake
diff --git a/cmake/FindOpenSGSupportlibs.cmake b/scripts/cmake/cmake/FindOpenSGSupportlibs.cmake
similarity index 100%
rename from cmake/FindOpenSGSupportlibs.cmake
rename to scripts/cmake/cmake/FindOpenSGSupportlibs.cmake
diff --git a/cmake/FindVRPN.cmake b/scripts/cmake/cmake/FindVRPN.cmake
similarity index 100%
rename from cmake/FindVRPN.cmake
rename to scripts/cmake/cmake/FindVRPN.cmake
diff --git a/cmake/Findcppcheck.cmake b/scripts/cmake/cmake/Findcppcheck.cmake
similarity index 100%
rename from cmake/Findcppcheck.cmake
rename to scripts/cmake/cmake/Findcppcheck.cmake
diff --git a/cmake/Findcppcheck.cpp b/scripts/cmake/cmake/Findcppcheck.cpp
similarity index 100%
rename from cmake/Findcppcheck.cpp
rename to scripts/cmake/cmake/Findcppcheck.cpp
diff --git a/cmake/Findcutil.cmake b/scripts/cmake/cmake/Findcutil.cmake
similarity index 100%
rename from cmake/Findcutil.cmake
rename to scripts/cmake/cmake/Findcutil.cmake
diff --git a/cmake/Findquatlib.cmake b/scripts/cmake/cmake/Findquatlib.cmake
similarity index 100%
rename from cmake/Findquatlib.cmake
rename to scripts/cmake/cmake/Findquatlib.cmake
diff --git a/cmake/GetCPUDetails.cmake b/scripts/cmake/cmake/GetCPUDetails.cmake
similarity index 100%
rename from cmake/GetCPUDetails.cmake
rename to scripts/cmake/cmake/GetCPUDetails.cmake
diff --git a/cmake/GetCompilerInfoString.cmake b/scripts/cmake/cmake/GetCompilerInfoString.cmake
similarity index 100%
rename from cmake/GetCompilerInfoString.cmake
rename to scripts/cmake/cmake/GetCompilerInfoString.cmake
diff --git a/cmake/GetGitRevisionDescription.cmake b/scripts/cmake/cmake/GetGitRevisionDescription.cmake
similarity index 100%
rename from cmake/GetGitRevisionDescription.cmake
rename to scripts/cmake/cmake/GetGitRevisionDescription.cmake
diff --git a/cmake/GetGitRevisionDescription.cmake.in b/scripts/cmake/cmake/GetGitRevisionDescription.cmake.in
similarity index 100%
rename from cmake/GetGitRevisionDescription.cmake.in
rename to scripts/cmake/cmake/GetGitRevisionDescription.cmake.in
diff --git a/cmake/LICENSE_1_0.txt b/scripts/cmake/cmake/LICENSE_1_0.txt
similarity index 100%
rename from cmake/LICENSE_1_0.txt
rename to scripts/cmake/cmake/LICENSE_1_0.txt
diff --git a/cmake/LibFindMacros.cmake b/scripts/cmake/cmake/LibFindMacros.cmake
similarity index 100%
rename from cmake/LibFindMacros.cmake
rename to scripts/cmake/cmake/LibFindMacros.cmake
diff --git a/cmake/Licensing.cmake b/scripts/cmake/cmake/Licensing.cmake
similarity index 100%
rename from cmake/Licensing.cmake
rename to scripts/cmake/cmake/Licensing.cmake
diff --git a/cmake/ListCombinations.cmake b/scripts/cmake/cmake/ListCombinations.cmake
similarity index 100%
rename from cmake/ListCombinations.cmake
rename to scripts/cmake/cmake/ListCombinations.cmake
diff --git a/cmake/ListFilter.cmake b/scripts/cmake/cmake/ListFilter.cmake
similarity index 100%
rename from cmake/ListFilter.cmake
rename to scripts/cmake/cmake/ListFilter.cmake
diff --git a/cmake/MSVCMultipleProcessCompile.cmake b/scripts/cmake/cmake/MSVCMultipleProcessCompile.cmake
similarity index 100%
rename from cmake/MSVCMultipleProcessCompile.cmake
rename to scripts/cmake/cmake/MSVCMultipleProcessCompile.cmake
diff --git a/cmake/MSVCStaticRuntime.cmake b/scripts/cmake/cmake/MSVCStaticRuntime.cmake
similarity index 100%
rename from cmake/MSVCStaticRuntime.cmake
rename to scripts/cmake/cmake/MSVCStaticRuntime.cmake
diff --git a/cmake/MSVCVerboseLinking.cmake b/scripts/cmake/cmake/MSVCVerboseLinking.cmake
similarity index 100%
rename from cmake/MSVCVerboseLinking.cmake
rename to scripts/cmake/cmake/MSVCVerboseLinking.cmake
diff --git a/cmake/OptionRequires.cmake b/scripts/cmake/cmake/OptionRequires.cmake
similarity index 100%
rename from cmake/OptionRequires.cmake
rename to scripts/cmake/cmake/OptionRequires.cmake
diff --git a/cmake/PrintVariables.cmake b/scripts/cmake/cmake/PrintVariables.cmake
similarity index 100%
rename from cmake/PrintVariables.cmake
rename to scripts/cmake/cmake/PrintVariables.cmake
diff --git a/cmake/ProcessorCount.cmake b/scripts/cmake/cmake/ProcessorCount.cmake
similarity index 100%
rename from cmake/ProcessorCount.cmake
rename to scripts/cmake/cmake/ProcessorCount.cmake
diff --git a/cmake/README.md b/scripts/cmake/cmake/README.md
similarity index 100%
rename from cmake/README.md
rename to scripts/cmake/cmake/README.md
diff --git a/cmake/ResetConfigurations.cmake b/scripts/cmake/cmake/ResetConfigurations.cmake
similarity index 100%
rename from cmake/ResetConfigurations.cmake
rename to scripts/cmake/cmake/ResetConfigurations.cmake
diff --git a/cmake/SetDefaultBuildType.cmake b/scripts/cmake/cmake/SetDefaultBuildType.cmake
similarity index 100%
rename from cmake/SetDefaultBuildType.cmake
rename to scripts/cmake/cmake/SetDefaultBuildType.cmake
diff --git a/cmake/UseBackportedModules.cmake b/scripts/cmake/cmake/UseBackportedModules.cmake
similarity index 100%
rename from cmake/UseBackportedModules.cmake
rename to scripts/cmake/cmake/UseBackportedModules.cmake
diff --git a/cmake/WarningDev.cmake b/scripts/cmake/cmake/WarningDev.cmake
similarity index 100%
rename from cmake/WarningDev.cmake
rename to scripts/cmake/cmake/WarningDev.cmake
diff --git a/cmake/cmake-2.8.0-modules/features/SelectLibraryConfigurations.cmake b/scripts/cmake/cmake/cmake-2.8.0-modules/features/SelectLibraryConfigurations.cmake
similarity index 100%
rename from cmake/cmake-2.8.0-modules/features/SelectLibraryConfigurations.cmake
rename to scripts/cmake/cmake/cmake-2.8.0-modules/features/SelectLibraryConfigurations.cmake
diff --git a/cmake/cmake-2.8.1-modules/patchctestbug10149/CTest.cmake b/scripts/cmake/cmake/cmake-2.8.1-modules/patchctestbug10149/CTest.cmake
similarity index 100%
rename from cmake/cmake-2.8.1-modules/patchctestbug10149/CTest.cmake
rename to scripts/cmake/cmake/cmake-2.8.1-modules/patchctestbug10149/CTest.cmake
diff --git a/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestScriptMode.cmake b/scripts/cmake/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestScriptMode.cmake
similarity index 100%
rename from cmake/cmake-2.8.1-modules/patchctestbug10149/CTestScriptMode.cmake
rename to scripts/cmake/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestScriptMode.cmake
diff --git a/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestTargets.cmake b/scripts/cmake/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestTargets.cmake
similarity index 100%
rename from cmake/cmake-2.8.1-modules/patchctestbug10149/CTestTargets.cmake
rename to scripts/cmake/cmake/cmake-2.8.1-modules/patchctestbug10149/CTestTargets.cmake
diff --git a/cmake/cmake-2.8.3-modules/FixWinInstallPrefix.cmake b/scripts/cmake/cmake/cmake-2.8.3-modules/FixWinInstallPrefix.cmake
similarity index 100%
rename from cmake/cmake-2.8.3-modules/FixWinInstallPrefix.cmake
rename to scripts/cmake/cmake/cmake-2.8.3-modules/FixWinInstallPrefix.cmake
diff --git a/cmake/cmake-2.8.3-modules/autoinclude.cmake b/scripts/cmake/cmake/cmake-2.8.3-modules/autoinclude.cmake
similarity index 100%
rename from cmake/cmake-2.8.3-modules/autoinclude.cmake
rename to scripts/cmake/cmake/cmake-2.8.3-modules/autoinclude.cmake
diff --git a/cmake/cmake-2.8.4-modules/ImproveEclipseGCCErrors.cmake b/scripts/cmake/cmake/cmake-2.8.4-modules/ImproveEclipseGCCErrors.cmake
similarity index 100%
rename from cmake/cmake-2.8.4-modules/ImproveEclipseGCCErrors.cmake
rename to scripts/cmake/cmake/cmake-2.8.4-modules/ImproveEclipseGCCErrors.cmake
diff --git a/cmake/cmake-2.8.4-modules/autoinclude.cmake b/scripts/cmake/cmake/cmake-2.8.4-modules/autoinclude.cmake
similarity index 100%
rename from cmake/cmake-2.8.4-modules/autoinclude.cmake
rename to scripts/cmake/cmake/cmake-2.8.4-modules/autoinclude.cmake
diff --git a/cmake/cmake-2.8.4-modules/boost/FindBoost.cmake b/scripts/cmake/cmake/cmake-2.8.4-modules/boost/FindBoost.cmake
similarity index 100%
rename from cmake/cmake-2.8.4-modules/boost/FindBoost.cmake
rename to scripts/cmake/cmake/cmake-2.8.4-modules/boost/FindBoost.cmake
diff --git a/cmake/cmake-2.9.0-modules/RequireOutOfSourceBuild.cmake b/scripts/cmake/cmake/cmake-2.9.0-modules/RequireOutOfSourceBuild.cmake
similarity index 100%
rename from cmake/cmake-2.9.0-modules/RequireOutOfSourceBuild.cmake
rename to scripts/cmake/cmake/cmake-2.9.0-modules/RequireOutOfSourceBuild.cmake
diff --git a/cmake/cmake-2.9.0-modules/autoinclude.cmake b/scripts/cmake/cmake/cmake-2.9.0-modules/autoinclude.cmake
similarity index 100%
rename from cmake/cmake-2.9.0-modules/autoinclude.cmake
rename to scripts/cmake/cmake/cmake-2.9.0-modules/autoinclude.cmake
diff --git a/cmake/module-docs/Example-FindMyPackage.cmake b/scripts/cmake/cmake/module-docs/Example-FindMyPackage.cmake
similarity index 100%
rename from cmake/module-docs/Example-FindMyPackage.cmake
rename to scripts/cmake/cmake/module-docs/Example-FindMyPackage.cmake
diff --git a/cmake/module-docs/Example-FindMySimplePackage.cmake b/scripts/cmake/cmake/module-docs/Example-FindMySimplePackage.cmake
similarity index 100%
rename from cmake/module-docs/Example-FindMySimplePackage.cmake
rename to scripts/cmake/cmake/module-docs/Example-FindMySimplePackage.cmake
diff --git a/cmake/package-licensing/Boost.cmake b/scripts/cmake/cmake/package-licensing/Boost.cmake
similarity index 100%
rename from cmake/package-licensing/Boost.cmake
rename to scripts/cmake/cmake/package-licensing/Boost.cmake
diff --git a/cmake/package-licensing/Eigen.cmake b/scripts/cmake/cmake/package-licensing/Eigen.cmake
similarity index 100%
rename from cmake/package-licensing/Eigen.cmake
rename to scripts/cmake/cmake/package-licensing/Eigen.cmake
diff --git a/cmake/package-licensing/Qt-LGPL.cmake b/scripts/cmake/cmake/package-licensing/Qt-LGPL.cmake
similarity index 100%
rename from cmake/package-licensing/Qt-LGPL.cmake
rename to scripts/cmake/cmake/package-licensing/Qt-LGPL.cmake