diff --git a/.gitmodules b/.gitmodules
index f0ee9e0..1328448 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,7 @@
 	path = advection
 	url = https://www1.am.uni-erlangen.de/git/festung-advection
 [submodule "hdg_advection"]
-	path = hdg_advection
+	path = advection_hdg
 	url = https://www1.am.uni-erlangen.de/git/festung-hdg_advection
 [submodule "advection_implicit"]
 	path = advection_implicit
diff --git a/doxyfile b/Doxyfile
similarity index 99%
rename from doxyfile
rename to Doxyfile
index 353c385..9388900 100644
--- a/doxyfile
+++ b/Doxyfile
@@ -776,7 +776,7 @@ INPUT                  = . \
                          doxygen/gallery.md \
                          license.md \
                          namingConvention.md \
-                         doxygen/solverStructure.md 
+                         doxygen/solverStructure.md
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/README.md b/README.md
index 6560f30..5fb0889 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ doxygen
 in the main directory.
 
 ## Contributors
-FESTUNGs main developers are [Florian Frank](http://frank.ink), [Balthasar Reuter](https://math.fau.de/reuter), and [Vadym Aizinger](https://math.fau.de/aizinger). Its initial release was developed at the [Chair for Applied Mathematics I](https://www.mso.math.fau.de/applied-mathematics-1.html) at [Friedrich-Alexander-University Erlangen-Nürnberg](https://www.fau.eu).
+FESTUNGs main developers are [Florian Frank](http://frank.ink), [Balthasar Reuter](https://math.fau.de/reuter), and [Vadym Aizinger](https://www.awi.de/nc/en/about-us/organisation/staff/vadym-aizinger.html). Its initial release was developed at the [Chair for Applied Mathematics I](https://www.mso.math.fau.de/applied-mathematics-1.html) at [Friedrich-Alexander-University Erlangen-Nürnberg](https://www.fau.eu).
 
 ### Third party libraries
 * FESTUNG makes extensive use of the built-in routines in MATLAB / GNU Octave.
diff --git a/advection b/advection
index 7a77735..b79caa7 160000
--- a/advection
+++ b/advection
@@ -1 +1 @@
-Subproject commit 7a77735360f4c74d197b7aaaba36541e3f6ddfd1
+Subproject commit b79caa78769d7ab3785d6a432d974a213496713a
diff --git a/advection_hdg b/advection_hdg
new file mode 160000
index 0000000..75aac65
--- /dev/null
+++ b/advection_hdg
@@ -0,0 +1 @@
+Subproject commit 75aac654d14a487b49a18c4bf6393975b9ae4acb
diff --git a/advection_implicit b/advection_implicit
index 47573ce..3572086 160000
--- a/advection_implicit
+++ b/advection_implicit
@@ -1 +1 @@
-Subproject commit 47573ced4ae41353ec26758a462c9f73f1b3f2b8
+Subproject commit 3572086ec3c64d8dc00046d65b4c59f4ff375e56
diff --git a/core b/core
index f0cd2eb..651dc19 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit f0cd2eb530090c2c09ac5e2f256245b33549e64b
+Subproject commit 651dc19cc7497c6e69697c34399df0e7d471a7d7
diff --git a/darcy_2dv b/darcy_2dv
index 3bc5b90..fb5d5c5 160000
--- a/darcy_2dv
+++ b/darcy_2dv
@@ -1 +1 @@
-Subproject commit 3bc5b9081f9a25778aee4a5fbfead2d343096724
+Subproject commit fb5d5c5eccf3180e46c88af7aa8aa143a3a0e994
diff --git a/darcy_swe_2dv b/darcy_swe_2dv
index 4616ab9..b54ca05 160000
--- a/darcy_swe_2dv
+++ b/darcy_swe_2dv
@@ -1 +1 @@
-Subproject commit 4616ab977740cc75e42b90961f25cc5d279ead9a
+Subproject commit b54ca05bf59fa9b0824f2a3c9a4c05eb04415e1f
diff --git a/diffusion b/diffusion
index 5b49bd7..27306fa 160000
--- a/diffusion
+++ b/diffusion
@@ -1 +1 @@
-Subproject commit 5b49bd789d86fc1832962a19cad7eb0d4ee37f0c
+Subproject commit 27306fa30bf5da209b9b596d7599dd820f767413
diff --git a/doxygen/references.dox b/doxygen/references.dox
index 4abba89..3f35da9 100644
--- a/doxygen/references.dox
+++ b/doxygen/references.dox
@@ -3,14 +3,14 @@
 //! 
 //! @section TAG_REF_1 FESTUNG articles
 //!
-//! @subsection RRAFP2018 [RRAFP2018]
+//! @subsection RRAFK2018 [RRAFK2018]
 //! B. Reuter, A. Rupp, V. Aizinger, F. Frank, P.Knabner,<br>
 //! <b>&ldquo;FESTUNG: A MATLAB/GNU Octave toolbox for the discontinuous Galerkin 
 //! method, Part IV: Generic problem framework and model-coupling 
 //! interface&rdquo;</b>,<br>
 //! Submitted to Computers & Mathematics with Applications (2018).
 //!
-//! @subsection JRASK2017 [JRASK2017]
+//! @subsection JRASK2018 [JRASK2018]
 //! A. Jaust, B. Reuter, V. Aizinger, J. Schütz, P. Knabner,<br>
 //! <b>&ldquo;FESTUNG: A MATLAB/GNU Octave toolbox for the discontinuous 
 //! Galerkin method, Part III: Hybridized discontinuous (HDG) formulation&rdquo;</b>,<br>
diff --git a/hdg_advection b/hdg_advection
deleted file mode 160000
index 40d4ccc..0000000
--- a/hdg_advection
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 40d4ccc8b46e5ff9aaf227c0a69a638d5303fd8c
diff --git a/swe b/swe
index c83190f..08ec963 160000
--- a/swe
+++ b/swe
@@ -1 +1 @@
-Subproject commit c83190f3f1241703d0da9ee67bb1b772c981d8b1
+Subproject commit 08ec9631595ae0144974d4c54b2f1a592e69d284
diff --git a/swe_2dv b/swe_2dv
index 2874d2e..c56a3d3 160000
--- a/swe_2dv
+++ b/swe_2dv
@@ -1 +1 @@
-Subproject commit 2874d2eccb1496bd448b4efd294fb808638c5e8d
+Subproject commit c56a3d36ed79a1c8b4730573423dc735fbb9c288
diff --git a/template b/template
index 9bf15d9..48d23e4 160000
--- a/template
+++ b/template
@@ -1 +1 @@
-Subproject commit 9bf15d9a4e25b93707a730f9567c4bf0739dcfc0
+Subproject commit 48d23e4b5054590beb7f7aa8648577d78c0de392