diff --git a/doc/Makefile.am b/doc/Makefile.am
index 15dbd78742b5e26e3496f97b49ca0d4d62f8d470..53882131bae100d1e2c058d0e23351c36fc02810 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,7 +5,7 @@ CURDIR = doc
 
 BASEDIR = ..
 
-docdir=$(datadir)/doc/dune-solvers
+docdir=$(datadir)/doc/dune/solvers
 
 include $(top_srcdir)/am/webstuff
 
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index e031ce3ad8e8dfe833e2697eb585b74f54cc459f..f3d804194c41348ea97d73bfe44d0db7fbb4cba4 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -3,7 +3,7 @@ BASEDIR=../..
 CURDIR=doc/doxygen
 WHAT=
 
-doxygendir = $(datadir)/doc/dune-solvers/doxygen
+doxygendir = $(datadir)/doc/dune/solvers/doxygen
 doxygen_DATA = $(WHAT)
 
 #we need this in the distribution
diff --git a/dune/solvers/Makefile.am b/dune/solvers/Makefile.am
index eca20b37d7adabd19e526eb9ddcd58a60e2899ae..a700a0df852a356e4c580a2c8892d2739769f61d 100644
--- a/dune/solvers/Makefile.am
+++ b/dune/solvers/Makefile.am
@@ -1,7 +1,7 @@
 
 SUBDIRS = common iterationsteps norms solvers transferoperators
 
-dune_solversdir = $(includedir)/dune/dune-solvers
+dune_solversdir = $(includedir)/dune/solvers
 dune_solvers_HEADERS = computeenergy.hh
 
 include $(top_srcdir)/am/global-rules
diff --git a/dune/solvers/common/Makefile.am b/dune/solvers/common/Makefile.am
index dfea333edd803387ec7bc2987faa68ded29c5428..f93219a8cefea8027ab0e4412d14c8a02e1ce3fa 100644
--- a/dune/solvers/common/Makefile.am
+++ b/dune/solvers/common/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS =
 
-commondir = $(includedir)/dune/dune-solvers/common
+commondir = $(includedir)/dune/solvers/common
 common_HEADERS = boxconstraint.hh \
                  genericvectortools.hh \
                  canignore.hh \
diff --git a/dune/solvers/iterationsteps/Makefile.am b/dune/solvers/iterationsteps/Makefile.am
index b18e7f478b7889b6a28325f36386fde6237c7984..3f306fc38566a5d9b649ad74de98f8da284db4a4 100644
--- a/dune/solvers/iterationsteps/Makefile.am
+++ b/dune/solvers/iterationsteps/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS =
 
-iterationstepsdir = $(includedir)/dune/dune-solvers/iterationsteps
+iterationstepsdir = $(includedir)/dune/solvers/iterationsteps
 iterationsteps_HEADERS = amgstep.hh blockgsstep.hh blockgsstep.cc iterationstep.hh \
           lineariterationstep.hh linegsstep.hh linegsstep.cc mmgstep.hh mmgstep.cc \
           multigridstep.hh  multigridstep.cc \
diff --git a/dune/solvers/norms/Makefile.am b/dune/solvers/norms/Makefile.am
index 2ec1e08da10ce2ddea71e4464a9493bb03450b5f..cd74e773f2ec44fcd781afdc5e8e49167f8af1d0 100644
--- a/dune/solvers/norms/Makefile.am
+++ b/dune/solvers/norms/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS =
 
-normsdir = $(includedir)/dune/dune-solvers/norms
+normsdir = $(includedir)/dune/solvers/norms
 norms_HEADERS = blocknorm.hh  diagnorm.hh  energynorm.hh  fullnorm.hh  h1seminorm.hh \
                 norm.hh  pnorm.hh  sumnorm.hh
 
diff --git a/dune/solvers/solvers/Makefile.am b/dune/solvers/solvers/Makefile.am
index 76962aec303f11587270a88ff63d65ebdd411a1d..798340a9221158eebe41d20159204f82bd620cb7 100644
--- a/dune/solvers/solvers/Makefile.am
+++ b/dune/solvers/solvers/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS =
 
-solversdir = $(includedir)/dune/dune-solvers/solvers
+solversdir = $(includedir)/dune/solvers/solvers
 solvers_HEADERS = cgsolver.cc cgsolver.hh iterativesolver.cc iterativesolver.hh \
                   loopsolver.cc loopsolver.hh quadraticipopt.hh solver.hh \
                   tcgsolver.cc tcgsolver.hh
diff --git a/dune/solvers/transferoperators/Makefile.am b/dune/solvers/transferoperators/Makefile.am
index a486dab386bb6b0fdadc3967290cadde59c9d147..d5394ca193801baf8e56fbac7843e9f334d63717 100644
--- a/dune/solvers/transferoperators/Makefile.am
+++ b/dune/solvers/transferoperators/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS =
 
-transferoperatorsdir = $(includedir)/dune/dune-solvers/transferoperators
+transferoperatorsdir = $(includedir)/dune/solvers/transferoperators
 transferoperators_HEADERS = compressedmultigridtransfer.hh multigridtransfer.hh \
                 truncatedcompressedmgtransfer.hh truncatedmgtransfer.hh densemultigridtransfer.hh \
                 mandelobsrestrictor.cc obstaclerestrictor.hh truncateddensemgtransfer.cc \