diff --git a/Makefile.am b/Makefile.am
index b7c8deb73ea0ab85d725e1a5bed3643816183b67..8b3e19be837169e9657c4b5e9fafeb6aba76bf98 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST=dune.module
 # need automake >= 1.5
 AUTOMAKE_OPTIONS = foreign 1.5
 
-SUBDIRS = common lib doc bin m4 am
+SUBDIRS = dune lib doc bin m4 am
 
 sourcescheck_NOSOURCES=aclocal.m4  dependencies.m4
 
diff --git a/common/.gitignore b/common/.gitignore
deleted file mode 100644
index d0d0108b4898e072af20661638958d03834815a2..0000000000000000000000000000000000000000
--- a/common/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-*.lo
-*.swp
-libcommon.la
-semantic.cache
diff --git a/common/exprtmpl/.gitignore b/common/exprtmpl/.gitignore
deleted file mode 100644
index 282522db0342d8750454b3dc162493b5fc709cc8..0000000000000000000000000000000000000000
--- a/common/exprtmpl/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/common/test/.gitignore b/common/test/.gitignore
deleted file mode 100644
index bc35e0b0c115c4343f51d424fea505cc7f80d47a..0000000000000000000000000000000000000000
--- a/common/test/.gitignore
+++ /dev/null
@@ -1,48 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-semantic.cache
-fvectortest
-mpicollcomm
-lrutest
-parsetest
-test-stack
-arraylisttest
-smartpointertest
-float_cmp
-bitsetvectortest
-iteratorfacadetest
-sllisttest
-tuplestest
-settest
-fmatrixtest
-poolallocatortest
-*.gcda
-*.gcno
-gmon.out
-gcdlcmtest
-streamtest
-exprtmpl
-timing_xpr
-timing_old
-timing_flt
-bigunsignedinttest
-mpihelpertest
-singletontest
-utilitytest
-testfassign_fail1
-testfassign_fail2
-testfassign_fail3
-testfassign_fail4
-testfassign_fail5
-testfassign_fail6
-testfassign1
-testfassign2
-testfassign3
-testfassign4
-smallobject
-conversiontest
-nullptr-test
-blockbitfieldtest
-deprtuplestest
diff --git a/configure.ac b/configure.ac
index b3b240544470b1685fad4fbc40ef7290008a6e15..8bd2700f98dde1ac9a5b3d26e9f0ca0a5fc44e42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 
 DUNE_AC_INIT # gets module version from dune.module file
 AM_INIT_AUTOMAKE
-AC_CONFIG_SRCDIR([common/stdstreams.cc])
+AC_CONFIG_SRCDIR([dune/common/stdstreams.cc])
 AM_CONFIG_HEADER([config.h])
 
 # create symlink dune -> $top_srcdir
@@ -23,9 +23,10 @@ AC_SUBST([LOCAL_LIBS], '$(top_builddir)/common/libcommon.la')
 AC_CONFIG_FILES([Makefile
      lib/Makefile
      bin/Makefile
-     common/Makefile
-     common/test/Makefile
-     common/exprtmpl/Makefile
+     dune/Makefile
+     dune/common/Makefile
+     dune/common/test/Makefile
+     dune/common/exprtmpl/Makefile
      doc/Makefile
      doc/devel/Makefile
      doc/layout/Makefile
diff --git a/dune/Makefile.am b/dune/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..d0b3a1009f33caa681e665e402b27c41ecf55103
--- /dev/null
+++ b/dune/Makefile.am
@@ -0,0 +1,5 @@
+# $Id: $
+
+SUBDIRS = common
+
+include $(top_srcdir)/am/global-rules
diff --git a/common/Makefile.am b/dune/common/Makefile.am
similarity index 100%
rename from common/Makefile.am
rename to dune/common/Makefile.am
diff --git a/common/alignment.hh b/dune/common/alignment.hh
similarity index 100%
rename from common/alignment.hh
rename to dune/common/alignment.hh
diff --git a/common/array.hh b/dune/common/array.hh
similarity index 100%
rename from common/array.hh
rename to dune/common/array.hh
diff --git a/common/arraylist.hh b/dune/common/arraylist.hh
similarity index 100%
rename from common/arraylist.hh
rename to dune/common/arraylist.hh
diff --git a/common/bartonnackmanifcheck.hh b/dune/common/bartonnackmanifcheck.hh
similarity index 100%
rename from common/bartonnackmanifcheck.hh
rename to dune/common/bartonnackmanifcheck.hh
diff --git a/common/bigunsignedint.hh b/dune/common/bigunsignedint.hh
similarity index 100%
rename from common/bigunsignedint.hh
rename to dune/common/bigunsignedint.hh
diff --git a/common/binaryfunctions.hh b/dune/common/binaryfunctions.hh
similarity index 100%
rename from common/binaryfunctions.hh
rename to dune/common/binaryfunctions.hh
diff --git a/common/bitsetvector.hh b/dune/common/bitsetvector.hh
similarity index 100%
rename from common/bitsetvector.hh
rename to dune/common/bitsetvector.hh
diff --git a/common/collectivecommunication.hh b/dune/common/collectivecommunication.hh
similarity index 100%
rename from common/collectivecommunication.hh
rename to dune/common/collectivecommunication.hh
diff --git a/common/configparser.cc b/dune/common/configparser.cc
similarity index 100%
rename from common/configparser.cc
rename to dune/common/configparser.cc
diff --git a/common/configparser.hh b/dune/common/configparser.hh
similarity index 100%
rename from common/configparser.hh
rename to dune/common/configparser.hh
diff --git a/common/debugstream.hh b/dune/common/debugstream.hh
similarity index 100%
rename from common/debugstream.hh
rename to dune/common/debugstream.hh
diff --git a/common/deprecated.hh b/dune/common/deprecated.hh
similarity index 100%
rename from common/deprecated.hh
rename to dune/common/deprecated.hh
diff --git a/common/enumset.hh b/dune/common/enumset.hh
similarity index 100%
rename from common/enumset.hh
rename to dune/common/enumset.hh
diff --git a/common/exceptions.hh b/dune/common/exceptions.hh
similarity index 100%
rename from common/exceptions.hh
rename to dune/common/exceptions.hh
diff --git a/common/exprtmpl.cc b/dune/common/exprtmpl.cc
similarity index 100%
rename from common/exprtmpl.cc
rename to dune/common/exprtmpl.cc
diff --git a/common/exprtmpl.hh b/dune/common/exprtmpl.hh
similarity index 100%
rename from common/exprtmpl.hh
rename to dune/common/exprtmpl.hh
diff --git a/common/exprtmpl/Makefile.am b/dune/common/exprtmpl/Makefile.am
similarity index 100%
rename from common/exprtmpl/Makefile.am
rename to dune/common/exprtmpl/Makefile.am
diff --git a/common/exprtmpl/exprexpr.inc b/dune/common/exprtmpl/exprexpr.inc
similarity index 100%
rename from common/exprtmpl/exprexpr.inc
rename to dune/common/exprtmpl/exprexpr.inc
diff --git a/common/exprtmpl/norm.inc b/dune/common/exprtmpl/norm.inc
similarity index 100%
rename from common/exprtmpl/norm.inc
rename to dune/common/exprtmpl/norm.inc
diff --git a/common/exprtmpl/scalar.inc b/dune/common/exprtmpl/scalar.inc
similarity index 100%
rename from common/exprtmpl/scalar.inc
rename to dune/common/exprtmpl/scalar.inc
diff --git a/common/fassign.hh b/dune/common/fassign.hh
similarity index 100%
rename from common/fassign.hh
rename to dune/common/fassign.hh
diff --git a/common/finitestack.hh b/dune/common/finitestack.hh
similarity index 100%
rename from common/finitestack.hh
rename to dune/common/finitestack.hh
diff --git a/common/fixedarray.hh b/dune/common/fixedarray.hh
similarity index 100%
rename from common/fixedarray.hh
rename to dune/common/fixedarray.hh
diff --git a/common/float_cmp.cc b/dune/common/float_cmp.cc
similarity index 100%
rename from common/float_cmp.cc
rename to dune/common/float_cmp.cc
diff --git a/common/float_cmp.hh b/dune/common/float_cmp.hh
similarity index 100%
rename from common/float_cmp.hh
rename to dune/common/float_cmp.hh
diff --git a/common/fmatrix.hh b/dune/common/fmatrix.hh
similarity index 100%
rename from common/fmatrix.hh
rename to dune/common/fmatrix.hh
diff --git a/common/fmatrixev.hh b/dune/common/fmatrixev.hh
similarity index 100%
rename from common/fmatrixev.hh
rename to dune/common/fmatrixev.hh
diff --git a/common/forloop.hh b/dune/common/forloop.hh
similarity index 100%
rename from common/forloop.hh
rename to dune/common/forloop.hh
diff --git a/common/function.hh b/dune/common/function.hh
similarity index 100%
rename from common/function.hh
rename to dune/common/function.hh
diff --git a/common/fvector.hh b/dune/common/fvector.hh
similarity index 100%
rename from common/fvector.hh
rename to dune/common/fvector.hh
diff --git a/common/gcd.hh b/dune/common/gcd.hh
similarity index 100%
rename from common/gcd.hh
rename to dune/common/gcd.hh
diff --git a/common/genericiterator.hh b/dune/common/genericiterator.hh
similarity index 100%
rename from common/genericiterator.hh
rename to dune/common/genericiterator.hh
diff --git a/common/geometrytype.hh b/dune/common/geometrytype.hh
similarity index 100%
rename from common/geometrytype.hh
rename to dune/common/geometrytype.hh
diff --git a/common/helpertemplates.hh b/dune/common/helpertemplates.hh
similarity index 100%
rename from common/helpertemplates.hh
rename to dune/common/helpertemplates.hh
diff --git a/common/interfaces.hh b/dune/common/interfaces.hh
similarity index 100%
rename from common/interfaces.hh
rename to dune/common/interfaces.hh
diff --git a/common/iteratorfacades.hh b/dune/common/iteratorfacades.hh
similarity index 100%
rename from common/iteratorfacades.hh
rename to dune/common/iteratorfacades.hh
diff --git a/common/lcm.hh b/dune/common/lcm.hh
similarity index 100%
rename from common/lcm.hh
rename to dune/common/lcm.hh
diff --git a/common/lru.hh b/dune/common/lru.hh
similarity index 100%
rename from common/lru.hh
rename to dune/common/lru.hh
diff --git a/common/misc.hh b/dune/common/misc.hh
similarity index 100%
rename from common/misc.hh
rename to dune/common/misc.hh
diff --git a/common/modules b/dune/common/modules
similarity index 100%
rename from common/modules
rename to dune/common/modules
diff --git a/common/mpicollectivecommunication.hh b/dune/common/mpicollectivecommunication.hh
similarity index 100%
rename from common/mpicollectivecommunication.hh
rename to dune/common/mpicollectivecommunication.hh
diff --git a/common/mpihelper.hh b/dune/common/mpihelper.hh
similarity index 100%
rename from common/mpihelper.hh
rename to dune/common/mpihelper.hh
diff --git a/common/nullptr.hh b/dune/common/nullptr.hh
similarity index 100%
rename from common/nullptr.hh
rename to dune/common/nullptr.hh
diff --git a/common/poolallocator.hh b/dune/common/poolallocator.hh
similarity index 100%
rename from common/poolallocator.hh
rename to dune/common/poolallocator.hh
diff --git a/common/precision.hh b/dune/common/precision.hh
similarity index 100%
rename from common/precision.hh
rename to dune/common/precision.hh
diff --git a/common/propertymap.hh b/dune/common/propertymap.hh
similarity index 100%
rename from common/propertymap.hh
rename to dune/common/propertymap.hh
diff --git a/common/shared_ptr.hh b/dune/common/shared_ptr.hh
similarity index 100%
rename from common/shared_ptr.hh
rename to dune/common/shared_ptr.hh
diff --git a/common/singleton.hh b/dune/common/singleton.hh
similarity index 100%
rename from common/singleton.hh
rename to dune/common/singleton.hh
diff --git a/common/sllist.hh b/dune/common/sllist.hh
similarity index 100%
rename from common/sllist.hh
rename to dune/common/sllist.hh
diff --git a/common/smallobject.hh b/dune/common/smallobject.hh
similarity index 100%
rename from common/smallobject.hh
rename to dune/common/smallobject.hh
diff --git a/common/smartpointer.hh b/dune/common/smartpointer.hh
similarity index 100%
rename from common/smartpointer.hh
rename to dune/common/smartpointer.hh
diff --git a/common/static_assert.hh b/dune/common/static_assert.hh
similarity index 100%
rename from common/static_assert.hh
rename to dune/common/static_assert.hh
diff --git a/common/stdstreams.cc b/dune/common/stdstreams.cc
similarity index 100%
rename from common/stdstreams.cc
rename to dune/common/stdstreams.cc
diff --git a/common/stdstreams.hh b/dune/common/stdstreams.hh
similarity index 100%
rename from common/stdstreams.hh
rename to dune/common/stdstreams.hh
diff --git a/common/test/Makefile.am b/dune/common/test/Makefile.am
similarity index 100%
rename from common/test/Makefile.am
rename to dune/common/test/Makefile.am
diff --git a/common/test/arraylisttest.cc b/dune/common/test/arraylisttest.cc
similarity index 100%
rename from common/test/arraylisttest.cc
rename to dune/common/test/arraylisttest.cc
diff --git a/common/test/bigunsignedinttest.cc b/dune/common/test/bigunsignedinttest.cc
similarity index 100%
rename from common/test/bigunsignedinttest.cc
rename to dune/common/test/bigunsignedinttest.cc
diff --git a/common/test/bitsetvectortest.cc b/dune/common/test/bitsetvectortest.cc
similarity index 100%
rename from common/test/bitsetvectortest.cc
rename to dune/common/test/bitsetvectortest.cc
diff --git a/common/test/conversiontest.cc b/dune/common/test/conversiontest.cc
similarity index 100%
rename from common/test/conversiontest.cc
rename to dune/common/test/conversiontest.cc
diff --git a/common/test/deprtuplestest.cc b/dune/common/test/deprtuplestest.cc
similarity index 100%
rename from common/test/deprtuplestest.cc
rename to dune/common/test/deprtuplestest.cc
diff --git a/common/test/exprtmpl.cc b/dune/common/test/exprtmpl.cc
similarity index 100%
rename from common/test/exprtmpl.cc
rename to dune/common/test/exprtmpl.cc
diff --git a/common/test/float_cmp.cc b/dune/common/test/float_cmp.cc
similarity index 100%
rename from common/test/float_cmp.cc
rename to dune/common/test/float_cmp.cc
diff --git a/common/test/fmatrixtest.cc b/dune/common/test/fmatrixtest.cc
similarity index 100%
rename from common/test/fmatrixtest.cc
rename to dune/common/test/fmatrixtest.cc
diff --git a/common/test/fvectortest.cc b/dune/common/test/fvectortest.cc
similarity index 100%
rename from common/test/fvectortest.cc
rename to dune/common/test/fvectortest.cc
diff --git a/common/test/gcdlcmtest.cc b/dune/common/test/gcdlcmtest.cc
similarity index 100%
rename from common/test/gcdlcmtest.cc
rename to dune/common/test/gcdlcmtest.cc
diff --git a/common/test/iteratorfacadetest.cc b/dune/common/test/iteratorfacadetest.cc
similarity index 100%
rename from common/test/iteratorfacadetest.cc
rename to dune/common/test/iteratorfacadetest.cc
diff --git a/common/test/iteratorfacadetest.hh b/dune/common/test/iteratorfacadetest.hh
similarity index 100%
rename from common/test/iteratorfacadetest.hh
rename to dune/common/test/iteratorfacadetest.hh
diff --git a/common/test/iteratortest.hh b/dune/common/test/iteratortest.hh
similarity index 100%
rename from common/test/iteratortest.hh
rename to dune/common/test/iteratortest.hh
diff --git a/common/test/lrutest.cc b/dune/common/test/lrutest.cc
similarity index 100%
rename from common/test/lrutest.cc
rename to dune/common/test/lrutest.cc
diff --git a/common/test/mpicollectivecommunication.cc b/dune/common/test/mpicollectivecommunication.cc
similarity index 100%
rename from common/test/mpicollectivecommunication.cc
rename to dune/common/test/mpicollectivecommunication.cc
diff --git a/common/test/mpihelpertest.cc b/dune/common/test/mpihelpertest.cc
similarity index 100%
rename from common/test/mpihelpertest.cc
rename to dune/common/test/mpihelpertest.cc
diff --git a/common/test/nullptr-test.cc b/dune/common/test/nullptr-test.cc
similarity index 100%
rename from common/test/nullptr-test.cc
rename to dune/common/test/nullptr-test.cc
diff --git a/common/test/nullptr-test2.cc b/dune/common/test/nullptr-test2.cc
similarity index 100%
rename from common/test/nullptr-test2.cc
rename to dune/common/test/nullptr-test2.cc
diff --git a/common/test/parsetest.cc b/dune/common/test/parsetest.cc
similarity index 100%
rename from common/test/parsetest.cc
rename to dune/common/test/parsetest.cc
diff --git a/common/test/poolallocatortest.cc b/dune/common/test/poolallocatortest.cc
similarity index 100%
rename from common/test/poolallocatortest.cc
rename to dune/common/test/poolallocatortest.cc
diff --git a/common/test/settest.cc b/dune/common/test/settest.cc
similarity index 100%
rename from common/test/settest.cc
rename to dune/common/test/settest.cc
diff --git a/common/test/singletontest.cc b/dune/common/test/singletontest.cc
similarity index 100%
rename from common/test/singletontest.cc
rename to dune/common/test/singletontest.cc
diff --git a/common/test/sllisttest.cc b/dune/common/test/sllisttest.cc
similarity index 100%
rename from common/test/sllisttest.cc
rename to dune/common/test/sllisttest.cc
diff --git a/common/test/smallobject.cc b/dune/common/test/smallobject.cc
similarity index 100%
rename from common/test/smallobject.cc
rename to dune/common/test/smallobject.cc
diff --git a/common/test/smartpointertest.cc b/dune/common/test/smartpointertest.cc
similarity index 100%
rename from common/test/smartpointertest.cc
rename to dune/common/test/smartpointertest.cc
diff --git a/common/test/static_assert_test.cc b/dune/common/test/static_assert_test.cc
similarity index 100%
rename from common/test/static_assert_test.cc
rename to dune/common/test/static_assert_test.cc
diff --git a/common/test/streamtest.cc b/dune/common/test/streamtest.cc
similarity index 100%
rename from common/test/streamtest.cc
rename to dune/common/test/streamtest.cc
diff --git a/common/test/test-stack.cc b/dune/common/test/test-stack.cc
similarity index 100%
rename from common/test/test-stack.cc
rename to dune/common/test/test-stack.cc
diff --git a/common/test/testfassign.cc b/dune/common/test/testfassign.cc
similarity index 100%
rename from common/test/testfassign.cc
rename to dune/common/test/testfassign.cc
diff --git a/common/test/testfassign2.cc b/dune/common/test/testfassign2.cc
similarity index 100%
rename from common/test/testfassign2.cc
rename to dune/common/test/testfassign2.cc
diff --git a/common/test/timing.cc b/dune/common/test/timing.cc
similarity index 100%
rename from common/test/timing.cc
rename to dune/common/test/timing.cc
diff --git a/common/test/tuplestest.cc b/dune/common/test/tuplestest.cc
similarity index 100%
rename from common/test/tuplestest.cc
rename to dune/common/test/tuplestest.cc
diff --git a/common/test/utilitytest.cc b/dune/common/test/utilitytest.cc
similarity index 100%
rename from common/test/utilitytest.cc
rename to dune/common/test/utilitytest.cc
diff --git a/common/timer.hh b/dune/common/timer.hh
similarity index 100%
rename from common/timer.hh
rename to dune/common/timer.hh
diff --git a/common/tuples.hh b/dune/common/tuples.hh
similarity index 100%
rename from common/tuples.hh
rename to dune/common/tuples.hh
diff --git a/common/typetraits.hh b/dune/common/typetraits.hh
similarity index 100%
rename from common/typetraits.hh
rename to dune/common/typetraits.hh
diff --git a/common/utility.hh b/dune/common/utility.hh
similarity index 100%
rename from common/utility.hh
rename to dune/common/utility.hh
diff --git a/common/version.hh b/dune/common/version.hh
similarity index 100%
rename from common/version.hh
rename to dune/common/version.hh
diff --git a/lib/Makefile.am b/lib/Makefile.am
index cf1d73b6fc560f7c1387a8653d7333955068263c..6ac67e2b1111f15dd2551e87ea2e5d6a93176487 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,6 +5,6 @@ lib_LTLIBRARIES = libdunecommon.la
 
 # this is just a renaming of libcommon to prevent name clashes
 libdunecommon_la_SOURCES =
-libdunecommon_la_LIBADD = ../common/libcommon.la
+libdunecommon_la_LIBADD = ../dune/common/libcommon.la
 
 include $(top_srcdir)/am/global-rules