diff --git a/doc/manual/CMakeLists.txt b/doc/manual/CMakeLists.txt
index c8583de9b8f19b2dbc5c609fe987477709a500d0..f68f9d7b86fdaa5e9571f22266563413ce789cf8 100644
--- a/doc/manual/CMakeLists.txt
+++ b/doc/manual/CMakeLists.txt
@@ -1,4 +1,4 @@
 dune_add_latex_document(
-  SOURCE dune-fufem-forms.tex
+  SOURCE dune-fufem.tex
   FATHER_TARGET doc
   INSTALL ${CMAKE_INSTALL_DOCDIR})
diff --git a/doc/manual/dune-fufem-forms.bib b/doc/manual/dune-fufem.bib
similarity index 100%
rename from doc/manual/dune-fufem-forms.bib
rename to doc/manual/dune-fufem.bib
diff --git a/doc/manual/dune-fufem-forms.tex b/doc/manual/dune-fufem.tex
similarity index 99%
rename from doc/manual/dune-fufem-forms.tex
rename to doc/manual/dune-fufem.tex
index 9dcc0e88bd1142d40b0e6f7019d6364fb8971186..383ecbc1c14d8a77c2b7ed94e1419f6dcb116bdf 100644
--- a/doc/manual/dune-fufem-forms.tex
+++ b/doc/manual/dune-fufem.tex
@@ -966,6 +966,6 @@ auto L = integrate(dot(f,v));
 
 
 \bibliographystyle{plainnat}
-\bibliography{dune-fufem-forms}
+\bibliography{dune-fufem}
 
 \end{document}
diff --git a/dune/CMakeLists.txt b/dune/CMakeLists.txt
index 7567b3500db47901aa2c984e681f90ba99d72b7e..60339afa63e01edf5d0e9400184d2501cfc72e2b 100644
--- a/dune/CMakeLists.txt
+++ b/dune/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory(fufem-forms)
+add_subdirectory(fufem)
diff --git a/dune/fufem-forms/forms.hh b/dune/fufem-forms/forms.hh
deleted file mode 100644
index 53f201bfa6f0db7de0a041d13ea3bd592adb454d..0000000000000000000000000000000000000000
--- a/dune/fufem-forms/forms.hh
+++ /dev/null
@@ -1,27 +0,0 @@
-// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// vi: set et ts=4 sw=2 sts=2:
-#ifndef DUNE_FUFEM_ASSEMBLERS_FORMS_HH
-#define DUNE_FUFEM_ASSEMBLERS_FORMS_HH
-
-
-#include <dune/fufem-forms/shapefunctioncache.hh>
-
-#include <dune/fufem-forms/baseclass.hh>
-#include <dune/fufem-forms/localoperators.hh>
-#include <dune/fufem-forms/nullaryoperators.hh>
-#include <dune/fufem-forms/transformedoperator.hh>
-#include <dune/fufem-forms/unaryoperators.hh>
-#include <dune/fufem-forms/sumoperator.hh>
-#include <dune/fufem-forms/productoperator.hh>
-#include <dune/fufem-forms/operators.hh>
-#include <dune/fufem-forms/localsumassembler.hh>
-#include <dune/fufem-forms/integratedlinearform.hh>
-#include <dune/fufem-forms/integratedbilinearform.hh>
-#include <dune/fufem-forms/integratedboundarylinearform.hh>
-#include <dune/fufem-forms/integratedboundarybilinearform.hh>
-#include <dune/fufem-forms/integrate.hh>
-#include <dune/fufem-forms/boundunaryoperator.hh>
-
-
-
-#endif // DUNE_FUFEM_ASSEMBLERS_FORMS_HH
diff --git a/dune/fufem/CMakeLists.txt b/dune/fufem/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7f95779ba05a6d39c2afe14d2e532b0ed104ee8a
--- /dev/null
+++ b/dune/fufem/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(forms)
diff --git a/dune/fufem-forms/CMakeLists.txt b/dune/fufem/forms/CMakeLists.txt
similarity index 87%
rename from dune/fufem-forms/CMakeLists.txt
rename to dune/fufem/forms/CMakeLists.txt
index 1242ab7ebb9a4210204a8c76cb833c8800a18144..43b80152e777c504cd4fd768ee91fd01da6ac7d7 100644
--- a/dune/fufem-forms/CMakeLists.txt
+++ b/dune/fufem/forms/CMakeLists.txt
@@ -17,4 +17,4 @@ install(FILES
   sumoperator.hh
   transformedoperator.hh
   unaryoperators.hh
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/fufem-forms)
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/fufem/forms)
diff --git a/dune/fufem-forms/baseclass.hh b/dune/fufem/forms/baseclass.hh
similarity index 100%
rename from dune/fufem-forms/baseclass.hh
rename to dune/fufem/forms/baseclass.hh
diff --git a/dune/fufem-forms/boundunaryoperator.hh b/dune/fufem/forms/boundunaryoperator.hh
similarity index 98%
rename from dune/fufem-forms/boundunaryoperator.hh
rename to dune/fufem/forms/boundunaryoperator.hh
index 2a06602f69a8d3b24e2b3364142d8ebe77f93dcb..7e1c7c861807a52a65e0b2dccbec70cc12c7c70a 100644
--- a/dune/fufem-forms/boundunaryoperator.hh
+++ b/dune/fufem/forms/boundunaryoperator.hh
@@ -8,9 +8,9 @@
 #include <tuple>
 #include <utility>
 
-#include <dune/fufem-forms/baseclass.hh>
-#include <dune/fufem-forms/transformedoperator.hh>
-#include <dune/fufem-forms/sumoperator.hh>
+#include <dune/fufem/forms/baseclass.hh>
+#include <dune/fufem/forms/transformedoperator.hh>
+#include <dune/fufem/forms/sumoperator.hh>
 
 
 
diff --git a/dune/fufem/forms/forms.hh b/dune/fufem/forms/forms.hh
new file mode 100644
index 0000000000000000000000000000000000000000..c02240f5cf98a2dfcf80ba39cff9a535c92c1c9b
--- /dev/null
+++ b/dune/fufem/forms/forms.hh
@@ -0,0 +1,27 @@
+// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+// vi: set et ts=4 sw=2 sts=2:
+#ifndef DUNE_FUFEM_ASSEMBLERS_FORMS_HH
+#define DUNE_FUFEM_ASSEMBLERS_FORMS_HH
+
+
+#include <dune/fufem/forms/shapefunctioncache.hh>
+
+#include <dune/fufem/forms/baseclass.hh>
+#include <dune/fufem/forms/localoperators.hh>
+#include <dune/fufem/forms/nullaryoperators.hh>
+#include <dune/fufem/forms/transformedoperator.hh>
+#include <dune/fufem/forms/unaryoperators.hh>
+#include <dune/fufem/forms/sumoperator.hh>
+#include <dune/fufem/forms/productoperator.hh>
+#include <dune/fufem/forms/operators.hh>
+#include <dune/fufem/forms/localsumassembler.hh>
+#include <dune/fufem/forms/integratedlinearform.hh>
+#include <dune/fufem/forms/integratedbilinearform.hh>
+#include <dune/fufem/forms/integratedboundarylinearform.hh>
+#include <dune/fufem/forms/integratedboundarybilinearform.hh>
+#include <dune/fufem/forms/integrate.hh>
+#include <dune/fufem/forms/boundunaryoperator.hh>
+
+
+
+#endif // DUNE_FUFEM_ASSEMBLERS_FORMS_HH
diff --git a/dune/fufem-forms/integrate.hh b/dune/fufem/forms/integrate.hh
similarity index 91%
rename from dune/fufem-forms/integrate.hh
rename to dune/fufem/forms/integrate.hh
index a3946f47335b02ec86f3369bf87401a4a4610b81..adb96d0fb83ce8675241319e35dff2b9d89f4cb5 100644
--- a/dune/fufem-forms/integrate.hh
+++ b/dune/fufem/forms/integrate.hh
@@ -8,11 +8,12 @@
 
 #include <dune/fufem/boundarypatch.hh>
 
-#include <dune/fufem-forms/baseclass.hh>
+#include <dune/fufem/forms/baseclass.hh>
 
-#include <dune/fufem-forms/integratedlinearform.hh>
-#include <dune/fufem-forms/integratedbilinearform.hh>
-#include <dune/fufem-forms/integratedboundarylinearform.hh>
+#include <dune/fufem/forms/integratedlinearform.hh>
+#include <dune/fufem/forms/integratedbilinearform.hh>
+#include <dune/fufem/forms/integratedboundarylinearform.hh>
+#include <dune/fufem/forms/integratedboundarybilinearform.hh>
 
 
 
diff --git a/dune/fufem-forms/integratedbilinearform.hh b/dune/fufem/forms/integratedbilinearform.hh
similarity index 96%
rename from dune/fufem-forms/integratedbilinearform.hh
rename to dune/fufem/forms/integratedbilinearform.hh
index c9f39cd7ed99d8ca11005ff2d4073c794b0306f7..7dbecc12f55d53845e1702f22897cd538f469d0d 100644
--- a/dune/fufem-forms/integratedbilinearform.hh
+++ b/dune/fufem/forms/integratedbilinearform.hh
@@ -11,9 +11,9 @@
 
 #include <dune/typetree/childextraction.hh>
 
-#include <dune/fufem-forms/shapefunctioncache.hh>
-#include <dune/fufem-forms/baseclass.hh>
-#include <dune/fufem-forms/localsumassembler.hh>
+#include <dune/fufem/forms/shapefunctioncache.hh>
+#include <dune/fufem/forms/baseclass.hh>
+#include <dune/fufem/forms/localsumassembler.hh>
 
 
 
diff --git a/dune/fufem-forms/integratedboundarybilinearform.hh b/dune/fufem/forms/integratedboundarybilinearform.hh
similarity index 97%
rename from dune/fufem-forms/integratedboundarybilinearform.hh
rename to dune/fufem/forms/integratedboundarybilinearform.hh
index 9ffe2ebb4b3ec6db2310c331034f966341527592..b9f9c1757466e8191eed451a5b5a75e1c3c54e6c 100644
--- a/dune/fufem-forms/integratedboundarybilinearform.hh
+++ b/dune/fufem/forms/integratedboundarybilinearform.hh
@@ -11,9 +11,9 @@
 
 #include <dune/typetree/childextraction.hh>
 
-#include <dune/fufem-forms/shapefunctioncache.hh>
-#include <dune/fufem-forms/baseclass.hh>
-#include <dune/fufem-forms/localsumassembler.hh>
+#include <dune/fufem/forms/shapefunctioncache.hh>
+#include <dune/fufem/forms/baseclass.hh>
+#include <dune/fufem/forms/localsumassembler.hh>
 
 
 
diff --git a/dune/fufem-forms/integratedboundarylinearform.hh b/dune/fufem/forms/integratedboundarylinearform.hh
similarity index 96%
rename from dune/fufem-forms/integratedboundarylinearform.hh
rename to dune/fufem/forms/integratedboundarylinearform.hh
index 81adc6c916a20aa9ac26f1ba17fdd570520239c5..464f7c28553c7a6a23f09435ffa60fcab8b20723 100644
--- a/dune/fufem-forms/integratedboundarylinearform.hh
+++ b/dune/fufem/forms/integratedboundarylinearform.hh
@@ -13,9 +13,9 @@
 
 #include <dune/fufem/boundarypatch.hh>
 
-#include <dune/fufem-forms/shapefunctioncache.hh>
-#include <dune/fufem-forms/baseclass.hh>
-#include <dune/fufem-forms/localsumassembler.hh>
+#include <dune/fufem/forms/shapefunctioncache.hh>
+#include <dune/fufem/forms/baseclass.hh>
+#include <dune/fufem/forms/localsumassembler.hh>
 
 
 
diff --git a/dune/fufem-forms/integratedlinearform.hh b/dune/fufem/forms/integratedlinearform.hh
similarity index 96%
rename from dune/fufem-forms/integratedlinearform.hh
rename to dune/fufem/forms/integratedlinearform.hh
index 6dfe7cdf781a4d3736f46f924d8bfd0109041a74..2dbf2eb34e25ff48572b24108e8948af5ba707f7 100644
--- a/dune/fufem-forms/integratedlinearform.hh
+++ b/dune/fufem/forms/integratedlinearform.hh
@@ -11,9 +11,9 @@
 
 #include <dune/typetree/childextraction.hh>
 
-#include <dune/fufem-forms/shapefunctioncache.hh>
-#include <dune/fufem-forms/baseclass.hh>
-#include <dune/fufem-forms/localsumassembler.hh>
+#include <dune/fufem/forms/shapefunctioncache.hh>
+#include <dune/fufem/forms/baseclass.hh>
+#include <dune/fufem/forms/localsumassembler.hh>
 
 
 
diff --git a/dune/fufem-forms/localoperators.hh b/dune/fufem/forms/localoperators.hh
similarity index 100%
rename from dune/fufem-forms/localoperators.hh
rename to dune/fufem/forms/localoperators.hh
diff --git a/dune/fufem-forms/localsumassembler.hh b/dune/fufem/forms/localsumassembler.hh
similarity index 100%
rename from dune/fufem-forms/localsumassembler.hh
rename to dune/fufem/forms/localsumassembler.hh
diff --git a/dune/fufem-forms/nullaryoperators.hh b/dune/fufem/forms/nullaryoperators.hh
similarity index 97%
rename from dune/fufem-forms/nullaryoperators.hh
rename to dune/fufem/forms/nullaryoperators.hh
index e69f2983353ba375f8b392e0d49136570c09f337..2a5888efb80cd7925ed08fa0a52516546cd50224 100644
--- a/dune/fufem-forms/nullaryoperators.hh
+++ b/dune/fufem/forms/nullaryoperators.hh
@@ -11,7 +11,7 @@
 #include <dune/istl/matrix.hh>
 #include <dune/istl/matrixindexset.hh>
 
-#include <dune/fufem-forms/baseclass.hh>
+#include <dune/fufem/forms/baseclass.hh>
 
 
 
diff --git a/dune/fufem-forms/operators.hh b/dune/fufem/forms/operators.hh
similarity index 93%
rename from dune/fufem-forms/operators.hh
rename to dune/fufem/forms/operators.hh
index e60afa54d11a1b5cb74337f0b1c580057eabc72c..b3ce59b4d34e478adea4934b49f67e52033a82c0 100644
--- a/dune/fufem-forms/operators.hh
+++ b/dune/fufem/forms/operators.hh
@@ -12,11 +12,11 @@
 
 #include <dune/istl/scaledidmatrix.hh>
 
-#include <dune/fufem-forms/baseclass.hh>
-#include <dune/fufem-forms/localoperators.hh>
-#include <dune/fufem-forms/transformedoperator.hh>
-#include <dune/fufem-forms/unaryoperators.hh>
-#include <dune/fufem-forms/productoperator.hh>
+#include <dune/fufem/forms/baseclass.hh>
+#include <dune/fufem/forms/localoperators.hh>
+#include <dune/fufem/forms/transformedoperator.hh>
+#include <dune/fufem/forms/unaryoperators.hh>
+#include <dune/fufem/forms/productoperator.hh>
 
 
 
diff --git a/dune/fufem-forms/productoperator.hh b/dune/fufem/forms/productoperator.hh
similarity index 98%
rename from dune/fufem-forms/productoperator.hh
rename to dune/fufem/forms/productoperator.hh
index 815e3d00050dee87b41053aaf7a0dcdbd98babf8..1dcc5351b74e845d7d3d8c5c12e62f8916203760 100644
--- a/dune/fufem-forms/productoperator.hh
+++ b/dune/fufem/forms/productoperator.hh
@@ -8,10 +8,10 @@
 #include <tuple>
 #include <utility>
 
-#include <dune/fufem-forms/baseclass.hh>
-#include <dune/fufem-forms/localoperators.hh>
-#include <dune/fufem-forms/transformedoperator.hh>
-#include <dune/fufem-forms/sumoperator.hh>
+#include <dune/fufem/forms/baseclass.hh>
+#include <dune/fufem/forms/localoperators.hh>
+#include <dune/fufem/forms/transformedoperator.hh>
+#include <dune/fufem/forms/sumoperator.hh>
 
 
 
diff --git a/dune/fufem-forms/shapefunctioncache.hh b/dune/fufem/forms/shapefunctioncache.hh
similarity index 100%
rename from dune/fufem-forms/shapefunctioncache.hh
rename to dune/fufem/forms/shapefunctioncache.hh
diff --git a/dune/fufem-forms/sumoperator.hh b/dune/fufem/forms/sumoperator.hh
similarity index 99%
rename from dune/fufem-forms/sumoperator.hh
rename to dune/fufem/forms/sumoperator.hh
index 436ce257440a2f826e14d784e4e3fa87fda8402c..793e374d41239d2949f3dbdd7bca57b077fec9cc 100644
--- a/dune/fufem-forms/sumoperator.hh
+++ b/dune/fufem/forms/sumoperator.hh
@@ -10,7 +10,7 @@
 
 #include <dune/fufem/quadraturerules/quadraturerulecache.hh>
 
-#include <dune/fufem-forms/baseclass.hh>
+#include <dune/fufem/forms/baseclass.hh>
 
 
 
diff --git a/dune/fufem-forms/transformedoperator.hh b/dune/fufem/forms/transformedoperator.hh
similarity index 99%
rename from dune/fufem-forms/transformedoperator.hh
rename to dune/fufem/forms/transformedoperator.hh
index 956e0c96b8358c78c7788ff8e5ed1695c4314a91..a38d5b67339a79e7a130bceb6345bd05a0444c1b 100644
--- a/dune/fufem-forms/transformedoperator.hh
+++ b/dune/fufem/forms/transformedoperator.hh
@@ -8,7 +8,7 @@
 #include <tuple>
 #include <utility>
 
-#include <dune/fufem-forms/localoperators.hh>
+#include <dune/fufem/forms/localoperators.hh>
 
 
 
diff --git a/dune/fufem-forms/unaryoperators.hh b/dune/fufem/forms/unaryoperators.hh
similarity index 99%
rename from dune/fufem-forms/unaryoperators.hh
rename to dune/fufem/forms/unaryoperators.hh
index 444383afe1df7442c43260c57b038a3a11ea47f8..b5ff189e827c61e779a89c48418093a6dfcb6ff2 100644
--- a/dune/fufem-forms/unaryoperators.hh
+++ b/dune/fufem/forms/unaryoperators.hh
@@ -19,8 +19,8 @@
 
 #include <dune/fufem/quadraturerules/quadraturerulecache.hh>
 
-#include <dune/fufem-forms/baseclass.hh>
-#include <dune/fufem-forms/transformedoperator.hh>
+#include <dune/fufem/forms/baseclass.hh>
+#include <dune/fufem/forms/transformedoperator.hh>
 
 
 namespace Dune::Fufem::Forms {
diff --git a/src/benchmark.cc b/src/benchmark.cc
index 49d42bc80b8ee79f4ff21bff8fdd3807ce401045..b8bf19e7bc50295965797ca05fb749d8f94b5911 100644
--- a/src/benchmark.cc
+++ b/src/benchmark.cc
@@ -37,7 +37,7 @@
 
 #include <dune/fufem/assemblers/localassemblers/laplaceassembler.hh>
 
-#include <dune/fufem-forms/forms.hh>
+#include <dune/fufem/forms/forms.hh>
 
 using namespace Dune;
 
diff --git a/src/fracture.cc b/src/fracture.cc
index 2f9417ec01191a9c7069e867f1320923a56898c3..757ac6390cd4a151109e68f617e513d2a3c6b797 100644
--- a/src/fracture.cc
+++ b/src/fracture.cc
@@ -40,7 +40,7 @@
 #include <dune/fufem/assemblers/dunefunctionsfunctionalassembler.hh>
 #include <dune/fufem/backends/istlmatrixbackend.hh>
 
-#include <dune/fufem-forms/forms.hh>
+#include <dune/fufem/forms/forms.hh>
 
 
 
diff --git a/src/poisson-mfem.cc b/src/poisson-mfem.cc
index 0cfd3388d84a0fc879f92a79bf18d898eb4e90db..eb3d54e3a1395098fed3a9809689730d6ffdbda2 100644
--- a/src/poisson-mfem.cc
+++ b/src/poisson-mfem.cc
@@ -38,7 +38,7 @@
 #include <dune/fufem/backends/istlmatrixbackend.hh>
 #include <dune/fufem/parallel/elementcoloring.hh>
 
-#include <dune/fufem-forms/forms.hh>
+#include <dune/fufem/forms/forms.hh>
 
 #define DIM2 // Use a two-dimensional test, otherwise three-dimensional
 
diff --git a/src/poisson-pq2.cc b/src/poisson-pq2.cc
index a5a786dcda153271344b12d3ebf5c8fa4392f31c..a11e2e87c8770529fdd83f3a9482f61eb6de2894 100644
--- a/src/poisson-pq2.cc
+++ b/src/poisson-pq2.cc
@@ -32,7 +32,7 @@
 #include <dune/fufem/backends/istlmatrixbackend.hh>
 #include <dune/fufem/boundarypatch.hh>
 
-#include <dune/fufem-forms/forms.hh>
+#include <dune/fufem/forms/forms.hh>
 
 using namespace Dune;
 
diff --git a/src/primal-plasticity.cc b/src/primal-plasticity.cc
index f4b14f7a23096e9bcabbce8d8e66b97d06808f4d..6675178b882bf0226c94ea7790034a647d98a73d 100644
--- a/src/primal-plasticity.cc
+++ b/src/primal-plasticity.cc
@@ -35,7 +35,7 @@
 #include <dune/fufem/assemblers/dunefunctionsfunctionalassembler.hh>
 #include <dune/fufem/backends/istlmatrixbackend.hh>
 
-#include <dune/fufem-forms/forms.hh>
+#include <dune/fufem/forms/forms.hh>
 
 
 
diff --git a/src/showcase.cc b/src/showcase.cc
index e23b114a6b63c1724427a18edbe36564ddd9a7b2..4e6ba94a32a59596515de7cc1ec3d9a9bad6ea09 100644
--- a/src/showcase.cc
+++ b/src/showcase.cc
@@ -32,7 +32,7 @@
 #include <dune/fufem/backends/istlmatrixbackend.hh>
 #include <dune/fufem/boundarypatch.hh>
 
-#include <dune/fufem-forms/forms.hh>
+#include <dune/fufem/forms/forms.hh>
 
 using namespace Dune;
 
diff --git a/src/stokes-taylorhood.cc b/src/stokes-taylorhood.cc
index 00403836ca9b91dadc64ef3e34e1c3771a1a4da6..29f55b9ce8c51571d49c95122efec516a203c060 100644
--- a/src/stokes-taylorhood.cc
+++ b/src/stokes-taylorhood.cc
@@ -41,7 +41,7 @@
 #include <dune/fufem/assemblers/dunefunctionsfunctionalassembler.hh>
 #include <dune/fufem/backends/istlmatrixbackend.hh>
 
-#include <dune/fufem-forms/forms.hh>
+#include <dune/fufem/forms/forms.hh>