From 1681e00a6f57e1238ba85df8ce78477ac5dbb33b Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Sun, 28 Jan 2018 17:17:46 +0100
Subject: [PATCH] renamed path dune/amdis to amdis

---
 CMakeLists.txt                                |  21 +---
 cmake/modules/AmdisMacros.cmake               |   5 +-
 doc/Mainpage.md                               |   8 +-
 dune.module                                   |   2 +-
 dune/CMakeLists.txt                           |   2 -
 dune/amdis/LinearAlgebra.hpp                  |  31 -----
 dune/amdis/utility/CMakeLists.txt             |  17 ---
 examples/CMakeLists.txt                       |  20 +++
 {src => examples}/ellipt.cc                   |   8 +-
 {src => examples}/heat.cc                     |  14 +--
 {src => examples}/navier_stokes.cc            |  25 ++--
 {src => examples/old}/BlockPreconditioner.hpp |   4 +-
 {src => examples/old}/MTLPfcPrecon.hpp        |   2 +-
 {src => examples/old}/MTLPfcPrecon.inc.hpp    |   0
 {src => examples/old}/PfcPrecon.hpp           |   2 +-
 {src => examples/old}/pfc.cc                  |  10 +-
 {src => examples}/stokes0.cc                  |  13 +-
 {src => examples}/stokes1.cc                  |  17 +--
 {src => examples}/stokes3.cc                  |  11 +-
 {src => examples}/vecellipt.cc                |   6 +-
 src/CMakeLists.txt                            |  21 +---
 src/amdis.cc                                  |  59 ---------
 {dune => src}/amdis/AMDiS.cpp                 |   4 +-
 {dune => src}/amdis/AMDiS.hpp                 |   0
 {dune => src}/amdis/AdaptBase.cpp             |   0
 {dune => src}/amdis/AdaptBase.hpp             |   0
 {dune => src}/amdis/AdaptInfo.cpp             |   2 +-
 {dune => src}/amdis/AdaptInfo.hpp             |   4 +-
 {dune => src}/amdis/AdaptInstationary.cpp     |  12 +-
 {dune => src}/amdis/AdaptInstationary.hpp     |   0
 {dune => src}/amdis/AdaptStationary.cpp       |   0
 {dune => src}/amdis/AdaptStationary.hpp       |   0
 {dune => src}/amdis/Assembler.hpp             |  10 +-
 {dune => src}/amdis/Assembler.inc.hpp         |   6 +-
 {dune => src}/amdis/CMakeLists.txt            |   3 +-
 {dune => src}/amdis/ContextGeometry.hpp       |   0
 {dune => src}/amdis/CreatorInterface.hpp      |   4 +-
 {dune => src}/amdis/CreatorMap.hpp            |   2 +-
 {dune => src}/amdis/DirichletBC.hpp           |  10 +-
 {dune => src}/amdis/DirichletBC.inc.hpp       |   4 +-
 {dune => src}/amdis/FileWriter.hpp            |  12 +-
 {dune => src}/amdis/FiniteElementSpaces.hpp   |   6 +-
 {dune => src}/amdis/Flag.hpp                  |   0
 {dune => src}/amdis/GridFunctionOperator.hpp  |   6 +-
 {dune => src}/amdis/GridFunctions.hpp         |  12 +-
 {dune => src}/amdis/Initfile.cpp              |   4 +-
 {dune => src}/amdis/Initfile.hpp              |   0
 {dune => src}/amdis/InitfileParser.cpp        |   8 +-
 {dune => src}/amdis/InitfileParser.hpp        |   0
 src/amdis/LinearAlgebra.hpp                   |  31 +++++
 {dune => src}/amdis/LocalAssembler.hpp        |   8 +-
 {dune => src}/amdis/LocalAssemblerBase.hpp    |   6 +-
 {dune => src}/amdis/Mesh.hpp                  |   6 +-
 {dune => src}/amdis/Operations.hpp            |  12 +-
 {dune => src}/amdis/Operators.hpp             |  38 +++---
 {dune => src}/amdis/Output.hpp                |   0
 {dune => src}/amdis/ProblemInstat.cpp         |   0
 {dune => src}/amdis/ProblemInstat.hpp         |   6 +-
 {dune => src}/amdis/ProblemInstat.inc.hpp     |   2 +-
 {dune => src}/amdis/ProblemInstatBase.cpp     |   0
 {dune => src}/amdis/ProblemInstatBase.hpp     |   0
 .../amdis/ProblemIterationInterface.hpp       |   0
 {dune => src}/amdis/ProblemStat.cpp           |   0
 {dune => src}/amdis/ProblemStat.hpp           |  44 +++----
 {dune => src}/amdis/ProblemStat.inc.hpp       |  12 +-
 {dune => src}/amdis/ProblemStatBase.hpp       |   0
 {dune => src}/amdis/ProblemStatTraits.hpp     |   0
 {dune => src}/amdis/ProblemTimeInterface.hpp  |   0
 .../amdis/StandardProblemIteration.cpp        |   6 +-
 .../amdis/StandardProblemIteration.hpp        |   0
 {dune => src}/amdis/assembler/CMakeLists.txt  |   2 +-
 .../assembler/FirstOrderDivTestvecTrial.hpp   |   2 +-
 .../assembler/FirstOrderGradTestTrial.hpp     |   2 +-
 .../assembler/FirstOrderGradTestTrialvec.hpp  |   2 +-
 .../assembler/FirstOrderPartialTestTrial.hpp  |   2 +-
 .../assembler/FirstOrderTestDivTrialvec.hpp   |   6 +-
 .../assembler/FirstOrderTestGradTrial.hpp     |   6 +-
 .../assembler/FirstOrderTestPartialTrial.hpp  |   6 +-
 .../assembler/FirstOrderTestvecGradTrial.hpp  |   6 +-
 .../SecondOrderDivTestvecDivTrialvec.hpp      |   6 +-
 .../SecondOrderGradTestGradTrial.hpp          |   6 +-
 .../SecondOrderPartialTestPartialTrial.hpp    |   6 +-
 .../amdis/assembler/StokesOperator.hpp        |   4 +-
 .../amdis/assembler/ZeroOrderTest.hpp         |   4 +-
 .../amdis/assembler/ZeroOrderTestTrial.hpp    |   4 +-
 .../amdis/assembler/ZeroOrderTestTrialvec.hpp |   4 +-
 .../amdis/assembler/ZeroOrderTestvec.hpp      |   4 +-
 .../amdis/assembler/ZeroOrderTestvecTrial.hpp |   2 +-
 .../assembler/ZeroOrderTestvecTrialvec.hpp    |   4 +-
 {dune => src}/amdis/common/Assigner.hpp       |   0
 {dune => src}/amdis/common/CMakeLists.txt     |   2 +-
 {dune => src}/amdis/common/ClonablePtr.hpp    |   2 +-
 {dune => src}/amdis/common/Concepts.hpp       |   6 +-
 {dune => src}/amdis/common/ConceptsBase.hpp   |   0
 {dune => src}/amdis/common/FieldMatVec.hpp    |  10 +-
 {dune => src}/amdis/common/FieldTraits.hpp    |   2 +-
 {dune => src}/amdis/common/IndexSeq.hpp       |   0
 {dune => src}/amdis/common/Literals.hpp       |   2 +-
 {dune => src}/amdis/common/Loops.hpp          |   0
 {dune => src}/amdis/common/Math.hpp           |   0
 {dune => src}/amdis/common/Mpl.hpp            |   0
 .../amdis/common/MultiTypeMatrix.hpp          |  14 +--
 .../amdis/common/MultiTypeVector.hpp          |  10 +-
 {dune => src}/amdis/common/ScalarTypes.hpp    |   0
 {dune => src}/amdis/common/Size.hpp           |   0
 {dune => src}/amdis/common/Tags.hpp           |   0
 {dune => src}/amdis/common/TupleUtility.hpp   |   4 +-
 {dune => src}/amdis/common/TypeDefs.hpp       |   2 +-
 {dune => src}/amdis/common/Utility.hpp        |   0
 {dune => src}/amdis/common/ValueCategory.hpp  |   2 +-
 .../gridfunctions/AnalyticGridFunction.hpp    |   4 +-
 .../amdis/gridfunctions/CMakeLists.txt        |   2 +-
 .../gridfunctions/ConstantGridFunction.hpp    |   6 +-
 .../gridfunctions/CoordsGridFunction.hpp      |   0
 .../amdis/gridfunctions/DOFVectorView.hpp     |   4 +-
 .../amdis/gridfunctions/DOFVectorView.inc.hpp |   2 +-
 .../gridfunctions/DerivativeGridFunction.hpp  |   2 +-
 .../gridfunctions/FunctorGridFunction.hpp     |  10 +-
 .../gridfunctions/GridFunctionConcepts.hpp    |   6 +-
 .../amdis/gridfunctions/Integrate.hpp         |   2 +-
 .../gridfunctions/OperationsGridFunction.hpp  |   8 +-
 {dune => src}/amdis/io/CMakeLists.txt         |   2 +-
 .../amdis/io/FileWriterInterface.hpp          |   6 +-
 .../amdis/linear_algebra/CMakeLists.txt       |   2 +-
 .../amdis/linear_algebra/DOFVectorBase.hpp    |   0
 .../linear_algebra/HierarchicWrapper.hpp      |   2 +-
 .../linear_algebra/LinearAlgebraBase.hpp      |   0
 .../linear_algebra/LinearSolverInterface.hpp  |  10 +-
 {dune => src}/amdis/linear_algebra/Mtl.hpp    |   0
 .../PreconditionerInterface.hpp               |   0
 .../amdis/linear_algebra/RunnerInterface.hpp  |   4 +-
 .../amdis/linear_algebra/SolverInfo.hpp       |   2 +-
 .../amdis/linear_algebra/istl/CMakeLists.txt  |   2 +-
 .../amdis/linear_algebra/istl/DOFMatrix.hpp   |   4 +-
 .../amdis/linear_algebra/istl/DOFVector.hpp   |   4 +-
 .../amdis/linear_algebra/istl/ISTLRunner.hpp  |   4 +-
 .../istl/ISTL_Preconditioner.hpp              |   0
 .../amdis/linear_algebra/istl/ISTL_Solver.hpp |   0
 .../linear_algebra/istl/LinearSolver.hpp      |   4 +-
 .../linear_algebra/istl/Preconditioner.hpp    |   2 +-
 .../linear_algebra/istl/SystemMatrix.cpp      |   2 +-
 .../linear_algebra/istl/SystemMatrix.hpp      |  10 +-
 .../linear_algebra/istl/SystemVector.cpp      |   2 +-
 .../linear_algebra/istl/SystemVector.hpp      |  12 +-
 .../mtl/BITL_Preconditioner.hpp               |   4 +-
 .../amdis/linear_algebra/mtl/BITL_Solver.hpp  |   4 +-
 .../linear_algebra/mtl/BlockMTLMatrix.hpp     |   8 +-
 .../linear_algebra/mtl/BlockMTLVector.hpp     |   6 +-
 .../amdis/linear_algebra/mtl/CMakeLists.txt   |   2 +-
 .../amdis/linear_algebra/mtl/Copy.hpp         |  10 +-
 .../amdis/linear_algebra/mtl/DOFMatrix.hpp    |   4 +-
 .../amdis/linear_algebra/mtl/DOFVector.hpp    |  10 +-
 .../linear_algebra/mtl/ITL_Preconditioner.hpp |   6 +-
 .../amdis/linear_algebra/mtl/ITL_Solver.hpp   |  26 ++--
 .../amdis/linear_algebra/mtl/KrylovRunner.hpp |  10 +-
 .../amdis/linear_algebra/mtl/LinearSolver.hpp |   8 +-
 .../linear_algebra/mtl/MTLDenseVector.hpp     |   2 +-
 .../amdis/linear_algebra/mtl/Mapper.hpp       |   4 +-
 .../linear_algebra/mtl/Preconditioner.hpp     |   2 +-
 .../amdis/linear_algebra/mtl/SystemMatrix.cpp |   2 +-
 .../amdis/linear_algebra/mtl/SystemMatrix.hpp |  12 +-
 .../amdis/linear_algebra/mtl/SystemVector.cpp |   2 +-
 .../amdis/linear_algebra/mtl/SystemVector.hpp |  16 +--
 .../linear_algebra/mtl/UmfpackRunner.hpp      |   6 +-
 .../linear_algebra/mtl/itl/CMakeLists.txt     |   2 +-
 .../linear_algebra/mtl/itl/block_diagonal.hpp |   2 +-
 .../amdis/linear_algebra/mtl/itl/details.hpp  |   0
 .../amdis/linear_algebra/mtl/itl/fgmres.hpp   |   0
 .../mtl/itl/fgmres_householder.hpp            |   0
 .../amdis/linear_algebra/mtl/itl/gcr.hpp      |   0
 .../amdis/linear_algebra/mtl/itl/gmres2.hpp   |   0
 .../mtl/itl/gmres_householder.hpp             |   0
 .../amdis/linear_algebra/mtl/itl/hypre.hpp    |   0
 .../linear_algebra/mtl/itl/masslumping.hpp    |   0
 .../amdis/linear_algebra/mtl/itl/minres.hpp   |   0
 .../amdis/linear_algebra/mtl/itl/preonly.hpp  |   0
 .../linear_algebra/mtl/itl/umfpack2_solve.hpp |   0
 {dune => src}/amdis/operations/Arithmetic.hpp |   8 +-
 {dune => src}/amdis/operations/Basic.hpp      |  10 +-
 {dune => src}/amdis/operations/CMakeLists.txt |   2 +-
 {dune => src}/amdis/operations/CMath.hpp      |   2 +-
 {dune => src}/amdis/operations/Composer.hpp   |   6 +-
 .../amdis/operations/FieldMatVec.hpp          |  10 +-
 {dune => src}/amdis/operations/MaxMin.hpp     |   0
 {dune => src}/amdis/test/CMakeLists.txt       |   0
 {dune => src}/amdis/test/kdtree.hpp           |   0
 {dune => src}/amdis/test/macro.stand.2d       |   0
 {dune => src}/amdis/test/test.json.2d         |   0
 {dune => src}/amdis/test/test1.cc             |   6 +-
 {dune => src}/amdis/test/test2.cc             |  54 ++++-----
 src/amdis/utility/CMakeLists.txt              |  22 ++++
 {dune => src}/amdis/utility/Filesystem.cpp    |   2 +-
 {dune => src}/amdis/utility/Filesystem.hpp    |   2 +-
 .../amdis/utility/FiniteElementType.hpp       |   6 +-
 {dune => src}/amdis/utility/MultiIndex.hpp    |   2 +-
 {dune => src}/amdis/utility/RangeType.hpp     |   4 +-
 {dune => src}/amdis/utility/String.hpp        |   0
 {dune => src}/amdis/utility/Traversal.hpp     |   0
 {dune => src}/amdis/utility/TreeData.hpp      |   2 +-
 {dune => src}/amdis/utility/TreePath.hpp      |   0
 {dune => src}/amdis/utility/Visitor.hpp       |   4 +-
 src/expressions.cc                            | 114 ------------------
 src/gridview.cc                               |  70 -----------
 src/test.cc                                   |  46 -------
 test/ConceptsTest.cpp                         |   4 +-
 test/ExpressionsTest.cpp                      |  12 +-
 test/FieldMatVecTest.cpp                      |   4 +-
 test/FilesystemTest.cpp                       |   2 +-
 test/FiniteElementTypeTest.cpp                |   2 +-
 test/MultiTypeMatrixTest.cpp                  |   4 +-
 test/MultiTypeVectorTest.cpp                  |   4 +-
 test/RangeTypeTest.cpp                        |   2 +-
 test/StringTest.cpp                           |   2 +-
 test/TreeDataTest.cpp                         |   2 +-
 214 files changed, 548 insertions(+), 842 deletions(-)
 delete mode 100644 dune/CMakeLists.txt
 delete mode 100644 dune/amdis/LinearAlgebra.hpp
 delete mode 100644 dune/amdis/utility/CMakeLists.txt
 create mode 100644 examples/CMakeLists.txt
 rename {src => examples}/ellipt.cc (90%)
 rename {src => examples}/heat.cc (84%)
 rename {src => examples}/navier_stokes.cc (87%)
 rename {src => examples/old}/BlockPreconditioner.hpp (95%)
 rename {src => examples/old}/MTLPfcPrecon.hpp (98%)
 rename {src => examples/old}/MTLPfcPrecon.inc.hpp (100%)
 rename {src => examples/old}/PfcPrecon.hpp (98%)
 rename {src => examples/old}/pfc.cc (94%)
 rename {src => examples}/stokes0.cc (84%)
 rename {src => examples}/stokes1.cc (81%)
 rename {src => examples}/stokes3.cc (87%)
 rename {src => examples}/vecellipt.cc (93%)
 delete mode 100644 src/amdis.cc
 rename {dune => src}/amdis/AMDiS.cpp (88%)
 rename {dune => src}/amdis/AMDiS.hpp (100%)
 rename {dune => src}/amdis/AdaptBase.cpp (100%)
 rename {dune => src}/amdis/AdaptBase.hpp (100%)
 rename {dune => src}/amdis/AdaptInfo.cpp (98%)
 rename {dune => src}/amdis/AdaptInfo.hpp (99%)
 rename {dune => src}/amdis/AdaptInstationary.cpp (96%)
 rename {dune => src}/amdis/AdaptInstationary.hpp (100%)
 rename {dune => src}/amdis/AdaptStationary.cpp (100%)
 rename {dune => src}/amdis/AdaptStationary.hpp (100%)
 rename {dune => src}/amdis/Assembler.hpp (94%)
 rename {dune => src}/amdis/Assembler.inc.hpp (98%)
 rename {dune => src}/amdis/CMakeLists.txt (94%)
 rename {dune => src}/amdis/ContextGeometry.hpp (100%)
 rename {dune => src}/amdis/CreatorInterface.hpp (96%)
 rename {dune => src}/amdis/CreatorMap.hpp (98%)
 rename {dune => src}/amdis/DirichletBC.hpp (95%)
 rename {dune => src}/amdis/DirichletBC.inc.hpp (95%)
 rename {dune => src}/amdis/FileWriter.hpp (93%)
 rename {dune => src}/amdis/FiniteElementSpaces.hpp (96%)
 rename {dune => src}/amdis/Flag.hpp (100%)
 rename {dune => src}/amdis/GridFunctionOperator.hpp (99%)
 rename {dune => src}/amdis/GridFunctions.hpp (91%)
 rename {dune => src}/amdis/Initfile.cpp (92%)
 rename {dune => src}/amdis/Initfile.hpp (100%)
 rename {dune => src}/amdis/InitfileParser.cpp (96%)
 rename {dune => src}/amdis/InitfileParser.hpp (100%)
 create mode 100644 src/amdis/LinearAlgebra.hpp
 rename {dune => src}/amdis/LocalAssembler.hpp (97%)
 rename {dune => src}/amdis/LocalAssemblerBase.hpp (96%)
 rename {dune => src}/amdis/Mesh.hpp (97%)
 rename {dune => src}/amdis/Operations.hpp (56%)
 rename {dune => src}/amdis/Operators.hpp (50%)
 rename {dune => src}/amdis/Output.hpp (100%)
 rename {dune => src}/amdis/ProblemInstat.cpp (100%)
 rename {dune => src}/amdis/ProblemInstat.hpp (94%)
 rename {dune => src}/amdis/ProblemInstat.inc.hpp (97%)
 rename {dune => src}/amdis/ProblemInstatBase.cpp (100%)
 rename {dune => src}/amdis/ProblemInstatBase.hpp (100%)
 rename {dune => src}/amdis/ProblemIterationInterface.hpp (100%)
 rename {dune => src}/amdis/ProblemStat.cpp (100%)
 rename {dune => src}/amdis/ProblemStat.hpp (94%)
 rename {dune => src}/amdis/ProblemStat.inc.hpp (97%)
 rename {dune => src}/amdis/ProblemStatBase.hpp (100%)
 rename {dune => src}/amdis/ProblemStatTraits.hpp (100%)
 rename {dune => src}/amdis/ProblemTimeInterface.hpp (100%)
 rename {dune => src}/amdis/StandardProblemIteration.cpp (95%)
 rename {dune => src}/amdis/StandardProblemIteration.hpp (100%)
 rename {dune => src}/amdis/assembler/CMakeLists.txt (90%)
 rename {dune => src}/amdis/assembler/FirstOrderDivTestvecTrial.hpp (96%)
 rename {dune => src}/amdis/assembler/FirstOrderGradTestTrial.hpp (96%)
 rename {dune => src}/amdis/assembler/FirstOrderGradTestTrialvec.hpp (96%)
 rename {dune => src}/amdis/assembler/FirstOrderPartialTestTrial.hpp (96%)
 rename {dune => src}/amdis/assembler/FirstOrderTestDivTrialvec.hpp (96%)
 rename {dune => src}/amdis/assembler/FirstOrderTestGradTrial.hpp (96%)
 rename {dune => src}/amdis/assembler/FirstOrderTestPartialTrial.hpp (96%)
 rename {dune => src}/amdis/assembler/FirstOrderTestvecGradTrial.hpp (96%)
 rename {dune => src}/amdis/assembler/SecondOrderDivTestvecDivTrialvec.hpp (98%)
 rename {dune => src}/amdis/assembler/SecondOrderGradTestGradTrial.hpp (98%)
 rename {dune => src}/amdis/assembler/SecondOrderPartialTestPartialTrial.hpp (97%)
 rename {dune => src}/amdis/assembler/StokesOperator.hpp (97%)
 rename {dune => src}/amdis/assembler/ZeroOrderTest.hpp (95%)
 rename {dune => src}/amdis/assembler/ZeroOrderTestTrial.hpp (97%)
 rename {dune => src}/amdis/assembler/ZeroOrderTestTrialvec.hpp (97%)
 rename {dune => src}/amdis/assembler/ZeroOrderTestvec.hpp (95%)
 rename {dune => src}/amdis/assembler/ZeroOrderTestvecTrial.hpp (96%)
 rename {dune => src}/amdis/assembler/ZeroOrderTestvecTrialvec.hpp (98%)
 rename {dune => src}/amdis/common/Assigner.hpp (100%)
 rename {dune => src}/amdis/common/CMakeLists.txt (84%)
 rename {dune => src}/amdis/common/ClonablePtr.hpp (98%)
 rename {dune => src}/amdis/common/Concepts.hpp (97%)
 rename {dune => src}/amdis/common/ConceptsBase.hpp (100%)
 rename {dune => src}/amdis/common/FieldMatVec.hpp (98%)
 rename {dune => src}/amdis/common/FieldTraits.hpp (88%)
 rename {dune => src}/amdis/common/IndexSeq.hpp (100%)
 rename {dune => src}/amdis/common/Literals.hpp (96%)
 rename {dune => src}/amdis/common/Loops.hpp (100%)
 rename {dune => src}/amdis/common/Math.hpp (100%)
 rename {dune => src}/amdis/common/Mpl.hpp (100%)
 rename {dune => src}/amdis/common/MultiTypeMatrix.hpp (92%)
 rename {dune => src}/amdis/common/MultiTypeVector.hpp (94%)
 rename {dune => src}/amdis/common/ScalarTypes.hpp (100%)
 rename {dune => src}/amdis/common/Size.hpp (100%)
 rename {dune => src}/amdis/common/Tags.hpp (100%)
 rename {dune => src}/amdis/common/TupleUtility.hpp (98%)
 rename {dune => src}/amdis/common/TypeDefs.hpp (89%)
 rename {dune => src}/amdis/common/Utility.hpp (100%)
 rename {dune => src}/amdis/common/ValueCategory.hpp (97%)
 rename {dune => src}/amdis/gridfunctions/AnalyticGridFunction.hpp (98%)
 rename {dune => src}/amdis/gridfunctions/CMakeLists.txt (82%)
 rename {dune => src}/amdis/gridfunctions/ConstantGridFunction.hpp (96%)
 rename {dune => src}/amdis/gridfunctions/CoordsGridFunction.hpp (100%)
 rename {dune => src}/amdis/gridfunctions/DOFVectorView.hpp (99%)
 rename {dune => src}/amdis/gridfunctions/DOFVectorView.inc.hpp (99%)
 rename {dune => src}/amdis/gridfunctions/DerivativeGridFunction.hpp (98%)
 rename {dune => src}/amdis/gridfunctions/FunctorGridFunction.hpp (97%)
 rename {dune => src}/amdis/gridfunctions/GridFunctionConcepts.hpp (97%)
 rename {dune => src}/amdis/gridfunctions/Integrate.hpp (98%)
 rename {dune => src}/amdis/gridfunctions/OperationsGridFunction.hpp (97%)
 rename {dune => src}/amdis/io/CMakeLists.txt (52%)
 rename {dune => src}/amdis/io/FileWriterInterface.hpp (89%)
 rename {dune => src}/amdis/linear_algebra/CMakeLists.txt (76%)
 rename {dune => src}/amdis/linear_algebra/DOFVectorBase.hpp (100%)
 rename {dune => src}/amdis/linear_algebra/HierarchicWrapper.hpp (97%)
 rename {dune => src}/amdis/linear_algebra/LinearAlgebraBase.hpp (100%)
 rename {dune => src}/amdis/linear_algebra/LinearSolverInterface.hpp (85%)
 rename {dune => src}/amdis/linear_algebra/Mtl.hpp (100%)
 rename {dune => src}/amdis/linear_algebra/PreconditionerInterface.hpp (100%)
 rename {dune => src}/amdis/linear_algebra/RunnerInterface.hpp (92%)
 rename {dune => src}/amdis/linear_algebra/SolverInfo.hpp (99%)
 rename {dune => src}/amdis/linear_algebra/istl/CMakeLists.txt (81%)
 rename {dune => src}/amdis/linear_algebra/istl/DOFMatrix.hpp (98%)
 rename {dune => src}/amdis/linear_algebra/istl/DOFVector.hpp (97%)
 rename {dune => src}/amdis/linear_algebra/istl/ISTLRunner.hpp (95%)
 rename {dune => src}/amdis/linear_algebra/istl/ISTL_Preconditioner.hpp (100%)
 rename {dune => src}/amdis/linear_algebra/istl/ISTL_Solver.hpp (100%)
 rename {dune => src}/amdis/linear_algebra/istl/LinearSolver.hpp (94%)
 rename {dune => src}/amdis/linear_algebra/istl/Preconditioner.hpp (96%)
 rename {dune => src}/amdis/linear_algebra/istl/SystemMatrix.cpp (83%)
 rename {dune => src}/amdis/linear_algebra/istl/SystemMatrix.hpp (97%)
 rename {dune => src}/amdis/linear_algebra/istl/SystemVector.cpp (83%)
 rename {dune => src}/amdis/linear_algebra/istl/SystemVector.hpp (97%)
 rename {dune => src}/amdis/linear_algebra/mtl/BITL_Preconditioner.hpp (90%)
 rename {dune => src}/amdis/linear_algebra/mtl/BITL_Solver.hpp (96%)
 rename {dune => src}/amdis/linear_algebra/mtl/BlockMTLMatrix.hpp (97%)
 rename {dune => src}/amdis/linear_algebra/mtl/BlockMTLVector.hpp (97%)
 rename {dune => src}/amdis/linear_algebra/mtl/CMakeLists.txt (87%)
 rename {dune => src}/amdis/linear_algebra/mtl/Copy.hpp (82%)
 rename {dune => src}/amdis/linear_algebra/mtl/DOFMatrix.hpp (99%)
 rename {dune => src}/amdis/linear_algebra/mtl/DOFVector.hpp (95%)
 rename {dune => src}/amdis/linear_algebra/mtl/ITL_Preconditioner.hpp (96%)
 rename {dune => src}/amdis/linear_algebra/mtl/ITL_Solver.hpp (95%)
 rename {dune => src}/amdis/linear_algebra/mtl/KrylovRunner.hpp (92%)
 rename {dune => src}/amdis/linear_algebra/mtl/LinearSolver.hpp (91%)
 rename {dune => src}/amdis/linear_algebra/mtl/MTLDenseVector.hpp (94%)
 rename {dune => src}/amdis/linear_algebra/mtl/Mapper.hpp (98%)
 rename {dune => src}/amdis/linear_algebra/mtl/Preconditioner.hpp (95%)
 rename {dune => src}/amdis/linear_algebra/mtl/SystemMatrix.cpp (79%)
 rename {dune => src}/amdis/linear_algebra/mtl/SystemMatrix.hpp (96%)
 rename {dune => src}/amdis/linear_algebra/mtl/SystemVector.cpp (79%)
 rename {dune => src}/amdis/linear_algebra/mtl/SystemVector.hpp (95%)
 rename {dune => src}/amdis/linear_algebra/mtl/UmfpackRunner.hpp (96%)
 rename {dune => src}/amdis/linear_algebra/mtl/itl/CMakeLists.txt (73%)
 rename {dune => src}/amdis/linear_algebra/mtl/itl/block_diagonal.hpp (97%)
 rename {dune => src}/amdis/linear_algebra/mtl/itl/details.hpp (100%)
 rename {dune => src}/amdis/linear_algebra/mtl/itl/fgmres.hpp (100%)
 rename {dune => src}/amdis/linear_algebra/mtl/itl/fgmres_householder.hpp (100%)
 rename {dune => src}/amdis/linear_algebra/mtl/itl/gcr.hpp (100%)
 rename {dune => src}/amdis/linear_algebra/mtl/itl/gmres2.hpp (100%)
 rename {dune => src}/amdis/linear_algebra/mtl/itl/gmres_householder.hpp (100%)
 rename {dune => src}/amdis/linear_algebra/mtl/itl/hypre.hpp (100%)
 rename {dune => src}/amdis/linear_algebra/mtl/itl/masslumping.hpp (100%)
 rename {dune => src}/amdis/linear_algebra/mtl/itl/minres.hpp (100%)
 rename {dune => src}/amdis/linear_algebra/mtl/itl/preonly.hpp (100%)
 rename {dune => src}/amdis/linear_algebra/mtl/itl/umfpack2_solve.hpp (100%)
 rename {dune => src}/amdis/operations/Arithmetic.hpp (97%)
 rename {dune => src}/amdis/operations/Basic.hpp (94%)
 rename {dune => src}/amdis/operations/CMakeLists.txt (67%)
 rename {dune => src}/amdis/operations/CMath.hpp (99%)
 rename {dune => src}/amdis/operations/Composer.hpp (96%)
 rename {dune => src}/amdis/operations/FieldMatVec.hpp (89%)
 rename {dune => src}/amdis/operations/MaxMin.hpp (100%)
 rename {dune => src}/amdis/test/CMakeLists.txt (100%)
 rename {dune => src}/amdis/test/kdtree.hpp (100%)
 rename {dune => src}/amdis/test/macro.stand.2d (100%)
 rename {dune => src}/amdis/test/test.json.2d (100%)
 rename {dune => src}/amdis/test/test1.cc (97%)
 rename {dune => src}/amdis/test/test2.cc (87%)
 create mode 100644 src/amdis/utility/CMakeLists.txt
 rename {dune => src}/amdis/utility/Filesystem.cpp (98%)
 rename {dune => src}/amdis/utility/Filesystem.hpp (98%)
 rename {dune => src}/amdis/utility/FiniteElementType.hpp (94%)
 rename {dune => src}/amdis/utility/MultiIndex.hpp (92%)
 rename {dune => src}/amdis/utility/RangeType.hpp (95%)
 rename {dune => src}/amdis/utility/String.hpp (100%)
 rename {dune => src}/amdis/utility/Traversal.hpp (100%)
 rename {dune => src}/amdis/utility/TreeData.hpp (99%)
 rename {dune => src}/amdis/utility/TreePath.hpp (100%)
 rename {dune => src}/amdis/utility/Visitor.hpp (98%)
 delete mode 100644 src/expressions.cc
 delete mode 100644 src/gridview.cc
 delete mode 100644 src/test.cc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fd26a40..6efe4119 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,5 @@
 cmake_minimum_required(VERSION 3.1)
-project(dune-amdis CXX)
-
-if(NOT (dune-common_DIR OR dune-common_ROOT OR
-      "${CMAKE_PREFIX_PATH}" MATCHES ".*dune-common.*"))
-    string(REPLACE  ${CMAKE_PROJECT_NAME} dune-common dune-common_DIR
-      ${PROJECT_BINARY_DIR})
-endif()
+project(amdis CXX)
 
 #find dune-common and set the module path
 find_package(dune-common REQUIRED)
@@ -17,33 +11,30 @@ include(DuneMacros)
 
 # start a dune project with information from dune.module
 dune_project()
+
 dune_enable_all_packages(MODULE_LIBRARIES amdis)
 
 include(AmdisMacros)
 add_subdirectory("src")
 add_subdirectory("test")
-add_subdirectory("dune")
+add_subdirectory("examples")
 add_subdirectory("doc")
 add_subdirectory("cmake/modules")
 
 
 # some additional packages and flags
-add_dune_alberta_flags("amdis" OBJECT USE_GENERIC)
-target_compile_definitions("amdis" PUBLIC AMDIS_BACKEND_MTL=1)
-target_compile_options("amdis" PUBLIC -ftemplate-backtrace-limit=0 -Wall -pedantic -Wno-unused-parameter)
-
 find_package(MTL REQUIRED
              PATHS /usr/local/lib/mtl4 /opt/sources/mtl4 /opt/development/mtl4)
 if (MTL_FOUND)
-  target_include_directories("amdis" PUBLIC ${MTL_INCLUDE_DIRS})
+  target_include_directories(amdis PUBLIC ${MTL_INCLUDE_DIRS})
 
   set (CXX_ELEVEN_FEATURE_LIST "MOVE" "AUTO" "RANGEDFOR" "INITLIST" "STATICASSERT" "DEFAULTIMPL")
   foreach (feature ${CXX_ELEVEN_FEATURE_LIST})
-      target_compile_definitions("amdis" PUBLIC MTL_WITH_${feature})
+      target_compile_definitions(amdis PUBLIC MTL_WITH_${feature})
   endforeach ()
 
   if (HAVE_UMFPACK OR ENABLE_SUITESPARSE OR SuiteSparse_FOUND)
-      target_compile_definitions("amdis" PUBLIC MTL_HAS_UMFPACK)
+      target_compile_definitions(amdis PUBLIC MTL_HAS_UMFPACK)
   endif ()
 endif (MTL_FOUND)
 
diff --git a/cmake/modules/AmdisMacros.cmake b/cmake/modules/AmdisMacros.cmake
index 641e2727..7c0715ef 100644
--- a/cmake/modules/AmdisMacros.cmake
+++ b/cmake/modules/AmdisMacros.cmake
@@ -1,3 +1,6 @@
 # File for module specific CMake tests.
 
-include(AMDiSCXXFeatures)
\ No newline at end of file
+include(AMDiSCXXFeatures)
+
+#find_package(SuiteSparse)
+#find_package(Alberta)
\ No newline at end of file
diff --git a/doc/Mainpage.md b/doc/Mainpage.md
index 3ba93471..fb1d0f79 100644
--- a/doc/Mainpage.md
+++ b/doc/Mainpage.md
@@ -13,10 +13,10 @@ and \f$ g(x) \equiv 0 \f$, the domain \f$ \Omega \f$ a square domain \f$ [0,1]^2
 and \f$ \Gamma \f$ the lower and left edge of the boundary.
 
 ~~~~~~~~~~~~~~~{.cpp}
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/AdaptInfo.hpp>
-#include <dune/amdis/AdaptStationary.hpp>
-#include <dune/amdis/ProblemStat.hpp>
+#include <amdis/AMDiS.hpp>
+#include <amdis/AdaptInfo.hpp>
+#include <amdis/AdaptStationary.hpp>
+#include <amdis/ProblemStat.hpp>
 
 // The namespace all AMDiS classes and functions are defined in
 using namespace AMDiS;
diff --git a/dune.module b/dune.module
index a103d5f0..123a1d68 100644
--- a/dune.module
+++ b/dune.module
@@ -3,7 +3,7 @@
 ################################
 
 #Name of the module
-Module: dune-amdis
+Module: amdis
 Version: 0.1
 Maintainer: simon.praetorius@tu-dresden.de
 #depending on
diff --git a/dune/CMakeLists.txt b/dune/CMakeLists.txt
deleted file mode 100644
index d5b6e792..00000000
--- a/dune/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_subdirectory(amdis)
-# add_subdirectory(amdis/test)
\ No newline at end of file
diff --git a/dune/amdis/LinearAlgebra.hpp b/dune/amdis/LinearAlgebra.hpp
deleted file mode 100644
index 676c486c..00000000
--- a/dune/amdis/LinearAlgebra.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <dune/amdis/linear_algebra/LinearSolverInterface.hpp>
-#include <dune/amdis/linear_algebra/SolverInfo.hpp>
-
-#if defined(AMDIS_BACKEND_ISTL)
-
-#include <dune/amdis/linear_algebra/istl/SystemVector.hpp>
-#include <dune/amdis/linear_algebra/istl/SystemMatrix.hpp>
-#include <dune/amdis/linear_algebra/istl/LinearSolver.hpp>
-
-#elif defined(AMDIS_BACKEND_MTL)
-
-#include <dune/amdis/linear_algebra/mtl/SystemVector.hpp>
-#include <dune/amdis/linear_algebra/mtl/SystemMatrix.hpp>
-#include <dune/amdis/linear_algebra/mtl/LinearSolver.hpp>
-#include <dune/amdis/linear_algebra/mtl/ITL_Solver.hpp>
-#include <dune/amdis/linear_algebra/mtl/BITL_Solver.hpp>
-
-#elif defined(AMDIS_BACKEND_PETSC)
-
-#include <dune/amdis/linear_algebra/petsc/SystemVector.hpp>
-#include <dune/amdis/linear_algebra/petsc/SystemMatrix.hpp>
-#include <dune/amdis/linear_algebra/petsc/LinearSolver.hpp>
-
-#else
-
-#error "Unknown linear algebra backend!. Set corresponding variable \
-        AMDIS_BACKEND_ISTL, AMDIS_BACKEND_MTL or AMDIS_BACKEND_PETSC."
-
-#endif
\ No newline at end of file
diff --git a/dune/amdis/utility/CMakeLists.txt b/dune/amdis/utility/CMakeLists.txt
deleted file mode 100644
index a1afc3cf..00000000
--- a/dune/amdis/utility/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-#install headers
-
-dune_library_add_sources(amdis SOURCES
-    Filesystem.cpp
-)
-
-install(FILES
-    Filesystem.hpp
-    FiniteElementType.hpp
-    MultiIndex.hpp
-    RangeType.hpp
-    String.hpp
-    Traversal.hpp
-    TreeData.hpp
-    TreePath.hpp
-    Visitor.hpp
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/utility)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644
index 00000000..cbce17cc
--- /dev/null
+++ b/examples/CMakeLists.txt
@@ -0,0 +1,20 @@
+
+set(projects2d "ellipt" "heat" "vecellipt" "stokes0" "stokes1" "stokes3" "navier_stokes")
+
+foreach(project ${projects2d})
+    add_executable(${project}.2d ${project}.cc)
+    add_dune_alberta_flags(GRIDDIM 2 WORLDDIM 2 ${project}.2d)
+    target_link_dune_default_libraries(${project}.2d)
+    target_link_libraries(${project}.2d "amdis")
+    target_compile_definitions(${project}.2d PRIVATE AMDIS_DIM=2 AMDIS_DOW=2)
+endforeach()
+
+set(projects3d "ellipt" "heat")
+
+foreach(project ${projects3d})
+    add_executable(${project}.3d ${project}.cc)
+    add_dune_alberta_flags(GRIDDIM 3 WORLDDIM 3 ${project}.3d)
+    target_link_dune_default_libraries(${project}.3d)
+    target_link_libraries(${project}.3d "amdis")
+    target_compile_definitions(${project}.3d PRIVATE AMDIS_DIM=3 AMDIS_DOW=3)
+endforeach()
\ No newline at end of file
diff --git a/src/ellipt.cc b/examples/ellipt.cc
similarity index 90%
rename from src/ellipt.cc
rename to examples/ellipt.cc
index e9b7e8a2..9b2e8914 100644
--- a/src/ellipt.cc
+++ b/examples/ellipt.cc
@@ -3,10 +3,10 @@
 
 #include <iostream>
 
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/Operators.hpp>
-#include <dune/amdis/common/Literals.hpp>
+#include <amdis/AMDiS.hpp>
+#include <amdis/ProblemStat.hpp>
+#include <amdis/Operators.hpp>
+#include <amdis/common/Literals.hpp>
 
 using namespace AMDiS;
 
diff --git a/src/heat.cc b/examples/heat.cc
similarity index 84%
rename from src/heat.cc
rename to examples/heat.cc
index ac4786a7..d2322641 100644
--- a/src/heat.cc
+++ b/examples/heat.cc
@@ -3,13 +3,13 @@
 
 #include <iostream>
 
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/AdaptInstationary.hpp>
-#include <dune/amdis/ProblemInstat.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/Operators.hpp>
-#include <dune/amdis/GridFunctions.hpp>
-#include <dune/amdis/common/Literals.hpp>
+#include <amdis/AMDiS.hpp>
+#include <amdis/AdaptInstationary.hpp>
+#include <amdis/ProblemInstat.hpp>
+#include <amdis/ProblemStat.hpp>
+#include <amdis/Operators.hpp>
+#include <amdis/GridFunctions.hpp>
+#include <amdis/common/Literals.hpp>
 
 using namespace AMDiS;
 
diff --git a/src/navier_stokes.cc b/examples/navier_stokes.cc
similarity index 87%
rename from src/navier_stokes.cc
rename to examples/navier_stokes.cc
index ec3254ea..39faa085 100644
--- a/src/navier_stokes.cc
+++ b/examples/navier_stokes.cc
@@ -2,27 +2,18 @@
 #include <ctime>
 #include <cmath>
 
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/AdaptInstationary.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/ProblemInstat.hpp>
-#include <dune/amdis/Operators.hpp>
-#include <dune/amdis/assembler/StokesOperator.hpp>
-
-#ifdef DOW
-#undef DOW
-#endif
-#define DOW AMDIS_DOW
-
-#ifndef STRATEGY
-#define STRATEGY 1
-#endif
+#include <amdis/AMDiS.hpp>
+#include <amdis/AdaptInstationary.hpp>
+#include <amdis/ProblemStat.hpp>
+#include <amdis/ProblemInstat.hpp>
+#include <amdis/Operators.hpp>
+#include <amdis/assembler/StokesOperator.hpp>
 
 using namespace AMDiS;
 
 struct NavierStokesBasis
 {
-  using Grid = Dune::AlbertaGrid<AMDIS_DIM,AMDIS_DOW>;
+  using Grid = Dune::YaspGrid<AMDIS_DIM>;
   using GlobalBasis = typename TaylorHoodBasis<Grid::LeafGridView>::GlobalBasis;
 };
 
@@ -69,7 +60,7 @@ int main(int argc, char** argv)
   auto opNonlin1 = makeOperator(tag::testvec_trialvec{}, density * trans(gradientAtQP(prob.getSolution(_v))));
   prob.addMatrixOperator(opNonlin1, _v, _v);
 
-  for (std::size_t i = 0; i < DOW; ++i) {
+  for (std::size_t i = 0; i < AMDIS_DOW; ++i) {
     // <(u^old * nabla)u_i, v_i>
     auto opNonlin2 = makeOperator(tag::test_gradtrial{}, density * prob.getSolution(_v));
     prob.addMatrixOperator(opNonlin2, treepath(_v,i), treepath(_v,i));
diff --git a/src/BlockPreconditioner.hpp b/examples/old/BlockPreconditioner.hpp
similarity index 95%
rename from src/BlockPreconditioner.hpp
rename to examples/old/BlockPreconditioner.hpp
index 80131c4c..423e3f7e 100644
--- a/src/BlockPreconditioner.hpp
+++ b/examples/old/BlockPreconditioner.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/LinearAlgebra.hpp>
+#include <amdis/AMDiS.hpp>
+#include <amdis/LinearAlgebra.hpp>
 
 namespace AMDiS
 {
diff --git a/src/MTLPfcPrecon.hpp b/examples/old/MTLPfcPrecon.hpp
similarity index 98%
rename from src/MTLPfcPrecon.hpp
rename to examples/old/MTLPfcPrecon.hpp
index 1ba8a04a..4f9ca302 100644
--- a/src/MTLPfcPrecon.hpp
+++ b/examples/old/MTLPfcPrecon.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "BlockPreconditioner.hpp"
-#include <dune/amdis/common/Literals.hpp>
+#include <amdis/common/Literals.hpp>
 
 namespace AMDiS
 {
diff --git a/src/MTLPfcPrecon.inc.hpp b/examples/old/MTLPfcPrecon.inc.hpp
similarity index 100%
rename from src/MTLPfcPrecon.inc.hpp
rename to examples/old/MTLPfcPrecon.inc.hpp
diff --git a/src/PfcPrecon.hpp b/examples/old/PfcPrecon.hpp
similarity index 98%
rename from src/PfcPrecon.hpp
rename to examples/old/PfcPrecon.hpp
index d88256fc..1b8b9fe1 100644
--- a/src/PfcPrecon.hpp
+++ b/examples/old/PfcPrecon.hpp
@@ -9,7 +9,7 @@
 #include <dune/istl/multitypeblockvector.hh>
 #include <dune/istl/preconditioner.hh>
 
-#include <dune/amdis/common/Mpl.hpp>
+#include <amdis/common/Mpl.hpp>
 
 namespace AMDiS {
 
diff --git a/src/pfc.cc b/examples/old/pfc.cc
similarity index 94%
rename from src/pfc.cc
rename to examples/old/pfc.cc
index 0e4637ad..984901fa 100644
--- a/src/pfc.cc
+++ b/examples/old/pfc.cc
@@ -5,11 +5,11 @@
 #include <ctime>
 #include <cmath>
 
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/AdaptInstationary.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/ProblemInstat.hpp>
-#include <dune/amdis/Terms.hpp>
+#include <amdis/AMDiS.hpp>
+#include <amdis/AdaptInstationary.hpp>
+#include <amdis/ProblemStat.hpp>
+#include <amdis/ProblemInstat.hpp>
+#include <amdis/Terms.hpp>
 
 #include "MTLPfcPrecon.hpp"
 
diff --git a/src/stokes0.cc b/examples/stokes0.cc
similarity index 84%
rename from src/stokes0.cc
rename to examples/stokes0.cc
index f03b6d3f..fac4ec6d 100644
--- a/src/stokes0.cc
+++ b/examples/stokes0.cc
@@ -2,9 +2,9 @@
 #include <ctime>
 #include <cmath>
 
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/Operators.hpp>
+#include <amdis/AMDiS.hpp>
+#include <amdis/ProblemStat.hpp>
+#include <amdis/Operators.hpp>
 
 #ifdef DOW
 #undef DOW
@@ -47,6 +47,8 @@ int main(int argc, char** argv)
       prob.addMatrixOperator(opDiv, _p, treepath(_v,i));
     }
 
+    auto opZero = makeOperator(tag::test_trial{}, 0.0);
+    prob.addMatrixOperator(opZero, _p, _p);
 
     // define boundary regions
     auto left = [](auto const& x) { return x[0] < 1.e-8; };
@@ -74,6 +76,11 @@ int main(int argc, char** argv)
     // assemble and solve system
     prob.buildAfterCoarsen(adaptInfo, Flag(0));
 
+    // write matrix to file
+    mtl::io::matrix_market_ostream out("matrix_stokes0.mtx");
+    out << prob.getSystemMatrix()->getMatrix();
+    std::cout << prob.getSystemMatrix()->getMatrix() << '\n';
+
     prob.solve(adaptInfo);
 
     // output solution
diff --git a/src/stokes1.cc b/examples/stokes1.cc
similarity index 81%
rename from src/stokes1.cc
rename to examples/stokes1.cc
index 050f5b17..c8d92b6d 100644
--- a/src/stokes1.cc
+++ b/examples/stokes1.cc
@@ -2,9 +2,9 @@
 #include <ctime>
 #include <cmath>
 
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/Operators.hpp>
+#include <amdis/AMDiS.hpp>
+#include <amdis/ProblemStat.hpp>
+#include <amdis/Operators.hpp>
 
 #ifdef DOW
 #undef DOW
@@ -78,14 +78,9 @@ int main(int argc, char** argv)
     prob.buildAfterCoarsen(adaptInfo, Flag(0));
 
     // write matrix to file
-    if (Parameters::get<int>("stokesMesh->global refinements").value_or(0) < 2) {
-      mtl::io::matrix_market_ostream out("stokes_matrix.mtx");
-      out << prob.getSystemMatrix()->getMatrix();
-
-      std::cout << "A = \n" << prob.getSystemMatrix()->getMatrix() << '\n';
-      std::cout << "x = \n" << prob.getSolution()->getVector() << '\n';
-      std::cout << "b = \n" << prob.getRhs()->getVector() << '\n';
-    }
+    mtl::io::matrix_market_ostream out("matrix_stokes1.mtx");
+    out << prob.getSystemMatrix()->getMatrix();
+    std::cout << prob.getSystemMatrix()->getMatrix() << '\n';
 
     prob.solve(adaptInfo);
 
diff --git a/src/stokes3.cc b/examples/stokes3.cc
similarity index 87%
rename from src/stokes3.cc
rename to examples/stokes3.cc
index d81c266a..76db5c2d 100644
--- a/src/stokes3.cc
+++ b/examples/stokes3.cc
@@ -2,10 +2,10 @@
 #include <ctime>
 #include <cmath>
 
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/Operators.hpp>
-#include <dune/amdis/assembler/StokesOperator.hpp>
+#include <amdis/AMDiS.hpp>
+#include <amdis/ProblemStat.hpp>
+#include <amdis/Operators.hpp>
+#include <amdis/assembler/StokesOperator.hpp>
 
 using namespace AMDiS;
 
@@ -30,6 +30,9 @@ int main(int argc, char** argv)
   auto opStokes = makeOperator(tag::stokes{}, viscosity);
   prob.addMatrixOperator(opStokes, treepath(), treepath());
 
+  auto opZero = makeOperator(tag::test_trial{}, 0.0);
+  prob.addMatrixOperator(opZero, _p, _p);
+
   // define boundary regions
   auto left = [](auto const& x) { return x[0] < 1.e-8; };
   auto not_left = [](auto const& x) { return x[0] > 1.0 - 1.e-8 || x[1] < 1.e-8 || x[1] > 1.0 - 1.e-8; };
diff --git a/src/vecellipt.cc b/examples/vecellipt.cc
similarity index 93%
rename from src/vecellipt.cc
rename to examples/vecellipt.cc
index befad34b..2b214042 100644
--- a/src/vecellipt.cc
+++ b/examples/vecellipt.cc
@@ -1,8 +1,8 @@
 #include <iostream>
 
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/Operators.hpp>
+#include <amdis/AMDiS.hpp>
+#include <amdis/ProblemStat.hpp>
+#include <amdis/Operators.hpp>
 
 using namespace AMDiS;
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 846b1c39..40bcf102 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,20 +1 @@
-
-set(projects2d "ellipt" "heat" "vecellipt" "expressions" "stokes0" "stokes1" "stokes3")
-
-foreach(project ${projects2d})
-    add_executable(${project}.2d ${project}.cc)
-    add_dune_alberta_flags(GRIDDIM 2 WORLDDIM 2 ${project}.2d)
-    target_link_dune_default_libraries(${project}.2d)
-    target_link_libraries(${project}.2d "amdis")
-    target_compile_definitions(${project}.2d PRIVATE AMDIS_DIM=2 AMDIS_DOW=2)
-endforeach()
-
-set(projects3d "ellipt" "heat")
-
-foreach(project ${projects3d})
-    add_executable(${project}.3d ${project}.cc)
-    add_dune_alberta_flags(GRIDDIM 3 WORLDDIM 3 ${project}.3d)
-    target_link_dune_default_libraries(${project}.3d)
-    target_link_libraries(${project}.3d "amdis")
-    target_compile_definitions(${project}.3d PRIVATE AMDIS_DIM=3 AMDIS_DOW=3)
-endforeach()
\ No newline at end of file
+add_subdirectory(amdis)
\ No newline at end of file
diff --git a/src/amdis.cc b/src/amdis.cc
deleted file mode 100644
index 9faa99c1..00000000
--- a/src/amdis.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// vi: set et ts=4 sw=2 sts=2:
-
-#include <iostream>
-
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/Terms.hpp>
-
-using namespace AMDiS;
-
-// 1 component with polynomial degree 1
-using HeatParam   = TestTraits<AMDIS_DIM, 2>;
-using HeatProblem = ProblemStat<HeatParam>;
-
-int main(int argc, char** argv)
-{
-    AMDiS::init(argc, argv);
-
-    HeatProblem prob("heat");
-    prob.initialize(INIT_ALL);
-
-    AdaptInfo adaptInfo("adapt");
-
-    double tau = adaptInfo.getTimestep();
-    AMDIS_MSG("timestep = " << tau);
-
-    using Op = HeatProblem::ElementOperator;
-    Op opLhs;
-    opLhs.addZOT( constant(1.0/tau) );
-    opLhs.addSOT( constant(1.0) );
-
-    Op opRhs;
-    opRhs.addZOT( valueOf(prob.getSolution<0>(), 1.0/tau) );
-    opRhs.addZOT( eval([](auto const& x) { return -1.0; }) );
-
-    prob.addMatrixOperator(opLhs, 0, 0);
-    prob.addVectorOperator(opRhs, 0);
-
-    // set boundary condition
-    auto predicate = [](auto const& p){ return p[0] < 1.e-8 || p[1] < 1.e-8; };
-    auto dbcValues = [](auto const& p){ return 0.0; };
-    prob.addDirichletBC(predicate, 0, 0, dbcValues);
-
-    prob.getSolution<0>().getVector() = 0.0;
-    double t = 0.0;
-    for (t = adaptInfo.getStartTime();
-         t < adaptInfo.getEndTime();
-         t+= adaptInfo.getTimestep())
-    {
-        prob.writeFiles(adaptInfo, t);
-        prob.buildAfterCoarsen(adaptInfo, Flag(0));
-        prob.solve(adaptInfo);
-    }
-
-    prob.writeFiles(adaptInfo, t);
-    AMDiS::finalize();
-    return 0;
-}
\ No newline at end of file
diff --git a/dune/amdis/AMDiS.cpp b/src/amdis/AMDiS.cpp
similarity index 88%
rename from dune/amdis/AMDiS.cpp
rename to src/amdis/AMDiS.cpp
index 4b0af196..8930d83a 100644
--- a/dune/amdis/AMDiS.cpp
+++ b/src/amdis/AMDiS.cpp
@@ -1,8 +1,8 @@
 #include "AMDiS.hpp"
 
 // AMDiS includes
-#include <dune/amdis/Initfile.hpp>
-#include <dune/amdis/Output.hpp>
+#include <amdis/Initfile.hpp>
+#include <amdis/Output.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/AMDiS.hpp b/src/amdis/AMDiS.hpp
similarity index 100%
rename from dune/amdis/AMDiS.hpp
rename to src/amdis/AMDiS.hpp
diff --git a/dune/amdis/AdaptBase.cpp b/src/amdis/AdaptBase.cpp
similarity index 100%
rename from dune/amdis/AdaptBase.cpp
rename to src/amdis/AdaptBase.cpp
diff --git a/dune/amdis/AdaptBase.hpp b/src/amdis/AdaptBase.hpp
similarity index 100%
rename from dune/amdis/AdaptBase.hpp
rename to src/amdis/AdaptBase.hpp
diff --git a/dune/amdis/AdaptInfo.cpp b/src/amdis/AdaptInfo.cpp
similarity index 98%
rename from dune/amdis/AdaptInfo.cpp
rename to src/amdis/AdaptInfo.cpp
index cc3ab743..d26d861d 100644
--- a/dune/amdis/AdaptInfo.cpp
+++ b/src/amdis/AdaptInfo.cpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <iostream>
 
-#include <dune/amdis/Initfile.hpp>
+#include <amdis/Initfile.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/AdaptInfo.hpp b/src/amdis/AdaptInfo.hpp
similarity index 99%
rename from dune/amdis/AdaptInfo.hpp
rename to src/amdis/AdaptInfo.hpp
index 019d94e3..6b7d6bae 100644
--- a/dune/amdis/AdaptInfo.hpp
+++ b/src/amdis/AdaptInfo.hpp
@@ -8,8 +8,8 @@
 #include <vector>
 
 // AMDiS includes
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/Math.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/Math.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/AdaptInstationary.cpp b/src/amdis/AdaptInstationary.cpp
similarity index 96%
rename from dune/amdis/AdaptInstationary.cpp
rename to src/amdis/AdaptInstationary.cpp
index bc5d28a6..05e4b9fd 100644
--- a/dune/amdis/AdaptInstationary.cpp
+++ b/src/amdis/AdaptInstationary.cpp
@@ -1,12 +1,12 @@
 #include "AdaptInstationary.hpp"
 
 // AMDiS includes
-#include <dune/amdis/AdaptInfo.hpp>
-#include <dune/amdis/Flag.hpp>
-#include <dune/amdis/Initfile.hpp>
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/ProblemIterationInterface.hpp>
-#include <dune/amdis/ProblemTimeInterface.hpp>
+#include <amdis/AdaptInfo.hpp>
+#include <amdis/Flag.hpp>
+#include <amdis/Initfile.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/ProblemIterationInterface.hpp>
+#include <amdis/ProblemTimeInterface.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/AdaptInstationary.hpp b/src/amdis/AdaptInstationary.hpp
similarity index 100%
rename from dune/amdis/AdaptInstationary.hpp
rename to src/amdis/AdaptInstationary.hpp
diff --git a/dune/amdis/AdaptStationary.cpp b/src/amdis/AdaptStationary.cpp
similarity index 100%
rename from dune/amdis/AdaptStationary.cpp
rename to src/amdis/AdaptStationary.cpp
diff --git a/dune/amdis/AdaptStationary.hpp b/src/amdis/AdaptStationary.hpp
similarity index 100%
rename from dune/amdis/AdaptStationary.hpp
rename to src/amdis/AdaptStationary.hpp
diff --git a/dune/amdis/Assembler.hpp b/src/amdis/Assembler.hpp
similarity index 94%
rename from dune/amdis/Assembler.hpp
rename to src/amdis/Assembler.hpp
index ed2127ce..ac4d8ff4 100644
--- a/dune/amdis/Assembler.hpp
+++ b/src/amdis/Assembler.hpp
@@ -6,11 +6,11 @@
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
 
-#include <dune/amdis/DirichletBC.hpp>
-#include <dune/amdis/LinearAlgebra.hpp>
-#include <dune/amdis/LocalAssemblerBase.hpp>
-#include <dune/amdis/common/Mpl.hpp>
-#include <dune/amdis/common/TypeDefs.hpp>
+#include <amdis/DirichletBC.hpp>
+#include <amdis/LinearAlgebra.hpp>
+#include <amdis/LocalAssemblerBase.hpp>
+#include <amdis/common/Mpl.hpp>
+#include <amdis/common/TypeDefs.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/Assembler.inc.hpp b/src/amdis/Assembler.inc.hpp
similarity index 98%
rename from dune/amdis/Assembler.inc.hpp
rename to src/amdis/Assembler.inc.hpp
index c0f5fa82..69d37bda 100644
--- a/dune/amdis/Assembler.inc.hpp
+++ b/src/amdis/Assembler.inc.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <dune/functions/functionspacebases/subspacebasis.hh>
-#include <dune/amdis/utility/TreePath.hpp>
-#include <dune/amdis/utility/Visitor.hpp>
+#include <amdis/utility/TreePath.hpp>
+#include <amdis/utility/Visitor.hpp>
 
-#include <dune/amdis/common/Math.hpp>
+#include <amdis/common/Math.hpp>
 
 namespace AMDiS {
 
diff --git a/dune/amdis/CMakeLists.txt b/src/amdis/CMakeLists.txt
similarity index 94%
rename from dune/amdis/CMakeLists.txt
rename to src/amdis/CMakeLists.txt
index 98bffe8b..225a825b 100644
--- a/dune/amdis/CMakeLists.txt
+++ b/src/amdis/CMakeLists.txt
@@ -13,6 +13,7 @@ dune_library_add_sources(amdis SOURCES
     ProblemStat.cpp
     StandardProblemIteration.cpp
 )
+link_libraries(amdis)
 
 install(FILES
     AdaptBase.hpp
@@ -50,7 +51,7 @@ install(FILES
     ProblemStatTraits.hpp
     ProblemTimeInterface.hpp
     StandardProblemIteration.hpp
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis)
 
 add_subdirectory("assembler")
 add_subdirectory("common")
diff --git a/dune/amdis/ContextGeometry.hpp b/src/amdis/ContextGeometry.hpp
similarity index 100%
rename from dune/amdis/ContextGeometry.hpp
rename to src/amdis/ContextGeometry.hpp
diff --git a/dune/amdis/CreatorInterface.hpp b/src/amdis/CreatorInterface.hpp
similarity index 96%
rename from dune/amdis/CreatorInterface.hpp
rename to src/amdis/CreatorInterface.hpp
index 0400989f..495c1934 100644
--- a/dune/amdis/CreatorInterface.hpp
+++ b/src/amdis/CreatorInterface.hpp
@@ -3,8 +3,8 @@
 #include <memory>
 #include <string>
 
-#include <dune/amdis/common/Utility.hpp>
-#include <dune/amdis/Output.hpp>
+#include <amdis/common/Utility.hpp>
+#include <amdis/Output.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/CreatorMap.hpp b/src/amdis/CreatorMap.hpp
similarity index 98%
rename from dune/amdis/CreatorMap.hpp
rename to src/amdis/CreatorMap.hpp
index b2f3e4f6..d0805353 100644
--- a/dune/amdis/CreatorMap.hpp
+++ b/src/amdis/CreatorMap.hpp
@@ -5,7 +5,7 @@
 #include <string>
 
 // AMDiS includes
-#include <dune/amdis/CreatorInterface.hpp>
+#include <amdis/CreatorInterface.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/DirichletBC.hpp b/src/amdis/DirichletBC.hpp
similarity index 95%
rename from dune/amdis/DirichletBC.hpp
rename to src/amdis/DirichletBC.hpp
index 40eced31..9e40fea8 100644
--- a/dune/amdis/DirichletBC.hpp
+++ b/src/amdis/DirichletBC.hpp
@@ -5,11 +5,11 @@
 #include <type_traits>
 #include <vector>
 
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/Concepts.hpp>
-#include <dune/amdis/common/ValueCategory.hpp>
-#include <dune/amdis/utility/RangeType.hpp>
-#include <dune/amdis/utility/TreeData.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/Concepts.hpp>
+#include <amdis/common/ValueCategory.hpp>
+#include <amdis/utility/RangeType.hpp>
+#include <amdis/utility/TreeData.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/DirichletBC.inc.hpp b/src/amdis/DirichletBC.inc.hpp
similarity index 95%
rename from dune/amdis/DirichletBC.inc.hpp
rename to src/amdis/DirichletBC.inc.hpp
index 9b101514..2f961175 100644
--- a/dune/amdis/DirichletBC.inc.hpp
+++ b/src/amdis/DirichletBC.inc.hpp
@@ -2,8 +2,8 @@
 
 #include <dune/functions/functionspacebases/interpolate.hh>
 #include <dune/functions/functionspacebases/subspacebasis.hh>
-#include <dune/amdis/LinearAlgebra.hpp>
-#include <dune/amdis/linear_algebra/HierarchicWrapper.hpp>
+#include <amdis/LinearAlgebra.hpp>
+#include <amdis/linear_algebra/HierarchicWrapper.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/FileWriter.hpp b/src/amdis/FileWriter.hpp
similarity index 93%
rename from dune/amdis/FileWriter.hpp
rename to src/amdis/FileWriter.hpp
index e0a16cfa..8b59c4cb 100644
--- a/dune/amdis/FileWriter.hpp
+++ b/src/amdis/FileWriter.hpp
@@ -9,12 +9,12 @@
 //#include <dune/geometry/referenceelements.hh>
 #include <dune/typetree/childextraction.hh>
 
-#include <dune/amdis/Initfile.hpp>
-#include <dune/amdis/common/Size.hpp>
-#include <dune/amdis/common/ValueCategory.hpp>
-#include <dune/amdis/gridfunctions/DOFVectorView.hpp>
-#include <dune/amdis/io/FileWriterInterface.hpp>
-#include <dune/amdis/utility/Filesystem.hpp>
+#include <amdis/Initfile.hpp>
+#include <amdis/common/Size.hpp>
+#include <amdis/common/ValueCategory.hpp>
+#include <amdis/gridfunctions/DOFVectorView.hpp>
+#include <amdis/io/FileWriterInterface.hpp>
+#include <amdis/utility/Filesystem.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/FiniteElementSpaces.hpp b/src/amdis/FiniteElementSpaces.hpp
similarity index 96%
rename from dune/amdis/FiniteElementSpaces.hpp
rename to src/amdis/FiniteElementSpaces.hpp
index 7f0c6699..10775960 100644
--- a/dune/amdis/FiniteElementSpaces.hpp
+++ b/src/amdis/FiniteElementSpaces.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <dune/amdis/common/TupleUtility.hpp>
-#include <dune/amdis/common/IndexSeq.hpp>
-#include <dune/amdis/common/Loops.hpp>
+#include <amdis/common/TupleUtility.hpp>
+#include <amdis/common/IndexSeq.hpp>
+#include <amdis/common/Loops.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/Flag.hpp b/src/amdis/Flag.hpp
similarity index 100%
rename from dune/amdis/Flag.hpp
rename to src/amdis/Flag.hpp
diff --git a/dune/amdis/GridFunctionOperator.hpp b/src/amdis/GridFunctionOperator.hpp
similarity index 99%
rename from dune/amdis/GridFunctionOperator.hpp
rename to src/amdis/GridFunctionOperator.hpp
index 898168f6..f2d07ac6 100644
--- a/dune/amdis/GridFunctionOperator.hpp
+++ b/src/amdis/GridFunctionOperator.hpp
@@ -3,9 +3,9 @@
 #include <cassert>
 #include <type_traits>
 
-#include <dune/amdis/GridFunctions.hpp>
-#include <dune/amdis/common/Utility.hpp>
-#include <dune/amdis/utility/FiniteElementType.hpp>
+#include <amdis/GridFunctions.hpp>
+#include <amdis/common/Utility.hpp>
+#include <amdis/utility/FiniteElementType.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/GridFunctions.hpp b/src/amdis/GridFunctions.hpp
similarity index 91%
rename from dune/amdis/GridFunctions.hpp
rename to src/amdis/GridFunctions.hpp
index 2bcff0d1..f25d3ef7 100644
--- a/dune/amdis/GridFunctions.hpp
+++ b/src/amdis/GridFunctions.hpp
@@ -61,12 +61,12 @@
   *   + `auto value1 = integrate(sin(X(0)), 4);`
   **/
 
-#include <dune/amdis/gridfunctions/AnalyticGridFunction.hpp>
-#include <dune/amdis/gridfunctions/ConstantGridFunction.hpp>
-#include <dune/amdis/gridfunctions/CoordsGridFunction.hpp>
-#include <dune/amdis/gridfunctions/DerivativeGridFunction.hpp>
-#include <dune/amdis/gridfunctions/FunctorGridFunction.hpp>
-#include <dune/amdis/gridfunctions/OperationsGridFunction.hpp>
+#include <amdis/gridfunctions/AnalyticGridFunction.hpp>
+#include <amdis/gridfunctions/ConstantGridFunction.hpp>
+#include <amdis/gridfunctions/CoordsGridFunction.hpp>
+#include <amdis/gridfunctions/DerivativeGridFunction.hpp>
+#include <amdis/gridfunctions/FunctorGridFunction.hpp>
+#include <amdis/gridfunctions/OperationsGridFunction.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/Initfile.cpp b/src/amdis/Initfile.cpp
similarity index 92%
rename from dune/amdis/Initfile.cpp
rename to src/amdis/Initfile.cpp
index 6c406213..6987dfee 100644
--- a/dune/amdis/Initfile.cpp
+++ b/src/amdis/Initfile.cpp
@@ -1,6 +1,6 @@
-#include <dune/amdis/Initfile.hpp>
+#include <amdis/Initfile.hpp>
 
-#include <dune/amdis/InitfileParser.hpp>
+#include <amdis/InitfileParser.hpp>
 
 // a parser for arithmetic expressions
 // #include <muParser.h>
diff --git a/dune/amdis/Initfile.hpp b/src/amdis/Initfile.hpp
similarity index 100%
rename from dune/amdis/Initfile.hpp
rename to src/amdis/Initfile.hpp
diff --git a/dune/amdis/InitfileParser.cpp b/src/amdis/InitfileParser.cpp
similarity index 96%
rename from dune/amdis/InitfileParser.cpp
rename to src/amdis/InitfileParser.cpp
index 1803b661..e1c7ee66 100644
--- a/dune/amdis/InitfileParser.cpp
+++ b/src/amdis/InitfileParser.cpp
@@ -1,8 +1,8 @@
-#include <dune/amdis/InitfileParser.hpp>
+#include <amdis/InitfileParser.hpp>
 
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/utility/Filesystem.hpp>
-#include <dune/amdis/utility/String.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/utility/Filesystem.hpp>
+#include <amdis/utility/String.hpp>
 
 namespace AMDiS {
 
diff --git a/dune/amdis/InitfileParser.hpp b/src/amdis/InitfileParser.hpp
similarity index 100%
rename from dune/amdis/InitfileParser.hpp
rename to src/amdis/InitfileParser.hpp
diff --git a/src/amdis/LinearAlgebra.hpp b/src/amdis/LinearAlgebra.hpp
new file mode 100644
index 00000000..569c7457
--- /dev/null
+++ b/src/amdis/LinearAlgebra.hpp
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <amdis/linear_algebra/LinearSolverInterface.hpp>
+#include <amdis/linear_algebra/SolverInfo.hpp>
+
+#if defined(AMDIS_BACKEND_ISTL)
+
+#include <amdis/linear_algebra/istl/SystemVector.hpp>
+#include <amdis/linear_algebra/istl/SystemMatrix.hpp>
+#include <amdis/linear_algebra/istl/LinearSolver.hpp>
+
+#elif defined(AMDIS_BACKEND_MTL)
+
+#include <amdis/linear_algebra/mtl/SystemVector.hpp>
+#include <amdis/linear_algebra/mtl/SystemMatrix.hpp>
+#include <amdis/linear_algebra/mtl/LinearSolver.hpp>
+#include <amdis/linear_algebra/mtl/ITL_Solver.hpp>
+#include <amdis/linear_algebra/mtl/BITL_Solver.hpp>
+
+#elif defined(AMDIS_BACKEND_PETSC)
+
+#include <amdis/linear_algebra/petsc/SystemVector.hpp>
+#include <amdis/linear_algebra/petsc/SystemMatrix.hpp>
+#include <amdis/linear_algebra/petsc/LinearSolver.hpp>
+
+#else
+
+#error "Unknown linear algebra backend!. Set corresponding variable \
+        AMDIS_BACKEND_ISTL, AMDIS_BACKEND_MTL or AMDIS_BACKEND_PETSC."
+
+#endif
\ No newline at end of file
diff --git a/dune/amdis/LocalAssembler.hpp b/src/amdis/LocalAssembler.hpp
similarity index 97%
rename from dune/amdis/LocalAssembler.hpp
rename to src/amdis/LocalAssembler.hpp
index d49095b8..424cc456 100644
--- a/dune/amdis/LocalAssembler.hpp
+++ b/src/amdis/LocalAssembler.hpp
@@ -6,10 +6,10 @@
 
 #include <dune/geometry/quadraturerules.hh>
 
-#include <dune/amdis/ContextGeometry.hpp>
-#include <dune/amdis/LocalAssemblerBase.hpp>
-#include <dune/amdis/common/Concepts.hpp>
-#include <dune/amdis/utility/FiniteElementType.hpp>
+#include <amdis/ContextGeometry.hpp>
+#include <amdis/LocalAssemblerBase.hpp>
+#include <amdis/common/Concepts.hpp>
+#include <amdis/utility/FiniteElementType.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/LocalAssemblerBase.hpp b/src/amdis/LocalAssemblerBase.hpp
similarity index 96%
rename from dune/amdis/LocalAssemblerBase.hpp
rename to src/amdis/LocalAssemblerBase.hpp
index 925e4fa8..960ccfce 100644
--- a/dune/amdis/LocalAssemblerBase.hpp
+++ b/src/amdis/LocalAssemblerBase.hpp
@@ -4,9 +4,9 @@
 #include <memory>
 #include <type_traits>
 
-#include <dune/amdis/common/ConceptsBase.hpp>
-#include <dune/amdis/common/TypeDefs.hpp>
-#include <dune/amdis/utility/TreeData.hpp>
+#include <amdis/common/ConceptsBase.hpp>
+#include <amdis/common/TypeDefs.hpp>
+#include <amdis/utility/TreeData.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/Mesh.hpp b/src/amdis/Mesh.hpp
similarity index 97%
rename from dune/amdis/Mesh.hpp
rename to src/amdis/Mesh.hpp
index 9384f98a..f2eae9cb 100644
--- a/dune/amdis/Mesh.hpp
+++ b/src/amdis/Mesh.hpp
@@ -14,9 +14,9 @@
 #include <dune/grid/albertagrid/albertareader.hh>
 #include <dune/grid/io/file/gmshreader.hh>
 
-#include <dune/amdis/Initfile.hpp>
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/utility/Filesystem.hpp>
+#include <amdis/Initfile.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/utility/Filesystem.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/Operations.hpp b/src/amdis/Operations.hpp
similarity index 56%
rename from dune/amdis/Operations.hpp
rename to src/amdis/Operations.hpp
index d3bfcd15..8c13c630 100644
--- a/dune/amdis/Operations.hpp
+++ b/src/amdis/Operations.hpp
@@ -10,9 +10,9 @@
   * derivatives w.r.t. the functor arguments.
   **/
 
-#include <dune/amdis/operations/Arithmetic.hpp>
-#include <dune/amdis/operations/Basic.hpp>
-#include <dune/amdis/operations/CMath.hpp>
-#include <dune/amdis/operations/Composer.hpp>
-#include <dune/amdis/operations/FieldMatVec.hpp>
-#include <dune/amdis/operations/MaxMin.hpp>
+#include <amdis/operations/Arithmetic.hpp>
+#include <amdis/operations/Basic.hpp>
+#include <amdis/operations/CMath.hpp>
+#include <amdis/operations/Composer.hpp>
+#include <amdis/operations/FieldMatVec.hpp>
+#include <amdis/operations/MaxMin.hpp>
diff --git a/dune/amdis/Operators.hpp b/src/amdis/Operators.hpp
similarity index 50%
rename from dune/amdis/Operators.hpp
rename to src/amdis/Operators.hpp
index 19f930d2..9bfde78d 100644
--- a/dune/amdis/Operators.hpp
+++ b/src/amdis/Operators.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <dune/amdis/LocalAssembler.hpp>
-#include <dune/amdis/GridFunctionOperator.hpp>
+#include <amdis/LocalAssembler.hpp>
+#include <amdis/GridFunctionOperator.hpp>
 
 /*
  * In the following comments we use the notation
@@ -38,25 +38,25 @@
   **/
 
 // zero-order operators
-#include <dune/amdis/assembler/ZeroOrderTest.hpp>             // <psi * c>
-#include <dune/amdis/assembler/ZeroOrderTestTrial.hpp>        // <psi, c * phi>
-#include <dune/amdis/assembler/ZeroOrderTestTrialvec.hpp>     // <psi, b * Phi>
-#include <dune/amdis/assembler/ZeroOrderTestvec.hpp>          // <Psi * b>
-#include <dune/amdis/assembler/ZeroOrderTestvecTrial.hpp>     // <Psi, b * phi>
-#include <dune/amdis/assembler/ZeroOrderTestvecTrialvec.hpp>  // <Psi, A * Phi>, <Psi, c * Phi>
+#include <amdis/assembler/ZeroOrderTest.hpp>             // <psi * c>
+#include <amdis/assembler/ZeroOrderTestTrial.hpp>        // <psi, c * phi>
+#include <amdis/assembler/ZeroOrderTestTrialvec.hpp>     // <psi, b * Phi>
+#include <amdis/assembler/ZeroOrderTestvec.hpp>          // <Psi * b>
+#include <amdis/assembler/ZeroOrderTestvecTrial.hpp>     // <Psi, b * phi>
+#include <amdis/assembler/ZeroOrderTestvecTrialvec.hpp>  // <Psi, A * Phi>, <Psi, c * Phi>
 
 // first-order operators
-#include <dune/amdis/assembler/FirstOrderDivTestvecTrial.hpp>   // <div(Psi), c * phi>
-#include <dune/amdis/assembler/FirstOrderGradTestTrial.hpp>     // <grad(psi), b * phi>
-#include <dune/amdis/assembler/FirstOrderGradTestTrialvec.hpp>  // <grad(psi), c * Phi>
-#include <dune/amdis/assembler/FirstOrderPartialTestTrial.hpp>  // <d_i(psi), c * psi>
-#include <dune/amdis/assembler/FirstOrderTestDivTrialvec.hpp>   // <psi, c * div(Phi)>
-#include <dune/amdis/assembler/FirstOrderTestGradTrial.hpp>     // <psi, b * grad(phi)>
-#include <dune/amdis/assembler/FirstOrderTestPartialTrial.hpp>  // <psi, c * d_i(phi)>
-#include <dune/amdis/assembler/FirstOrderTestvecGradTrial.hpp>  // <Psi, c * grad(phi)>
+#include <amdis/assembler/FirstOrderDivTestvecTrial.hpp>   // <div(Psi), c * phi>
+#include <amdis/assembler/FirstOrderGradTestTrial.hpp>     // <grad(psi), b * phi>
+#include <amdis/assembler/FirstOrderGradTestTrialvec.hpp>  // <grad(psi), c * Phi>
+#include <amdis/assembler/FirstOrderPartialTestTrial.hpp>  // <d_i(psi), c * psi>
+#include <amdis/assembler/FirstOrderTestDivTrialvec.hpp>   // <psi, c * div(Phi)>
+#include <amdis/assembler/FirstOrderTestGradTrial.hpp>     // <psi, b * grad(phi)>
+#include <amdis/assembler/FirstOrderTestPartialTrial.hpp>  // <psi, c * d_i(phi)>
+#include <amdis/assembler/FirstOrderTestvecGradTrial.hpp>  // <Psi, c * grad(phi)>
 
 // second-order operators
-#include <dune/amdis/assembler/SecondOrderDivTestvecDivTrialvec.hpp>    // <div(Psi), c * div(Phi)>
-#include <dune/amdis/assembler/SecondOrderGradTestGradTrial.hpp>        // <grad(psi), A * grad(phi)>
-#include <dune/amdis/assembler/SecondOrderPartialTestPartialTrial.hpp>  // <d_i(psi), c * d_j(phi)>
+#include <amdis/assembler/SecondOrderDivTestvecDivTrialvec.hpp>    // <div(Psi), c * div(Phi)>
+#include <amdis/assembler/SecondOrderGradTestGradTrial.hpp>        // <grad(psi), A * grad(phi)>
+#include <amdis/assembler/SecondOrderPartialTestPartialTrial.hpp>  // <d_i(psi), c * d_j(phi)>
 
diff --git a/dune/amdis/Output.hpp b/src/amdis/Output.hpp
similarity index 100%
rename from dune/amdis/Output.hpp
rename to src/amdis/Output.hpp
diff --git a/dune/amdis/ProblemInstat.cpp b/src/amdis/ProblemInstat.cpp
similarity index 100%
rename from dune/amdis/ProblemInstat.cpp
rename to src/amdis/ProblemInstat.cpp
diff --git a/dune/amdis/ProblemInstat.hpp b/src/amdis/ProblemInstat.hpp
similarity index 94%
rename from dune/amdis/ProblemInstat.hpp
rename to src/amdis/ProblemInstat.hpp
index 2259d250..635a65e6 100644
--- a/dune/amdis/ProblemInstat.hpp
+++ b/src/amdis/ProblemInstat.hpp
@@ -2,9 +2,9 @@
 
 #include <string>
 
-#include <dune/amdis/ProblemInstatBase.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/common/Utility.hpp>
+#include <amdis/ProblemInstatBase.hpp>
+#include <amdis/ProblemStat.hpp>
+#include <amdis/common/Utility.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/ProblemInstat.inc.hpp b/src/amdis/ProblemInstat.inc.hpp
similarity index 97%
rename from dune/amdis/ProblemInstat.inc.hpp
rename to src/amdis/ProblemInstat.inc.hpp
index 3a7b80de..f58123eb 100644
--- a/dune/amdis/ProblemInstat.inc.hpp
+++ b/src/amdis/ProblemInstat.inc.hpp
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include <dune/amdis/AdaptInfo.hpp>
+#include <amdis/AdaptInfo.hpp>
 
 namespace AMDiS {
 
diff --git a/dune/amdis/ProblemInstatBase.cpp b/src/amdis/ProblemInstatBase.cpp
similarity index 100%
rename from dune/amdis/ProblemInstatBase.cpp
rename to src/amdis/ProblemInstatBase.cpp
diff --git a/dune/amdis/ProblemInstatBase.hpp b/src/amdis/ProblemInstatBase.hpp
similarity index 100%
rename from dune/amdis/ProblemInstatBase.hpp
rename to src/amdis/ProblemInstatBase.hpp
diff --git a/dune/amdis/ProblemIterationInterface.hpp b/src/amdis/ProblemIterationInterface.hpp
similarity index 100%
rename from dune/amdis/ProblemIterationInterface.hpp
rename to src/amdis/ProblemIterationInterface.hpp
diff --git a/dune/amdis/ProblemStat.cpp b/src/amdis/ProblemStat.cpp
similarity index 100%
rename from dune/amdis/ProblemStat.cpp
rename to src/amdis/ProblemStat.cpp
diff --git a/dune/amdis/ProblemStat.hpp b/src/amdis/ProblemStat.hpp
similarity index 94%
rename from dune/amdis/ProblemStat.hpp
rename to src/amdis/ProblemStat.hpp
index 99b8ed66..40894909 100644
--- a/dune/amdis/ProblemStat.hpp
+++ b/src/amdis/ProblemStat.hpp
@@ -12,28 +12,28 @@
 #include <dune/common/fmatrix.hh>
 #include <dune/grid/common/grid.hh>
 
-#include <dune/amdis/AdaptInfo.hpp>
-#include <dune/amdis/Assembler.hpp>
-#include <dune/amdis/CreatorInterface.hpp>
-#include <dune/amdis/DirichletBC.hpp>
-#include <dune/amdis/Flag.hpp>
-#include <dune/amdis/Initfile.hpp>
-#include <dune/amdis/LinearAlgebra.hpp>
-#include <dune/amdis/Mesh.hpp>
-#include <dune/amdis/ProblemStatBase.hpp>
-#include <dune/amdis/ProblemStatTraits.hpp>
-#include <dune/amdis/StandardProblemIteration.hpp>
-
-#include <dune/amdis/common/TupleUtility.hpp>
-#include <dune/amdis/common/TypeDefs.hpp>
-#include <dune/amdis/common/Utility.hpp>
-
-#include <dune/amdis/GridFunctions.hpp>
-#include <dune/amdis/gridfunctions/DOFVectorView.hpp>
-
-#include <dune/amdis/io/FileWriterInterface.hpp>
-
-#include <dune/amdis/utility/TreePath.hpp>
+#include <amdis/AdaptInfo.hpp>
+#include <amdis/Assembler.hpp>
+#include <amdis/CreatorInterface.hpp>
+#include <amdis/DirichletBC.hpp>
+#include <amdis/Flag.hpp>
+#include <amdis/Initfile.hpp>
+#include <amdis/LinearAlgebra.hpp>
+#include <amdis/Mesh.hpp>
+#include <amdis/ProblemStatBase.hpp>
+#include <amdis/ProblemStatTraits.hpp>
+#include <amdis/StandardProblemIteration.hpp>
+
+#include <amdis/common/TupleUtility.hpp>
+#include <amdis/common/TypeDefs.hpp>
+#include <amdis/common/Utility.hpp>
+
+#include <amdis/GridFunctions.hpp>
+#include <amdis/gridfunctions/DOFVectorView.hpp>
+
+#include <amdis/io/FileWriterInterface.hpp>
+
+#include <amdis/utility/TreePath.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/ProblemStat.inc.hpp b/src/amdis/ProblemStat.inc.hpp
similarity index 97%
rename from dune/amdis/ProblemStat.inc.hpp
rename to src/amdis/ProblemStat.inc.hpp
index 4ecc1882..a5d6444b 100644
--- a/dune/amdis/ProblemStat.inc.hpp
+++ b/src/amdis/ProblemStat.inc.hpp
@@ -7,12 +7,12 @@
 #include <dune/common/timer.hh>
 #include <dune/typetree/childextraction.hh>
 
-#include <dune/amdis/AdaptInfo.hpp>
-#include <dune/amdis/Assembler.hpp>
-#include <dune/amdis/FileWriter.hpp>
-#include <dune/amdis/LocalAssembler.hpp>
-#include <dune/amdis/GridFunctionOperator.hpp>
-#include <dune/amdis/common/Loops.hpp>
+#include <amdis/AdaptInfo.hpp>
+#include <amdis/Assembler.hpp>
+#include <amdis/FileWriter.hpp>
+#include <amdis/LocalAssembler.hpp>
+#include <amdis/GridFunctionOperator.hpp>
+#include <amdis/common/Loops.hpp>
 
 namespace AMDiS {
 
diff --git a/dune/amdis/ProblemStatBase.hpp b/src/amdis/ProblemStatBase.hpp
similarity index 100%
rename from dune/amdis/ProblemStatBase.hpp
rename to src/amdis/ProblemStatBase.hpp
diff --git a/dune/amdis/ProblemStatTraits.hpp b/src/amdis/ProblemStatTraits.hpp
similarity index 100%
rename from dune/amdis/ProblemStatTraits.hpp
rename to src/amdis/ProblemStatTraits.hpp
diff --git a/dune/amdis/ProblemTimeInterface.hpp b/src/amdis/ProblemTimeInterface.hpp
similarity index 100%
rename from dune/amdis/ProblemTimeInterface.hpp
rename to src/amdis/ProblemTimeInterface.hpp
diff --git a/dune/amdis/StandardProblemIteration.cpp b/src/amdis/StandardProblemIteration.cpp
similarity index 95%
rename from dune/amdis/StandardProblemIteration.cpp
rename to src/amdis/StandardProblemIteration.cpp
index 4521aca3..434e0d19 100644
--- a/dune/amdis/StandardProblemIteration.cpp
+++ b/src/amdis/StandardProblemIteration.cpp
@@ -1,8 +1,8 @@
 #include "StandardProblemIteration.hpp"
 
-#include <dune/amdis/AdaptInfo.hpp>
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/ProblemStatBase.hpp>
+#include <amdis/AdaptInfo.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/ProblemStatBase.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/StandardProblemIteration.hpp b/src/amdis/StandardProblemIteration.hpp
similarity index 100%
rename from dune/amdis/StandardProblemIteration.hpp
rename to src/amdis/StandardProblemIteration.hpp
diff --git a/dune/amdis/assembler/CMakeLists.txt b/src/amdis/assembler/CMakeLists.txt
similarity index 90%
rename from dune/amdis/assembler/CMakeLists.txt
rename to src/amdis/assembler/CMakeLists.txt
index 97228e55..f325175d 100644
--- a/dune/amdis/assembler/CMakeLists.txt
+++ b/src/amdis/assembler/CMakeLists.txt
@@ -18,4 +18,4 @@ install(FILES
     ZeroOrderTestvec.hpp
     ZeroOrderTestvecTrial.hpp
     ZeroOrderTestvecTrialvec.hpp
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/assembler)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/assembler)
diff --git a/dune/amdis/assembler/FirstOrderDivTestvecTrial.hpp b/src/amdis/assembler/FirstOrderDivTestvecTrial.hpp
similarity index 96%
rename from dune/amdis/assembler/FirstOrderDivTestvecTrial.hpp
rename to src/amdis/assembler/FirstOrderDivTestvecTrial.hpp
index 2c6ee725..ecdcc737 100644
--- a/dune/amdis/assembler/FirstOrderDivTestvecTrial.hpp
+++ b/src/amdis/assembler/FirstOrderDivTestvecTrial.hpp
@@ -2,7 +2,7 @@
 
 #include <type_traits>
 
-#include <dune/amdis/assembler/FirstOrderTestDivTrialvec.hpp>
+#include <amdis/assembler/FirstOrderTestDivTrialvec.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/FirstOrderGradTestTrial.hpp b/src/amdis/assembler/FirstOrderGradTestTrial.hpp
similarity index 96%
rename from dune/amdis/assembler/FirstOrderGradTestTrial.hpp
rename to src/amdis/assembler/FirstOrderGradTestTrial.hpp
index 453e7388..1ca7e92a 100644
--- a/dune/amdis/assembler/FirstOrderGradTestTrial.hpp
+++ b/src/amdis/assembler/FirstOrderGradTestTrial.hpp
@@ -2,7 +2,7 @@
 
 #include <type_traits>
 
-#include <dune/amdis/assembler/FirstOrderTestGradTrial.hpp>
+#include <amdis/assembler/FirstOrderTestGradTrial.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/FirstOrderGradTestTrialvec.hpp b/src/amdis/assembler/FirstOrderGradTestTrialvec.hpp
similarity index 96%
rename from dune/amdis/assembler/FirstOrderGradTestTrialvec.hpp
rename to src/amdis/assembler/FirstOrderGradTestTrialvec.hpp
index e74f0990..4d270a11 100644
--- a/dune/amdis/assembler/FirstOrderGradTestTrialvec.hpp
+++ b/src/amdis/assembler/FirstOrderGradTestTrialvec.hpp
@@ -2,7 +2,7 @@
 
 #include <type_traits>
 
-#include <dune/amdis/assembler/FirstOrderTestvecGradTrial.hpp>
+#include <amdis/assembler/FirstOrderTestvecGradTrial.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/FirstOrderPartialTestTrial.hpp b/src/amdis/assembler/FirstOrderPartialTestTrial.hpp
similarity index 96%
rename from dune/amdis/assembler/FirstOrderPartialTestTrial.hpp
rename to src/amdis/assembler/FirstOrderPartialTestTrial.hpp
index 182a70fb..a37fc043 100644
--- a/dune/amdis/assembler/FirstOrderPartialTestTrial.hpp
+++ b/src/amdis/assembler/FirstOrderPartialTestTrial.hpp
@@ -2,7 +2,7 @@
 
 #include <type_traits>
 
-#include <dune/amdis/assembler/FirstOrderTestPartialTrial.hpp>
+#include <amdis/assembler/FirstOrderTestPartialTrial.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/FirstOrderTestDivTrialvec.hpp b/src/amdis/assembler/FirstOrderTestDivTrialvec.hpp
similarity index 96%
rename from dune/amdis/assembler/FirstOrderTestDivTrialvec.hpp
rename to src/amdis/assembler/FirstOrderTestDivTrialvec.hpp
index 448d4caf..d571babf 100644
--- a/dune/amdis/assembler/FirstOrderTestDivTrialvec.hpp
+++ b/src/amdis/assembler/FirstOrderTestDivTrialvec.hpp
@@ -2,9 +2,9 @@
 
 #include <type_traits>
 
-#include <dune/amdis/GridFunctionOperator.hpp>
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/ValueCategory.hpp>
+#include <amdis/GridFunctionOperator.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/ValueCategory.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/FirstOrderTestGradTrial.hpp b/src/amdis/assembler/FirstOrderTestGradTrial.hpp
similarity index 96%
rename from dune/amdis/assembler/FirstOrderTestGradTrial.hpp
rename to src/amdis/assembler/FirstOrderTestGradTrial.hpp
index 08981ff9..a4ae5383 100644
--- a/dune/amdis/assembler/FirstOrderTestGradTrial.hpp
+++ b/src/amdis/assembler/FirstOrderTestGradTrial.hpp
@@ -2,9 +2,9 @@
 
 #include <type_traits>
 
-#include <dune/amdis/GridFunctionOperator.hpp>
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/ValueCategory.hpp>
+#include <amdis/GridFunctionOperator.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/ValueCategory.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/FirstOrderTestPartialTrial.hpp b/src/amdis/assembler/FirstOrderTestPartialTrial.hpp
similarity index 96%
rename from dune/amdis/assembler/FirstOrderTestPartialTrial.hpp
rename to src/amdis/assembler/FirstOrderTestPartialTrial.hpp
index c7ebd529..2d900f5d 100644
--- a/dune/amdis/assembler/FirstOrderTestPartialTrial.hpp
+++ b/src/amdis/assembler/FirstOrderTestPartialTrial.hpp
@@ -2,9 +2,9 @@
 
 #include <type_traits>
 
-#include <dune/amdis/GridFunctionOperator.hpp>
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/ValueCategory.hpp>
+#include <amdis/GridFunctionOperator.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/ValueCategory.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/FirstOrderTestvecGradTrial.hpp b/src/amdis/assembler/FirstOrderTestvecGradTrial.hpp
similarity index 96%
rename from dune/amdis/assembler/FirstOrderTestvecGradTrial.hpp
rename to src/amdis/assembler/FirstOrderTestvecGradTrial.hpp
index 674d59a6..2bfd6d52 100644
--- a/dune/amdis/assembler/FirstOrderTestvecGradTrial.hpp
+++ b/src/amdis/assembler/FirstOrderTestvecGradTrial.hpp
@@ -2,9 +2,9 @@
 
 #include <type_traits>
 
-#include <dune/amdis/GridFunctionOperator.hpp>
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/ValueCategory.hpp>
+#include <amdis/GridFunctionOperator.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/ValueCategory.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/SecondOrderDivTestvecDivTrialvec.hpp b/src/amdis/assembler/SecondOrderDivTestvecDivTrialvec.hpp
similarity index 98%
rename from dune/amdis/assembler/SecondOrderDivTestvecDivTrialvec.hpp
rename to src/amdis/assembler/SecondOrderDivTestvecDivTrialvec.hpp
index 19f54ff6..6a4a6272 100644
--- a/dune/amdis/assembler/SecondOrderDivTestvecDivTrialvec.hpp
+++ b/src/amdis/assembler/SecondOrderDivTestvecDivTrialvec.hpp
@@ -2,9 +2,9 @@
 
 #include <type_traits>
 
-#include <dune/amdis/GridFunctionOperator.hpp>
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/ValueCategory.hpp>
+#include <amdis/GridFunctionOperator.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/ValueCategory.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/SecondOrderGradTestGradTrial.hpp b/src/amdis/assembler/SecondOrderGradTestGradTrial.hpp
similarity index 98%
rename from dune/amdis/assembler/SecondOrderGradTestGradTrial.hpp
rename to src/amdis/assembler/SecondOrderGradTestGradTrial.hpp
index 65c07e4b..e2f955d1 100644
--- a/dune/amdis/assembler/SecondOrderGradTestGradTrial.hpp
+++ b/src/amdis/assembler/SecondOrderGradTestGradTrial.hpp
@@ -2,9 +2,9 @@
 
 #include <type_traits>
 
-#include <dune/amdis/GridFunctionOperator.hpp>
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/ValueCategory.hpp>
+#include <amdis/GridFunctionOperator.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/ValueCategory.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/SecondOrderPartialTestPartialTrial.hpp b/src/amdis/assembler/SecondOrderPartialTestPartialTrial.hpp
similarity index 97%
rename from dune/amdis/assembler/SecondOrderPartialTestPartialTrial.hpp
rename to src/amdis/assembler/SecondOrderPartialTestPartialTrial.hpp
index bfb522e7..f5c548ad 100644
--- a/dune/amdis/assembler/SecondOrderPartialTestPartialTrial.hpp
+++ b/src/amdis/assembler/SecondOrderPartialTestPartialTrial.hpp
@@ -2,9 +2,9 @@
 
 #include <type_traits>
 
-#include <dune/amdis/GridFunctionOperator.hpp>
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/ValueCategory.hpp>
+#include <amdis/GridFunctionOperator.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/ValueCategory.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/StokesOperator.hpp b/src/amdis/assembler/StokesOperator.hpp
similarity index 97%
rename from dune/amdis/assembler/StokesOperator.hpp
rename to src/amdis/assembler/StokesOperator.hpp
index 43e01279..46c191a6 100644
--- a/dune/amdis/assembler/StokesOperator.hpp
+++ b/src/amdis/assembler/StokesOperator.hpp
@@ -3,8 +3,8 @@
 #include <type_traits>
 #include <vector>
 
-#include <dune/amdis/GridFunctionOperator.hpp>
-#include <dune/amdis/common/ValueCategory.hpp>
+#include <amdis/GridFunctionOperator.hpp>
+#include <amdis/common/ValueCategory.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/ZeroOrderTest.hpp b/src/amdis/assembler/ZeroOrderTest.hpp
similarity index 95%
rename from dune/amdis/assembler/ZeroOrderTest.hpp
rename to src/amdis/assembler/ZeroOrderTest.hpp
index 416e9182..fd6f6786 100644
--- a/dune/amdis/assembler/ZeroOrderTest.hpp
+++ b/src/amdis/assembler/ZeroOrderTest.hpp
@@ -2,8 +2,8 @@
 
 #include <type_traits>
 
-#include <dune/amdis/GridFunctionOperator.hpp>
-#include <dune/amdis/common/ValueCategory.hpp>
+#include <amdis/GridFunctionOperator.hpp>
+#include <amdis/common/ValueCategory.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/ZeroOrderTestTrial.hpp b/src/amdis/assembler/ZeroOrderTestTrial.hpp
similarity index 97%
rename from dune/amdis/assembler/ZeroOrderTestTrial.hpp
rename to src/amdis/assembler/ZeroOrderTestTrial.hpp
index 7cc42bb1..d7df01aa 100644
--- a/dune/amdis/assembler/ZeroOrderTestTrial.hpp
+++ b/src/amdis/assembler/ZeroOrderTestTrial.hpp
@@ -2,8 +2,8 @@
 
 #include <type_traits>
 
-#include <dune/amdis/GridFunctionOperator.hpp>
-#include <dune/amdis/common/ValueCategory.hpp>
+#include <amdis/GridFunctionOperator.hpp>
+#include <amdis/common/ValueCategory.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/ZeroOrderTestTrialvec.hpp b/src/amdis/assembler/ZeroOrderTestTrialvec.hpp
similarity index 97%
rename from dune/amdis/assembler/ZeroOrderTestTrialvec.hpp
rename to src/amdis/assembler/ZeroOrderTestTrialvec.hpp
index d3481ef3..fbe2f357 100644
--- a/dune/amdis/assembler/ZeroOrderTestTrialvec.hpp
+++ b/src/amdis/assembler/ZeroOrderTestTrialvec.hpp
@@ -2,8 +2,8 @@
 
 #include <type_traits>
 
-#include <dune/amdis/GridFunctionOperator.hpp>
-#include <dune/amdis/common/ValueCategory.hpp>
+#include <amdis/GridFunctionOperator.hpp>
+#include <amdis/common/ValueCategory.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/ZeroOrderTestvec.hpp b/src/amdis/assembler/ZeroOrderTestvec.hpp
similarity index 95%
rename from dune/amdis/assembler/ZeroOrderTestvec.hpp
rename to src/amdis/assembler/ZeroOrderTestvec.hpp
index 8e9333ea..49a5d40a 100644
--- a/dune/amdis/assembler/ZeroOrderTestvec.hpp
+++ b/src/amdis/assembler/ZeroOrderTestvec.hpp
@@ -2,8 +2,8 @@
 
 #include <type_traits>
 
-#include <dune/amdis/GridFunctionOperator.hpp>
-#include <dune/amdis/common/ValueCategory.hpp>
+#include <amdis/GridFunctionOperator.hpp>
+#include <amdis/common/ValueCategory.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/ZeroOrderTestvecTrial.hpp b/src/amdis/assembler/ZeroOrderTestvecTrial.hpp
similarity index 96%
rename from dune/amdis/assembler/ZeroOrderTestvecTrial.hpp
rename to src/amdis/assembler/ZeroOrderTestvecTrial.hpp
index 3081f7fc..d6083d1a 100644
--- a/dune/amdis/assembler/ZeroOrderTestvecTrial.hpp
+++ b/src/amdis/assembler/ZeroOrderTestvecTrial.hpp
@@ -2,7 +2,7 @@
 
 #include <type_traits>
 
-#include <dune/amdis/assembler/ZeroOrderTestTrialvec.hpp>
+#include <amdis/assembler/ZeroOrderTestTrialvec.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/assembler/ZeroOrderTestvecTrialvec.hpp b/src/amdis/assembler/ZeroOrderTestvecTrialvec.hpp
similarity index 98%
rename from dune/amdis/assembler/ZeroOrderTestvecTrialvec.hpp
rename to src/amdis/assembler/ZeroOrderTestvecTrialvec.hpp
index a56500a4..77a478e8 100644
--- a/dune/amdis/assembler/ZeroOrderTestvecTrialvec.hpp
+++ b/src/amdis/assembler/ZeroOrderTestvecTrialvec.hpp
@@ -2,8 +2,8 @@
 
 #include <type_traits>
 
-#include <dune/amdis/GridFunctionOperator.hpp>
-#include <dune/amdis/common/ValueCategory.hpp>
+#include <amdis/GridFunctionOperator.hpp>
+#include <amdis/common/ValueCategory.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/common/Assigner.hpp b/src/amdis/common/Assigner.hpp
similarity index 100%
rename from dune/amdis/common/Assigner.hpp
rename to src/amdis/common/Assigner.hpp
diff --git a/dune/amdis/common/CMakeLists.txt b/src/amdis/common/CMakeLists.txt
similarity index 84%
rename from dune/amdis/common/CMakeLists.txt
rename to src/amdis/common/CMakeLists.txt
index 6c97462b..51f68567 100644
--- a/dune/amdis/common/CMakeLists.txt
+++ b/src/amdis/common/CMakeLists.txt
@@ -18,4 +18,4 @@ install(FILES
     TypeDefs.hpp
     Utility.hpp
     ValueCategory.hpp
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/common)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/common)
diff --git a/dune/amdis/common/ClonablePtr.hpp b/src/amdis/common/ClonablePtr.hpp
similarity index 98%
rename from dune/amdis/common/ClonablePtr.hpp
rename to src/amdis/common/ClonablePtr.hpp
index 98fd6c68..2dcd9c35 100644
--- a/dune/amdis/common/ClonablePtr.hpp
+++ b/src/amdis/common/ClonablePtr.hpp
@@ -3,7 +3,7 @@
 #include <memory>
 #include <utility>
 
-#include <dune/amdis/common/Utility.hpp>
+#include <amdis/common/Utility.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/common/Concepts.hpp b/src/amdis/common/Concepts.hpp
similarity index 97%
rename from dune/amdis/common/Concepts.hpp
rename to src/amdis/common/Concepts.hpp
index 846d2805..a04721a0 100644
--- a/dune/amdis/common/Concepts.hpp
+++ b/src/amdis/common/Concepts.hpp
@@ -4,9 +4,9 @@
 
 #include <dune/functions/common/functionconcepts.hh>
 
-#include <dune/amdis/common/ConceptsBase.hpp>
-#include <dune/amdis/common/Mpl.hpp>
-#include <dune/amdis/common/Utility.hpp>
+#include <amdis/common/ConceptsBase.hpp>
+#include <amdis/common/Mpl.hpp>
+#include <amdis/common/Utility.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/common/ConceptsBase.hpp b/src/amdis/common/ConceptsBase.hpp
similarity index 100%
rename from dune/amdis/common/ConceptsBase.hpp
rename to src/amdis/common/ConceptsBase.hpp
diff --git a/dune/amdis/common/FieldMatVec.hpp b/src/amdis/common/FieldMatVec.hpp
similarity index 98%
rename from dune/amdis/common/FieldMatVec.hpp
rename to src/amdis/common/FieldMatVec.hpp
index fff29c74..90baf9d0 100644
--- a/dune/amdis/common/FieldMatVec.hpp
+++ b/src/amdis/common/FieldMatVec.hpp
@@ -6,11 +6,11 @@
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
 
-#include <dune/amdis/common/Math.hpp>
-#include <dune/amdis/common/Concepts.hpp>
-#include <dune/amdis/common/ScalarTypes.hpp>
-#include <dune/amdis/operations/Arithmetic.hpp>
-#include <dune/amdis/operations/MaxMin.hpp>
+#include <amdis/common/Math.hpp>
+#include <amdis/common/Concepts.hpp>
+#include <amdis/common/ScalarTypes.hpp>
+#include <amdis/operations/Arithmetic.hpp>
+#include <amdis/operations/MaxMin.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/common/FieldTraits.hpp b/src/amdis/common/FieldTraits.hpp
similarity index 88%
rename from dune/amdis/common/FieldTraits.hpp
rename to src/amdis/common/FieldTraits.hpp
index bd16c80e..226fd9b9 100644
--- a/dune/amdis/common/FieldTraits.hpp
+++ b/src/amdis/common/FieldTraits.hpp
@@ -2,7 +2,7 @@
 
 #include <dune/common/ftraits.hh>
 
-#include <dune/amdis/common/Utility.hpp>
+#include <amdis/common/Utility.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/common/IndexSeq.hpp b/src/amdis/common/IndexSeq.hpp
similarity index 100%
rename from dune/amdis/common/IndexSeq.hpp
rename to src/amdis/common/IndexSeq.hpp
diff --git a/dune/amdis/common/Literals.hpp b/src/amdis/common/Literals.hpp
similarity index 96%
rename from dune/amdis/common/Literals.hpp
rename to src/amdis/common/Literals.hpp
index a328f6b2..7ea68ad4 100644
--- a/dune/amdis/common/Literals.hpp
+++ b/src/amdis/common/Literals.hpp
@@ -2,7 +2,7 @@
 
 #include <cassert>
 
-#include <dune/amdis/common/Mpl.hpp>
+#include <amdis/common/Mpl.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/common/Loops.hpp b/src/amdis/common/Loops.hpp
similarity index 100%
rename from dune/amdis/common/Loops.hpp
rename to src/amdis/common/Loops.hpp
diff --git a/dune/amdis/common/Math.hpp b/src/amdis/common/Math.hpp
similarity index 100%
rename from dune/amdis/common/Math.hpp
rename to src/amdis/common/Math.hpp
diff --git a/dune/amdis/common/Mpl.hpp b/src/amdis/common/Mpl.hpp
similarity index 100%
rename from dune/amdis/common/Mpl.hpp
rename to src/amdis/common/Mpl.hpp
diff --git a/dune/amdis/common/MultiTypeMatrix.hpp b/src/amdis/common/MultiTypeMatrix.hpp
similarity index 92%
rename from dune/amdis/common/MultiTypeMatrix.hpp
rename to src/amdis/common/MultiTypeMatrix.hpp
index ea8d5ece..f1c7b87c 100644
--- a/dune/amdis/common/MultiTypeMatrix.hpp
+++ b/src/amdis/common/MultiTypeMatrix.hpp
@@ -2,13 +2,13 @@
 
 #include <tuple>
 
-#include <dune/amdis/common/Concepts.hpp>
-#include <dune/amdis/common/FieldTraits.hpp>
-#include <dune/amdis/common/Loops.hpp>
-#include <dune/amdis/common/Mpl.hpp>
-#include <dune/amdis/common/MultiTypeVector.hpp>
-#include <dune/amdis/common/Size.hpp>
-#include <dune/amdis/utility/MultiIndex.hpp>
+#include <amdis/common/Concepts.hpp>
+#include <amdis/common/FieldTraits.hpp>
+#include <amdis/common/Loops.hpp>
+#include <amdis/common/Mpl.hpp>
+#include <amdis/common/MultiTypeVector.hpp>
+#include <amdis/common/Size.hpp>
+#include <amdis/utility/MultiIndex.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/common/MultiTypeVector.hpp b/src/amdis/common/MultiTypeVector.hpp
similarity index 94%
rename from dune/amdis/common/MultiTypeVector.hpp
rename to src/amdis/common/MultiTypeVector.hpp
index 34c75485..d2f89d54 100644
--- a/dune/amdis/common/MultiTypeVector.hpp
+++ b/src/amdis/common/MultiTypeVector.hpp
@@ -4,11 +4,11 @@
 
 #include <dune/functions/common/indexaccess.hh>
 
-#include <dune/amdis/common/Concepts.hpp>
-#include <dune/amdis/common/FieldTraits.hpp>
-#include <dune/amdis/common/Loops.hpp>
-#include <dune/amdis/common/Mpl.hpp>
-#include <dune/amdis/common/Size.hpp>
+#include <amdis/common/Concepts.hpp>
+#include <amdis/common/FieldTraits.hpp>
+#include <amdis/common/Loops.hpp>
+#include <amdis/common/Mpl.hpp>
+#include <amdis/common/Size.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/common/ScalarTypes.hpp b/src/amdis/common/ScalarTypes.hpp
similarity index 100%
rename from dune/amdis/common/ScalarTypes.hpp
rename to src/amdis/common/ScalarTypes.hpp
diff --git a/dune/amdis/common/Size.hpp b/src/amdis/common/Size.hpp
similarity index 100%
rename from dune/amdis/common/Size.hpp
rename to src/amdis/common/Size.hpp
diff --git a/dune/amdis/common/Tags.hpp b/src/amdis/common/Tags.hpp
similarity index 100%
rename from dune/amdis/common/Tags.hpp
rename to src/amdis/common/Tags.hpp
diff --git a/dune/amdis/common/TupleUtility.hpp b/src/amdis/common/TupleUtility.hpp
similarity index 98%
rename from dune/amdis/common/TupleUtility.hpp
rename to src/amdis/common/TupleUtility.hpp
index b03213f8..dcd8ba4b 100644
--- a/dune/amdis/common/TupleUtility.hpp
+++ b/src/amdis/common/TupleUtility.hpp
@@ -3,8 +3,8 @@
 #include <tuple>
 #include <type_traits>
 
-#include <dune/amdis/common/IndexSeq.hpp>
-#include <dune/amdis/common/Utility.hpp>
+#include <amdis/common/IndexSeq.hpp>
+#include <amdis/common/Utility.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/common/TypeDefs.hpp b/src/amdis/common/TypeDefs.hpp
similarity index 89%
rename from dune/amdis/common/TypeDefs.hpp
rename to src/amdis/common/TypeDefs.hpp
index 1bafb5a1..735d9cb6 100644
--- a/dune/amdis/common/TypeDefs.hpp
+++ b/src/amdis/common/TypeDefs.hpp
@@ -2,7 +2,7 @@
 
 #include <type_traits>
 
-#include <dune/amdis/linear_algebra/Mtl.hpp>
+#include <amdis/linear_algebra/Mtl.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/common/Utility.hpp b/src/amdis/common/Utility.hpp
similarity index 100%
rename from dune/amdis/common/Utility.hpp
rename to src/amdis/common/Utility.hpp
diff --git a/dune/amdis/common/ValueCategory.hpp b/src/amdis/common/ValueCategory.hpp
similarity index 97%
rename from dune/amdis/common/ValueCategory.hpp
rename to src/amdis/common/ValueCategory.hpp
index a8e378ef..3c1b61c3 100644
--- a/dune/amdis/common/ValueCategory.hpp
+++ b/src/amdis/common/ValueCategory.hpp
@@ -6,7 +6,7 @@
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
 
-#include <dune/amdis/common/Tags.hpp>
+#include <amdis/common/Tags.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/gridfunctions/AnalyticGridFunction.hpp b/src/amdis/gridfunctions/AnalyticGridFunction.hpp
similarity index 98%
rename from dune/amdis/gridfunctions/AnalyticGridFunction.hpp
rename to src/amdis/gridfunctions/AnalyticGridFunction.hpp
index e339b330..d2e78231 100644
--- a/dune/amdis/gridfunctions/AnalyticGridFunction.hpp
+++ b/src/amdis/gridfunctions/AnalyticGridFunction.hpp
@@ -6,8 +6,8 @@
 #include <dune/functions/common/signature.hh>
 #include <dune/functions/gridfunctions/gridviewentityset.hh>
 
-#include <dune/amdis/Operations.hpp>
-#include <dune/amdis/gridfunctions/GridFunctionConcepts.hpp>
+#include <amdis/Operations.hpp>
+#include <amdis/gridfunctions/GridFunctionConcepts.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/gridfunctions/CMakeLists.txt b/src/amdis/gridfunctions/CMakeLists.txt
similarity index 82%
rename from dune/amdis/gridfunctions/CMakeLists.txt
rename to src/amdis/gridfunctions/CMakeLists.txt
index 51955a79..a2b00db0 100644
--- a/dune/amdis/gridfunctions/CMakeLists.txt
+++ b/src/amdis/gridfunctions/CMakeLists.txt
@@ -11,4 +11,4 @@ install(FILES
     GridFunctionConcepts.hpp
     Integrate.hpp
     OperationsGridFunction.hpp
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/gridfunctions)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/gridfunctions)
diff --git a/dune/amdis/gridfunctions/ConstantGridFunction.hpp b/src/amdis/gridfunctions/ConstantGridFunction.hpp
similarity index 96%
rename from dune/amdis/gridfunctions/ConstantGridFunction.hpp
rename to src/amdis/gridfunctions/ConstantGridFunction.hpp
index c5899e1b..6e7539f4 100644
--- a/dune/amdis/gridfunctions/ConstantGridFunction.hpp
+++ b/src/amdis/gridfunctions/ConstantGridFunction.hpp
@@ -8,9 +8,9 @@
 #include <dune/common/fvector.hh>
 #include <dune/functions/common/defaultderivativetraits.hh>
 
-#include <dune/amdis/common/Utility.hpp>
-#include <dune/amdis/gridfunctions/AnalyticGridFunction.hpp>
-#include <dune/amdis/gridfunctions/GridFunctionConcepts.hpp>
+#include <amdis/common/Utility.hpp>
+#include <amdis/gridfunctions/AnalyticGridFunction.hpp>
+#include <amdis/gridfunctions/GridFunctionConcepts.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/gridfunctions/CoordsGridFunction.hpp b/src/amdis/gridfunctions/CoordsGridFunction.hpp
similarity index 100%
rename from dune/amdis/gridfunctions/CoordsGridFunction.hpp
rename to src/amdis/gridfunctions/CoordsGridFunction.hpp
diff --git a/dune/amdis/gridfunctions/DOFVectorView.hpp b/src/amdis/gridfunctions/DOFVectorView.hpp
similarity index 99%
rename from dune/amdis/gridfunctions/DOFVectorView.hpp
rename to src/amdis/gridfunctions/DOFVectorView.hpp
index 411a192a..f0a5f937 100644
--- a/dune/amdis/gridfunctions/DOFVectorView.hpp
+++ b/src/amdis/gridfunctions/DOFVectorView.hpp
@@ -10,8 +10,8 @@
 #include <dune/functions/gridfunctions/gridviewentityset.hh>
 #include <dune/typetree/childextraction.hh>
 
-#include <dune/amdis/GridFunctions.hpp>
-#include <dune/amdis/utility/FiniteElementType.hpp>
+#include <amdis/GridFunctions.hpp>
+#include <amdis/utility/FiniteElementType.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/gridfunctions/DOFVectorView.inc.hpp b/src/amdis/gridfunctions/DOFVectorView.inc.hpp
similarity index 99%
rename from dune/amdis/gridfunctions/DOFVectorView.inc.hpp
rename to src/amdis/gridfunctions/DOFVectorView.inc.hpp
index f9852c95..1ce56ad6 100644
--- a/dune/amdis/gridfunctions/DOFVectorView.inc.hpp
+++ b/src/amdis/gridfunctions/DOFVectorView.inc.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <dune/amdis/common/FieldMatVec.hpp>
+#include <amdis/common/FieldMatVec.hpp>
 
 namespace AMDiS {
 
diff --git a/dune/amdis/gridfunctions/DerivativeGridFunction.hpp b/src/amdis/gridfunctions/DerivativeGridFunction.hpp
similarity index 98%
rename from dune/amdis/gridfunctions/DerivativeGridFunction.hpp
rename to src/amdis/gridfunctions/DerivativeGridFunction.hpp
index 4cd026a8..bdfc164d 100644
--- a/dune/amdis/gridfunctions/DerivativeGridFunction.hpp
+++ b/src/amdis/gridfunctions/DerivativeGridFunction.hpp
@@ -4,7 +4,7 @@
 
 #include <dune/functions/common/defaultderivativetraits.hh>
 
-#include <dune/amdis/gridfunctions/GridFunctionConcepts.hpp>
+#include <amdis/gridfunctions/GridFunctionConcepts.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/gridfunctions/FunctorGridFunction.hpp b/src/amdis/gridfunctions/FunctorGridFunction.hpp
similarity index 97%
rename from dune/amdis/gridfunctions/FunctorGridFunction.hpp
rename to src/amdis/gridfunctions/FunctorGridFunction.hpp
index 1d59930c..5ccbd54b 100644
--- a/dune/amdis/gridfunctions/FunctorGridFunction.hpp
+++ b/src/amdis/gridfunctions/FunctorGridFunction.hpp
@@ -5,11 +5,11 @@
 
 #include <dune/common/std/apply.hh>
 
-#include <dune/amdis/Operations.hpp>
-#include <dune/amdis/common/IndexSeq.hpp>
-#include <dune/amdis/common/Loops.hpp>
-#include <dune/amdis/common/Mpl.hpp>
-#include <dune/amdis/gridfunctions/GridFunctionConcepts.hpp>
+#include <amdis/Operations.hpp>
+#include <amdis/common/IndexSeq.hpp>
+#include <amdis/common/Loops.hpp>
+#include <amdis/common/Mpl.hpp>
+#include <amdis/gridfunctions/GridFunctionConcepts.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/gridfunctions/GridFunctionConcepts.hpp b/src/amdis/gridfunctions/GridFunctionConcepts.hpp
similarity index 97%
rename from dune/amdis/gridfunctions/GridFunctionConcepts.hpp
rename to src/amdis/gridfunctions/GridFunctionConcepts.hpp
index 2cd6ea5f..2148b276 100644
--- a/dune/amdis/gridfunctions/GridFunctionConcepts.hpp
+++ b/src/amdis/gridfunctions/GridFunctionConcepts.hpp
@@ -2,9 +2,9 @@
 
 #include <dune/common/typeutilities.hh>
 
-#include <dune/amdis/common/Concepts.hpp>
-#include <dune/amdis/common/IndexSeq.hpp>
-#include <dune/amdis/common/Mpl.hpp>
+#include <amdis/common/Concepts.hpp>
+#include <amdis/common/IndexSeq.hpp>
+#include <amdis/common/Mpl.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/gridfunctions/Integrate.hpp b/src/amdis/gridfunctions/Integrate.hpp
similarity index 98%
rename from dune/amdis/gridfunctions/Integrate.hpp
rename to src/amdis/gridfunctions/Integrate.hpp
index f3dc892f..61c53c63 100644
--- a/dune/amdis/gridfunctions/Integrate.hpp
+++ b/src/amdis/gridfunctions/Integrate.hpp
@@ -2,7 +2,7 @@
 
 #include <dune/geometry/quadraturerules.hh>
 
-#include <dune/amdis/GridFunctions.hpp>
+#include <amdis/GridFunctions.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/gridfunctions/OperationsGridFunction.hpp b/src/amdis/gridfunctions/OperationsGridFunction.hpp
similarity index 97%
rename from dune/amdis/gridfunctions/OperationsGridFunction.hpp
rename to src/amdis/gridfunctions/OperationsGridFunction.hpp
index 2df50b3f..3e578d40 100644
--- a/dune/amdis/gridfunctions/OperationsGridFunction.hpp
+++ b/src/amdis/gridfunctions/OperationsGridFunction.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <dune/amdis/Operations.hpp>
-#include <dune/amdis/gridfunctions/FunctorGridFunction.hpp>
-#include <dune/amdis/operations/Arithmetic.hpp>
-#include <dune/amdis/operations/FieldMatVec.hpp>
+#include <amdis/Operations.hpp>
+#include <amdis/gridfunctions/FunctorGridFunction.hpp>
+#include <amdis/operations/Arithmetic.hpp>
+#include <amdis/operations/FieldMatVec.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/io/CMakeLists.txt b/src/amdis/io/CMakeLists.txt
similarity index 52%
rename from dune/amdis/io/CMakeLists.txt
rename to src/amdis/io/CMakeLists.txt
index 2f050333..be748941 100644
--- a/dune/amdis/io/CMakeLists.txt
+++ b/src/amdis/io/CMakeLists.txt
@@ -2,4 +2,4 @@
 
 install(FILES
     FileWriterInterface.hpp
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/io)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/io)
diff --git a/dune/amdis/io/FileWriterInterface.hpp b/src/amdis/io/FileWriterInterface.hpp
similarity index 89%
rename from dune/amdis/io/FileWriterInterface.hpp
rename to src/amdis/io/FileWriterInterface.hpp
index 3601272c..4884e43a 100644
--- a/dune/amdis/io/FileWriterInterface.hpp
+++ b/src/amdis/io/FileWriterInterface.hpp
@@ -2,9 +2,9 @@
 
 #include <string>
 
-#include <dune/amdis/Initfile.hpp>
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/utility/Filesystem.hpp>
+#include <amdis/Initfile.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/utility/Filesystem.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/CMakeLists.txt b/src/amdis/linear_algebra/CMakeLists.txt
similarity index 76%
rename from dune/amdis/linear_algebra/CMakeLists.txt
rename to src/amdis/linear_algebra/CMakeLists.txt
index 7d878c8b..1c2985d3 100644
--- a/dune/amdis/linear_algebra/CMakeLists.txt
+++ b/src/amdis/linear_algebra/CMakeLists.txt
@@ -7,6 +7,6 @@ install(FILES
     PreconditionerInterface.hpp
     RunnerInterface.hpp
     SolverInfo.hpp
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/linear_algebra)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/linear_algebra)
 
 add_subdirectory("mtl")
diff --git a/dune/amdis/linear_algebra/DOFVectorBase.hpp b/src/amdis/linear_algebra/DOFVectorBase.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/DOFVectorBase.hpp
rename to src/amdis/linear_algebra/DOFVectorBase.hpp
diff --git a/dune/amdis/linear_algebra/HierarchicWrapper.hpp b/src/amdis/linear_algebra/HierarchicWrapper.hpp
similarity index 97%
rename from dune/amdis/linear_algebra/HierarchicWrapper.hpp
rename to src/amdis/linear_algebra/HierarchicWrapper.hpp
index f46a9db4..858231db 100644
--- a/dune/amdis/linear_algebra/HierarchicWrapper.hpp
+++ b/src/amdis/linear_algebra/HierarchicWrapper.hpp
@@ -2,7 +2,7 @@
 
 #include <dune/functions/functionspacebases/sizeinfo.hh>
 
-#include <dune/amdis/utility/MultiIndex.hpp>
+#include <amdis/utility/MultiIndex.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/LinearAlgebraBase.hpp b/src/amdis/linear_algebra/LinearAlgebraBase.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/LinearAlgebraBase.hpp
rename to src/amdis/linear_algebra/LinearAlgebraBase.hpp
diff --git a/dune/amdis/linear_algebra/LinearSolverInterface.hpp b/src/amdis/linear_algebra/LinearSolverInterface.hpp
similarity index 85%
rename from dune/amdis/linear_algebra/LinearSolverInterface.hpp
rename to src/amdis/linear_algebra/LinearSolverInterface.hpp
index 04b92f14..f308e1d2 100644
--- a/dune/amdis/linear_algebra/LinearSolverInterface.hpp
+++ b/src/amdis/linear_algebra/LinearSolverInterface.hpp
@@ -11,12 +11,12 @@
  * systems.
  */
 
-#include <dune/amdis/common/Utility.hpp>
-#include <dune/amdis/linear_algebra/LinearAlgebraBase.hpp>
+#include <amdis/common/Utility.hpp>
+#include <amdis/linear_algebra/LinearAlgebraBase.hpp>
 
-#include <dune/amdis/linear_algebra/PreconditionerInterface.hpp>
-#include <dune/amdis/linear_algebra/RunnerInterface.hpp>
-#include <dune/amdis/linear_algebra/SolverInfo.hpp>
+#include <amdis/linear_algebra/PreconditionerInterface.hpp>
+#include <amdis/linear_algebra/RunnerInterface.hpp>
+#include <amdis/linear_algebra/SolverInfo.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/Mtl.hpp b/src/amdis/linear_algebra/Mtl.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/Mtl.hpp
rename to src/amdis/linear_algebra/Mtl.hpp
diff --git a/dune/amdis/linear_algebra/PreconditionerInterface.hpp b/src/amdis/linear_algebra/PreconditionerInterface.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/PreconditionerInterface.hpp
rename to src/amdis/linear_algebra/PreconditionerInterface.hpp
diff --git a/dune/amdis/linear_algebra/RunnerInterface.hpp b/src/amdis/linear_algebra/RunnerInterface.hpp
similarity index 92%
rename from dune/amdis/linear_algebra/RunnerInterface.hpp
rename to src/amdis/linear_algebra/RunnerInterface.hpp
index c85a3577..0c81227c 100644
--- a/dune/amdis/linear_algebra/RunnerInterface.hpp
+++ b/src/amdis/linear_algebra/RunnerInterface.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <dune/amdis/common/Utility.hpp>
-#include <dune/amdis/linear_algebra/SolverInfo.hpp>
+#include <amdis/common/Utility.hpp>
+#include <amdis/linear_algebra/SolverInfo.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/SolverInfo.hpp b/src/amdis/linear_algebra/SolverInfo.hpp
similarity index 99%
rename from dune/amdis/linear_algebra/SolverInfo.hpp
rename to src/amdis/linear_algebra/SolverInfo.hpp
index f85b30e5..36be43d0 100644
--- a/dune/amdis/linear_algebra/SolverInfo.hpp
+++ b/src/amdis/linear_algebra/SolverInfo.hpp
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include <dune/amdis/Initfile.hpp>
+#include <amdis/Initfile.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/istl/CMakeLists.txt b/src/amdis/linear_algebra/istl/CMakeLists.txt
similarity index 81%
rename from dune/amdis/linear_algebra/istl/CMakeLists.txt
rename to src/amdis/linear_algebra/istl/CMakeLists.txt
index 3213d6b3..cd5ee97f 100644
--- a/dune/amdis/linear_algebra/istl/CMakeLists.txt
+++ b/src/amdis/linear_algebra/istl/CMakeLists.txt
@@ -14,4 +14,4 @@ install(FILES
     SystemMatrix.hpp
     SystemVector.hpp
     UmfpackRunner.hpp
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/linear_algebra/istl)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/linear_algebra/istl)
diff --git a/dune/amdis/linear_algebra/istl/DOFMatrix.hpp b/src/amdis/linear_algebra/istl/DOFMatrix.hpp
similarity index 98%
rename from dune/amdis/linear_algebra/istl/DOFMatrix.hpp
rename to src/amdis/linear_algebra/istl/DOFMatrix.hpp
index 482a8e4f..808af385 100644
--- a/dune/amdis/linear_algebra/istl/DOFMatrix.hpp
+++ b/src/amdis/linear_algebra/istl/DOFMatrix.hpp
@@ -6,8 +6,8 @@
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/matrixindexset.hh>
 
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/ClonablePtr.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/ClonablePtr.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/istl/DOFVector.hpp b/src/amdis/linear_algebra/istl/DOFVector.hpp
similarity index 97%
rename from dune/amdis/linear_algebra/istl/DOFVector.hpp
rename to src/amdis/linear_algebra/istl/DOFVector.hpp
index 5c0f1e2a..77fa9d66 100644
--- a/dune/amdis/linear_algebra/istl/DOFVector.hpp
+++ b/src/amdis/linear_algebra/istl/DOFVector.hpp
@@ -7,8 +7,8 @@
 
 #include <dune/functions/functionspacebases/interpolate.hh>
 
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/ClonablePtr.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/ClonablePtr.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/istl/ISTLRunner.hpp b/src/amdis/linear_algebra/istl/ISTLRunner.hpp
similarity index 95%
rename from dune/amdis/linear_algebra/istl/ISTLRunner.hpp
rename to src/amdis/linear_algebra/istl/ISTLRunner.hpp
index 28f8e940..46d7790f 100644
--- a/dune/amdis/linear_algebra/istl/ISTLRunner.hpp
+++ b/src/amdis/linear_algebra/istl/ISTLRunner.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <dune/amdis/linear_algebra/istl/ISTL_Solver.hpp>
-#include <dune/amdis/linear_algebra/istl/Preconditioner.hpp>
+#include <amdis/linear_algebra/istl/ISTL_Solver.hpp>
+#include <amdis/linear_algebra/istl/Preconditioner.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/istl/ISTL_Preconditioner.hpp b/src/amdis/linear_algebra/istl/ISTL_Preconditioner.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/istl/ISTL_Preconditioner.hpp
rename to src/amdis/linear_algebra/istl/ISTL_Preconditioner.hpp
diff --git a/dune/amdis/linear_algebra/istl/ISTL_Solver.hpp b/src/amdis/linear_algebra/istl/ISTL_Solver.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/istl/ISTL_Solver.hpp
rename to src/amdis/linear_algebra/istl/ISTL_Solver.hpp
diff --git a/dune/amdis/linear_algebra/istl/LinearSolver.hpp b/src/amdis/linear_algebra/istl/LinearSolver.hpp
similarity index 94%
rename from dune/amdis/linear_algebra/istl/LinearSolver.hpp
rename to src/amdis/linear_algebra/istl/LinearSolver.hpp
index 9f266d48..7799eaa2 100644
--- a/dune/amdis/linear_algebra/istl/LinearSolver.hpp
+++ b/src/amdis/linear_algebra/istl/LinearSolver.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <dune/amdis/linear_algebra/LinearSolverInterface.hpp>
-#include <dune/amdis/linear_algebra/istl/ISTLRunner.hpp>
+#include <amdis/linear_algebra/LinearSolverInterface.hpp>
+#include <amdis/linear_algebra/istl/ISTLRunner.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/istl/Preconditioner.hpp b/src/amdis/linear_algebra/istl/Preconditioner.hpp
similarity index 96%
rename from dune/amdis/linear_algebra/istl/Preconditioner.hpp
rename to src/amdis/linear_algebra/istl/Preconditioner.hpp
index b1067fda..6c331d53 100644
--- a/dune/amdis/linear_algebra/istl/Preconditioner.hpp
+++ b/src/amdis/linear_algebra/istl/Preconditioner.hpp
@@ -5,7 +5,7 @@
 #include <dune/istl/preconditioner.hh>
 #include <dune/istl/solvercategory.hh>
 
-#include <dune/amdis/linear_algebra/istl/ISTL_Preconditioner.hpp>
+#include <amdis/linear_algebra/istl/ISTL_Preconditioner.hpp>
 
 namespace AMDiS {
 
diff --git a/dune/amdis/linear_algebra/istl/SystemMatrix.cpp b/src/amdis/linear_algebra/istl/SystemMatrix.cpp
similarity index 83%
rename from dune/amdis/linear_algebra/istl/SystemMatrix.cpp
rename to src/amdis/linear_algebra/istl/SystemMatrix.cpp
index 3528f1cd..26d4d975 100644
--- a/dune/amdis/linear_algebra/istl/SystemMatrix.cpp
+++ b/src/amdis/linear_algebra/istl/SystemMatrix.cpp
@@ -1,5 +1,5 @@
 #define AMDIS_NO_EXTERN_SYSTEMMATRIX
-#include <dune/amdis/linear_algebra/istl/SystemMatrix.hpp>
+#include <amdis/linear_algebra/istl/SystemMatrix.hpp>
 #undef AMDIS_NO_EXTERN_SYSTEMMATRIX
 
 
diff --git a/dune/amdis/linear_algebra/istl/SystemMatrix.hpp b/src/amdis/linear_algebra/istl/SystemMatrix.hpp
similarity index 97%
rename from dune/amdis/linear_algebra/istl/SystemMatrix.hpp
rename to src/amdis/linear_algebra/istl/SystemMatrix.hpp
index 7f68dff2..fa3e50b2 100644
--- a/dune/amdis/linear_algebra/istl/SystemMatrix.hpp
+++ b/src/amdis/linear_algebra/istl/SystemMatrix.hpp
@@ -8,13 +8,13 @@
 #include <dune/istl/multitypeblockmatrix.hh>
 #include <dune/istl/multitypeblockvector.hh>
 
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/TupleUtility.hpp>
-#include <dune/amdis/common/Utility.hpp>
-#include <dune/amdis/linear_algebra/istl/DOFMatrix.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/TupleUtility.hpp>
+#include <amdis/common/Utility.hpp>
+#include <amdis/linear_algebra/istl/DOFMatrix.hpp>
 
 // for explicit instantiation
-#include <dune/amdis/ProblemStatTraits.hpp>
+#include <amdis/ProblemStatTraits.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/istl/SystemVector.cpp b/src/amdis/linear_algebra/istl/SystemVector.cpp
similarity index 83%
rename from dune/amdis/linear_algebra/istl/SystemVector.cpp
rename to src/amdis/linear_algebra/istl/SystemVector.cpp
index 6c7235fd..fc04f99b 100644
--- a/dune/amdis/linear_algebra/istl/SystemVector.cpp
+++ b/src/amdis/linear_algebra/istl/SystemVector.cpp
@@ -1,5 +1,5 @@
 #define AMDIS_NO_EXTERN_SYSTEMVECTOR
-#include <dune/amdis/linear_algebra/istl/SystemVector.hpp>
+#include <amdis/linear_algebra/istl/SystemVector.hpp>
 #undef AMDIS_NO_EXTERN_SYSTEMVECTOR
 
 
diff --git a/dune/amdis/linear_algebra/istl/SystemVector.hpp b/src/amdis/linear_algebra/istl/SystemVector.hpp
similarity index 97%
rename from dune/amdis/linear_algebra/istl/SystemVector.hpp
rename to src/amdis/linear_algebra/istl/SystemVector.hpp
index c30997a8..7dfcbb2b 100644
--- a/dune/amdis/linear_algebra/istl/SystemVector.hpp
+++ b/src/amdis/linear_algebra/istl/SystemVector.hpp
@@ -7,15 +7,15 @@
 
 #include <dune/istl/multitypeblockvector.hh>
 
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/Loops.hpp>
-#include <dune/amdis/common/TupleUtility.hpp>
-#include <dune/amdis/common/Utility.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/Loops.hpp>
+#include <amdis/common/TupleUtility.hpp>
+#include <amdis/common/Utility.hpp>
 
-#include <dune/amdis/linear_algebra/istl/DOFVector.hpp>
+#include <amdis/linear_algebra/istl/DOFVector.hpp>
 
 // for explicit instantiation
-#include <dune/amdis/ProblemStatTraits.hpp>
+#include <amdis/ProblemStatTraits.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/BITL_Preconditioner.hpp b/src/amdis/linear_algebra/mtl/BITL_Preconditioner.hpp
similarity index 90%
rename from dune/amdis/linear_algebra/mtl/BITL_Preconditioner.hpp
rename to src/amdis/linear_algebra/mtl/BITL_Preconditioner.hpp
index f042e53c..8a573968 100644
--- a/dune/amdis/linear_algebra/mtl/BITL_Preconditioner.hpp
+++ b/src/amdis/linear_algebra/mtl/BITL_Preconditioner.hpp
@@ -2,8 +2,8 @@
 
 #include "itl/block_diagonal.hpp"
 
-#include <dune/amdis/CreatorMap.hpp>
-#include <dune/amdis/linear_algebra/mtl/ITL_Preconditioner.hpp>
+#include <amdis/CreatorMap.hpp>
+#include <amdis/linear_algebra/mtl/ITL_Preconditioner.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/BITL_Solver.hpp b/src/amdis/linear_algebra/mtl/BITL_Solver.hpp
similarity index 96%
rename from dune/amdis/linear_algebra/mtl/BITL_Solver.hpp
rename to src/amdis/linear_algebra/mtl/BITL_Solver.hpp
index d441f036..c011bdc7 100644
--- a/dune/amdis/linear_algebra/mtl/BITL_Solver.hpp
+++ b/src/amdis/linear_algebra/mtl/BITL_Solver.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <dune/amdis/CreatorMap.hpp>
-#include <dune/amdis/linear_algebra/mtl/ITL_Solver.hpp>
+#include <amdis/CreatorMap.hpp>
+#include <amdis/linear_algebra/mtl/ITL_Solver.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/BlockMTLMatrix.hpp b/src/amdis/linear_algebra/mtl/BlockMTLMatrix.hpp
similarity index 97%
rename from dune/amdis/linear_algebra/mtl/BlockMTLMatrix.hpp
rename to src/amdis/linear_algebra/mtl/BlockMTLMatrix.hpp
index 1e88dd47..ef661b36 100644
--- a/dune/amdis/linear_algebra/mtl/BlockMTLMatrix.hpp
+++ b/src/amdis/linear_algebra/mtl/BlockMTLMatrix.hpp
@@ -6,10 +6,10 @@
 
 #include <boost/numeric/mtl/matrices.hpp>
 
-#include <dune/amdis/common/Utility.hpp>
-#include <dune/amdis/common/Literals.hpp>
-#include <dune/amdis/common/Loops.hpp>
-#include <dune/amdis/linear_algebra/LinearAlgebraBase.hpp>
+#include <amdis/common/Utility.hpp>
+#include <amdis/common/Literals.hpp>
+#include <amdis/common/Loops.hpp>
+#include <amdis/linear_algebra/LinearAlgebraBase.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/BlockMTLVector.hpp b/src/amdis/linear_algebra/mtl/BlockMTLVector.hpp
similarity index 97%
rename from dune/amdis/linear_algebra/mtl/BlockMTLVector.hpp
rename to src/amdis/linear_algebra/mtl/BlockMTLVector.hpp
index 82774ed3..05d93d23 100644
--- a/dune/amdis/linear_algebra/mtl/BlockMTLVector.hpp
+++ b/src/amdis/linear_algebra/mtl/BlockMTLVector.hpp
@@ -5,9 +5,9 @@
 
 #include <boost/numeric/mtl/utility/irange.hpp>
 
-#include <dune/amdis/common/Mpl.hpp>
-#include <dune/amdis/linear_algebra/LinearAlgebraBase.hpp>
-#include <dune/amdis/linear_algebra/mtl/MTLDenseVector.hpp>
+#include <amdis/common/Mpl.hpp>
+#include <amdis/linear_algebra/LinearAlgebraBase.hpp>
+#include <amdis/linear_algebra/mtl/MTLDenseVector.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/CMakeLists.txt b/src/amdis/linear_algebra/mtl/CMakeLists.txt
similarity index 87%
rename from dune/amdis/linear_algebra/mtl/CMakeLists.txt
rename to src/amdis/linear_algebra/mtl/CMakeLists.txt
index 0e3e8e95..0e6d6a67 100644
--- a/dune/amdis/linear_algebra/mtl/CMakeLists.txt
+++ b/src/amdis/linear_algebra/mtl/CMakeLists.txt
@@ -21,6 +21,6 @@ install(FILES
     SystemMatrix.hpp
     SystemVector.hpp
     UmfpackRunner.hpp
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/linear_algebra/mtl)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/linear_algebra/mtl)
 
 add_subdirectory("itl")
diff --git a/dune/amdis/linear_algebra/mtl/Copy.hpp b/src/amdis/linear_algebra/mtl/Copy.hpp
similarity index 82%
rename from dune/amdis/linear_algebra/mtl/Copy.hpp
rename to src/amdis/linear_algebra/mtl/Copy.hpp
index 1bc43e76..1724b311 100644
--- a/dune/amdis/linear_algebra/mtl/Copy.hpp
+++ b/src/amdis/linear_algebra/mtl/Copy.hpp
@@ -2,13 +2,13 @@
 
 #include <algorithm>
 
-#include <dune/amdis/linear_algebra/mtl/BlockMTLVector.hpp>
-#include <dune/amdis/linear_algebra/mtl/BlockMTLMatrix.hpp>
+#include <amdis/linear_algebra/mtl/BlockMTLVector.hpp>
+#include <amdis/linear_algebra/mtl/BlockMTLMatrix.hpp>
 
-#include <dune/amdis/linear_algebra/mtl/SystemVector.hpp>
-#include <dune/amdis/linear_algebra/mtl/SystemMatrix.hpp>
+#include <amdis/linear_algebra/mtl/SystemVector.hpp>
+#include <amdis/linear_algebra/mtl/SystemMatrix.hpp>
 
-#include <dune/amdis/linear_algebra/mtl/Mapper.hpp>
+#include <amdis/linear_algebra/mtl/Mapper.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/DOFMatrix.hpp b/src/amdis/linear_algebra/mtl/DOFMatrix.hpp
similarity index 99%
rename from dune/amdis/linear_algebra/mtl/DOFMatrix.hpp
rename to src/amdis/linear_algebra/mtl/DOFMatrix.hpp
index 8eee06da..b8b4d85d 100644
--- a/dune/amdis/linear_algebra/mtl/DOFMatrix.hpp
+++ b/src/amdis/linear_algebra/mtl/DOFMatrix.hpp
@@ -15,8 +15,8 @@
 #include <dune/common/reservedvector.hh>
 #include <dune/functions/functionspacebases/flatmultiindex.hh>
 
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/ClonablePtr.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/ClonablePtr.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/DOFVector.hpp b/src/amdis/linear_algebra/mtl/DOFVector.hpp
similarity index 95%
rename from dune/amdis/linear_algebra/mtl/DOFVector.hpp
rename to src/amdis/linear_algebra/mtl/DOFVector.hpp
index fcb63d89..b66d6ab5 100644
--- a/dune/amdis/linear_algebra/mtl/DOFVector.hpp
+++ b/src/amdis/linear_algebra/mtl/DOFVector.hpp
@@ -8,11 +8,11 @@
 #include <dune/functions/functionspacebases/flatmultiindex.hh>
 #include <dune/functions/functionspacebases/interpolate.hh>
 
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/ClonablePtr.hpp>
-#include <dune/amdis/common/ScalarTypes.hpp>
-#include <dune/amdis/linear_algebra/mtl/MTLDenseVector.hpp>
-#include <dune/amdis/utility/MultiIndex.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/ClonablePtr.hpp>
+#include <amdis/common/ScalarTypes.hpp>
+#include <amdis/linear_algebra/mtl/MTLDenseVector.hpp>
+#include <amdis/utility/MultiIndex.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/ITL_Preconditioner.hpp b/src/amdis/linear_algebra/mtl/ITL_Preconditioner.hpp
similarity index 96%
rename from dune/amdis/linear_algebra/mtl/ITL_Preconditioner.hpp
rename to src/amdis/linear_algebra/mtl/ITL_Preconditioner.hpp
index 847a55f7..2e8ac6ef 100644
--- a/dune/amdis/linear_algebra/mtl/ITL_Preconditioner.hpp
+++ b/src/amdis/linear_algebra/mtl/ITL_Preconditioner.hpp
@@ -8,10 +8,10 @@
 #include <boost/numeric/itl/pc/ic_0.hpp>
 #include <boost/numeric/mtl/vector/assigner.hpp>
 
-#include <dune/amdis/linear_algebra/mtl/itl/masslumping.hpp>
+#include <amdis/linear_algebra/mtl/itl/masslumping.hpp>
 
-#include <dune/amdis/CreatorMap.hpp>
-#include <dune/amdis/linear_algebra/mtl/Preconditioner.hpp>
+#include <amdis/CreatorMap.hpp>
+#include <amdis/linear_algebra/mtl/Preconditioner.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/ITL_Solver.hpp b/src/amdis/linear_algebra/mtl/ITL_Solver.hpp
similarity index 95%
rename from dune/amdis/linear_algebra/mtl/ITL_Solver.hpp
rename to src/amdis/linear_algebra/mtl/ITL_Solver.hpp
index 038a9797..c60b372c 100644
--- a/dune/amdis/linear_algebra/mtl/ITL_Solver.hpp
+++ b/src/amdis/linear_algebra/mtl/ITL_Solver.hpp
@@ -18,19 +18,19 @@
 // #include <boost/numeric/itl/krylov/tfqmr.hpp>
 
 // more solvers defined in AMDiS
-#include <dune/amdis/linear_algebra/mtl/itl/minres.hpp>
-#include <dune/amdis/linear_algebra/mtl/itl/gcr.hpp>
-#include <dune/amdis/linear_algebra/mtl/itl/fgmres.hpp>
-#include <dune/amdis/linear_algebra/mtl/itl/fgmres_householder.hpp>
-#include <dune/amdis/linear_algebra/mtl/itl/gmres2.hpp>
-#include <dune/amdis/linear_algebra/mtl/itl/gmres_householder.hpp>
-#include <dune/amdis/linear_algebra/mtl/itl/preonly.hpp>
-
-#include <dune/amdis/CreatorMap.hpp>
-#include <dune/amdis/Initfile.hpp>
-#include <dune/amdis/linear_algebra/mtl/LinearSolver.hpp>
-#include <dune/amdis/linear_algebra/mtl/KrylovRunner.hpp>
-#include <dune/amdis/linear_algebra/mtl/UmfpackRunner.hpp>
+#include <amdis/linear_algebra/mtl/itl/minres.hpp>
+#include <amdis/linear_algebra/mtl/itl/gcr.hpp>
+#include <amdis/linear_algebra/mtl/itl/fgmres.hpp>
+#include <amdis/linear_algebra/mtl/itl/fgmres_householder.hpp>
+#include <amdis/linear_algebra/mtl/itl/gmres2.hpp>
+#include <amdis/linear_algebra/mtl/itl/gmres_householder.hpp>
+#include <amdis/linear_algebra/mtl/itl/preonly.hpp>
+
+#include <amdis/CreatorMap.hpp>
+#include <amdis/Initfile.hpp>
+#include <amdis/linear_algebra/mtl/LinearSolver.hpp>
+#include <amdis/linear_algebra/mtl/KrylovRunner.hpp>
+#include <amdis/linear_algebra/mtl/UmfpackRunner.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/KrylovRunner.hpp b/src/amdis/linear_algebra/mtl/KrylovRunner.hpp
similarity index 92%
rename from dune/amdis/linear_algebra/mtl/KrylovRunner.hpp
rename to src/amdis/linear_algebra/mtl/KrylovRunner.hpp
index 41e0f6f9..45b9ea2a 100644
--- a/dune/amdis/linear_algebra/mtl/KrylovRunner.hpp
+++ b/src/amdis/linear_algebra/mtl/KrylovRunner.hpp
@@ -9,12 +9,12 @@
 #include <boost/numeric/mtl/mtl.hpp>
 
 // AMDiS headers
-#include <dune/amdis/linear_algebra/PreconditionerInterface.hpp>
-#include <dune/amdis/linear_algebra/RunnerInterface.hpp>
-#include <dune/amdis/linear_algebra/SolverInfo.hpp>
+#include <amdis/linear_algebra/PreconditionerInterface.hpp>
+#include <amdis/linear_algebra/RunnerInterface.hpp>
+#include <amdis/linear_algebra/SolverInfo.hpp>
 
-#include <dune/amdis/linear_algebra/mtl/ITL_Preconditioner.hpp>
-#include <dune/amdis/linear_algebra/mtl/BITL_Preconditioner.hpp>
+#include <amdis/linear_algebra/mtl/ITL_Preconditioner.hpp>
+#include <amdis/linear_algebra/mtl/BITL_Preconditioner.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/LinearSolver.hpp b/src/amdis/linear_algebra/mtl/LinearSolver.hpp
similarity index 91%
rename from dune/amdis/linear_algebra/mtl/LinearSolver.hpp
rename to src/amdis/linear_algebra/mtl/LinearSolver.hpp
index 2a63a93d..b8a1f70e 100644
--- a/dune/amdis/linear_algebra/mtl/LinearSolver.hpp
+++ b/src/amdis/linear_algebra/mtl/LinearSolver.hpp
@@ -5,10 +5,10 @@
 #include <dune/common/timer.hh>
 
 // AMDiS includes
-#include <dune/amdis/CreatorInterface.hpp>
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/linear_algebra/LinearSolverInterface.hpp>
-#include <dune/amdis/linear_algebra/mtl/BlockMTLVector.hpp>
+#include <amdis/CreatorInterface.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/linear_algebra/LinearSolverInterface.hpp>
+#include <amdis/linear_algebra/mtl/BlockMTLVector.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/MTLDenseVector.hpp b/src/amdis/linear_algebra/mtl/MTLDenseVector.hpp
similarity index 94%
rename from dune/amdis/linear_algebra/mtl/MTLDenseVector.hpp
rename to src/amdis/linear_algebra/mtl/MTLDenseVector.hpp
index 1dd083e0..87dd50a9 100644
--- a/dune/amdis/linear_algebra/mtl/MTLDenseVector.hpp
+++ b/src/amdis/linear_algebra/mtl/MTLDenseVector.hpp
@@ -3,7 +3,7 @@
 
 #include <boost/numeric/mtl/vector/dense_vector.hpp>
 
-#include <dune/amdis/linear_algebra/LinearAlgebraBase.hpp>
+#include <amdis/linear_algebra/LinearAlgebraBase.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/Mapper.hpp b/src/amdis/linear_algebra/mtl/Mapper.hpp
similarity index 98%
rename from dune/amdis/linear_algebra/mtl/Mapper.hpp
rename to src/amdis/linear_algebra/mtl/Mapper.hpp
index 20b000c7..6249f094 100644
--- a/dune/amdis/linear_algebra/mtl/Mapper.hpp
+++ b/src/amdis/linear_algebra/mtl/Mapper.hpp
@@ -4,8 +4,8 @@
 
 #include <boost/numeric/mtl/matrix/mapped_inserter.hpp>
 
-#include <dune/amdis/linear_algebra/mtl/BlockMTLMatrix.hpp>
-#include <dune/amdis/linear_algebra/mtl/SystemMatrix.hpp>
+#include <amdis/linear_algebra/mtl/BlockMTLMatrix.hpp>
+#include <amdis/linear_algebra/mtl/SystemMatrix.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/Preconditioner.hpp b/src/amdis/linear_algebra/mtl/Preconditioner.hpp
similarity index 95%
rename from dune/amdis/linear_algebra/mtl/Preconditioner.hpp
rename to src/amdis/linear_algebra/mtl/Preconditioner.hpp
index d7e9876a..822d1221 100644
--- a/dune/amdis/linear_algebra/mtl/Preconditioner.hpp
+++ b/src/amdis/linear_algebra/mtl/Preconditioner.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <dune/amdis/linear_algebra/PreconditionerInterface.hpp>
+#include <amdis/linear_algebra/PreconditionerInterface.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/SystemMatrix.cpp b/src/amdis/linear_algebra/mtl/SystemMatrix.cpp
similarity index 79%
rename from dune/amdis/linear_algebra/mtl/SystemMatrix.cpp
rename to src/amdis/linear_algebra/mtl/SystemMatrix.cpp
index 6b9e47bb..6182e507 100644
--- a/dune/amdis/linear_algebra/mtl/SystemMatrix.cpp
+++ b/src/amdis/linear_algebra/mtl/SystemMatrix.cpp
@@ -1,5 +1,5 @@
 #define AMDIS_NO_EXTERN_SYSTEMMATRIX
-#include <dune/amdis/linear_algebra/mtl/SystemMatrix.hpp>
+#include <amdis/linear_algebra/mtl/SystemMatrix.hpp>
 #undef AMDIS_NO_EXTERN_SYSTEMMATRIX
 
 
diff --git a/dune/amdis/linear_algebra/mtl/SystemMatrix.hpp b/src/amdis/linear_algebra/mtl/SystemMatrix.hpp
similarity index 96%
rename from dune/amdis/linear_algebra/mtl/SystemMatrix.hpp
rename to src/amdis/linear_algebra/mtl/SystemMatrix.hpp
index fa6e137f..a674fd16 100644
--- a/dune/amdis/linear_algebra/mtl/SystemMatrix.hpp
+++ b/src/amdis/linear_algebra/mtl/SystemMatrix.hpp
@@ -8,14 +8,14 @@
 #include <boost/numeric/mtl/matrix/dense2D.hpp>
 #include <boost/numeric/mtl/matrix/compressed2D.hpp>
 
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/TupleUtility.hpp>
-#include <dune/amdis/common/Utility.hpp>
-#include <dune/amdis/linear_algebra/mtl/BlockMTLMatrix.hpp>
-#include <dune/amdis/linear_algebra/mtl/DOFMatrix.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/TupleUtility.hpp>
+#include <amdis/common/Utility.hpp>
+#include <amdis/linear_algebra/mtl/BlockMTLMatrix.hpp>
+#include <amdis/linear_algebra/mtl/DOFMatrix.hpp>
 
 // for explicit instantiation
-#include <dune/amdis/ProblemStatTraits.hpp>
+#include <amdis/ProblemStatTraits.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/SystemVector.cpp b/src/amdis/linear_algebra/mtl/SystemVector.cpp
similarity index 79%
rename from dune/amdis/linear_algebra/mtl/SystemVector.cpp
rename to src/amdis/linear_algebra/mtl/SystemVector.cpp
index 81c809a7..6fe23e98 100644
--- a/dune/amdis/linear_algebra/mtl/SystemVector.cpp
+++ b/src/amdis/linear_algebra/mtl/SystemVector.cpp
@@ -1,5 +1,5 @@
 #define AMDIS_NO_EXTERN_SYSTEMVECTOR
-#include <dune/amdis/linear_algebra/mtl/SystemVector.hpp>
+#include <amdis/linear_algebra/mtl/SystemVector.hpp>
 #undef AMDIS_NO_EXTERN_SYSTEMVECTOR
 
 
diff --git a/dune/amdis/linear_algebra/mtl/SystemVector.hpp b/src/amdis/linear_algebra/mtl/SystemVector.hpp
similarity index 95%
rename from dune/amdis/linear_algebra/mtl/SystemVector.hpp
rename to src/amdis/linear_algebra/mtl/SystemVector.hpp
index eb45dcf1..93123b79 100644
--- a/dune/amdis/linear_algebra/mtl/SystemVector.hpp
+++ b/src/amdis/linear_algebra/mtl/SystemVector.hpp
@@ -6,17 +6,17 @@
 #include <tuple>
 #include <vector>
 
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/common/Loops.hpp>
-#include <dune/amdis/common/ScalarTypes.hpp>
-#include <dune/amdis/common/TupleUtility.hpp>
-#include <dune/amdis/common/Utility.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/common/Loops.hpp>
+#include <amdis/common/ScalarTypes.hpp>
+#include <amdis/common/TupleUtility.hpp>
+#include <amdis/common/Utility.hpp>
 
-#include <dune/amdis/linear_algebra/mtl/BlockMTLVector.hpp>
-#include <dune/amdis/linear_algebra/mtl/DOFVector.hpp>
+#include <amdis/linear_algebra/mtl/BlockMTLVector.hpp>
+#include <amdis/linear_algebra/mtl/DOFVector.hpp>
 
 // for explicit instantiation
-#include <dune/amdis/ProblemStatTraits.hpp>
+#include <amdis/ProblemStatTraits.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/UmfpackRunner.hpp b/src/amdis/linear_algebra/mtl/UmfpackRunner.hpp
similarity index 96%
rename from dune/amdis/linear_algebra/mtl/UmfpackRunner.hpp
rename to src/amdis/linear_algebra/mtl/UmfpackRunner.hpp
index 1a0f5127..fbca866f 100644
--- a/dune/amdis/linear_algebra/mtl/UmfpackRunner.hpp
+++ b/src/amdis/linear_algebra/mtl/UmfpackRunner.hpp
@@ -13,10 +13,10 @@
 #include <boost/numeric/mtl/operation/two_norm.hpp>
 #include <boost/numeric/mtl/interface/umfpack_solve.hpp>
 
-#include <dune/amdis/linear_algebra/RunnerInterface.hpp>
-#include <dune/amdis/linear_algebra/SolverInfo.hpp>
+#include <amdis/linear_algebra/RunnerInterface.hpp>
+#include <amdis/linear_algebra/SolverInfo.hpp>
 
-#include <dune/amdis/linear_algebra/mtl/Copy.hpp>
+#include <amdis/linear_algebra/mtl/Copy.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/linear_algebra/mtl/itl/CMakeLists.txt b/src/amdis/linear_algebra/mtl/itl/CMakeLists.txt
similarity index 73%
rename from dune/amdis/linear_algebra/mtl/itl/CMakeLists.txt
rename to src/amdis/linear_algebra/mtl/itl/CMakeLists.txt
index d9f50282..58ff9722 100644
--- a/dune/amdis/linear_algebra/mtl/itl/CMakeLists.txt
+++ b/src/amdis/linear_algebra/mtl/itl/CMakeLists.txt
@@ -11,4 +11,4 @@ install(FILES
   minres.hpp
   preonly.hpp
   umfpack2_solve.hpp
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/linear_algebra/mtl/itl)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/linear_algebra/mtl/itl)
diff --git a/dune/amdis/linear_algebra/mtl/itl/block_diagonal.hpp b/src/amdis/linear_algebra/mtl/itl/block_diagonal.hpp
similarity index 97%
rename from dune/amdis/linear_algebra/mtl/itl/block_diagonal.hpp
rename to src/amdis/linear_algebra/mtl/itl/block_diagonal.hpp
index 59193d34..3e9f147c 100644
--- a/dune/amdis/linear_algebra/mtl/itl/block_diagonal.hpp
+++ b/src/amdis/linear_algebra/mtl/itl/block_diagonal.hpp
@@ -2,7 +2,7 @@
 
 #include <boost/numeric/itl/pc/diagonal.hpp>
 
-#include <dune/amdis/linear_algebra/mtl/BlockMTLMatrix.hpp>
+#include <amdis/linear_algebra/mtl/BlockMTLMatrix.hpp>
 
 namespace itl
 {
diff --git a/dune/amdis/linear_algebra/mtl/itl/details.hpp b/src/amdis/linear_algebra/mtl/itl/details.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/mtl/itl/details.hpp
rename to src/amdis/linear_algebra/mtl/itl/details.hpp
diff --git a/dune/amdis/linear_algebra/mtl/itl/fgmres.hpp b/src/amdis/linear_algebra/mtl/itl/fgmres.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/mtl/itl/fgmres.hpp
rename to src/amdis/linear_algebra/mtl/itl/fgmres.hpp
diff --git a/dune/amdis/linear_algebra/mtl/itl/fgmres_householder.hpp b/src/amdis/linear_algebra/mtl/itl/fgmres_householder.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/mtl/itl/fgmres_householder.hpp
rename to src/amdis/linear_algebra/mtl/itl/fgmres_householder.hpp
diff --git a/dune/amdis/linear_algebra/mtl/itl/gcr.hpp b/src/amdis/linear_algebra/mtl/itl/gcr.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/mtl/itl/gcr.hpp
rename to src/amdis/linear_algebra/mtl/itl/gcr.hpp
diff --git a/dune/amdis/linear_algebra/mtl/itl/gmres2.hpp b/src/amdis/linear_algebra/mtl/itl/gmres2.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/mtl/itl/gmres2.hpp
rename to src/amdis/linear_algebra/mtl/itl/gmres2.hpp
diff --git a/dune/amdis/linear_algebra/mtl/itl/gmres_householder.hpp b/src/amdis/linear_algebra/mtl/itl/gmres_householder.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/mtl/itl/gmres_householder.hpp
rename to src/amdis/linear_algebra/mtl/itl/gmres_householder.hpp
diff --git a/dune/amdis/linear_algebra/mtl/itl/hypre.hpp b/src/amdis/linear_algebra/mtl/itl/hypre.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/mtl/itl/hypre.hpp
rename to src/amdis/linear_algebra/mtl/itl/hypre.hpp
diff --git a/dune/amdis/linear_algebra/mtl/itl/masslumping.hpp b/src/amdis/linear_algebra/mtl/itl/masslumping.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/mtl/itl/masslumping.hpp
rename to src/amdis/linear_algebra/mtl/itl/masslumping.hpp
diff --git a/dune/amdis/linear_algebra/mtl/itl/minres.hpp b/src/amdis/linear_algebra/mtl/itl/minres.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/mtl/itl/minres.hpp
rename to src/amdis/linear_algebra/mtl/itl/minres.hpp
diff --git a/dune/amdis/linear_algebra/mtl/itl/preonly.hpp b/src/amdis/linear_algebra/mtl/itl/preonly.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/mtl/itl/preonly.hpp
rename to src/amdis/linear_algebra/mtl/itl/preonly.hpp
diff --git a/dune/amdis/linear_algebra/mtl/itl/umfpack2_solve.hpp b/src/amdis/linear_algebra/mtl/itl/umfpack2_solve.hpp
similarity index 100%
rename from dune/amdis/linear_algebra/mtl/itl/umfpack2_solve.hpp
rename to src/amdis/linear_algebra/mtl/itl/umfpack2_solve.hpp
diff --git a/dune/amdis/operations/Arithmetic.hpp b/src/amdis/operations/Arithmetic.hpp
similarity index 97%
rename from dune/amdis/operations/Arithmetic.hpp
rename to src/amdis/operations/Arithmetic.hpp
index 95f1159d..b853e419 100644
--- a/dune/amdis/operations/Arithmetic.hpp
+++ b/src/amdis/operations/Arithmetic.hpp
@@ -2,10 +2,10 @@
 
 #include <algorithm>
 
-#include <dune/amdis/common/Math.hpp>
-#include <dune/amdis/common/Concepts.hpp>
-#include <dune/amdis/operations/Basic.hpp>
-#include <dune/amdis/operations/Composer.hpp>
+#include <amdis/common/Math.hpp>
+#include <amdis/common/Concepts.hpp>
+#include <amdis/operations/Basic.hpp>
+#include <amdis/operations/Composer.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/operations/Basic.hpp b/src/amdis/operations/Basic.hpp
similarity index 94%
rename from dune/amdis/operations/Basic.hpp
rename to src/amdis/operations/Basic.hpp
index bcc5d0f8..c5ae4ac2 100644
--- a/dune/amdis/operations/Basic.hpp
+++ b/src/amdis/operations/Basic.hpp
@@ -2,11 +2,11 @@
 
 #include <algorithm>
 
-#include <dune/amdis/common/IndexSeq.hpp>
-#include <dune/amdis/common/Math.hpp>
-#include <dune/amdis/common/Mpl.hpp>
-#include <dune/amdis/common/Concepts.hpp>
-#include <dune/amdis/common/ScalarTypes.hpp>
+#include <amdis/common/IndexSeq.hpp>
+#include <amdis/common/Math.hpp>
+#include <amdis/common/Mpl.hpp>
+#include <amdis/common/Concepts.hpp>
+#include <amdis/common/ScalarTypes.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/operations/CMakeLists.txt b/src/amdis/operations/CMakeLists.txt
similarity index 67%
rename from dune/amdis/operations/CMakeLists.txt
rename to src/amdis/operations/CMakeLists.txt
index 624d7666..9bb68ae2 100644
--- a/dune/amdis/operations/CMakeLists.txt
+++ b/src/amdis/operations/CMakeLists.txt
@@ -7,4 +7,4 @@ install(FILES
     Composer.hpp
     FieldMatVec.hpp
     MaxMin.hpp
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/operations)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/operations)
diff --git a/dune/amdis/operations/CMath.hpp b/src/amdis/operations/CMath.hpp
similarity index 99%
rename from dune/amdis/operations/CMath.hpp
rename to src/amdis/operations/CMath.hpp
index 5c2c83c0..e8c7a39d 100644
--- a/dune/amdis/operations/CMath.hpp
+++ b/src/amdis/operations/CMath.hpp
@@ -2,7 +2,7 @@
 
 #include <cmath>
 
-#include <dune/amdis/operations/Basic.hpp>
+#include <amdis/operations/Basic.hpp>
 
 /// Macro that generates a unary functor with explicitly given function and derivative.
 /**
diff --git a/dune/amdis/operations/Composer.hpp b/src/amdis/operations/Composer.hpp
similarity index 96%
rename from dune/amdis/operations/Composer.hpp
rename to src/amdis/operations/Composer.hpp
index 2a1e987e..8fe96855 100644
--- a/dune/amdis/operations/Composer.hpp
+++ b/src/amdis/operations/Composer.hpp
@@ -5,9 +5,9 @@
 
 #include <dune/common/std/apply.hh>
 
-#include <dune/amdis/common/IndexSeq.hpp>
-#include <dune/amdis/common/Mpl.hpp>
-#include <dune/amdis/operations/Basic.hpp>
+#include <amdis/common/IndexSeq.hpp>
+#include <amdis/common/Mpl.hpp>
+#include <amdis/operations/Basic.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/operations/FieldMatVec.hpp b/src/amdis/operations/FieldMatVec.hpp
similarity index 89%
rename from dune/amdis/operations/FieldMatVec.hpp
rename to src/amdis/operations/FieldMatVec.hpp
index 2355353d..5b04cb4a 100644
--- a/dune/amdis/operations/FieldMatVec.hpp
+++ b/src/amdis/operations/FieldMatVec.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <dune/amdis/common/FieldMatVec.hpp>
-#include <dune/amdis/operations/Arithmetic.hpp>
-#include <dune/amdis/operations/Basic.hpp>
-#include <dune/amdis/operations/CMath.hpp>
-#include <dune/amdis/operations/Composer.hpp>
+#include <amdis/common/FieldMatVec.hpp>
+#include <amdis/operations/Arithmetic.hpp>
+#include <amdis/operations/Basic.hpp>
+#include <amdis/operations/CMath.hpp>
+#include <amdis/operations/Composer.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/operations/MaxMin.hpp b/src/amdis/operations/MaxMin.hpp
similarity index 100%
rename from dune/amdis/operations/MaxMin.hpp
rename to src/amdis/operations/MaxMin.hpp
diff --git a/dune/amdis/test/CMakeLists.txt b/src/amdis/test/CMakeLists.txt
similarity index 100%
rename from dune/amdis/test/CMakeLists.txt
rename to src/amdis/test/CMakeLists.txt
diff --git a/dune/amdis/test/kdtree.hpp b/src/amdis/test/kdtree.hpp
similarity index 100%
rename from dune/amdis/test/kdtree.hpp
rename to src/amdis/test/kdtree.hpp
diff --git a/dune/amdis/test/macro.stand.2d b/src/amdis/test/macro.stand.2d
similarity index 100%
rename from dune/amdis/test/macro.stand.2d
rename to src/amdis/test/macro.stand.2d
diff --git a/dune/amdis/test/test.json.2d b/src/amdis/test/test.json.2d
similarity index 100%
rename from dune/amdis/test/test.json.2d
rename to src/amdis/test/test.json.2d
diff --git a/dune/amdis/test/test1.cc b/src/amdis/test/test1.cc
similarity index 97%
rename from dune/amdis/test/test1.cc
rename to src/amdis/test/test1.cc
index fd247c63..e7ecb748 100644
--- a/dune/amdis/test/test1.cc
+++ b/src/amdis/test/test1.cc
@@ -1,6 +1,6 @@
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/common/Literals.hpp>
+#include <amdis/AMDiS.hpp>
+#include <amdis/ProblemStat.hpp>
+#include <amdis/common/Literals.hpp>
 
 #define TEST_EQ(expr1, expr2) test_exit( (expr1) == (expr2), "'" , #expr1 , "' != '" , #expr2 , "'" )
 
diff --git a/dune/amdis/test/test2.cc b/src/amdis/test/test2.cc
similarity index 87%
rename from dune/amdis/test/test2.cc
rename to src/amdis/test/test2.cc
index 5cbfa00f..b24f9428 100644
--- a/dune/amdis/test/test2.cc
+++ b/src/amdis/test/test2.cc
@@ -1,6 +1,6 @@
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/common/Literals.hpp>
+#include <amdis/AMDiS.hpp>
+#include <amdis/ProblemStat.hpp>
+#include <amdis/common/Literals.hpp>
 
 #ifndef DIM
 #define DIM 2
@@ -12,7 +12,7 @@
 using namespace AMDiS;
 
 namespace {
-  
+
   using TestParam   = ProblemStatTraits<DIM, DOW, 1>;
   using TestProblem = ProblemStat<TestParam>;
   using Op = TestProblem::OperatorType;
@@ -26,80 +26,80 @@ namespace {
     {
       prob->initialize(INIT_ALL);
     }
-    
-  
+
+
     void test1() // AddOperators
     {
       auto const& u = prob->getSolution<0>();
-      
+
       // define operators
       Op op1;
-      op1.addZOT( 1.0 ); 
+      op1.addZOT( 1.0 );
       op1.addZOT( constant(1.0) );
-      
+
       // value of DOFVector at QPs
       op1.addZOT( valueOf(u) );
       op1.addZOT( valueOfFunc(u, [](auto const& U) { return U; }) );
       op1.addZOT( valueOfFunc(u, [](auto const& U) { return U; }, 1) );
-      
+
       // partial derivative of DOFVector
       op1.addZOT( derivativeOf(u, 0) );
       op1.addZOT( derivativeOf(u, 1) );
-      
+
   //     op1.addFOT( gradientOf(u), GRD_PSI );
-      
+
       // evaluate functor at coordinates
       op1.addZOT( eval([](auto const& x) { return x[0]; }) );
       op1.addZOT( [](auto const& x) { return 1.0; } );
-      
+
       // add operator to system
       prob->addMatrixOperator(op1, 0, 0);
       prob->addVectorOperator(op1, 0);
-      
+
       // define operators with factor argument
       Op op2;
       op2.addZOT( valueOf(u, 1.0) );
-      
+
       op2.addZOT( derivativeOf(u, 0, 1.0) );
       op2.addZOT( derivativeOf(u, 1, 1.0) );
-      
+
       // add operator to system, with optional factor as pointer
       double* factor = new double(1.0);
       prob->addMatrixOperator(op2, 0, 0, factor);
       prob->addVectorOperator(op2, 0, factor);
     }
-  
-  
-    void test2() // MatrixVector 
+
+
+    void test2() // MatrixVector
     {
       auto const& u = prob->getSolution<0>();
 
       using GradOp = std::decay_t< decltype(gradientOf(u)) >;
       using DerivOp = std::decay_t< decltype(derivativeOf(u,0)) >;
-      
+
       using Jacobian = typename GradOp::value_type;
       using Derivative = typename DerivOp::value_type;
-      
+
       Jacobian v, w;
-      
+
       double erg = v[0].dot(w[0]);
     }
 
   protected:
     shared_ptr<TestProblem> prob;
   };
-  
+
 } // end namespace
 
 
-int main(int argc, char* argv[]) 
-{  
+int main(int argc, char* argv[])
+{
   AMDiS::init(argc, argv);
-    
+
   auto tester = make_shared<AMDiSTester>("test");
   tester->test1();
   tester->test2();
-      
+
   AMDiS::finalize();
   return 0;
 }
\ No newline at end of file
diff --git a/src/amdis/utility/CMakeLists.txt b/src/amdis/utility/CMakeLists.txt
new file mode 100644
index 00000000..6342008d
--- /dev/null
+++ b/src/amdis/utility/CMakeLists.txt
@@ -0,0 +1,22 @@
+#install headers
+
+target_include_directories(amdis PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src>)
+target_compile_definitions(amdis PUBLIC AMDIS_BACKEND_MTL=1)
+target_compile_options(amdis PUBLIC -Wall -pedantic -Wno-unused-parameter) #-ftemplate-backtrace-limit=0
+
+dune_library_add_sources(amdis SOURCES
+    Filesystem.cpp
+)
+
+install(FILES
+    Filesystem.hpp
+    FiniteElementType.hpp
+    MultiIndex.hpp
+    RangeType.hpp
+    String.hpp
+    Traversal.hpp
+    TreeData.hpp
+    TreePath.hpp
+    Visitor.hpp
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/utility)
diff --git a/dune/amdis/utility/Filesystem.cpp b/src/amdis/utility/Filesystem.cpp
similarity index 98%
rename from dune/amdis/utility/Filesystem.cpp
rename to src/amdis/utility/Filesystem.cpp
index 2a916832..233ea457 100644
--- a/dune/amdis/utility/Filesystem.cpp
+++ b/src/amdis/utility/Filesystem.cpp
@@ -17,7 +17,7 @@
 #include <fstream>
 #include <string>
 
-#include <dune/amdis/Output.hpp>
+#include <amdis/Output.hpp>
 
 template <class... Args>
 void inline _ignore_(Args&&...) {}
diff --git a/dune/amdis/utility/Filesystem.hpp b/src/amdis/utility/Filesystem.hpp
similarity index 98%
rename from dune/amdis/utility/Filesystem.hpp
rename to src/amdis/utility/Filesystem.hpp
index 87b2f975..debb8bd5 100644
--- a/dune/amdis/utility/Filesystem.hpp
+++ b/src/amdis/utility/Filesystem.hpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <vector>
 
-#include <dune/amdis/utility/String.hpp>
+#include <amdis/utility/String.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/utility/FiniteElementType.hpp b/src/amdis/utility/FiniteElementType.hpp
similarity index 94%
rename from dune/amdis/utility/FiniteElementType.hpp
rename to src/amdis/utility/FiniteElementType.hpp
index 87c47336..286034bc 100644
--- a/dune/amdis/utility/FiniteElementType.hpp
+++ b/src/amdis/utility/FiniteElementType.hpp
@@ -2,9 +2,9 @@
 
 #include <cmath>
 
-#include <dune/amdis/common/Loops.hpp>
-#include <dune/amdis/common/Mpl.hpp>
-#include <dune/amdis/common/Tags.hpp>
+#include <amdis/common/Loops.hpp>
+#include <amdis/common/Mpl.hpp>
+#include <amdis/common/Tags.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/utility/MultiIndex.hpp b/src/amdis/utility/MultiIndex.hpp
similarity index 92%
rename from dune/amdis/utility/MultiIndex.hpp
rename to src/amdis/utility/MultiIndex.hpp
index 93453b4d..196f12d7 100644
--- a/dune/amdis/utility/MultiIndex.hpp
+++ b/src/amdis/utility/MultiIndex.hpp
@@ -4,7 +4,7 @@
 #include <dune/functions/common/indexaccess.hh>
 #include <dune/functions/functionspacebases/flatmultiindex.hh>
 
-#include <dune/amdis/common/Mpl.hpp>
+#include <amdis/common/Mpl.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/utility/RangeType.hpp b/src/amdis/utility/RangeType.hpp
similarity index 95%
rename from dune/amdis/utility/RangeType.hpp
rename to src/amdis/utility/RangeType.hpp
index 02eb8679..cee8d959 100644
--- a/dune/amdis/utility/RangeType.hpp
+++ b/src/amdis/utility/RangeType.hpp
@@ -4,8 +4,8 @@
 
 #include <dune/common/fvector.hh>
 
-#include <dune/amdis/common/IndexSeq.hpp>
-#include <dune/amdis/common/MultiTypeVector.hpp>
+#include <amdis/common/IndexSeq.hpp>
+#include <amdis/common/MultiTypeVector.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/utility/String.hpp b/src/amdis/utility/String.hpp
similarity index 100%
rename from dune/amdis/utility/String.hpp
rename to src/amdis/utility/String.hpp
diff --git a/dune/amdis/utility/Traversal.hpp b/src/amdis/utility/Traversal.hpp
similarity index 100%
rename from dune/amdis/utility/Traversal.hpp
rename to src/amdis/utility/Traversal.hpp
diff --git a/dune/amdis/utility/TreeData.hpp b/src/amdis/utility/TreeData.hpp
similarity index 99%
rename from dune/amdis/utility/TreeData.hpp
rename to src/amdis/utility/TreeData.hpp
index 6798b009..411969d3 100644
--- a/dune/amdis/utility/TreeData.hpp
+++ b/src/amdis/utility/TreeData.hpp
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include <dune/typetree/typetree.hh>
-#include <dune/amdis/utility/Visitor.hpp>
+#include <amdis/utility/Visitor.hpp>
 
 namespace AMDiS
 {
diff --git a/dune/amdis/utility/TreePath.hpp b/src/amdis/utility/TreePath.hpp
similarity index 100%
rename from dune/amdis/utility/TreePath.hpp
rename to src/amdis/utility/TreePath.hpp
diff --git a/dune/amdis/utility/Visitor.hpp b/src/amdis/utility/Visitor.hpp
similarity index 98%
rename from dune/amdis/utility/Visitor.hpp
rename to src/amdis/utility/Visitor.hpp
index a87991f9..dd2c0a8b 100644
--- a/dune/amdis/utility/Visitor.hpp
+++ b/src/amdis/utility/Visitor.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <dune/typetree/visitor.hh>
-#include <dune/amdis/common/Mpl.hpp>
-#include <dune/amdis/utility/Traversal.hpp>
+#include <amdis/common/Mpl.hpp>
+#include <amdis/utility/Traversal.hpp>
 
 namespace AMDiS
 {
diff --git a/src/expressions.cc b/src/expressions.cc
deleted file mode 100644
index 05cd063c..00000000
--- a/src/expressions.cc
+++ /dev/null
@@ -1,114 +0,0 @@
-// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// vi: set et ts=4 sw=2 sts=2:
-
-#include <iostream>
-
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/Operators.hpp>
-#include <dune/amdis/common/Literals.hpp>
-#include <dune/amdis/common/FieldMatVec.hpp>
-#include <dune/amdis/gridfunctions/Integrate.hpp>
-
-
-using namespace AMDiS;
-
-// 1 component with polynomial degree 1
-//using Grid = Dune::AlbertaGrid<AMDIS_DIM, AMDIS_DOW>;
-using ElliptParam   = YaspGridBasis<AMDIS_DIM, 2>;
-using ElliptProblem = ProblemStat<ElliptParam>;
-
-int main(int argc, char** argv)
-{
-  AMDiS::init(argc, argv);
-
-  using namespace Dune::Indices;
-
-  ElliptProblem prob("ellipt");
-  prob.initialize(INIT_ALL);
-
-  auto u = prob.getSolution(_0);
-
-  // eval a functor at global coordinates (at quadrature points)
-  auto expr1 = evalAtQP([](Dune::FieldVector<double, AMDIS_DOW> const& x) { return x[0] + x[1]; });
-  auto expr2 = [](Dune::FieldVector<double, AMDIS_DOW> const& x) { return x[0] + x[1]; };
-  auto expr3 = [](auto const& x) { return x[0] + x[1]; };
-
-  // constant values at quadrature points
-  auto expr4 = 1.0;
-  auto expr5 = Dune::FieldVector<double, AMDIS_DOW>{1.0, 2.0};
-  auto expr6 = std::ref(expr4);
-
-  // Coordinate vector and component
-  auto expr7 = X();
-  auto expr8 = X(0);
-
-  // Evaluation of the DOFVector (component) at quadrature points
-  auto expr9 = prob.getSolution(_0);
-
-  // ---------------------------------
-
-  // derivative of expressions
-
-  auto diff4 = gradientAtQP(expr4);
-  // auto diff5 = gradientAtQP(expr5);
-  auto diff6 = gradientAtQP(expr6);
-
-  // auto diff7 = gradientAtQP(expr7);
-  auto diff8 = gradientAtQP(expr8);
-
-  auto diff9 = gradientAtQP(expr9);
-
-  // ---------------------------------
-
-  u.interpolate(expr1);
-  u.interpolate(expr2);
-  u.interpolate(expr3);
-
-  u.interpolate(expr4);
-  u.interpolate(expr6);
-
-  u.interpolate(expr8);
-
-  u.interpolate(expr9);
-
-  // ---------------------------------
-
-  // operations with expressions
-
-  auto op1 = expr1 + expr2;
-  auto op2 = expr1 * expr4;
-  auto op3 = two_norm(expr5);
-  auto op4 = min(expr6, expr8);
-  auto op5 = one_norm(expr7);
-
-  auto op6 = invokeAtQP([](double v) { return 2*v; }, op5);
-
-
-  u.interpolate(two_norm(diff4));
-  u.interpolate(two_norm(diff6));
-
-  u.interpolate(two_norm(diff8));
-
-  u.interpolate(two_norm(diff9));
-
-  // ---------------------------------
-
-  // integration of expressions
-
-  auto gv = u.basis().gridView();
-
-  auto int1 = integrate(op1, gv, 5);
-  auto int2 = integrate(op2, gv, 5);
-  auto int3 = integrate(op3, gv);
-  auto int4 = integrate(op4, gv, 5);
-  auto int5 = integrate(op5, gv, 5);
-  auto int6 = integrate(op6, gv, 5);
-
-  std::cout << int1 << int2 << int3 << int4 << int5 << int6 << "\n";
-
-  AdaptInfo adaptInfo("adapt", 1);
-  prob.writeFiles(adaptInfo, true);
-  AMDiS::finalize();
-  return 0;
-}
diff --git a/src/gridview.cc b/src/gridview.cc
deleted file mode 100644
index df2bed9d..00000000
--- a/src/gridview.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// vi: set et ts=4 sw=2 sts=2:
-
-#include <iostream>
-
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/AdaptInstationary.hpp>
-#include <dune/amdis/ProblemInstat.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/Terms.hpp>
-#include <dune/amdis/common/Literals.hpp>
-
-#include <dune/grid/utility/structuredgridfactory.hh>
-
-using namespace AMDiS;
-
-using Grid = Dune::AlbertaGrid<AMDIS_DIM, AMDIS_DOW>;
-
-// 1 component with polynomial degree 1
-using Param   = LagrangeTraits<Grid, 1>;
-using ElliptProblem = ProblemStat<Param>;
-using ElliptProblemInstat = ProblemInstat<Param>;
-
-int main(int argc, char** argv)
-{
-  AMDiS::init(argc, argv);
-
-  // Create grid from structured grid
-  std::array<unsigned int, 2> n = {{4, 4}};
-  Dune::FieldVector<double, 2> lower = {{0.0, 0.0}};
-  Dune::FieldVector<double, 2> upper = {{1.0, 1.0}};
-  auto grid = Dune::StructuredGridFactory<Grid>::createSimplexGrid(lower, upper, n);
-  // NOTE: can not be used with AlbertaGrid
-
-  ElliptProblem prob("ellipt", *grid);
-  prob.initialize(INIT_ALL);
-
-  ElliptProblemInstat probInstat("ellipt", prob);
-  probInstat.initialize(INIT_UH_OLD);
-
-  AdaptInfo adaptInfo("adapt");
-
-  using Op = ElliptProblem::ElementOperator;
-  Op opL, opForce;
-
-  opL.addSOT(1.0);
-  prob.addMatrixOperator(opL, 0, 0);
-
-  opForce.addZOT( eval([](auto const& x) { return -1.0; }) );
-  prob.addVectorOperator(opForce, 0);
-
-  using BOp = ElliptProblem::IntersectionOperator;
-  BOp opB;
-  opB.addZOT(1.0);
-  prob.addVectorOperator({1}, opB, 0);
-
-  // set boundary condition
-  auto predicate = [](auto const& x){ return x[0] < 1.e-8 || x[1] < 1.e-8; }; // define boundary
-  auto dbcValues = [](auto const& x){ return 0.0; }; // set value
-  prob.addDirichletBC(predicate, 0, 0, dbcValues);
-
-  *prob.getSolution() = 0.0; // maybe not necessary
-
-  prob.buildAfterCoarsen(adaptInfo, Flag(0));
-  prob.solve(adaptInfo);
-  prob.writeFiles(adaptInfo, true);
-
-  AMDiS::finalize();
-  return 0;
-}
diff --git a/src/test.cc b/src/test.cc
deleted file mode 100644
index e1357592..00000000
--- a/src/test.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// vi: set et ts=4 sw=2 sts=2:
-
-#include <iostream>
-
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/AdaptInstationary.hpp>
-#include <dune/amdis/ProblemInstat.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/Terms.hpp>
-#include <dune/amdis/common/Literals.hpp>
-
-using namespace AMDiS;
-
-#define DIM 2
-
-int main(int argc, char** argv)
-{
-  AMDiS::init(argc, argv);
-  using namespace Dune::Functions::BasisBuilder;
-
-  const int dim = DIM;
-  typedef Dune::YaspGrid<dim> GridType;
-  Dune::FieldVector<double,dim> bbox = {1, 1};
-  std::array<int,dim> num = {1, 1};
-  GridType grid(bbox,num);
-
-  typedef GridType::LeafGridView GridView;
-  GridView gridView = grid.leafGridView();
-
-  auto basis = makeBasis(
-      gridView,
-      composite(
-        power<dim>(
-          lagrange<2>(),
-          flatLexicographic()),
-        lagrange<1>(),
-        blockedLexicographic()
-      ));
-
-  auto localView = basis.localView();
-  forEachNode(localView.tree(), [&](auto const& rowNode, auto rowTreePath)
-  {
-    msg("Basis[", to_string(rowTreePath), "]: treeIndex = ",rowNode.treeIndex());
-  });
-}
diff --git a/test/ConceptsTest.cpp b/test/ConceptsTest.cpp
index 3ce8b5e6..ee75dfe4 100644
--- a/test/ConceptsTest.cpp
+++ b/test/ConceptsTest.cpp
@@ -4,8 +4,8 @@
 #include <dune/common/reservedvector.hh>
 #include <dune/functions/functionspacebases/flatmultiindex.hh>
 
-#include <dune/amdis/common/Concepts.hpp>
-#include <dune/amdis/common/FieldMatVec.hpp>
+#include <amdis/common/Concepts.hpp>
+#include <amdis/common/FieldMatVec.hpp>
 
 using namespace AMDiS;
 
diff --git a/test/ExpressionsTest.cpp b/test/ExpressionsTest.cpp
index 80db279b..bc544975 100644
--- a/test/ExpressionsTest.cpp
+++ b/test/ExpressionsTest.cpp
@@ -3,12 +3,12 @@
 
 #include <iostream>
 
-#include <dune/amdis/AMDiS.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/Operators.hpp>
-#include <dune/amdis/common/Literals.hpp>
-#include <dune/amdis/common/FieldMatVec.hpp>
-#include <dune/amdis/gridfunctions/Integrate.hpp>
+#include <amdis/AMDiS.hpp>
+#include <amdis/ProblemStat.hpp>
+#include <amdis/Operators.hpp>
+#include <amdis/common/Literals.hpp>
+#include <amdis/common/FieldMatVec.hpp>
+#include <amdis/gridfunctions/Integrate.hpp>
 
 
 using namespace AMDiS;
diff --git a/test/FieldMatVecTest.cpp b/test/FieldMatVecTest.cpp
index bf890851..d4573ffb 100644
--- a/test/FieldMatVecTest.cpp
+++ b/test/FieldMatVecTest.cpp
@@ -1,7 +1,7 @@
 #include <cmath>
 
-#include <dune/amdis/common/FieldMatVec.hpp>
-#include <dune/amdis/common/Math.hpp>
+#include <amdis/common/FieldMatVec.hpp>
+#include <amdis/common/Math.hpp>
 
 #include "Tests.hpp"
 
diff --git a/test/FilesystemTest.cpp b/test/FilesystemTest.cpp
index 0686769f..4cb0ff25 100644
--- a/test/FilesystemTest.cpp
+++ b/test/FilesystemTest.cpp
@@ -1,4 +1,4 @@
-#include <dune/amdis/utility/Filesystem.hpp>
+#include <amdis/utility/Filesystem.hpp>
 
 #include "Tests.hpp"
 
diff --git a/test/FiniteElementTypeTest.cpp b/test/FiniteElementTypeTest.cpp
index 3bb0e0d5..4bcc8387 100644
--- a/test/FiniteElementTypeTest.cpp
+++ b/test/FiniteElementTypeTest.cpp
@@ -4,7 +4,7 @@
 #include <dune/functions/functionspacebases/powerbasis.hh>
 #include <dune/functions/functionspacebases/lagrangebasis.hh>
 
-#include <dune/amdis/utility/FiniteElementType.hpp>
+#include <amdis/utility/FiniteElementType.hpp>
 #include "Tests.hpp"
 
 int main()
diff --git a/test/MultiTypeMatrixTest.cpp b/test/MultiTypeMatrixTest.cpp
index 3ce99c72..0b81d2d5 100644
--- a/test/MultiTypeMatrixTest.cpp
+++ b/test/MultiTypeMatrixTest.cpp
@@ -1,5 +1,5 @@
-#include <dune/amdis/common/FieldMatVec.hpp>
-#include <dune/amdis/common/MultiTypeMatrix.hpp>
+#include <amdis/common/FieldMatVec.hpp>
+#include <amdis/common/MultiTypeMatrix.hpp>
 
 using namespace AMDiS;
 
diff --git a/test/MultiTypeVectorTest.cpp b/test/MultiTypeVectorTest.cpp
index dbfe6ba8..c1ae6a56 100644
--- a/test/MultiTypeVectorTest.cpp
+++ b/test/MultiTypeVectorTest.cpp
@@ -1,5 +1,5 @@
-#include <dune/amdis/common/FieldMatVec.hpp>
-#include <dune/amdis/common/MultiTypeVector.hpp>
+#include <amdis/common/FieldMatVec.hpp>
+#include <amdis/common/MultiTypeVector.hpp>
 
 using namespace AMDiS;
 
diff --git a/test/RangeTypeTest.cpp b/test/RangeTypeTest.cpp
index ce34a5e7..0ae30121 100644
--- a/test/RangeTypeTest.cpp
+++ b/test/RangeTypeTest.cpp
@@ -4,7 +4,7 @@
 #include <dune/functions/functionspacebases/powerbasis.hh>
 #include <dune/functions/functionspacebases/lagrangebasis.hh>
 
-#include <dune/amdis/utility/RangeType.hpp>
+#include <amdis/utility/RangeType.hpp>
 #include "Tests.hpp"
 
 int main()
diff --git a/test/StringTest.cpp b/test/StringTest.cpp
index dabdb755..c73cefdc 100644
--- a/test/StringTest.cpp
+++ b/test/StringTest.cpp
@@ -1,7 +1,7 @@
 #include <string>
 #include <vector>
 
-#include <dune/amdis/utility/String.hpp>
+#include <amdis/utility/String.hpp>
 #include "Tests.hpp"
 
 using namespace AMDiS;
diff --git a/test/TreeDataTest.cpp b/test/TreeDataTest.cpp
index a02ff23b..3e02c17c 100644
--- a/test/TreeDataTest.cpp
+++ b/test/TreeDataTest.cpp
@@ -9,7 +9,7 @@
 #include <dune/functions/functionspacebases/lagrangebasis.hh>
 #include <dune/functions/functionspacebases/powerbasis.hh>
 
-#include <dune/amdis/utility/TreeData.hpp>
+#include <amdis/utility/TreeData.hpp>
 
 #include "Tests.hpp"
 
-- 
GitLab