diff --git a/CMakeLists.txt b/CMakeLists.txt
index 640161747aa1efc9146900a5c0c27d0e17cdc874..247e4f1e9ddef794ef60ece651c031ff6e073157 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,7 @@ project( OGS-6 )
 INCLUDE(scripts/cmake/CMakeSetup.cmake)
 INCLUDE(scripts/cmake/CompilerSetup.cmake)
 INCLUDE(scripts/cmake/Find.cmake)
+INCLUDE(scripts/cmake/ProjectSetup.cmake)
 
 ###############
 ### Options ###
@@ -22,9 +23,9 @@ IF((CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC) AND GPROF_PATH)
 	OPTION(OGS_PROFILE "Enables compiling with flags set for profiling with gprof." OFF)
 ENDIF() # GCC AND GPROF_PATH
 
-# Set build directories
-SET( EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin )
-SET( LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib )
+######################
+### Subdirectories ###
+######################
 
 # Add subdirectories with the projects
 ADD_SUBDIRECTORY( Base )
diff --git a/scripts/cmake/ProjectSetup.cmake b/scripts/cmake/ProjectSetup.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..43d955296f359bf696e3000453876d2790a3b97f
--- /dev/null
+++ b/scripts/cmake/ProjectSetup.cmake
@@ -0,0 +1,3 @@
+# Set build directories
+SET( EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin )
+SET( LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib )
\ No newline at end of file