diff --git a/modules/default_build_paths.cmake b/modules/default_build_paths.cmake
new file mode 100644
index 0000000..0b036e0
--- /dev/null
+++ b/modules/default_build_paths.cmake
@@ -0,0 +1,2 @@
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
diff --git a/modules/src.cmake b/modules/src.cmake
new file mode 100644
index 0000000..09c6426
--- /dev/null
+++ b/modules/src.cmake
@@ -0,0 +1 @@
+add_subdirectory(${PROJECT_SOURCE_DIR}/src)
diff --git a/test/cxx/cmake/autocmake.cfg b/test/cxx/cmake/autocmake.cfg
index 299eed9..876cdc3 100644
--- a/test/cxx/cmake/autocmake.cfg
+++ b/test/cxx/cmake/autocmake.cfg
@@ -5,3 +5,9 @@ name: example
 source: https://github.com/scisoft/autocmake/raw/master/modules/cxx.cmake
 docopt: --cxx=<CXX> C++ compiler [default: g++].
 export: 'CXX=%s' % arguments['--cxx']
+
+[default_build_paths]
+source: https://github.com/scisoft/autocmake/raw/master/modules/default_build_paths.cmake
+
+[src]
+source: https://github.com/scisoft/autocmake/raw/master/modules/src.cmake
diff --git a/test/fortran/cmake/autocmake.cfg b/test/fortran/cmake/autocmake.cfg
index eefa6c4..a273ca4 100644
--- a/test/fortran/cmake/autocmake.cfg
+++ b/test/fortran/cmake/autocmake.cfg
@@ -5,3 +5,9 @@ name: example
 source: https://github.com/scisoft/autocmake/raw/master/modules/fc.cmake
 docopt: --fc=<FC> Fortran compiler [default: gfortran].
 export: 'FC=%s' % arguments['--fc']
+
+[default_build_paths]
+source: https://github.com/scisoft/autocmake/raw/master/modules/default_build_paths.cmake
+
+[src]
+source: https://github.com/scisoft/autocmake/raw/master/modules/src.cmake
diff --git a/update.py b/update.py
index e945496..054b65a 100755
--- a/update.py
+++ b/update.py
@@ -182,11 +182,6 @@ def gen_cmakelists(config, relative_path, list_of_modules):
     s.append('# places during configuration and build')
     s.append('find_package(PythonInterp REQUIRED)')
 
-    s.append('\n')
-    s.append('# default paths')
-    s.append('set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)')
-    s.append('set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)')
-
     s.append('\n')
     s.append('# determine program version from file, example: "14.1"')
     s.append('# the reason why this information is stored')
@@ -213,9 +208,6 @@ def gen_cmakelists(config, relative_path, list_of_modules):
     for m in list_of_modules:
         s.append('include(autocmake_%s)' % os.path.splitext(m)[0])
 
-    s.append('\n')
-    s.append('add_subdirectory(${PROJECT_SOURCE_DIR}/src)')
-
     return s