diff --git a/dune/solvers/iterationsteps/amgstep.hh b/dune/solvers/iterationsteps/amgstep.hh
index 86115fe4c23f0e3d8f40d476af4b9515a07cc4af..524fc1be8ae960bb162c67e345d4cea17cde24a2 100644
--- a/dune/solvers/iterationsteps/amgstep.hh
+++ b/dune/solvers/iterationsteps/amgstep.hh
@@ -5,7 +5,7 @@
\brief A wrapper class for the ISTL AMG implementation
*/
-#include <dune-solvers/iterationsteps/lineariterationstep.hh>
+#include <dune/solvers/iterationsteps/lineariterationstep.hh>
#include <dune/istl/paamg/amg.hh>
/** \brief A wrapper class for the ISTL AMG implementation
diff --git a/dune/solvers/iterationsteps/istlseqilu0step.hh b/dune/solvers/iterationsteps/istlseqilu0step.hh
index c93d4d6a7b5f0485450982f6833698c5d5b71388..0caa13df417d393a42066e60057723356c02d5d4 100644
--- a/dune/solvers/iterationsteps/istlseqilu0step.hh
+++ b/dune/solvers/iterationsteps/istlseqilu0step.hh
@@ -7,7 +7,7 @@
#include <memory>
-#include <dune-solvers/iterationsteps/lineariterationstep.hh>
+#include <dune/solvers/iterationsteps/lineariterationstep.hh>
#include <dune/istl/preconditioners.hh>
#include <dune/istl/operators.hh>
diff --git a/dune/solvers/iterationsteps/iterationstep.hh b/dune/solvers/iterationsteps/iterationstep.hh
index 154df55e2e99db9672f45c327bdba9a40fd5bb24..c63337940da5949a868e990ae2fc2ffff7db566b 100644
--- a/dune/solvers/iterationsteps/iterationstep.hh
+++ b/dune/solvers/iterationsteps/iterationstep.hh
@@ -1,12 +1,12 @@
#ifndef ITERATIONSTEP_HH
#define ITERATIONSTEP_HH
-#include <dune-solvers/numproc.hh>
#include <vector>
#include <string>
#include <dune/common/bitsetvector.hh>
-#include <dune-solvers/common/canignore.hh>
+#include <dune/solvers/common/canignore.hh>
+#include <dune/solvers/numproc.hh>
//! Base class for iteration steps being called by an iterative solver
template<class VectorType, class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension> >
diff --git a/dune/solvers/iterationsteps/mmgstep.cc b/dune/solvers/iterationsteps/mmgstep.cc
index 958949e4d5d84ef46c066537d47ae8aa580d428f..0d53f2cbbd3a5f7657d714bda71652bb55b46abb 100644
--- a/dune/solvers/iterationsteps/mmgstep.cc
+++ b/dune/solvers/iterationsteps/mmgstep.cc
@@ -1,11 +1,11 @@
-#include <dune-solvers/transferoperators/truncatedmgtransfer.hh>
-#include <dune-solvers/iterationsteps/projectedblockgsstep.hh>
+#include <dune/solvers/transferoperators/truncatedmgtransfer.hh>
+#include <dune/solvers/iterationsteps/projectedblockgsstep.hh>
-#include <dune-solvers/computeenergy.hh>
+#include <dune/solvers/computeenergy.hh>
#ifdef HAVE_IPOPT
-#include <dune-solvers/solvers/quadraticipopt.hh>
+#include <dune/solvers/solvers/quadraticipopt.hh>
#endif
template <class OperatorType, class DiscFuncType>
diff --git a/dune/solvers/iterationsteps/mmgstep.hh b/dune/solvers/iterationsteps/mmgstep.hh
index 9d68cf0e1e5d19ef94b9054b01964e245be25b11..9e79e89c04f6c959bbbe645543741185a0d09677 100644
--- a/dune/solvers/iterationsteps/mmgstep.hh
+++ b/dune/solvers/iterationsteps/mmgstep.hh
@@ -1,12 +1,12 @@
#ifndef DUNE_MONOTONE_MULTIGRID_STEP_HH
#define DUNE_MONOTONE_MULTIGRID_STEP_HH
-#include <dune-solvers/iterationsteps/multigridstep.hh>
-#include <dune-solvers/iterationsteps/projectedblockgsstep.hh>
-#include <dune-solvers/transferoperators/multigridtransfer.hh>
+#include <dune/solvers/iterationsteps/multigridstep.hh>
+#include <dune/solvers/iterationsteps/projectedblockgsstep.hh>
+#include <dune/solvers/transferoperators/multigridtransfer.hh>
-#include <dune-solvers/boxconstraint.hh>
-#include <dune-solvers/transferoperators/obstaclerestrictor.hh>
+#include <dune/solvers/boxconstraint.hh>
+#include <dune/solvers/transferoperators/obstaclerestrictor.hh>
/** \brief The general monotone multigrid solver
*/
diff --git a/dune/solvers/iterationsteps/multigridstep.cc b/dune/solvers/iterationsteps/multigridstep.cc
index 1edc6273a932bcf138b07500d659e1909ff06114..137518de61038517fd390b891d93802768a1edc4 100644
--- a/dune/solvers/iterationsteps/multigridstep.cc
+++ b/dune/solvers/iterationsteps/multigridstep.cc
@@ -1,12 +1,12 @@
#include <typeinfo>
-#include <dune-solvers/transferoperators/multigridtransfer.hh>
-#include <dune-solvers/solvers/loopsolver.hh>
-#include <dune-solvers/genericvectortools.hh>
+#include <dune/solvers/transferoperators/multigridtransfer.hh>
+#include <dune/solvers/solvers/loopsolver.hh>
+#include <dune/solvers/genericvectortools.hh>
#include "blockgsstep.hh"
#ifdef HAVE_IPOPT
-#include <dune-solvers/solvers/quadraticipopt.hh>
+#include <dune/solvers/solvers/quadraticipopt.hh>
#endif
template <class OperatorType, class VectorType, class BitVectorType>
diff --git a/dune/solvers/iterationsteps/multigridstep.hh b/dune/solvers/iterationsteps/multigridstep.hh
index 720f3dcb8fcd83b1c80491a5454bb757f6221a0a..6dbd016161c22c996567136e30097c8f8db58494 100644
--- a/dune/solvers/iterationsteps/multigridstep.hh
+++ b/dune/solvers/iterationsteps/multigridstep.hh
@@ -4,8 +4,8 @@
#include <vector>
#include <dune/common/bitsetvector.hh>
-#include <dune-solvers/transferoperators/multigridtransfer.hh>
-#include <dune-solvers/solvers/iterativesolver.hh>
+#include <dune/solvers/transferoperators/multigridtransfer.hh>
+#include <dune/solvers/solvers/iterativesolver.hh>
#include "lineariterationstep.hh"
diff --git a/dune/solvers/iterationsteps/projectedblockgsstep.hh b/dune/solvers/iterationsteps/projectedblockgsstep.hh
index f4582930ae2aca9d0f3bc03a9ce0865992386a3c..f07cf570260e120fcd17b3988ff740a5bec7365c 100644
--- a/dune/solvers/iterationsteps/projectedblockgsstep.hh
+++ b/dune/solvers/iterationsteps/projectedblockgsstep.hh
@@ -4,7 +4,7 @@
#include <vector>
#include "blockgsstep.hh"
-#include <dune-solvers/boxconstraint.hh>
+#include <dune/solvers/boxconstraint.hh>
template<class OperatorType, class DiscFuncType>
class ProjectedBlockGSStep : public BlockGSStep<OperatorType, DiscFuncType>
diff --git a/dune/solvers/iterationsteps/truncatedblockgsstep.hh b/dune/solvers/iterationsteps/truncatedblockgsstep.hh
index 4d1cb464af82b979702de9499c56fb7b39ffea80..5fdeddee0e39eeaf0d356ba57f54f3e1bf17cd62 100644
--- a/dune/solvers/iterationsteps/truncatedblockgsstep.hh
+++ b/dune/solvers/iterationsteps/truncatedblockgsstep.hh
@@ -3,7 +3,7 @@
#include <dune/common/bitsetvector.hh>
-#include <dune-solvers/iterationsteps/lineariterationstep.hh>
+#include <dune/solvers/iterationsteps/lineariterationstep.hh>
diff --git a/dune/solvers/iterationsteps/truncatedsaddlepointgsstep.hh b/dune/solvers/iterationsteps/truncatedsaddlepointgsstep.hh
index 0143200a1b2427e7cb38f9a3cfd683c573e70cf7..3496ec2813621e6c9b392958f17883832545e48c 100644
--- a/dune/solvers/iterationsteps/truncatedsaddlepointgsstep.hh
+++ b/dune/solvers/iterationsteps/truncatedsaddlepointgsstep.hh
@@ -5,7 +5,7 @@
#include <dune/common/fmatrix.hh>
#include <dune/istl/matrix.hh>
-#include <dune-solvers/iterationsteps/lineariterationstep.hh>
+#include <dune/solvers/iterationsteps/lineariterationstep.hh>
//! Point block Gauß-Seidel step for saddle point problems.
diff --git a/dune/solvers/iterationsteps/trustregiongsstep.hh b/dune/solvers/iterationsteps/trustregiongsstep.hh
index 6ac68d925d44328aecae06abba08f30ec8c475a9..8ee78a78aa208af5085a86494ae5614a4ab840ca 100644
--- a/dune/solvers/iterationsteps/trustregiongsstep.hh
+++ b/dune/solvers/iterationsteps/trustregiongsstep.hh
@@ -7,7 +7,7 @@
*/
#include "projectedblockgsstep.hh"
-#include <dune-solvers/boxconstraint.hh>
+#include <dune/solvers/boxconstraint.hh>
/** \brief A Gauss-Seidel iterator which does not assume that the functional
is convex, but which expects a bounded admissible set.
diff --git a/dune/solvers/norms/energynorm.hh b/dune/solvers/norms/energynorm.hh
index 4db27e2f4b9edd93d0bdfe4987bde01251092e9f..49099cd6aa4484bf4d781df68201090208446605 100644
--- a/dune/solvers/norms/energynorm.hh
+++ b/dune/solvers/norms/energynorm.hh
@@ -2,7 +2,7 @@
#define ENERGY_NORM_HH
#include "norm.hh"
-#include <dune-solvers/iterationsteps/lineariterationstep.hh>
+#include <dune/solvers/iterationsteps/lineariterationstep.hh>
template<class OperatorType, class DiscFuncType>
class EnergyNorm : public Norm<DiscFuncType>
diff --git a/dune/solvers/solvers/cgsolver.hh b/dune/solvers/solvers/cgsolver.hh
index 1d5e8d1befcc2404e51eaa1114a5354b50b96830..3360d91ef322964dff1ee1f76404aae1ecfa3e4c 100644
--- a/dune/solvers/solvers/cgsolver.hh
+++ b/dune/solvers/solvers/cgsolver.hh
@@ -1,9 +1,9 @@
#ifndef CG_SOLVER_HH
#define CG_SOLVER_HH
-#include <dune-solvers/solvers/iterativesolver.hh>
-#include <dune-solvers/iterationsteps/lineariterationstep.hh>
-#include <dune-solvers/norms/norm.hh>
+#include <dune/solvers/solvers/iterativesolver.hh>
+#include <dune/solvers/iterationsteps/lineariterationstep.hh>
+#include <dune/solvers/norms/norm.hh>
/** \brief A conjugate gradient solver
*
diff --git a/dune/solvers/solvers/iterativesolver.cc b/dune/solvers/solvers/iterativesolver.cc
index 1837dde0fa95dfb9578bfa7202b4284e87e436ed..67b27d1bd5b2a1da6219499c595f6679d4d90ab3 100644
--- a/dune/solvers/solvers/iterativesolver.cc
+++ b/dune/solvers/solvers/iterativesolver.cc
@@ -4,7 +4,7 @@
#include <iomanip>
#include <fstream>
-#include <dune-solvers/genericvectortools.hh>
+#include <dune/solvers/genericvectortools.hh>
template <class VectorType, class BitVectorType>
void IterativeSolver<VectorType, BitVectorType>::check() const
diff --git a/dune/solvers/solvers/iterativesolver.hh b/dune/solvers/solvers/iterativesolver.hh
index 2224c206087ac07501d9a51ea8e4f3c5f941b0b4..e39c635e86366d45b1185bc714b0c58cce73ce11 100644
--- a/dune/solvers/solvers/iterativesolver.hh
+++ b/dune/solvers/solvers/iterativesolver.hh
@@ -2,8 +2,8 @@
#define ITERATIVE_SOLVER_HH
#include "solver.hh"
-#include <dune-solvers/iterationsteps/iterationstep.hh>
-#include <dune-solvers/norms/norm.hh>
+#include <dune/solvers/iterationsteps/iterationstep.hh>
+#include <dune/solvers/norms/norm.hh>
/** \brief A generic iterative solver
*
diff --git a/dune/solvers/solvers/loopsolver.hh b/dune/solvers/solvers/loopsolver.hh
index 73cbee8ae06bdb39ca9c6ffab8c3a9bdf026c2e8..c167f2c92556683682736201d0b6a065c30827e3 100644
--- a/dune/solvers/solvers/loopsolver.hh
+++ b/dune/solvers/solvers/loopsolver.hh
@@ -1,9 +1,9 @@
#ifndef LOOP_SOLVER_HH
#define LOOP_SOLVER_HH
-#include <dune-solvers/solvers/iterativesolver.hh>
-#include <dune-solvers/iterationsteps/iterationstep.hh>
-#include <dune-solvers/norms/norm.hh>
+#include <dune/solvers/solvers/iterativesolver.hh>
+#include <dune/solvers/iterationsteps/iterationstep.hh>
+#include <dune/solvers/norms/norm.hh>
/** \brief A solver which consists of a single loop
*
diff --git a/dune/solvers/solvers/quadraticipopt.hh b/dune/solvers/solvers/quadraticipopt.hh
index 9d5e80314d7d3a4ea3281d0de3a5f60d99181afb..7c095c17ed4efa0365a7426314032945c03b992b 100644
--- a/dune/solvers/solvers/quadraticipopt.hh
+++ b/dune/solvers/solvers/quadraticipopt.hh
@@ -15,9 +15,9 @@
#include <dune/istl/bcrsmatrix.hh>
#include <dune/istl/bvector.hh>
-#include <dune-solvers/boxconstraint.hh>
-#include <dune-solvers/common/canignore.hh>
-#include <dune-solvers/solvers/iterativesolver.hh>
+#include <dune/solvers/boxconstraint.hh>
+#include <dune/solvers/common/canignore.hh>
+#include <dune/solvers/solvers/iterativesolver.hh>
/** \todo Undef those because they clash. I think this is an IPOPT bug.
(their config.h is included by a header). */
diff --git a/dune/solvers/solvers/solver.hh b/dune/solvers/solvers/solver.hh
index 8ca66ab8e36f53e47af4704a4aaba5d7a2eb2d8d..14ead9b2e8f99006c08e99318f927be9107e178e 100644
--- a/dune/solvers/solvers/solver.hh
+++ b/dune/solvers/solvers/solver.hh
@@ -1,7 +1,7 @@
#ifndef DUNE_SOLVER_HH
#define DUNE_SOLVER_HH
-#include <dune-solvers/numproc.hh>
+#include <dune/solvers/numproc.hh>
/** \brief The base class for all sorts of solver algorithms */
class Solver : public NumProc
diff --git a/dune/solvers/solvers/tcgsolver.cc b/dune/solvers/solvers/tcgsolver.cc
index 281338618b9060996dcf6c63ad24c69ce3a478fd..7ce24590039f0a753fd04a6a5a16043910f6b5de 100644
--- a/dune/solvers/solvers/tcgsolver.cc
+++ b/dune/solvers/solvers/tcgsolver.cc
@@ -2,7 +2,7 @@
#include <limits>
#include <iomanip>
-#include <dune-solvers/norms/energynorm.hh>
+#include <dune/solvers/norms/energynorm.hh>
template <class MatrixType, class VectorType>
void TruncatedCGSolver<MatrixType, VectorType>::check() const
diff --git a/dune/solvers/solvers/tcgsolver.hh b/dune/solvers/solvers/tcgsolver.hh
index 99406f61f5d43655926aa139d1555f0aa47fa185..0bd03648daf8cf87f2a50ebeb9afda6733b3944d 100644
--- a/dune/solvers/solvers/tcgsolver.hh
+++ b/dune/solvers/solvers/tcgsolver.hh
@@ -1,9 +1,9 @@
#ifndef TRUNCATED_CG_SOLVER_HH
#define TRUNCATED_CG_SOLVER_HH
-#include <dune-solvers/solvers/iterativesolver.hh>
-#include <dune-solvers/iterationsteps/lineariterationstep.hh>
-#include <dune-solvers/norms/norm.hh>
+#include <dune/solvers/solvers/iterativesolver.hh>
+#include <dune/solvers/iterationsteps/lineariterationstep.hh>
+#include <dune/solvers/norms/norm.hh>
/** \brief A truncated conjugate gradient solver
*
diff --git a/dune/solvers/transferoperators/mandelobsrestrictor.cc b/dune/solvers/transferoperators/mandelobsrestrictor.cc
index b766ecf6e868987d300f8f388726a6ee12fb9a3c..2bab8b36a219e8c42406210d941164984d5721ca 100644
--- a/dune/solvers/transferoperators/mandelobsrestrictor.cc
+++ b/dune/solvers/transferoperators/mandelobsrestrictor.cc
@@ -1,4 +1,4 @@
-#include <dune-solvers/transferoperators/compressedmultigridtransfer.hh>
+#include <dune/solvers/transferoperators/compressedmultigridtransfer.hh>
template <class DiscFuncType>
void MandelObstacleRestrictor<DiscFuncType>::
diff --git a/dune/solvers/transferoperators/mandelobsrestrictor.hh b/dune/solvers/transferoperators/mandelobsrestrictor.hh
index f691cc70f623793198ca4c10732484d5ffcaacb9..6e347248494fad1ea511c4f13343cf598501d607 100644
--- a/dune/solvers/transferoperators/mandelobsrestrictor.hh
+++ b/dune/solvers/transferoperators/mandelobsrestrictor.hh
@@ -2,9 +2,9 @@
#define MANDEL_OBSTACLE_RESTRICTOR_HH
#include <dune/common/bitsetvector.hh>
-#include <dune-solvers/transferoperators/obstaclerestrictor.hh>
-#include <dune-solvers/transferoperators/multigridtransfer.hh>
-#include <dune-solvers/boxconstraint.hh>
+#include <dune/solvers/transferoperators/obstaclerestrictor.hh>
+#include <dune/solvers/transferoperators/multigridtransfer.hh>
+#include <dune/solvers/boxconstraint.hh>
template <class DiscFuncType>
class MandelObstacleRestrictor : public ObstacleRestrictor<DiscFuncType>
diff --git a/dune/solvers/transferoperators/obstaclerestrictor.hh b/dune/solvers/transferoperators/obstaclerestrictor.hh
index 395d52ccdacc9c802cb812e2cb1a177b693007b6..aa6edbeb3aef867a171dd021bee88d0d491e1562 100644
--- a/dune/solvers/transferoperators/obstaclerestrictor.hh
+++ b/dune/solvers/transferoperators/obstaclerestrictor.hh
@@ -3,8 +3,8 @@
#include <vector>
-#include <dune-solvers/transferoperators/multigridtransfer.hh>
-#include <dune-solvers/boxconstraint.hh>
+#include <dune/solvers/transferoperators/multigridtransfer.hh>
+#include <dune/solvers/boxconstraint.hh>
/** \brief Abstract base class for all obstacle restriction operators
* \todo Do we need the template parameter?
diff --git a/src/dune_solvers.cc b/src/dune_solvers.cc
index a9433c054d3d500ab638469d53533f40f241f87b..a11fd8f52c72054bf1d994a9a6d0f34480ba3d8d 100644
--- a/src/dune_solvers.cc
+++ b/src/dune_solvers.cc
@@ -10,7 +10,7 @@ int main(int argc, char** argv)
try{
//Maybe initialize Mpi
Dune::MPIHelper& helper = Dune::MPIHelper::instance(argc, argv);
- std::cout << "Hello World! This is dune-solvers." << std::endl;
+ std::cout << "Hello World! This is dune/solvers." << std::endl;
if(Dune::MPIHelper::isFake)
std::cout<< "This is a sequential program." << std::endl;
else