diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7023ffb..dc1d15c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,10 +44,6 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
 set(gismo_MODULES ${gismo_MODULES} $<TARGET_OBJECTS:${PROJECT_NAME}>
   CACHE INTERNAL "G+Smo modules" )
 
-#Symlink include dir (in case your headers are in /src)
-execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_BINARY_DIR}/${PROJECT_NAME})
-
-
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}"
   DESTINATION include/gismo
   FILES_MATCHING PATTERN "*.h" )
diff --git a/examples/aroundCylinder_NS_2D.cpp b/examples/aroundCylinder_NS_2D.cpp
index c5dafc1..2a17541 100644
--- a/examples/aroundCylinder_NS_2D.cpp
+++ b/examples/aroundCylinder_NS_2D.cpp
@@ -3,9 +3,9 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsNsAssembler.h>
-#include <gsElasticity/gsIterative.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsNsAssembler.h>
+#include <gsElasticity/src/gsIterative.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/aroundCylinder_NS_2Dt.cpp b/examples/aroundCylinder_NS_2Dt.cpp
index ad005f8..366e52f 100644
--- a/examples/aroundCylinder_NS_2Dt.cpp
+++ b/examples/aroundCylinder_NS_2Dt.cpp
@@ -6,10 +6,10 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsNsAssembler.h>
-#include <gsElasticity/gsMassAssembler.h>
-#include <gsElasticity/gsNsTimeIntegrator.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsNsAssembler.h>
+#include <gsElasticity/src/gsMassAssembler.h>
+#include <gsElasticity/src/gsNsTimeIntegrator.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 #include <fstream>
 
diff --git a/examples/aroundCylinder_stokes_2D.cpp b/examples/aroundCylinder_stokes_2D.cpp
index 43419bb..b796bb9 100644
--- a/examples/aroundCylinder_stokes_2D.cpp
+++ b/examples/aroundCylinder_stokes_2D.cpp
@@ -3,8 +3,8 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsNsAssembler.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsNsAssembler.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/beam_nonLinElast_3D.cpp b/examples/beam_nonLinElast_3D.cpp
index 0233841..96a4c5b 100644
--- a/examples/beam_nonLinElast_3D.cpp
+++ b/examples/beam_nonLinElast_3D.cpp
@@ -4,11 +4,11 @@
 /// Authors: O. Weeger (2012-1015, TU Kaiserslautern),
 ///          A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsIterative.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
-#include <gsElasticity/gsMaterialBase.h>
-#include <gsElasticity/gsLinearMaterial.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsIterative.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsMaterialBase.h>
+#include <gsElasticity/src/gsLinearMaterial.h>
 
 using namespace gismo;
 
diff --git a/examples/biceps_activeMuscle_3D.cpp b/examples/biceps_activeMuscle_3D.cpp
index 2e4021e..64d0592 100644
--- a/examples/biceps_activeMuscle_3D.cpp
+++ b/examples/biceps_activeMuscle_3D.cpp
@@ -5,11 +5,11 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsMuscleAssembler.h>
-#include <gsElasticity/gsMassAssembler.h>
-#include <gsElasticity/gsElTimeIntegrator.h>
-#include <gsElasticity/gsIterative.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsMuscleAssembler.h>
+#include <gsElasticity/src/gsMassAssembler.h>
+#include <gsElasticity/src/gsElTimeIntegrator.h>
+#include <gsElasticity/src/gsIterative.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/biceps_activeMuscle_3Dt.cpp b/examples/biceps_activeMuscle_3Dt.cpp
index adf5d83..acd9de1 100644
--- a/examples/biceps_activeMuscle_3Dt.cpp
+++ b/examples/biceps_activeMuscle_3Dt.cpp
@@ -5,11 +5,11 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsMuscleAssembler.h>
-#include <gsElasticity/gsMassAssembler.h>
-#include <gsElasticity/gsElTimeIntegrator.h>
-#include <gsElasticity/gsIterative.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsMuscleAssembler.h>
+#include <gsElasticity/src/gsMassAssembler.h>
+#include <gsElasticity/src/gsElTimeIntegrator.h>
+#include <gsElasticity/src/gsIterative.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/cooks_mixedLinElast_2D.cpp b/examples/cooks_mixedLinElast_2D.cpp
index 464ed71..afa6e9b 100644
--- a/examples/cooks_mixedLinElast_2D.cpp
+++ b/examples/cooks_mixedLinElast_2D.cpp
@@ -4,8 +4,8 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/cooks_mixedNonLinElast_2D.cpp b/examples/cooks_mixedNonLinElast_2D.cpp
index 9bd10f4..42d2517 100644
--- a/examples/cooks_mixedNonLinElast_2D.cpp
+++ b/examples/cooks_mixedNonLinElast_2D.cpp
@@ -4,10 +4,10 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsIterative.h>
-#include <gsElasticity/gsGeoUtils.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsIterative.h>
+#include <gsElasticity/src/gsGeoUtils.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/cooks_nonLinElast_2D.cpp b/examples/cooks_nonLinElast_2D.cpp
index de7424c..63477fd 100644
--- a/examples/cooks_nonLinElast_2D.cpp
+++ b/examples/cooks_nonLinElast_2D.cpp
@@ -4,12 +4,12 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsIterative.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
-#include <gsElasticity/gsMaterialBase.h>
-#include <gsElasticity/gsLinearMaterial.h>
-#include <gsElasticity/gsNeoHookeLogMaterial.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsIterative.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsMaterialBase.h>
+#include <gsElasticity/src/gsLinearMaterial.h>
+#include <gsElasticity/src/gsNeoHookeLogMaterial.h>
 
 using namespace gismo;
 
diff --git a/examples/flappingBeam_CFD1_NS_2D.cpp b/examples/flappingBeam_CFD1_NS_2D.cpp
index 58ad6e0..df5f229 100644
--- a/examples/flappingBeam_CFD1_NS_2D.cpp
+++ b/examples/flappingBeam_CFD1_NS_2D.cpp
@@ -6,9 +6,9 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsNsAssembler.h>
-#include <gsElasticity/gsIterative.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsNsAssembler.h>
+#include <gsElasticity/src/gsIterative.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/flappingBeam_CFD3_NS_2Dt.cpp b/examples/flappingBeam_CFD3_NS_2Dt.cpp
index 5501db9..8d58d68 100644
--- a/examples/flappingBeam_CFD3_NS_2Dt.cpp
+++ b/examples/flappingBeam_CFD3_NS_2Dt.cpp
@@ -8,10 +8,10 @@
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 ///
 #include <gismo.h>
-#include <gsElasticity/gsNsAssembler.h>
-#include <gsElasticity/gsMassAssembler.h>
-#include <gsElasticity/gsNsTimeIntegrator.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsNsAssembler.h>
+#include <gsElasticity/src/gsMassAssembler.h>
+#include <gsElasticity/src/gsNsTimeIntegrator.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/flappingBeam_CSM1_nonLinElast_2D.cpp b/examples/flappingBeam_CSM1_nonLinElast_2D.cpp
index d435219..c14e207 100644
--- a/examples/flappingBeam_CSM1_nonLinElast_2D.cpp
+++ b/examples/flappingBeam_CSM1_nonLinElast_2D.cpp
@@ -4,9 +4,9 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsIterative.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsIterative.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/flappingBeam_CSM3_nonLinElast_2Dt.cpp b/examples/flappingBeam_CSM3_nonLinElast_2Dt.cpp
index 35f33a0..e0dd84b 100644
--- a/examples/flappingBeam_CSM3_nonLinElast_2Dt.cpp
+++ b/examples/flappingBeam_CSM3_nonLinElast_2Dt.cpp
@@ -4,10 +4,10 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsMassAssembler.h>
-#include <gsElasticity/gsElTimeIntegrator.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsMassAssembler.h>
+#include <gsElasticity/src/gsElTimeIntegrator.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/flappingBeam_FSI2_coupledFSI_2Dt.cpp b/examples/flappingBeam_FSI2_coupledFSI_2Dt.cpp
index 3e172a8..e4544df 100644
--- a/examples/flappingBeam_FSI2_coupledFSI_2Dt.cpp
+++ b/examples/flappingBeam_FSI2_coupledFSI_2Dt.cpp
@@ -4,15 +4,15 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsElTimeIntegrator.h>
-#include <gsElasticity/gsNsAssembler.h>
-#include <gsElasticity/gsNsTimeIntegrator.h>
-#include <gsElasticity/gsMassAssembler.h>
-#include <gsElasticity/gsALE.h>
-#include <gsElasticity/gsPartitionedFSI.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
-#include <gsElasticity/gsGeoUtils.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsElTimeIntegrator.h>
+#include <gsElasticity/src/gsNsAssembler.h>
+#include <gsElasticity/src/gsNsTimeIntegrator.h>
+#include <gsElasticity/src/gsMassAssembler.h>
+#include <gsElasticity/src/gsALE.h>
+#include <gsElasticity/src/gsPartitionedFSI.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsGeoUtils.h>
 
 using namespace gismo;
 
diff --git a/examples/flappingBeam_meshDeform_2D.cpp b/examples/flappingBeam_meshDeform_2D.cpp
index 3edc782..d98c7fc 100644
--- a/examples/flappingBeam_meshDeform_2D.cpp
+++ b/examples/flappingBeam_meshDeform_2D.cpp
@@ -6,12 +6,12 @@
 /// The ALE mapping is computed using the nonlinear elasticity method with Jacobian-based local stiffening.
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsElTimeIntegrator.h>
-#include <gsElasticity/gsMassAssembler.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
-#include <gsElasticity/gsGeoUtils.h>
-#include <gsElasticity/gsALE.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsElTimeIntegrator.h>
+#include <gsElasticity/src/gsMassAssembler.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsGeoUtils.h>
+#include <gsElasticity/src/gsALE.h>
 
 using namespace gismo;
 
diff --git a/examples/gsMaterial_test.cpp b/examples/gsMaterial_test.cpp
index 68b6602..1d49bc9 100644
--- a/examples/gsMaterial_test.cpp
+++ b/examples/gsMaterial_test.cpp
@@ -12,8 +12,8 @@
 */
 
 #include <gismo.h>
-#include <gsElasticity/gsMaterialEval.h>
-#include <gsElasticity/gsLinearMaterial.h>
+#include <gsElasticity/src/gsMaterialEval.h>
+#include <gsElasticity/src/gsLinearMaterial.h>
 #include <gsUtils/gsStopwatch.h>
 
 using namespace gismo;
diff --git a/examples/muscleBeam_activeMuscle_3Dt.cpp b/examples/muscleBeam_activeMuscle_3Dt.cpp
index ab955bd..90234ef 100644
--- a/examples/muscleBeam_activeMuscle_3Dt.cpp
+++ b/examples/muscleBeam_activeMuscle_3Dt.cpp
@@ -5,11 +5,11 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsMuscleAssembler.h>
-#include <gsElasticity/gsMassAssembler.h>
-#include <gsElasticity/gsElTimeIntegrator.h>
-#include <gsElasticity/gsIterative.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsMuscleAssembler.h>
+#include <gsElasticity/src/gsMassAssembler.h>
+#include <gsElasticity/src/gsElTimeIntegrator.h>
+#include <gsElasticity/src/gsIterative.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/muscleBeam_mixedNonLinElast_3D.cpp b/examples/muscleBeam_mixedNonLinElast_3D.cpp
index 6a178f8..f36f37d 100644
--- a/examples/muscleBeam_mixedNonLinElast_3D.cpp
+++ b/examples/muscleBeam_mixedNonLinElast_3D.cpp
@@ -4,9 +4,9 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsIterative.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsIterative.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/muscleBeam_mixedNonLinElast_3Dt.cpp b/examples/muscleBeam_mixedNonLinElast_3Dt.cpp
index 7efb3fb..95709f4 100644
--- a/examples/muscleBeam_mixedNonLinElast_3Dt.cpp
+++ b/examples/muscleBeam_mixedNonLinElast_3Dt.cpp
@@ -4,11 +4,11 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsMassAssembler.h>
-#include <gsElasticity/gsElTimeIntegrator.h>
-#include <gsElasticity/gsIterative.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsMassAssembler.h>
+#include <gsElasticity/src/gsElTimeIntegrator.h>
+#include <gsElasticity/src/gsIterative.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/plateWithHoleMP_linElast_2D.cpp b/examples/plateWithHoleMP_linElast_2D.cpp
index d4b744a..801749b 100644
--- a/examples/plateWithHoleMP_linElast_2D.cpp
+++ b/examples/plateWithHoleMP_linElast_2D.cpp
@@ -7,8 +7,8 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/plateWithHole_linElast_2D.cpp b/examples/plateWithHole_linElast_2D.cpp
index e4e5f40..5aa0e28 100644
--- a/examples/plateWithHole_linElast_2D.cpp
+++ b/examples/plateWithHole_linElast_2D.cpp
@@ -4,10 +4,10 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
-#include <gsElasticity/gsMaterialBase.h>
-#include <gsElasticity/gsLinearMaterial.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsMaterialBase.h>
+#include <gsElasticity/src/gsLinearMaterial.h>
 
 using namespace gismo;
 
diff --git a/examples/quarterAnnulus_mixedBiharmonic_2D.cpp b/examples/quarterAnnulus_mixedBiharmonic_2D.cpp
index eb35f34..befc54f 100644
--- a/examples/quarterAnnulus_mixedBiharmonic_2D.cpp
+++ b/examples/quarterAnnulus_mixedBiharmonic_2D.cpp
@@ -2,8 +2,8 @@
 ///
 /// Authors: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsBiharmonicAssembler.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsBiharmonicAssembler.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/rotor_thermalExp_2D.cpp b/examples/rotor_thermalExp_2D.cpp
index 4cd735d..2c97248 100644
--- a/examples/rotor_thermalExp_2D.cpp
+++ b/examples/rotor_thermalExp_2D.cpp
@@ -3,8 +3,8 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsThermoAssembler.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsThermoAssembler.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/rotor_thermalExp_2Dt.cpp b/examples/rotor_thermalExp_2Dt.cpp
index 2e14f9d..23d93ed 100644
--- a/examples/rotor_thermalExp_2Dt.cpp
+++ b/examples/rotor_thermalExp_2Dt.cpp
@@ -6,8 +6,8 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsThermoAssembler.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsThermoAssembler.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/singlePatch_meshDeform_2D.cpp b/examples/singlePatch_meshDeform_2D.cpp
index 8b5c1a9..fc1bf47 100644
--- a/examples/singlePatch_meshDeform_2D.cpp
+++ b/examples/singlePatch_meshDeform_2D.cpp
@@ -2,9 +2,9 @@
 ///
 /// Author: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsGeoUtils.h>
-#include <gsElasticity/gsALE.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsGeoUtils.h>
+#include <gsElasticity/src/gsALE.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/examples/spring_nonLinElast_3D.cpp b/examples/spring_nonLinElast_3D.cpp
index 9a4a919..f9383b2 100644
--- a/examples/spring_nonLinElast_3D.cpp
+++ b/examples/spring_nonLinElast_3D.cpp
@@ -2,10 +2,10 @@
 ///
 /// Authors: A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsIterative.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
-#include <gsElasticity/gsGeoUtils.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsIterative.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsGeoUtils.h>
 
 using namespace gismo;
 
diff --git a/examples/terrific_linElast_3D.cpp b/examples/terrific_linElast_3D.cpp
index f53d1e1..b6385d0 100644
--- a/examples/terrific_linElast_3D.cpp
+++ b/examples/terrific_linElast_3D.cpp
@@ -4,10 +4,10 @@
 /// Authors: O. Weeger (2012-1015, TU Kaiserslautern),
 ///          A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
-#include <gsElasticity/gsMaterialBase.h>
-#include <gsElasticity/gsLinearMaterial.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsMaterialBase.h>
+#include <gsElasticity/src/gsLinearMaterial.h>
 
 using namespace gismo;
 
diff --git a/examples/terrific_nonLinElast_3D.cpp b/examples/terrific_nonLinElast_3D.cpp
index 91fedf0..17b6767 100644
--- a/examples/terrific_nonLinElast_3D.cpp
+++ b/examples/terrific_nonLinElast_3D.cpp
@@ -4,10 +4,10 @@
 /// Authors: O. Weeger (2012-1015, TU Kaiserslautern),
 ///          A.Shamanskiy (2016 - ...., TU Kaiserslautern)
 #include <gismo.h>
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsIterative.h>
-#include <gsElasticity/gsLinearMaterial.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsIterative.h>
+#include <gsElasticity/src/gsLinearMaterial.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 
 using namespace gismo;
 
diff --git a/src/gsALE.h b/src/gsALE.h
index c814be7..116056f 100644
--- a/src/gsALE.h
+++ b/src/gsALE.h
@@ -14,10 +14,10 @@
 
 #pragma once
 #include <gsIO/gsOptionList.h>
-#include <gsElasticity/gsBaseUtils.h>
+#include <gsElasticity/src/gsBaseUtils.h>
 #include <gsCore/gsMultiPatch.h>
-#include <gsElasticity/gsIterative.h>
-#include <gsElasticity/gsBaseAssembler.h>
+#include <gsElasticity/src/gsIterative.h>
+#include <gsElasticity/src/gsBaseAssembler.h>
 
 namespace gismo
 {
diff --git a/src/gsALE.hpp b/src/gsALE.hpp
index 3c578a5..b2ae14d 100644
--- a/src/gsALE.hpp
+++ b/src/gsALE.hpp
@@ -14,13 +14,13 @@
 
 #pragma once
 
-#include <gsElasticity/gsALE.h>
+#include <gsElasticity/src/gsALE.h>
 
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsElPoissonAssembler.h>
-#include <gsElasticity/gsBiharmonicAssembler.h>
-#include <gsElasticity/gsIterative.h>
-#include <gsElasticity/gsGeoUtils.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsElPoissonAssembler.h>
+#include <gsElasticity/src/gsBiharmonicAssembler.h>
+#include <gsElasticity/src/gsIterative.h>
+#include <gsElasticity/src/gsGeoUtils.h>
 #include <gsCore/gsConstantFunction.h>
 
 namespace gismo
diff --git a/src/gsALE_.cpp b/src/gsALE_.cpp
index 2cca77e..e0383fe 100644
--- a/src/gsALE_.cpp
+++ b/src/gsALE_.cpp
@@ -1,7 +1,7 @@
 #include <gsCore/gsTemplateTools.h>
 
-#include <gsElasticity/gsALE.h>
-#include <gsElasticity/gsALE.hpp>
+#include <gsElasticity/src/gsALE.h>
+#include <gsElasticity/src/gsALE.hpp>
 
 namespace gismo
 {
diff --git a/src/gsBaseAssembler.hpp b/src/gsBaseAssembler.hpp
index 6465757..ee7f523 100644
--- a/src/gsBaseAssembler.hpp
+++ b/src/gsBaseAssembler.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <gsElasticity/gsBaseAssembler.h>
+#include <gsElasticity/src/gsBaseAssembler.h>
 
 namespace gismo
 {
diff --git a/src/gsBaseAssembler_.cpp b/src/gsBaseAssembler_.cpp
index 0840c72..29796ef 100644
--- a/src/gsBaseAssembler_.cpp
+++ b/src/gsBaseAssembler_.cpp
@@ -1,7 +1,7 @@
 #include <gsCore/gsTemplateTools.h>
 
-#include <gsElasticity/gsBaseAssembler.h>
-#include <gsElasticity/gsBaseAssembler.hpp>
+#include <gsElasticity/src/gsBaseAssembler.h>
+#include <gsElasticity/src/gsBaseAssembler.hpp>
 
 namespace gismo
 {
diff --git a/src/gsBiharmonicAssembler.h b/src/gsBiharmonicAssembler.h
index fdf97a7..b62b835 100644
--- a/src/gsBiharmonicAssembler.h
+++ b/src/gsBiharmonicAssembler.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <gsElasticity/gsBaseAssembler.h>
+#include <gsElasticity/src/gsBaseAssembler.h>
 
 namespace gismo
 {
diff --git a/src/gsBiharmonicAssembler.hpp b/src/gsBiharmonicAssembler.hpp
index 93521ba..62476f0 100644
--- a/src/gsBiharmonicAssembler.hpp
+++ b/src/gsBiharmonicAssembler.hpp
@@ -14,10 +14,10 @@
 
 #pragma once
 
-#include <gsElasticity/gsBiharmonicAssembler.h>
+#include <gsElasticity/src/gsBiharmonicAssembler.h>
 
 #include <gsPde/gsPoissonPde.h>
-#include <gsElasticity/gsVisitorBiharmonicMixed.h>
+#include <gsElasticity/src/gsVisitorBiharmonicMixed.h>
 
 namespace gismo
 {
diff --git a/src/gsBiharmonicAssembler_.cpp b/src/gsBiharmonicAssembler_.cpp
index a1b66f0..bbc46bb 100644
--- a/src/gsBiharmonicAssembler_.cpp
+++ b/src/gsBiharmonicAssembler_.cpp
@@ -1,7 +1,7 @@
 #include <gsCore/gsTemplateTools.h>
 
-#include <gsElasticity/gsBiharmonicAssembler.h>
-#include <gsElasticity/gsBiharmonicAssembler.hpp>
+#include <gsElasticity/src/gsBiharmonicAssembler.h>
+#include <gsElasticity/src/gsBiharmonicAssembler.hpp>
 
 namespace gismo
 {
diff --git a/src/gsElPoissonAssembler.h b/src/gsElPoissonAssembler.h
index 7c9b0b6..802337b 100644
--- a/src/gsElPoissonAssembler.h
+++ b/src/gsElPoissonAssembler.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <gsElasticity/gsBaseAssembler.h>
+#include <gsElasticity/src/gsBaseAssembler.h>
 
 namespace gismo
 {
diff --git a/src/gsElPoissonAssembler.hpp b/src/gsElPoissonAssembler.hpp
index bdd608e..0a91913 100644
--- a/src/gsElPoissonAssembler.hpp
+++ b/src/gsElPoissonAssembler.hpp
@@ -14,10 +14,10 @@
 
 #pragma once
 
-#include <gsElasticity/gsElPoissonAssembler.h>
+#include <gsElasticity/src/gsElPoissonAssembler.h>
 
 #include <gsPde/gsPoissonPde.h>
-#include <gsElasticity/gsVisitorElPoisson.h>
+#include <gsElasticity/src/gsVisitorElPoisson.h>
 
 namespace gismo
 {
diff --git a/src/gsElPoissonAssembler_.cpp b/src/gsElPoissonAssembler_.cpp
index 16f3cd9..d33bd48 100644
--- a/src/gsElPoissonAssembler_.cpp
+++ b/src/gsElPoissonAssembler_.cpp
@@ -1,7 +1,7 @@
 #include <gsCore/gsTemplateTools.h>
 
-#include <gsElasticity/gsElPoissonAssembler.h>
-#include <gsElasticity/gsElPoissonAssembler.hpp>
+#include <gsElasticity/src/gsElPoissonAssembler.h>
+#include <gsElasticity/src/gsElPoissonAssembler.hpp>
 
 namespace gismo
 {
diff --git a/src/gsElTimeIntegrator.h b/src/gsElTimeIntegrator.h
index d945c8e..c75d9c2 100644
--- a/src/gsElTimeIntegrator.h
+++ b/src/gsElTimeIntegrator.h
@@ -14,10 +14,10 @@
 
 #pragma once
 
-#include <gsElasticity/gsBaseAssembler.h>
-#include <gsElasticity/gsBaseUtils.h>
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsMassAssembler.h>
+#include <gsElasticity/src/gsBaseAssembler.h>
+#include <gsElasticity/src/gsBaseUtils.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsMassAssembler.h>
 
 namespace gismo
 {
diff --git a/src/gsElTimeIntegrator.hpp b/src/gsElTimeIntegrator.hpp
index 60b153b..828bac5 100644
--- a/src/gsElTimeIntegrator.hpp
+++ b/src/gsElTimeIntegrator.hpp
@@ -15,11 +15,11 @@
 
 #pragma once
 
-#include <gsElasticity/gsElTimeIntegrator.h>
+#include <gsElasticity/src/gsElTimeIntegrator.h>
 
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsMassAssembler.h>
-#include <gsElasticity/gsIterative.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsMassAssembler.h>
+#include <gsElasticity/src/gsIterative.h>
 
 namespace gismo
 {
diff --git a/src/gsElTimeIntegrator_.cpp b/src/gsElTimeIntegrator_.cpp
index d9f4e68..d081741 100644
--- a/src/gsElTimeIntegrator_.cpp
+++ b/src/gsElTimeIntegrator_.cpp
@@ -1,7 +1,7 @@
 #include <gsCore/gsTemplateTools.h>
 
-#include <gsElasticity/gsElTimeIntegrator.h>
-#include <gsElasticity/gsElTimeIntegrator.hpp>
+#include <gsElasticity/src/gsElTimeIntegrator.h>
+#include <gsElasticity/src/gsElTimeIntegrator.hpp>
 
 namespace gismo
 {
diff --git a/src/gsElasticityAssembler.h b/src/gsElasticityAssembler.h
index 8bfd301..795acd7 100644
--- a/src/gsElasticityAssembler.h
+++ b/src/gsElasticityAssembler.h
@@ -15,11 +15,11 @@
 
 #pragma once
 
-#include <gsElasticity/gsBaseAssembler.h>
-#include <gsElasticity/gsElasticityFunctions.h>
-#include <gsElasticity/gsBaseUtils.h>
-#include <gsElasticity/gsMaterialBase.h>
-#include <gsElasticity/gsMaterialContainer.h>
+#include <gsElasticity/src/gsBaseAssembler.h>
+#include <gsElasticity/src/gsElasticityFunctions.h>
+#include <gsElasticity/src/gsBaseUtils.h>
+#include <gsElasticity/src/gsMaterialBase.h>
+#include <gsElasticity/src/gsMaterialContainer.h>
 
 namespace gismo
 {
@@ -39,7 +39,7 @@ class gsElasticityAssembler : public gsBaseAssembler<T>
     gsElasticityAssembler(const gsMultiPatch<T> & patches,
                           const gsMultiBasis<T> & basis,
                           const gsBoundaryConditions<T> & bconditions,
-                          const gsFunction<T> & body_force);   
+                          const gsFunction<T> & body_force);
 
     /// @brief Constructor of mixed formulation (displacement + pressure)
     gsElasticityAssembler(const gsMultiPatch<T> & patches,
@@ -53,14 +53,14 @@ class gsElasticityAssembler : public gsBaseAssembler<T>
                           const gsMultiBasis<T> & basis,
                           const gsBoundaryConditions<T> & bconditions,
                           const gsFunction<T>   & body_force,
-                          const gsMaterialBase<T> * material);   
+                          const gsMaterialBase<T> * material);
 
     /// @brief Constructor for displacement formulation
     gsElasticityAssembler(const gsMultiPatch<T> & patches,
                           const gsMultiBasis<T> & basis,
                           const gsBoundaryConditions<T> & bconditions,
                           const gsFunction<T> & body_force,
-                                gsMaterialContainer<T> materials);   
+                                gsMaterialContainer<T> materials);
 
     /// @brief Returns the list of default options for assembly
     static gsOptionList defaultOptions();
diff --git a/src/gsElasticityAssembler.hpp b/src/gsElasticityAssembler.hpp
index 1394c40..9aaa9bb 100644
--- a/src/gsElasticityAssembler.hpp
+++ b/src/gsElasticityAssembler.hpp
@@ -15,21 +15,21 @@
 
 #pragma once
 
-#include <gsElasticity/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
 
 #include <gsUtils/gsPointGrid.h>
-#include <gsElasticity/gsBaseUtils.h>
-#include <gsElasticity/gsGeoUtils.h>
-#include <gsElasticity/gsBasePde.h>
+#include <gsElasticity/src/gsBaseUtils.h>
+#include <gsElasticity/src/gsGeoUtils.h>
+#include <gsElasticity/src/gsBasePde.h>
 
 // Element visitors
-#include <gsElasticity/gsVisitorLinearElasticity.h>
-#include <gsElasticity/gsVisitorLinearElasticityMM.h>
-#include <gsElasticity/gsVisitorMixedLinearElasticity.h>
-#include <gsElasticity/gsVisitorMixedNonLinearElasticity.h>
-#include <gsElasticity/gsVisitorNonLinearElasticity.h>
-#include <gsElasticity/gsVisitorNonLinearElasticityMM.h>
-#include <gsElasticity/gsVisitorElasticityNeumann.h>
+#include <gsElasticity/src/gsVisitorLinearElasticity.h>
+#include <gsElasticity/src/gsVisitorLinearElasticityMM.h>
+#include <gsElasticity/src/gsVisitorMixedLinearElasticity.h>
+#include <gsElasticity/src/gsVisitorMixedNonLinearElasticity.h>
+#include <gsElasticity/src/gsVisitorNonLinearElasticity.h>
+#include <gsElasticity/src/gsVisitorNonLinearElasticityMM.h>
+#include <gsElasticity/src/gsVisitorElasticityNeumann.h>
 
 namespace gismo
 {
diff --git a/src/gsElasticityAssembler_.cpp b/src/gsElasticityAssembler_.cpp
index cb8a9d3..21f474b 100644
--- a/src/gsElasticityAssembler_.cpp
+++ b/src/gsElasticityAssembler_.cpp
@@ -1,7 +1,7 @@
 #include <gsCore/gsTemplateTools.h>
 
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsElasticityAssembler.hpp>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsElasticityAssembler.hpp>
 
 namespace gismo
 {
diff --git a/src/gsElasticityFunctions.h b/src/gsElasticityFunctions.h
index 0df3536..75c7e46 100644
--- a/src/gsElasticityFunctions.h
+++ b/src/gsElasticityFunctions.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <gsCore/gsMultiPatch.h>
-#include <gsElasticity/gsBaseUtils.h>
+#include <gsElasticity/src/gsBaseUtils.h>
 #include <gsIO/gsOptionList.h>
 
 namespace gismo
diff --git a/src/gsElasticityFunctions.hpp b/src/gsElasticityFunctions.hpp
index e81bcdb..90b3e09 100644
--- a/src/gsElasticityFunctions.hpp
+++ b/src/gsElasticityFunctions.hpp
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <gsElasticity/gsElasticityFunctions.h>
+#include <gsElasticity/src/gsElasticityFunctions.h>
 #include <gsCore/gsFuncData.h>
 #include <gsAssembler/gsAssembler.h>
 
diff --git a/src/gsElasticityFunctions_.cpp b/src/gsElasticityFunctions_.cpp
index f81583f..4a007f7 100644
--- a/src/gsElasticityFunctions_.cpp
+++ b/src/gsElasticityFunctions_.cpp
@@ -1,7 +1,7 @@
 #include <gsCore/gsTemplateTools.h>
 
-#include <gsElasticity/gsElasticityFunctions.h>
-#include <gsElasticity/gsElasticityFunctions.hpp>
+#include <gsElasticity/src/gsElasticityFunctions.h>
+#include <gsElasticity/src/gsElasticityFunctions.hpp>
 
 namespace gismo
 {
diff --git a/src/gsGeoUtils.hpp b/src/gsGeoUtils.hpp
index 9eb665a..2744a24 100644
--- a/src/gsGeoUtils.hpp
+++ b/src/gsGeoUtils.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <gsElasticity/gsGeoUtils.h>
+#include <gsElasticity/src/gsGeoUtils.h>
 
 #include <gsCore/gsField.h>
 #include <gsCore/gsFuncData.h>
@@ -26,9 +26,9 @@
 #include <gsAssembler/gsQuadrature.h>
 #include <gsModeling/gsCoonsPatch.h>
 
-#include <gsElasticity/gsElasticityAssembler.h>
-#include <gsElasticity/gsElasticityFunctions.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsElasticityFunctions.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 #include <gsUtils/gsMesh/gsMesh.h>
 #include <gsIO/gsWriteParaview.h>
 
diff --git a/src/gsGeoUtils_.cpp b/src/gsGeoUtils_.cpp
index 59c30cd..ab1adf1 100644
--- a/src/gsGeoUtils_.cpp
+++ b/src/gsGeoUtils_.cpp
@@ -1,7 +1,7 @@
 #include <gsCore/gsTemplateTools.h>
 
-#include <gsElasticity/gsGeoUtils.h>
-#include <gsElasticity/gsGeoUtils.hpp>
+#include <gsElasticity/src/gsGeoUtils.h>
+#include <gsElasticity/src/gsGeoUtils.hpp>
 
 namespace gismo
 {
diff --git a/src/gsIterative.h b/src/gsIterative.h
index c7f4321..66b4b54 100644
--- a/src/gsIterative.h
+++ b/src/gsIterative.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <gsIO/gsOptionList.h>
-#include <gsElasticity/gsBaseUtils.h>
+#include <gsElasticity/src/gsBaseUtils.h>
 #include <functional>
 
 namespace gismo
diff --git a/src/gsIterative.hpp b/src/gsIterative.hpp
index 801784f..e366ca1 100644
--- a/src/gsIterative.hpp
+++ b/src/gsIterative.hpp
@@ -15,9 +15,9 @@
 
 #pragma once
 
-#include <gsElasticity/gsIterative.h>
+#include <gsElasticity/src/gsIterative.h>
 
-#include <gsElasticity/gsBaseAssembler.h>
+#include <gsElasticity/src/gsBaseAssembler.h>
 
 #include <sstream>
 
diff --git a/src/gsIterative_.cpp b/src/gsIterative_.cpp
index 5b4d08c..c602268 100644
--- a/src/gsIterative_.cpp
+++ b/src/gsIterative_.cpp
@@ -1,7 +1,7 @@
 #include <gsCore/gsTemplateTools.h>
 
-#include <gsElasticity/gsIterative.h>
-#include <gsElasticity/gsIterative.hpp>
+#include <gsElasticity/src/gsIterative.h>
+#include <gsElasticity/src/gsIterative.hpp>
 
 namespace gismo
 {
diff --git a/src/gsLinearMaterial.h b/src/gsLinearMaterial.h
index 045ddef..569571d 100644
--- a/src/gsLinearMaterial.h
+++ b/src/gsLinearMaterial.h
@@ -20,8 +20,8 @@
 
 #pragma once
 
-#include <gsElasticity/gsMaterialBase.h>
-#include <gsElasticity/gsVisitorElUtils.h>
+#include <gsElasticity/src/gsMaterialBase.h>
+#include <gsElasticity/src/gsVisitorElUtils.h>
 #include <gsCore/gsConstantFunction.h>
 
 namespace gismo
diff --git a/src/gsMassAssembler.h b/src/gsMassAssembler.h
index d55b41f..da93918 100644
--- a/src/gsMassAssembler.h
+++ b/src/gsMassAssembler.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <gsElasticity/gsBaseAssembler.h>
+#include <gsElasticity/src/gsBaseAssembler.h>
 
 namespace gismo
 {
diff --git a/src/gsMassAssembler.hpp b/src/gsMassAssembler.hpp
index 2d23875..426592e 100644
--- a/src/gsMassAssembler.hpp
+++ b/src/gsMassAssembler.hpp
@@ -15,9 +15,9 @@
 
 #pragma once
 
-#include <gsElasticity/gsMassAssembler.h>
-#include <gsElasticity/gsBasePde.h>
-#include <gsElasticity/gsVisitorMassElasticity.h>
+#include <gsElasticity/src/gsMassAssembler.h>
+#include <gsElasticity/src/gsBasePde.h>
+#include <gsElasticity/src/gsVisitorMassElasticity.h>
 
 namespace gismo
 {
diff --git a/src/gsMassAssembler_.cpp b/src/gsMassAssembler_.cpp
index 06cc4b8..27ce277 100644
--- a/src/gsMassAssembler_.cpp
+++ b/src/gsMassAssembler_.cpp
@@ -1,8 +1,8 @@
 
 #include <gsCore/gsTemplateTools.h>
 
-#include <gsElasticity/gsMassAssembler.h>
-#include <gsElasticity/gsMassAssembler.hpp>
+#include <gsElasticity/src/gsMassAssembler.h>
+#include <gsElasticity/src/gsMassAssembler.hpp>
 
 namespace gismo
 {
diff --git a/src/gsMaterialBase_.cpp b/src/gsMaterialBase_.cpp
index a3bd431..14c2f95 100644
--- a/src/gsMaterialBase_.cpp
+++ b/src/gsMaterialBase_.cpp
@@ -1,7 +1,7 @@
 // #include <gsCore/gsTemplateTools.h>
 
-// #include <gsElasticity/src/gsMaterialBase.h>
-// #include <gsElasticity/src/gsMaterialBase.hpp>
+// #include <gsElasticity/src/src/gsMaterialBase.h>
+// #include <gsElasticity/src/src/gsMaterialBase.hpp>
 
 // namespace gismo
 // {
diff --git a/src/gsMaterialContainer.h b/src/gsMaterialContainer.h
index f02d665..32f32ab 100644
--- a/src/gsMaterialContainer.h
+++ b/src/gsMaterialContainer.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <gsElasticity/gsMaterialBase.h>
+#include <gsElasticity/src/gsMaterialBase.h>
 
 namespace gismo
 {
diff --git a/src/gsMaterialEval.h b/src/gsMaterialEval.h
index 8ecb217..731e6d7 100644
--- a/src/gsMaterialEval.h
+++ b/src/gsMaterialEval.h
@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include <gsElasticity/gsMaterialUtils.h>
-#include <gsElasticity/gsMaterialContainer.h>
-#include <gsElasticity/gsVisitorElUtils.h>
+#include <gsElasticity/src/gsMaterialUtils.h>
+#include <gsElasticity/src/gsMaterialContainer.h>
+#include <gsElasticity/src/gsVisitorElUtils.h>
 #include <gsCore/gsFunction.h>
 
 namespace gismo
diff --git a/src/gsMaterialEval.hpp b/src/gsMaterialEval.hpp
index ba69e5a..c28bb46 100644
--- a/src/gsMaterialEval.hpp
+++ b/src/gsMaterialEval.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <gsElasticity/gsMaterialEval.h>
+#include <gsElasticity/src/gsMaterialEval.h>
 
 namespace gismo
 {
diff --git a/src/gsMaterialEval_.cpp b/src/gsMaterialEval_.cpp
index 6b2f0fd..6984112 100644
--- a/src/gsMaterialEval_.cpp
+++ b/src/gsMaterialEval_.cpp
@@ -1,7 +1,7 @@
 // #include <gsCore/gsTemplateTools.h>
 
-// #include <gsElasticity/gsMaterialEval.h>
-// // #include <gsElasticity/gsMaterialEval.hpp>
+// #include <gsElasticity/src/gsMaterialEval.h>
+// // #include <gsElasticity/src/gsMaterialEval.hpp>
 
 // namespace gismo
 // {
diff --git a/src/gsMaterial_.cpp b/src/gsMaterial_.cpp
index a4ed776..38f4841 100644
--- a/src/gsMaterial_.cpp
+++ b/src/gsMaterial_.cpp
@@ -1,8 +1,8 @@
 #include <gsCore/gsTemplateTools.h>
 
-#include <gsElasticity/gsLinearMaterial.h>
-#include <gsElasticity/gsNeoHookeLogMaterial.h>
-#include <gsElasticity/gsNeoHookeQuadMaterial.h>
+#include <gsElasticity/src/gsLinearMaterial.h>
+#include <gsElasticity/src/gsNeoHookeLogMaterial.h>
+#include <gsElasticity/src/gsNeoHookeQuadMaterial.h>
 
 namespace gismo
 {
diff --git a/src/gsMooneyRivlinMaterial.h b/src/gsMooneyRivlinMaterial.h
index 2bb4f3a..af36061 100644
--- a/src/gsMooneyRivlinMaterial.h
+++ b/src/gsMooneyRivlinMaterial.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <gsElasticity/gsMaterialBase.h>
-#include <gsElasticity/gsVisitorElUtils.h>
+#include <gsElasticity/src/gsMaterialBase.h>
+#include <gsElasticity/src/gsVisitorElUtils.h>
 #include <gsUtils/gsThreaded.h>
 
 namespace gismo
diff --git a/src/gsMuscleAssembler.h b/src/gsMuscleAssembler.h
index 1e9ae21..31a54dc 100644
--- a/src/gsMuscleAssembler.h
+++ b/src/gsMuscleAssembler.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <gsElasticity/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
 
 namespace gismo
 {
diff --git a/src/gsMuscleAssembler.hpp b/src/gsMuscleAssembler.hpp
index bf2164e..44c0f9c 100644
--- a/src/gsMuscleAssembler.hpp
+++ b/src/gsMuscleAssembler.hpp
@@ -14,13 +14,13 @@
 
 #pragma once
 
-#include <gsElasticity/gsMuscleAssembler.h>
+#include <gsElasticity/src/gsMuscleAssembler.h>
 
-#include <gsElasticity/gsGeoUtils.h>
+#include <gsElasticity/src/gsGeoUtils.h>
 
 // Element visitors
-#include <gsElasticity/gsVisitorMuscle.h>
-#include <gsElasticity/gsVisitorElasticityNeumann.h>
+#include <gsElasticity/src/gsVisitorMuscle.h>
+#include <gsElasticity/src/gsVisitorElasticityNeumann.h>
 
 namespace gismo
 {
diff --git a/src/gsMuscleAssembler_.cpp b/src/gsMuscleAssembler_.cpp
index 08285ee..1e422c5 100644
--- a/src/gsMuscleAssembler_.cpp
+++ b/src/gsMuscleAssembler_.cpp
@@ -1,6 +1,6 @@
 #include <gsCore/gsTemplateTools.h>
-#include <gsElasticity/gsMuscleAssembler.h>
-#include <gsElasticity/gsMuscleAssembler.hpp>
+#include <gsElasticity/src/gsMuscleAssembler.h>
+#include <gsElasticity/src/gsMuscleAssembler.hpp>
 
 namespace gismo
 {
diff --git a/src/gsNeoHookeLogMaterial.h b/src/gsNeoHookeLogMaterial.h
index 5d60eeb..551c3cb 100644
--- a/src/gsNeoHookeLogMaterial.h
+++ b/src/gsNeoHookeLogMaterial.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <gsElasticity/gsMaterialBase.h>
+#include <gsElasticity/src/gsMaterialBase.h>
 #include <gsCore/gsConstantFunction.h>
 
 namespace gismo
diff --git a/src/gsNeoHookeQuadMaterial.h b/src/gsNeoHookeQuadMaterial.h
index 337a0a7..a080018 100644
--- a/src/gsNeoHookeQuadMaterial.h
+++ b/src/gsNeoHookeQuadMaterial.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include <gsElasticity/gsMaterialBase.h>
+#include <gsElasticity/src/gsMaterialBase.h>
 #include <gsCore/gsConstantFunction.h>
 
 namespace gismo
diff --git a/src/gsNsAssembler.h b/src/gsNsAssembler.h
index 416862b..2771f35 100644
--- a/src/gsNsAssembler.h
+++ b/src/gsNsAssembler.h
@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include <gsElasticity/gsBaseAssembler.h>
-#include <gsElasticity/gsBaseUtils.h>
+#include <gsElasticity/src/gsBaseAssembler.h>
+#include <gsElasticity/src/gsBaseUtils.h>
 
 namespace gismo
 {
@@ -45,7 +45,7 @@ class gsNsAssembler : public gsBaseAssembler<T>
     //--------------------- SYSTEM ASSEMBLY ----------------------------------//
 
     using Base::assemble;
-    
+
     /// @brief Assembly of the linear system for the Stokes problem
     /// @{
     virtual void assemble(bool saveEliminationMatrix);
diff --git a/src/gsNsAssembler.hpp b/src/gsNsAssembler.hpp
index 4e810a8..4a2fb4b 100644
--- a/src/gsNsAssembler.hpp
+++ b/src/gsNsAssembler.hpp
@@ -14,14 +14,14 @@
 
 #pragma once
 
-#include <gsElasticity/gsNsAssembler.h>
+#include <gsElasticity/src/gsNsAssembler.h>
 
-#include <gsElasticity/gsBasePde.h>
+#include <gsElasticity/src/gsBasePde.h>
 #include <gsUtils/gsPointGrid.h>
 
 // Element visitors
-#include <gsElasticity/gsVisitorStokes.h>
-#include <gsElasticity/gsVisitorNavierStokes.h>
+#include <gsElasticity/src/gsVisitorStokes.h>
+#include <gsElasticity/src/gsVisitorNavierStokes.h>
 
 namespace gismo
 {
diff --git a/src/gsNsAssembler_.cpp b/src/gsNsAssembler_.cpp
index c1870ad..cf903b6 100644
--- a/src/gsNsAssembler_.cpp
+++ b/src/gsNsAssembler_.cpp
@@ -1,7 +1,7 @@
 #include <gsCore/gsTemplateTools.h>
 
-#include <gsElasticity/gsNsAssembler.h>
-#include <gsElasticity/gsNsAssembler.hpp>
+#include <gsElasticity/src/gsNsAssembler.h>
+#include <gsElasticity/src/gsNsAssembler.hpp>
 
 namespace gismo
 {
diff --git a/src/gsNsTimeIntegrator.h b/src/gsNsTimeIntegrator.h
index 4cb227e..291b6d3 100644
--- a/src/gsNsTimeIntegrator.h
+++ b/src/gsNsTimeIntegrator.h
@@ -14,10 +14,10 @@
 
 #pragma once
 
-#include <gsElasticity/gsBaseAssembler.h>
-#include <gsElasticity/gsBaseUtils.h>
-#include <gsElasticity/gsNsAssembler.h>
-#include <gsElasticity/gsMassAssembler.h>
+#include <gsElasticity/src/gsBaseAssembler.h>
+#include <gsElasticity/src/gsBaseUtils.h>
+#include <gsElasticity/src/gsNsAssembler.h>
+#include <gsElasticity/src/gsMassAssembler.h>
 
 namespace gismo
 {
diff --git a/src/gsNsTimeIntegrator.hpp b/src/gsNsTimeIntegrator.hpp
index 35d269b..6a8df84 100644
--- a/src/gsNsTimeIntegrator.hpp
+++ b/src/gsNsTimeIntegrator.hpp
@@ -15,11 +15,11 @@
 
 #pragma once
 
-#include <gsElasticity/gsNsTimeIntegrator.h>
+#include <gsElasticity/src/gsNsTimeIntegrator.h>
 
-#include <gsElasticity/gsNsAssembler.h>
-#include <gsElasticity/gsMassAssembler.h>
-#include <gsElasticity/gsIterative.h>
+#include <gsElasticity/src/gsNsAssembler.h>
+#include <gsElasticity/src/gsMassAssembler.h>
+#include <gsElasticity/src/gsIterative.h>
 
 namespace gismo
 {
diff --git a/src/gsNsTimeIntegrator_.cpp b/src/gsNsTimeIntegrator_.cpp
index ae2064d..384d2c0 100644
--- a/src/gsNsTimeIntegrator_.cpp
+++ b/src/gsNsTimeIntegrator_.cpp
@@ -1,7 +1,7 @@
 #include <gsCore/gsTemplateTools.h>
 
-#include <gsElasticity/gsNsTimeIntegrator.h>
-#include <gsElasticity/gsNsTimeIntegrator.hpp>
+#include <gsElasticity/src/gsNsTimeIntegrator.h>
+#include <gsElasticity/src/gsNsTimeIntegrator.hpp>
 
 namespace gismo
 {
diff --git a/src/gsPartitionedFSI.hpp b/src/gsPartitionedFSI.hpp
index ebe2715..820ef66 100644
--- a/src/gsPartitionedFSI.hpp
+++ b/src/gsPartitionedFSI.hpp
@@ -14,13 +14,13 @@
 
 #pragma once
 
-#include <gsElasticity/gsPartitionedFSI.h>
+#include <gsElasticity/src/gsPartitionedFSI.h>
 
-#include <gsElasticity/gsNsTimeIntegrator.h>
-#include <gsElasticity/gsElTimeIntegrator.h>
-#include <gsElasticity/gsALE.h>
+#include <gsElasticity/src/gsNsTimeIntegrator.h>
+#include <gsElasticity/src/gsElTimeIntegrator.h>
+#include <gsElasticity/src/gsALE.h>
 #include <gsUtils/gsStopwatch.h>
-#include <gsElasticity/gsGeoUtils.h>
+#include <gsElasticity/src/gsGeoUtils.h>
 
 namespace gismo
 {
diff --git a/src/gsPartitionedFSI_.cpp b/src/gsPartitionedFSI_.cpp
index 4f826e9..cc52d63 100644
--- a/src/gsPartitionedFSI_.cpp
+++ b/src/gsPartitionedFSI_.cpp
@@ -1,7 +1,7 @@
 #include <gsCore/gsTemplateTools.h>
 
-#include <gsElasticity/gsPartitionedFSI.h>
-#include <gsElasticity/gsPartitionedFSI.hpp>
+#include <gsElasticity/src/gsPartitionedFSI.h>
+#include <gsElasticity/src/gsPartitionedFSI.hpp>
 
 namespace gismo
 {
diff --git a/src/gsThermoAssembler.h b/src/gsThermoAssembler.h
index 89f3ff6..39a3ce2 100644
--- a/src/gsThermoAssembler.h
+++ b/src/gsThermoAssembler.h
@@ -14,7 +14,7 @@
 */
 #pragma once
 
-#include <gsElasticity/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
 
 namespace gismo
 {
diff --git a/src/gsThermoAssembler.hpp b/src/gsThermoAssembler.hpp
index ed8277e..4562262 100644
--- a/src/gsThermoAssembler.hpp
+++ b/src/gsThermoAssembler.hpp
@@ -15,10 +15,10 @@
 
 #pragma once
 
-#include <gsElasticity/gsThermoAssembler.h>
+#include <gsElasticity/src/gsThermoAssembler.h>
 
-#include <gsElasticity/gsVisitorThermo.h>
-#include <gsElasticity/gsVisitorThermoBoundary.h>
+#include <gsElasticity/src/gsVisitorThermo.h>
+#include <gsElasticity/src/gsVisitorThermoBoundary.h>
 
 namespace gismo
 {
diff --git a/src/gsThermoAssembler_.cpp b/src/gsThermoAssembler_.cpp
index cb26c45..48f1312 100644
--- a/src/gsThermoAssembler_.cpp
+++ b/src/gsThermoAssembler_.cpp
@@ -1,6 +1,6 @@
 #include <gsCore/gsTemplateTools.h>
-#include <gsElasticity/gsThermoAssembler.h>
-#include <gsElasticity/gsThermoAssembler.hpp>
+#include <gsElasticity/src/gsThermoAssembler.h>
+#include <gsElasticity/src/gsThermoAssembler.hpp>
 
 namespace gismo
 {
diff --git a/src/gsVisitorLinearElasticity.h b/src/gsVisitorLinearElasticity.h
index 9f079a2..5cc56d6 100644
--- a/src/gsVisitorLinearElasticity.h
+++ b/src/gsVisitorLinearElasticity.h
@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include <gsElasticity/gsVisitorElUtils.h>
-#include <gsElasticity/gsBasePde.h>
+#include <gsElasticity/src/gsVisitorElUtils.h>
+#include <gsElasticity/src/gsBasePde.h>
 
 #include <gsAssembler/gsQuadrature.h>
 #include <gsCore/gsFuncData.h>
diff --git a/src/gsVisitorLinearElasticityMM.h b/src/gsVisitorLinearElasticityMM.h
index ef56e2b..c788cab 100644
--- a/src/gsVisitorLinearElasticityMM.h
+++ b/src/gsVisitorLinearElasticityMM.h
@@ -15,11 +15,11 @@
 
 #pragma once
 
-#include <gsElasticity/gsVisitorElUtils.h>
-#include <gsElasticity/gsBasePde.h>
-#include <gsElasticity/gsMaterialBase.h>
-#include <gsElasticity/gsMaterialEval.h>
-#include <gsElasticity/gsMaterialContainer.h>
+#include <gsElasticity/src/gsVisitorElUtils.h>
+#include <gsElasticity/src/gsBasePde.h>
+#include <gsElasticity/src/gsMaterialBase.h>
+#include <gsElasticity/src/gsMaterialEval.h>
+#include <gsElasticity/src/gsMaterialContainer.h>
 
 #include <gsAssembler/gsQuadrature.h>
 #include <gsCore/gsFuncData.h>
diff --git a/src/gsVisitorMixedLinearElasticity.h b/src/gsVisitorMixedLinearElasticity.h
index e9952b3..1b00365 100644
--- a/src/gsVisitorMixedLinearElasticity.h
+++ b/src/gsVisitorMixedLinearElasticity.h
@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include <gsElasticity/gsVisitorElUtils.h>
-#include <gsElasticity/gsBasePde.h>
+#include <gsElasticity/src/gsVisitorElUtils.h>
+#include <gsElasticity/src/gsBasePde.h>
 
 #include <gsAssembler/gsQuadrature.h>
 #include <gsCore/gsFuncData.h>
diff --git a/src/gsVisitorMixedNonLinearElasticity.h b/src/gsVisitorMixedNonLinearElasticity.h
index 34e3e15..7bf6ea3 100644
--- a/src/gsVisitorMixedNonLinearElasticity.h
+++ b/src/gsVisitorMixedNonLinearElasticity.h
@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include <gsElasticity/gsVisitorElUtils.h>
-#include <gsElasticity/gsBasePde.h>
+#include <gsElasticity/src/gsVisitorElUtils.h>
+#include <gsElasticity/src/gsBasePde.h>
 
 #include <gsAssembler/gsQuadrature.h>
 #include <gsCore/gsFuncData.h>
diff --git a/src/gsVisitorMuscle.h b/src/gsVisitorMuscle.h
index 1e6ee63..24c6cea 100644
--- a/src/gsVisitorMuscle.h
+++ b/src/gsVisitorMuscle.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <gsElasticity/gsVisitorElUtils.h>
-#include <gsElasticity/gsBasePde.h>
+#include <gsElasticity/src/gsVisitorElUtils.h>
+#include <gsElasticity/src/gsBasePde.h>
 
 #include <gsAssembler/gsQuadrature.h>
 #include <gsCore/gsFuncData.h>
diff --git a/src/gsVisitorNavierStokes.h b/src/gsVisitorNavierStokes.h
index 4692d69..f2ab5df 100644
--- a/src/gsVisitorNavierStokes.h
+++ b/src/gsVisitorNavierStokes.h
@@ -18,7 +18,7 @@
 #include <gsCore/gsFuncData.h>
 #include <algorithm>
 
-#include <gsElasticity/gsBasePde.h>
+#include <gsElasticity/src/gsBasePde.h>
 
 namespace gismo
 {
diff --git a/src/gsVisitorNonLinearElasticity.h b/src/gsVisitorNonLinearElasticity.h
index a6d8c4b..883efbc 100644
--- a/src/gsVisitorNonLinearElasticity.h
+++ b/src/gsVisitorNonLinearElasticity.h
@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include <gsElasticity/gsVisitorElUtils.h>
-#include <gsElasticity/gsBasePde.h>
+#include <gsElasticity/src/gsVisitorElUtils.h>
+#include <gsElasticity/src/gsBasePde.h>
 
 #include <gsAssembler/gsQuadrature.h>
 #include <gsCore/gsFuncData.h>
diff --git a/src/gsVisitorNonLinearElasticityMM.h b/src/gsVisitorNonLinearElasticityMM.h
index 176063b..109b311 100644
--- a/src/gsVisitorNonLinearElasticityMM.h
+++ b/src/gsVisitorNonLinearElasticityMM.h
@@ -15,10 +15,10 @@
 
 #pragma once
 
-#include <gsElasticity/gsVisitorElUtils.h>
-#include <gsElasticity/gsBasePde.h>
-#include <gsElasticity/gsMaterialBase.h>
-#include <gsElasticity/gsMaterialContainer.h>
+#include <gsElasticity/src/gsVisitorElUtils.h>
+#include <gsElasticity/src/gsBasePde.h>
+#include <gsElasticity/src/gsMaterialBase.h>
+#include <gsElasticity/src/gsMaterialContainer.h>
 
 #include <gsAssembler/gsQuadrature.h>
 #include <gsCore/gsFuncData.h>
diff --git a/src/gsVisitorStokes.h b/src/gsVisitorStokes.h
index 981815c..61eaadf 100644
--- a/src/gsVisitorStokes.h
+++ b/src/gsVisitorStokes.h
@@ -16,7 +16,7 @@
 
 #include <gsAssembler/gsQuadrature.h>
 #include <gsCore/gsFuncData.h>
-#include <gsElasticity/gsBasePde.h>
+#include <gsElasticity/src/gsBasePde.h>
 
 namespace gismo
 {
diff --git a/src/gsWriteParaviewMultiPhysics.hpp b/src/gsWriteParaviewMultiPhysics.hpp
index ae54505..4b639c7 100644
--- a/src/gsWriteParaviewMultiPhysics.hpp
+++ b/src/gsWriteParaviewMultiPhysics.hpp
@@ -12,13 +12,13 @@
     Inspired by gsWriteParaview.hpp by A. Mantzaflaris
 */
 
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
 #include <gsUtils/gsPointGrid.h>
 #include <gsUtils/gsMesh/gsMesh.h>
 #include <gsCore/gsFunction.h>
 #include <gsCore/gsField.h>
 #include <gsIO/gsWriteParaview.h>
-#include <gsElasticity/gsGeoUtils.h>
+#include <gsElasticity/src/gsGeoUtils.h>
 
 
 #define PLOT_PRECISION 11
diff --git a/src/gsWriteParaviewMultiPhysics_.cpp b/src/gsWriteParaviewMultiPhysics_.cpp
index 471f468..6c2b6c6 100644
--- a/src/gsWriteParaviewMultiPhysics_.cpp
+++ b/src/gsWriteParaviewMultiPhysics_.cpp
@@ -1,8 +1,8 @@
 
 #include <gsCore/gsTemplateTools.h>
 
-#include <gsElasticity/gsWriteParaviewMultiPhysics.h>
-#include <gsElasticity/gsWriteParaviewMultiPhysics.hpp>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.h>
+#include <gsElasticity/src/gsWriteParaviewMultiPhysics.hpp>
 
 namespace gismo
 {
diff --git a/tutorials/linear_solid.cpp b/tutorials/linear_solid.cpp
index c5c3bf9..b7812dc 100644
--- a/tutorials/linear_solid.cpp
+++ b/tutorials/linear_solid.cpp
@@ -14,7 +14,7 @@
 #include <gismo.h>
 
 //! [Includes]
-#include <gsElasticity/gsElasticityAssembler.h>
+#include <gsElasticity/src/gsElasticityAssembler.h>
 //! [Includes]
 
 using namespace gismo;