diff --git a/gsKLShell.h b/gsKLShell.h
index 304267f..667294b 100644
--- a/gsKLShell.h
+++ b/gsKLShell.h
@@ -24,9 +24,7 @@ namespace gismo
 {
 #ifdef GISMO_WITH_PYBIND11
 
-  namespace py = pybind11;
-
-  void pybind11_init_gsKLShell(py::module &m);
+  void pybind11_init_gsKLShell(pybind11::module &m);
 
 #endif
 }
diff --git a/gsKLShell_.cpp b/gsKLShell_.cpp
index 1e0dd41..0bf4c93 100644
--- a/gsKLShell_.cpp
+++ b/gsKLShell_.cpp
@@ -1,14 +1,12 @@
 #include <gsCore/gsTemplateTools.h>
-
+#include <gsKLShell/gsKLShell.h>
 
 namespace gismo
 {
 
 #ifdef GISMO_WITH_PYBIND11
 
-  namespace py = pybind11;
-
-  void pybind11_init_gsKLShell(py::module &m)
+  void pybind11_init_gsKLShell(pybind11::module &m)
   {
     gismo::pybind11_init_gsMaterialMatrixBase( m );
 
diff --git a/src/gsKLShell_.cpp b/src/gsKLShell_.cpp
new file mode 100644
index 0000000..0bf4c93
--- /dev/null
+++ b/src/gsKLShell_.cpp
@@ -0,0 +1,57 @@
+#include <gsCore/gsTemplateTools.h>
+#include <gsKLShell/gsKLShell.h>
+
+namespace gismo
+{
+
+#ifdef GISMO_WITH_PYBIND11
+
+  void pybind11_init_gsKLShell(pybind11::module &m)
+  {
+    gismo::pybind11_init_gsMaterialMatrixBase( m );
+
+    gismo::pybind11_init_gsMaterialMatrixBaseDim2( m );
+    gismo::pybind11_init_gsMaterialMatrixBaseDim3( m );
+
+    gismo::pybind11_init_gsMaterialMatrixLinear2( m );
+    gismo::pybind11_init_gsMaterialMatrixLinear3( m );
+
+    gismo::pybind11_init_gsMaterialMatrixNH2i( m );
+    gismo::pybind11_init_gsMaterialMatrixNH2c( m );
+
+    gismo::pybind11_init_gsMaterialMatrixNH3i( m );
+    gismo::pybind11_init_gsMaterialMatrixNH3c( m );
+
+    gismo::pybind11_init_gsMaterialMatrixMR2i( m );
+    gismo::pybind11_init_gsMaterialMatrixMR2c( m );
+
+    gismo::pybind11_init_gsMaterialMatrixMR3i( m );
+    gismo::pybind11_init_gsMaterialMatrixMR3c( m );
+
+    gismo::pybind11_init_gsMaterialMatrixOG2i( m );
+    gismo::pybind11_init_gsMaterialMatrixOG2c( m );
+
+    gismo::pybind11_init_gsMaterialMatrixOG3i( m );
+    gismo::pybind11_init_gsMaterialMatrixOG3c( m );
+
+    gismo::pybind11_init_gsThinShellAssemblerBase( m );
+    gismo::pybind11_enum_gsThinShellAssemblerStatus( m );
+
+    gismo::pybind11_init_gsThinShellAssembler2( m );
+    gismo::pybind11_init_gsThinShellAssembler3( m );
+    gismo::pybind11_init_gsThinShellAssembler3nb( m );
+
+    gismo::pybind11_enum_GoalFunction( m );
+
+    gismo::pybind11_init_gsThinShellAssemblerDWRBase( m );
+
+    gismo::pybind11_init_gsThinShellAssemblerDWR2( m );
+    gismo::pybind11_init_gsThinShellAssemblerDWR3( m );
+    gismo::pybind11_init_gsThinShellAssemblerDWR3nb( m );
+  }
+
+#endif
+
+
+}
+