diff --git a/viscoelast.cc b/viscoelast.cc
index b0ccb66dc3b84c87830722bf8cea775532bacc10..10e6fd85c24d2ce2ff58f3d35293afb928bf73c0 100644
--- a/viscoelast.cc
+++ b/viscoelast.cc
@@ -14,16 +14,16 @@
 #include <dune/ag-common/sampleonbitfield.hh>
 #include <dune/ag-common/prolongboundarypatch.hh>
 #include <dune/ag-common/readbitfield.hh>
-#include <dune/ag-common/blockgsstep.hh>
-#include <dune/ag-common/multigridstep.hh>
-#include <dune/ag-common/transferoperators/compressedmultigridtransfer.hh>
-#include <dune/ag-common/iterativesolver.hh>
+#include <dune-solvers/iterationsteps/blockgsstep.hh>
+#include <dune-solvers/iterationsteps/multigridstep.hh>
+#include <dune-solvers/transferoperators/compressedmultigridtransfer.hh>
+#include <dune-solvers/solvers/loopsolver.hh>
 #include <dune/ag-common/computestress.hh>
 #include <dune/ag-common/neumannassembler.hh>
-#include <dune/ag-common/norms/energynorm.hh>
-#include <dune/ag-common/hierarchicestimator.hh>
+#include <dune-solvers/norms/energynorm.hh>
+#include <dune/ag-common/estimators/hierarchicestimator.hh>
 #include <dune/disc/elasticity/linearelasticityassembler.hh>
-#include "src/viscoelasticassembler.hh"
+#include "dune-elasticity/viscoelasticassembler.hh"
 //#include <fstream>
 
 
@@ -113,7 +113,7 @@ int main (int argc, char *argv[]) try
     	// Read Dirichlet boundary values
     	std::vector<BitSetVector<dim> > dirichletNodes(maxLevel+1);
    
-    	std::vector<BoundaryPatch<GridType> > dirichletBoundary(maxLevel+1);
+    	std::vector<LevelBoundaryPatch<GridType> > dirichletBoundary(maxLevel+1);
     	dirichletBoundary[0].setup(grid, 0);
         readBoundaryPatch(dirichletBoundary[0], path + dirichletFile);
 
@@ -132,7 +132,7 @@ int main (int argc, char *argv[]) try
         */
           	
     	std::vector<BitSetVector<dim> > neumannNodes(maxLevel+1);
-    	std::vector<BoundaryPatch<GridType> > neumannBoundary(maxLevel+1);
+    	std::vector<LevelBoundaryPatch<GridType> > neumannBoundary(maxLevel+1);
     	std::vector<VectorType> neumannValues(maxLevel+1);
     	
     	//Read neumann boundary values