diff --git a/gpu/CMakeMacros/Cocoa/Link.cmake b/CMake/CMakeMacros_old/Cocoa/Link.cmake
similarity index 100%
rename from gpu/CMakeMacros/Cocoa/Link.cmake
rename to CMake/CMakeMacros_old/Cocoa/Link.cmake
diff --git a/gpu/CMakeMacros/Environment/environment.cmake b/CMake/CMakeMacros_old/Environment/environment.cmake
similarity index 100%
rename from gpu/CMakeMacros/Environment/environment.cmake
rename to CMake/CMakeMacros_old/Environment/environment.cmake
diff --git a/gpu/CMakeMacros/GMock/FindGMock.cmake b/CMake/CMakeMacros_old/GMock/FindGMock.cmake
similarity index 100%
rename from gpu/CMakeMacros/GMock/FindGMock.cmake
rename to CMake/CMakeMacros_old/GMock/FindGMock.cmake
diff --git a/gpu/CMakeMacros/GMock/Link.cmake b/CMake/CMakeMacros_old/GMock/Link.cmake
similarity index 100%
rename from gpu/CMakeMacros/GMock/Link.cmake
rename to CMake/CMakeMacros_old/GMock/Link.cmake
diff --git a/gpu/CMakeMacros/JsonCpp/FindJsonCpp.cmake b/CMake/CMakeMacros_old/JsonCpp/FindJsonCpp.cmake
similarity index 100%
rename from gpu/CMakeMacros/JsonCpp/FindJsonCpp.cmake
rename to CMake/CMakeMacros_old/JsonCpp/FindJsonCpp.cmake
diff --git a/gpu/CMakeMacros/JsonCpp/Link.cmake b/CMake/CMakeMacros_old/JsonCpp/Link.cmake
similarity index 100%
rename from gpu/CMakeMacros/JsonCpp/Link.cmake
rename to CMake/CMakeMacros_old/JsonCpp/Link.cmake
diff --git a/gpu/CMakeMacros/MacOSXBundle/Info.plist b/CMake/CMakeMacros_old/MacOSXBundle/Info.plist
similarity index 100%
rename from gpu/CMakeMacros/MacOSXBundle/Info.plist
rename to CMake/CMakeMacros_old/MacOSXBundle/Info.plist
diff --git a/gpu/CMakeMacros/MacOSXBundle/MacOSXBundle.cmake b/CMake/CMakeMacros_old/MacOSXBundle/MacOSXBundle.cmake
similarity index 100%
rename from gpu/CMakeMacros/MacOSXBundle/MacOSXBundle.cmake
rename to CMake/CMakeMacros_old/MacOSXBundle/MacOSXBundle.cmake
diff --git a/gpu/CMakeMacros/MathLink/Link.cmake b/CMake/CMakeMacros_old/MathLink/Link.cmake
similarity index 100%
rename from gpu/CMakeMacros/MathLink/Link.cmake
rename to CMake/CMakeMacros_old/MathLink/Link.cmake
diff --git a/gpu/CMakeMacros/Metis/FindMetis.cmake b/CMake/CMakeMacros_old/Metis/FindMetis.cmake
similarity index 100%
rename from gpu/CMakeMacros/Metis/FindMetis.cmake
rename to CMake/CMakeMacros_old/Metis/FindMetis.cmake
diff --git a/gpu/CMakeMacros/Metis/Link.cmake b/CMake/CMakeMacros_old/Metis/Link.cmake
similarity index 100%
rename from gpu/CMakeMacros/Metis/Link.cmake
rename to CMake/CMakeMacros_old/Metis/Link.cmake
diff --git a/gpu/CMakeMacros/Qt/Link.cmake b/CMake/CMakeMacros_old/Qt/Link.cmake
similarity index 100%
rename from gpu/CMakeMacros/Qt/Link.cmake
rename to CMake/CMakeMacros_old/Qt/Link.cmake
diff --git a/gpu/CMakeMacros/README.md b/CMake/CMakeMacros_old/README.md
similarity index 100%
rename from gpu/CMakeMacros/README.md
rename to CMake/CMakeMacros_old/README.md
diff --git a/gpu/CMakeMacros/VTK/Link.cmake b/CMake/CMakeMacros_old/VTK/Link.cmake
similarity index 100%
rename from gpu/CMakeMacros/VTK/Link.cmake
rename to CMake/CMakeMacros_old/VTK/Link.cmake
diff --git a/gpu/CMakeMacros/fftw/FindFftw.cmake b/CMake/CMakeMacros_old/fftw/FindFftw.cmake
similarity index 100%
rename from gpu/CMakeMacros/fftw/FindFftw.cmake
rename to CMake/CMakeMacros_old/fftw/FindFftw.cmake
diff --git a/gpu/CMakeMacros/fftw/Link.cmake b/CMake/CMakeMacros_old/fftw/Link.cmake
similarity index 100%
rename from gpu/CMakeMacros/fftw/Link.cmake
rename to CMake/CMakeMacros_old/fftw/Link.cmake
diff --git a/gpu/CMakeMacros/general/BuildTarget.cmake b/CMake/CMakeMacros_old/general/BuildTarget.cmake
similarity index 100%
rename from gpu/CMakeMacros/general/BuildTarget.cmake
rename to CMake/CMakeMacros_old/general/BuildTarget.cmake
diff --git a/gpu/CMakeMacros/general/BuildTargetUtilities.cmake b/CMake/CMakeMacros_old/general/BuildTargetUtilities.cmake
similarity index 100%
rename from gpu/CMakeMacros/general/BuildTargetUtilities.cmake
rename to CMake/CMakeMacros_old/general/BuildTargetUtilities.cmake
diff --git a/gpu/CMakeMacros/general/EndingsToCollect.cmake b/CMake/CMakeMacros_old/general/EndingsToCollect.cmake
similarity index 100%
rename from gpu/CMakeMacros/general/EndingsToCollect.cmake
rename to CMake/CMakeMacros_old/general/EndingsToCollect.cmake
diff --git a/gpu/CMakeMacros/general/FileUtilities.cmake b/CMake/CMakeMacros_old/general/FileUtilities.cmake
similarity index 100%
rename from gpu/CMakeMacros/general/FileUtilities.cmake
rename to CMake/CMakeMacros_old/general/FileUtilities.cmake
diff --git a/gpu/CMakeMacros/general/FindCompiler.cmake b/CMake/CMakeMacros_old/general/FindCompiler.cmake
similarity index 100%
rename from gpu/CMakeMacros/general/FindCompiler.cmake
rename to CMake/CMakeMacros_old/general/FindCompiler.cmake
diff --git a/gpu.cmake b/gpu.cmake
index 3d351c3a456acd7236ceb99b67d5fd4cc248723c..2be43a5aef95dc3c254d4f02119282910cd023fa 100644
--- a/gpu.cmake
+++ b/gpu.cmake
@@ -102,7 +102,7 @@ enable_language(CUDA)
 
 #############################################################
 
-include(${CMAKE_SOURCE_DIR}/gpu/${cmakeMacroPath}/general/FindCompiler.cmake)
+include(${CMAKE_PATH}/CMakeMacros_old/general/FindCompiler.cmake)
 configure_file(src/gpu/VirtualFluidsDefinitions.in.h VirtualFluidsDefinitions.h)
 if(MSVC)
     SET( CMAKE_CXX_FLAGS "/FI${CMAKE_BINARY_DIR}/VirtualFluidsDefinitions.h ${CMAKE_CXX_FLAGS}" )
diff --git a/gpu/CMakeLists.txt b/gpu/CMakeLists.txt
index 6b30bad6b215318afa3d8ad557a997604d239edf..0df8e2d206f52654fce576fdf435a248715fada7 100644
--- a/gpu/CMakeLists.txt
+++ b/gpu/CMakeLists.txt
@@ -30,7 +30,7 @@ endif()
 #############################################################
 ###                     ENVIRONMENT                       ###
 #############################################################
-set(cmakeMacroPath "CMakeMacros")
+set(cmakeMacroPath "CMakeMacros_old")
 #include(${cmakeMacroPath}/Environment/environment.cmake)
 
 #CAB