diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ddb285..534073f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,9 +13,8 @@ include(gsConfig)
 
 ## Collect files
 aux_header_directory     (${CMAKE_CURRENT_SOURCE_DIR}/src ${PROJECT_NAME}_H  )
-aux_header_directory     (${CMAKE_CURRENT_SOURCE_DIR}/gsTemplates ${PROJECT_NAME}_H  )
-aux_cpp_directory        (${CMAKE_CURRENT_SOURCE_DIR}/gsTemplates ${PROJECT_NAME}_CPP)
-aux_tmpl_header_directory(${CMAKE_CURRENT_SOURCE_DIR}/gsTemplates ${PROJECT_NAME}_HPP)
+aux_cpp_directory        (${CMAKE_CURRENT_SOURCE_DIR}/src ${PROJECT_NAME}_CPP)
+aux_tmpl_header_directory(${CMAKE_CURRENT_SOURCE_DIR}/src ${PROJECT_NAME}_HPP)
 
 if( (NOT GISMO_BUILD_LIB) )
   aux_instance_directory (${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_NAME}_INS)
diff --git a/examples/helloSubmodule.cpp b/examples/helloSubmodule.cpp
index cbc8f32..dd9d860 100644
--- a/examples/helloSubmodule.cpp
+++ b/examples/helloSubmodule.cpp
@@ -14,8 +14,7 @@
 //! [Include namespace]
 #include <gismo.h>
 
-#include <gsModule/gsTemplates/gsClass.h>
-#include <gsModule/gsHeader2.h>
+#include <gsModule/gsClass.h>
 
 using namespace gismo;
 //! [Include namespace]
@@ -27,13 +26,9 @@ int main(int argc, char *argv[])
 
   // Example how to use the class in submodules
   submoduleClass submClass;
-  std::string str = "Hello, I am called from the submodule class, stored in gsSubmodule/gsFolder1";
+  std::string str = "Hello, I am called from the submodule class, stored in gsModule/src";
   submClass.printString(str);
-  
-  submoduleClass2 submClass2;
-  std::string str2 = "Hello, I am called from the submodule class, stored in gsSubmodule";
-  submClass2.printString(str2);
-  
+
   gsMultiPatch<real_t> mp;
   gsReadFile<>("turtle.xml",mp);
   gsInfo<<"Plotting the geometry, given in gsSubmodule/filedata in Paraview as geom.pvd\n";
diff --git a/gsTemplates/gsClass.h b/src/gsClass.h
similarity index 100%
rename from gsTemplates/gsClass.h
rename to src/gsClass.h
diff --git a/gsTemplates/gsClass.hpp b/src/gsClass.hpp
similarity index 100%
rename from gsTemplates/gsClass.hpp
rename to src/gsClass.hpp
diff --git a/gsTemplates/gsClass_.cpp b/src/gsClass_.cpp
similarity index 100%
rename from gsTemplates/gsClass_.cpp
rename to src/gsClass_.cpp