diff --git a/dune/microstructure/materialDefinitions.hh b/dune/microstructure/deprecated_headers/materialDefinitions.hh
similarity index 100%
rename from dune/microstructure/materialDefinitions.hh
rename to dune/microstructure/deprecated_headers/materialDefinitions.hh
diff --git a/dune/microstructure/microstructure.hh b/dune/microstructure/deprecated_headers/microstructure.hh
similarity index 100%
rename from dune/microstructure/microstructure.hh
rename to dune/microstructure/deprecated_headers/microstructure.hh
diff --git a/dune/microstructure/prestrain_material_geometry.hh b/dune/microstructure/deprecated_headers/prestrain_material_geometry.hh
similarity index 100%
rename from dune/microstructure/prestrain_material_geometry.hh
rename to dune/microstructure/deprecated_headers/prestrain_material_geometry.hh
diff --git a/dune/microstructure/prestrainimp.hh b/dune/microstructure/deprecated_headers/prestrainimp.hh
similarity index 100%
rename from dune/microstructure/prestrainimp.hh
rename to dune/microstructure/deprecated_headers/prestrainimp.hh
diff --git a/dune/microstructure/vtk_filler.hh b/dune/microstructure/deprecated_headers/vtk_filler.hh
similarity index 100%
rename from dune/microstructure/vtk_filler.hh
rename to dune/microstructure/deprecated_headers/vtk_filler.hh
diff --git a/dune/microstructure/prestrainedMaterial.hh b/dune/microstructure/prestrainedMaterial.hh
index 3b7c1a579fcd4c8f87f8acdbe943833f2994dec7..4a020ed988ec52eedfe97a90bfe2e37a6464a298 100644
--- a/dune/microstructure/prestrainedMaterial.hh
+++ b/dune/microstructure/prestrainedMaterial.hh
@@ -8,11 +8,14 @@
 #include <dune/common/parametertree.hh>
 #include <dune/fufem/dunepython.hh>
 #include <dune/microstructure/matrix_operations.hh>
-#include <dune/microstructure/materialDefinitions.hh>
+
+// #include <dune/microstructure/materialDefinitions.hh> //deprecated
 
 
 using namespace Dune;
 using namespace MatrixOperations;
+using namespace Functions;
+using namespace Functions::BasisFactory;
 using std::pow;
 using std::abs;
 using std::sqrt;
@@ -420,39 +423,37 @@ FieldMatrix<double,6,6> setupPhase(const std::string phaseType, Python::Module m
   }
 
   ///////////////////////////////////////////////////////////////////////
-
-
-  //---function that determines elasticity Tensor 
-    void setupMaterial(const std::string name)  // cant use materialFunctionName_ here!?
-    {
-        // std::cout << "Using material definition:" << name << std::endl;
-        if(name == "material_neukamm")
-        {   
-          indicatorFunction_ = indicatorFunction_material_neukamm<Domain>;
-          elasticityTensor_ = material_neukamm;
-          prestrain_ = prestrain_material_neukamm;
-        }
-        else if(name == "two_phase_material_1")
-        {
-          indicatorFunction_ = indicatorFunction_two_phase_material_1<Domain>;
-          elasticityTensor_ = two_phase_material_1;
-          prestrain_ = prestrain_two_phase_material_1;
-        }
-        else if(name == "two_phase_material_2")
-        {
-          indicatorFunction_ = indicatorFunction_two_phase_material_2<Domain>;
-          elasticityTensor_ = two_phase_material_2;
-          prestrain_ = prestrain_two_phase_material_2;
-        }
-        else if(name == "homogeneous")
-        {
-          indicatorFunction_ = indicatorFunction_material_homogeneous<Domain>;
-          elasticityTensor_ = material_homogeneous;
-          prestrain_ = prestrain_homogeneous;
-        }
-        else
-         DUNE_THROW(Exception, "There exists no material with this name "); 
-    }
+  // //---function that determines elasticity Tensor 
+  //   void setupMaterial(const std::string name)  // cant use materialFunctionName_ here!?
+  //   {
+  //       // std::cout << "Using material definition:" << name << std::endl;
+  //       if(name == "material_neukamm")
+  //       {   
+  //         indicatorFunction_ = indicatorFunction_material_neukamm<Domain>;
+  //         elasticityTensor_ = material_neukamm;
+  //         prestrain_ = prestrain_material_neukamm;
+  //       }
+  //       else if(name == "two_phase_material_1")
+  //       {
+  //         indicatorFunction_ = indicatorFunction_two_phase_material_1<Domain>;
+  //         elasticityTensor_ = two_phase_material_1;
+  //         prestrain_ = prestrain_two_phase_material_1;
+  //       }
+  //       else if(name == "two_phase_material_2")
+  //       {
+  //         indicatorFunction_ = indicatorFunction_two_phase_material_2<Domain>;
+  //         elasticityTensor_ = two_phase_material_2;
+  //         prestrain_ = prestrain_two_phase_material_2;
+  //       }
+  //       else if(name == "homogeneous")
+  //       {
+  //         indicatorFunction_ = indicatorFunction_material_homogeneous<Domain>;
+  //         elasticityTensor_ = material_homogeneous;
+  //         prestrain_ = prestrain_homogeneous;
+  //       }
+  //       else
+  //        DUNE_THROW(Exception, "There exists no material with this name "); 
+  //   }
 
 
 
@@ -642,15 +643,14 @@ FieldMatrix<double,6,6> setupPhase(const std::string phaseType, Python::Module m
 
 
 
-
 ////////////////////////////////////////////////////////
 
 
   //--- Apply elasticityTensor_ to input Matrix G at material phase
  // input: Matrix G, material-phase
-  MatrixRT ElasticityTensor(const MatrixRT& G, const int& phase) const  
+  MatrixRT ElasticityTensor(const MatrixRT& G, const int& phase) const      //deprecated
   {
-    return elasticityTensor_(G,phase);
+    return elasticityTensor_(G,phase);   
   }
 
   int IndicatorFunction(const Domain& x) const
diff --git a/src/Cell-Problem.cc b/src/Cell-Problem.cc
index 7d7f2c3b81babf9f0dbb03339515ac46792bd570..af299a97ca38c14f7f4d8a35d41dde59d8c02057 100644
--- a/src/Cell-Problem.cc
+++ b/src/Cell-Problem.cc
@@ -44,14 +44,14 @@
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh> 
 
-#include <dune/microstructure/prestrain_material_geometry.hh>
+// #include <dune/microstructure/prestrain_material_geometry.hh>
 #include <dune/microstructure/matrix_operations.hh>
-#include <dune/microstructure/vtk_filler.hh>    //TEST
+// #include <dune/microstructure/vtk_filler.hh>    //TEST
 #include <dune/microstructure/CorrectorComputer.hh>    
 #include <dune/microstructure/EffectiveQuantitiesComputer.hh>  
 #include <dune/microstructure/prestrainedMaterial.hh>  
 
-#include <dune/solvers/solvers/umfpacksolver.hh>  //TEST 
+#include <dune/solvers/solvers/umfpacksolver.hh>   //TEST 
 #include <dune/istl/eigenvalue/test/matrixinfo.hh> // TEST: compute condition Number 
 
 // #include <dune/fufem/discretizationerror.hh>