diff --git a/dune-solvers/Makefile.am b/dune/solvers/Makefile.am
similarity index 100%
rename from dune-solvers/Makefile.am
rename to dune/solvers/Makefile.am
diff --git a/dune-solvers/boxconstraint.hh b/dune/solvers/boxconstraint.hh
similarity index 100%
rename from dune-solvers/boxconstraint.hh
rename to dune/solvers/boxconstraint.hh
diff --git a/dune-solvers/common/Makefile.am b/dune/solvers/common/Makefile.am
similarity index 100%
rename from dune-solvers/common/Makefile.am
rename to dune/solvers/common/Makefile.am
diff --git a/dune-solvers/common/canignore.hh b/dune/solvers/common/canignore.hh
similarity index 100%
rename from dune-solvers/common/canignore.hh
rename to dune/solvers/common/canignore.hh
diff --git a/dune-solvers/computeenergy.hh b/dune/solvers/computeenergy.hh
similarity index 100%
rename from dune-solvers/computeenergy.hh
rename to dune/solvers/computeenergy.hh
diff --git a/dune-solvers/genericvectortools.hh b/dune/solvers/genericvectortools.hh
similarity index 100%
rename from dune-solvers/genericvectortools.hh
rename to dune/solvers/genericvectortools.hh
diff --git a/dune-solvers/iterationsteps/Makefile.am b/dune/solvers/iterationsteps/Makefile.am
similarity index 100%
rename from dune-solvers/iterationsteps/Makefile.am
rename to dune/solvers/iterationsteps/Makefile.am
diff --git a/dune-solvers/iterationsteps/amgstep.hh b/dune/solvers/iterationsteps/amgstep.hh
similarity index 100%
rename from dune-solvers/iterationsteps/amgstep.hh
rename to dune/solvers/iterationsteps/amgstep.hh
diff --git a/dune-solvers/iterationsteps/blockgsstep.cc b/dune/solvers/iterationsteps/blockgsstep.cc
similarity index 100%
rename from dune-solvers/iterationsteps/blockgsstep.cc
rename to dune/solvers/iterationsteps/blockgsstep.cc
diff --git a/dune-solvers/iterationsteps/blockgsstep.hh b/dune/solvers/iterationsteps/blockgsstep.hh
similarity index 100%
rename from dune-solvers/iterationsteps/blockgsstep.hh
rename to dune/solvers/iterationsteps/blockgsstep.hh
diff --git a/dune-solvers/iterationsteps/istlseqilu0step.hh b/dune/solvers/iterationsteps/istlseqilu0step.hh
similarity index 100%
rename from dune-solvers/iterationsteps/istlseqilu0step.hh
rename to dune/solvers/iterationsteps/istlseqilu0step.hh
diff --git a/dune-solvers/iterationsteps/iterationstep.hh b/dune/solvers/iterationsteps/iterationstep.hh
similarity index 100%
rename from dune-solvers/iterationsteps/iterationstep.hh
rename to dune/solvers/iterationsteps/iterationstep.hh
diff --git a/dune-solvers/iterationsteps/lineariterationstep.hh b/dune/solvers/iterationsteps/lineariterationstep.hh
similarity index 100%
rename from dune-solvers/iterationsteps/lineariterationstep.hh
rename to dune/solvers/iterationsteps/lineariterationstep.hh
diff --git a/dune-solvers/iterationsteps/mmgstep.cc b/dune/solvers/iterationsteps/mmgstep.cc
similarity index 100%
rename from dune-solvers/iterationsteps/mmgstep.cc
rename to dune/solvers/iterationsteps/mmgstep.cc
diff --git a/dune-solvers/iterationsteps/mmgstep.hh b/dune/solvers/iterationsteps/mmgstep.hh
similarity index 100%
rename from dune-solvers/iterationsteps/mmgstep.hh
rename to dune/solvers/iterationsteps/mmgstep.hh
diff --git a/dune-solvers/iterationsteps/multigridstep.cc b/dune/solvers/iterationsteps/multigridstep.cc
similarity index 100%
rename from dune-solvers/iterationsteps/multigridstep.cc
rename to dune/solvers/iterationsteps/multigridstep.cc
diff --git a/dune-solvers/iterationsteps/multigridstep.hh b/dune/solvers/iterationsteps/multigridstep.hh
similarity index 100%
rename from dune-solvers/iterationsteps/multigridstep.hh
rename to dune/solvers/iterationsteps/multigridstep.hh
diff --git a/dune-solvers/iterationsteps/projectedblockgsstep.cc b/dune/solvers/iterationsteps/projectedblockgsstep.cc
similarity index 100%
rename from dune-solvers/iterationsteps/projectedblockgsstep.cc
rename to dune/solvers/iterationsteps/projectedblockgsstep.cc
diff --git a/dune-solvers/iterationsteps/projectedblockgsstep.hh b/dune/solvers/iterationsteps/projectedblockgsstep.hh
similarity index 100%
rename from dune-solvers/iterationsteps/projectedblockgsstep.hh
rename to dune/solvers/iterationsteps/projectedblockgsstep.hh
diff --git a/dune-solvers/iterationsteps/truncatedblockgsstep.hh b/dune/solvers/iterationsteps/truncatedblockgsstep.hh
similarity index 100%
rename from dune-solvers/iterationsteps/truncatedblockgsstep.hh
rename to dune/solvers/iterationsteps/truncatedblockgsstep.hh
diff --git a/dune-solvers/iterationsteps/truncatedsaddlepointgsstep.hh b/dune/solvers/iterationsteps/truncatedsaddlepointgsstep.hh
similarity index 100%
rename from dune-solvers/iterationsteps/truncatedsaddlepointgsstep.hh
rename to dune/solvers/iterationsteps/truncatedsaddlepointgsstep.hh
diff --git a/dune-solvers/iterationsteps/trustregiongsstep.cc b/dune/solvers/iterationsteps/trustregiongsstep.cc
similarity index 100%
rename from dune-solvers/iterationsteps/trustregiongsstep.cc
rename to dune/solvers/iterationsteps/trustregiongsstep.cc
diff --git a/dune-solvers/iterationsteps/trustregiongsstep.hh b/dune/solvers/iterationsteps/trustregiongsstep.hh
similarity index 100%
rename from dune-solvers/iterationsteps/trustregiongsstep.hh
rename to dune/solvers/iterationsteps/trustregiongsstep.hh
diff --git a/dune-solvers/norms/Makefile.am b/dune/solvers/norms/Makefile.am
similarity index 100%
rename from dune-solvers/norms/Makefile.am
rename to dune/solvers/norms/Makefile.am
diff --git a/dune-solvers/norms/blocknorm.hh b/dune/solvers/norms/blocknorm.hh
similarity index 100%
rename from dune-solvers/norms/blocknorm.hh
rename to dune/solvers/norms/blocknorm.hh
diff --git a/dune-solvers/norms/diagnorm.hh b/dune/solvers/norms/diagnorm.hh
similarity index 100%
rename from dune-solvers/norms/diagnorm.hh
rename to dune/solvers/norms/diagnorm.hh
diff --git a/dune-solvers/norms/energynorm.hh b/dune/solvers/norms/energynorm.hh
similarity index 100%
rename from dune-solvers/norms/energynorm.hh
rename to dune/solvers/norms/energynorm.hh
diff --git a/dune-solvers/norms/fullnorm.hh b/dune/solvers/norms/fullnorm.hh
similarity index 100%
rename from dune-solvers/norms/fullnorm.hh
rename to dune/solvers/norms/fullnorm.hh
diff --git a/dune-solvers/norms/h1seminorm.hh b/dune/solvers/norms/h1seminorm.hh
similarity index 100%
rename from dune-solvers/norms/h1seminorm.hh
rename to dune/solvers/norms/h1seminorm.hh
diff --git a/dune-solvers/norms/norm.hh b/dune/solvers/norms/norm.hh
similarity index 100%
rename from dune-solvers/norms/norm.hh
rename to dune/solvers/norms/norm.hh
diff --git a/dune-solvers/norms/pnorm.hh b/dune/solvers/norms/pnorm.hh
similarity index 100%
rename from dune-solvers/norms/pnorm.hh
rename to dune/solvers/norms/pnorm.hh
diff --git a/dune-solvers/norms/sumnorm.hh b/dune/solvers/norms/sumnorm.hh
similarity index 100%
rename from dune-solvers/norms/sumnorm.hh
rename to dune/solvers/norms/sumnorm.hh
diff --git a/dune-solvers/numproc.hh b/dune/solvers/numproc.hh
similarity index 100%
rename from dune-solvers/numproc.hh
rename to dune/solvers/numproc.hh
diff --git a/dune-solvers/solvers/Makefile.am b/dune/solvers/solvers/Makefile.am
similarity index 100%
rename from dune-solvers/solvers/Makefile.am
rename to dune/solvers/solvers/Makefile.am
diff --git a/dune-solvers/solvers/cgsolver.cc b/dune/solvers/solvers/cgsolver.cc
similarity index 100%
rename from dune-solvers/solvers/cgsolver.cc
rename to dune/solvers/solvers/cgsolver.cc
diff --git a/dune-solvers/solvers/cgsolver.hh b/dune/solvers/solvers/cgsolver.hh
similarity index 100%
rename from dune-solvers/solvers/cgsolver.hh
rename to dune/solvers/solvers/cgsolver.hh
diff --git a/dune-solvers/solvers/iterativesolver.cc b/dune/solvers/solvers/iterativesolver.cc
similarity index 100%
rename from dune-solvers/solvers/iterativesolver.cc
rename to dune/solvers/solvers/iterativesolver.cc
diff --git a/dune-solvers/solvers/iterativesolver.hh b/dune/solvers/solvers/iterativesolver.hh
similarity index 100%
rename from dune-solvers/solvers/iterativesolver.hh
rename to dune/solvers/solvers/iterativesolver.hh
diff --git a/dune-solvers/solvers/loopsolver.cc b/dune/solvers/solvers/loopsolver.cc
similarity index 100%
rename from dune-solvers/solvers/loopsolver.cc
rename to dune/solvers/solvers/loopsolver.cc
diff --git a/dune-solvers/solvers/loopsolver.hh b/dune/solvers/solvers/loopsolver.hh
similarity index 100%
rename from dune-solvers/solvers/loopsolver.hh
rename to dune/solvers/solvers/loopsolver.hh
diff --git a/dune-solvers/solvers/quadraticipopt.hh b/dune/solvers/solvers/quadraticipopt.hh
similarity index 100%
rename from dune-solvers/solvers/quadraticipopt.hh
rename to dune/solvers/solvers/quadraticipopt.hh
diff --git a/dune-solvers/solvers/solver.hh b/dune/solvers/solvers/solver.hh
similarity index 100%
rename from dune-solvers/solvers/solver.hh
rename to dune/solvers/solvers/solver.hh
diff --git a/dune-solvers/solvers/tcgsolver.cc b/dune/solvers/solvers/tcgsolver.cc
similarity index 100%
rename from dune-solvers/solvers/tcgsolver.cc
rename to dune/solvers/solvers/tcgsolver.cc
diff --git a/dune-solvers/solvers/tcgsolver.hh b/dune/solvers/solvers/tcgsolver.hh
similarity index 100%
rename from dune-solvers/solvers/tcgsolver.hh
rename to dune/solvers/solvers/tcgsolver.hh
diff --git a/dune-solvers/transferoperators/Makefile.am b/dune/solvers/transferoperators/Makefile.am
similarity index 100%
rename from dune-solvers/transferoperators/Makefile.am
rename to dune/solvers/transferoperators/Makefile.am
diff --git a/dune-solvers/transferoperators/compressedmultigridtransfer.hh b/dune/solvers/transferoperators/compressedmultigridtransfer.hh
similarity index 100%
rename from dune-solvers/transferoperators/compressedmultigridtransfer.hh
rename to dune/solvers/transferoperators/compressedmultigridtransfer.hh
diff --git a/dune-solvers/transferoperators/densemultigridtransfer.hh b/dune/solvers/transferoperators/densemultigridtransfer.hh
similarity index 100%
rename from dune-solvers/transferoperators/densemultigridtransfer.hh
rename to dune/solvers/transferoperators/densemultigridtransfer.hh
diff --git a/dune-solvers/transferoperators/genericmultigridtransfer.hh b/dune/solvers/transferoperators/genericmultigridtransfer.hh
similarity index 100%
rename from dune-solvers/transferoperators/genericmultigridtransfer.hh
rename to dune/solvers/transferoperators/genericmultigridtransfer.hh
diff --git a/dune-solvers/transferoperators/mandelobsrestrictor.cc b/dune/solvers/transferoperators/mandelobsrestrictor.cc
similarity index 100%
rename from dune-solvers/transferoperators/mandelobsrestrictor.cc
rename to dune/solvers/transferoperators/mandelobsrestrictor.cc
diff --git a/dune-solvers/transferoperators/mandelobsrestrictor.hh b/dune/solvers/transferoperators/mandelobsrestrictor.hh
similarity index 100%
rename from dune-solvers/transferoperators/mandelobsrestrictor.hh
rename to dune/solvers/transferoperators/mandelobsrestrictor.hh
diff --git a/dune-solvers/transferoperators/multigridtransfer.hh b/dune/solvers/transferoperators/multigridtransfer.hh
similarity index 100%
rename from dune-solvers/transferoperators/multigridtransfer.hh
rename to dune/solvers/transferoperators/multigridtransfer.hh
diff --git a/dune-solvers/transferoperators/obstaclerestrictor.hh b/dune/solvers/transferoperators/obstaclerestrictor.hh
similarity index 100%
rename from dune-solvers/transferoperators/obstaclerestrictor.hh
rename to dune/solvers/transferoperators/obstaclerestrictor.hh
diff --git a/dune-solvers/transferoperators/truncatedcompressedmgtransfer.cc b/dune/solvers/transferoperators/truncatedcompressedmgtransfer.cc
similarity index 100%
rename from dune-solvers/transferoperators/truncatedcompressedmgtransfer.cc
rename to dune/solvers/transferoperators/truncatedcompressedmgtransfer.cc
diff --git a/dune-solvers/transferoperators/truncatedcompressedmgtransfer.hh b/dune/solvers/transferoperators/truncatedcompressedmgtransfer.hh
similarity index 100%
rename from dune-solvers/transferoperators/truncatedcompressedmgtransfer.hh
rename to dune/solvers/transferoperators/truncatedcompressedmgtransfer.hh
diff --git a/dune-solvers/transferoperators/truncateddensemgtransfer.cc b/dune/solvers/transferoperators/truncateddensemgtransfer.cc
similarity index 100%
rename from dune-solvers/transferoperators/truncateddensemgtransfer.cc
rename to dune/solvers/transferoperators/truncateddensemgtransfer.cc
diff --git a/dune-solvers/transferoperators/truncateddensemgtransfer.hh b/dune/solvers/transferoperators/truncateddensemgtransfer.hh
similarity index 100%
rename from dune-solvers/transferoperators/truncateddensemgtransfer.hh
rename to dune/solvers/transferoperators/truncateddensemgtransfer.hh
diff --git a/dune-solvers/transferoperators/truncatedmgtransfer.hh b/dune/solvers/transferoperators/truncatedmgtransfer.hh
similarity index 100%
rename from dune-solvers/transferoperators/truncatedmgtransfer.hh
rename to dune/solvers/transferoperators/truncatedmgtransfer.hh