diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2345f41cbff617fe45589f6e488ac9caaa2ffd73..95c9e8e21aec3be6b79d8e544e3735197736fb09 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -26,8 +26,8 @@ repos:
         language: system
         files: '.*\.cpp'
         stages: [commit, manual]
-  - repo: https://github.com/ambv/black
-    rev: 20.8b1
+  - repo: https://github.com/psf/black
+    rev: 22.3.0
     hooks:
       - id: black
         exclude: "ThirdParty|LinearMFront/generate_ref.py"
diff --git a/web/content/docs/benchmarks/EhlersDamage/EhlersDamage.md b/web/content/docs/benchmarks/EhlersDamage/EhlersDamage/index.md
similarity index 100%
rename from web/content/docs/benchmarks/EhlersDamage/EhlersDamage.md
rename to web/content/docs/benchmarks/EhlersDamage/EhlersDamage/index.md
diff --git a/web/content/docs/benchmarks/bgr_verification_examples/heatconduction.md b/web/content/docs/benchmarks/bgr_verification_examples/heatconduction/index.md
similarity index 100%
rename from web/content/docs/benchmarks/bgr_verification_examples/heatconduction.md
rename to web/content/docs/benchmarks/bgr_verification_examples/heatconduction/index.md
diff --git a/web/content/docs/benchmarks/bgr_verification_examples/hydromechanics.md b/web/content/docs/benchmarks/bgr_verification_examples/hydromechanics/index.md
similarity index 100%
rename from web/content/docs/benchmarks/bgr_verification_examples/hydromechanics.md
rename to web/content/docs/benchmarks/bgr_verification_examples/hydromechanics/index.md
diff --git a/web/content/docs/benchmarks/bgr_verification_examples/liquid_flow.md b/web/content/docs/benchmarks/bgr_verification_examples/liquid_flow/index.md
similarity index 100%
rename from web/content/docs/benchmarks/bgr_verification_examples/liquid_flow.md
rename to web/content/docs/benchmarks/bgr_verification_examples/liquid_flow/index.md
diff --git a/web/content/docs/benchmarks/bgr_verification_examples/mechanics.md b/web/content/docs/benchmarks/bgr_verification_examples/mechanics/index.md
similarity index 100%
rename from web/content/docs/benchmarks/bgr_verification_examples/mechanics.md
rename to web/content/docs/benchmarks/bgr_verification_examples/mechanics/index.md
diff --git a/web/content/docs/benchmarks/bgr_verification_examples/thermohydromechanics.md b/web/content/docs/benchmarks/bgr_verification_examples/thermohydromechanics/index.md
similarity index 100%
rename from web/content/docs/benchmarks/bgr_verification_examples/thermohydromechanics.md
rename to web/content/docs/benchmarks/bgr_verification_examples/thermohydromechanics/index.md
diff --git a/web/content/docs/benchmarks/bgr_verification_examples/thermomechanics.md b/web/content/docs/benchmarks/bgr_verification_examples/thermomechanics/index.md
similarity index 100%
rename from web/content/docs/benchmarks/bgr_verification_examples/thermomechanics.md
rename to web/content/docs/benchmarks/bgr_verification_examples/thermomechanics/index.md
diff --git a/web/content/docs/benchmarks/creep-after-excavation-bgra/T.png b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/T.png
similarity index 100%
rename from web/content/docs/benchmarks/creep-after-excavation-bgra/T.png
rename to web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/T.png
diff --git a/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation.md b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/index.md
similarity index 88%
rename from web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation.md
rename to web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/index.md
index 7fc58ab6278b3eb5bc16c4803580cf330bec5bf4..e4f5b6e3feaf11543d93e46dc51e9b6784e0e839 100644
--- a/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation.md
+++ b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/index.md
@@ -19,7 +19,7 @@ this example represents the creep in the near field of
 drift in the deep rock salt after excavation. The domain and the
 geometry are shown in the following figure:
 
-![Mesh and Geometry.](../mesh.png#thwo-third "Mesh and Geometry.")
+![Mesh and Geometry.](mesh.png "Mesh and Geometry.")
 
 The domain has two material groups, which are highlighted by different
 colors. The material group that is in the
@@ -79,17 +79,17 @@ the left sub-figure show the time variations of horizontal and vertical stresses
 green vertical line in it marks the time of the displayed stress field.
 
 <figure>
-    <img src="../stress_xx_yy_20.png" alt="Stress distribution at the time of 109 days." id="fig_2">
+    <img src="stress_xx_yy_20.png" alt="Stress distribution at the time of 109 days." id="fig_2">
     <figcaption>Stress distribution at the time of 109 days.</figcaption>
 </figure>
 
 <figure>
-    <img src="../stress_xx_yy_50.png" alt="Stress distribution at the time of 409 days." id="fig_3">
+    <img src="stress_xx_yy_50.png" alt="Stress distribution at the time of 409 days." id="fig_3">
     <figcaption>Stress distribution at the time of 409 days.</figcaption>
 </figure>
 
 <figure>
-    <img src="../stress_xx_yy_110.png" alt="Stress distribution at the time of 1000 days." id="fig_4">
+    <img src="stress_xx_yy_110.png" alt="Stress distribution at the time of 1000 days." id="fig_4">
     <figcaption>Stress distribution at the time of 1000 days.</figcaption>
 </figure>
 
@@ -101,13 +101,13 @@ horizontal stress.
 The following figure shows the strain distribution at the
 end of the simulation time at 1000 days.
 <figure>
-    <img src="../strain.png" alt="Strain distribution at the time of 1000 days." id="fig_5">
+    <img src="strain.png" alt="Strain distribution at the time of 1000 days." id="fig_5">
     <figcaption>Strain distribution at the time of 1000 days.</figcaption>
 </figure>
 
 The steady-state temperature distribution is displayed in the following figure
 <figure>
-    <img src="../T.png" alt="Temperature distribution at the time of 1000 days." id="fig_6">
+    <img src="T.png" alt="Temperature distribution at the time of 1000 days." id="fig_6">
     <figcaption>Temperature distribution at the time of 1000 days.</figcaption>
 </figure>
 
diff --git a/web/content/docs/benchmarks/creep-after-excavation-bgra/mesh.png b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/mesh.png
similarity index 100%
rename from web/content/docs/benchmarks/creep-after-excavation-bgra/mesh.png
rename to web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/mesh.png
diff --git a/web/content/docs/benchmarks/creep-after-excavation-bgra/strain.png b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/strain.png
similarity index 100%
rename from web/content/docs/benchmarks/creep-after-excavation-bgra/strain.png
rename to web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/strain.png
diff --git a/web/content/docs/benchmarks/creep-after-excavation-bgra/stress_xx_yy_110.png b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/stress_xx_yy_110.png
similarity index 100%
rename from web/content/docs/benchmarks/creep-after-excavation-bgra/stress_xx_yy_110.png
rename to web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/stress_xx_yy_110.png
diff --git a/web/content/docs/benchmarks/creep-after-excavation-bgra/stress_xx_yy_20.png b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/stress_xx_yy_20.png
similarity index 100%
rename from web/content/docs/benchmarks/creep-after-excavation-bgra/stress_xx_yy_20.png
rename to web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/stress_xx_yy_20.png
diff --git a/web/content/docs/benchmarks/creep-after-excavation-bgra/stress_xx_yy_50.png b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/stress_xx_yy_50.png
similarity index 100%
rename from web/content/docs/benchmarks/creep-after-excavation-bgra/stress_xx_yy_50.png
rename to web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation/stress_xx_yy_50.png
diff --git a/web/content/docs/benchmarks/creepbgra/BGRaVerificationExamples.md b/web/content/docs/benchmarks/creepbgra/BGRaVerificationExamples/index.md
similarity index 100%
rename from web/content/docs/benchmarks/creepbgra/BGRaVerificationExamples.md
rename to web/content/docs/benchmarks/creepbgra/BGRaVerificationExamples/index.md
diff --git a/web/content/docs/benchmarks/creepbgra/bgra0.png b/web/content/docs/benchmarks/creepbgra/CreepBGRa/bgra0.png
similarity index 100%
rename from web/content/docs/benchmarks/creepbgra/bgra0.png
rename to web/content/docs/benchmarks/creepbgra/CreepBGRa/bgra0.png
diff --git a/web/content/docs/benchmarks/creepbgra/doku_BGRa.pdf b/web/content/docs/benchmarks/creepbgra/CreepBGRa/doku_BGRa.pdf
similarity index 100%
rename from web/content/docs/benchmarks/creepbgra/doku_BGRa.pdf
rename to web/content/docs/benchmarks/creepbgra/CreepBGRa/doku_BGRa.pdf
diff --git a/web/content/docs/benchmarks/creepbgra/CreepBRGa.md b/web/content/docs/benchmarks/creepbgra/CreepBGRa/index.md
similarity index 98%
rename from web/content/docs/benchmarks/creepbgra/CreepBRGa.md
rename to web/content/docs/benchmarks/creepbgra/CreepBGRa/index.md
index 0370b638d138c91671467a1b8b5e1dffe9be6a69..323808fe362476c5e7c6c7530245a298a115cbaa 100644
--- a/web/content/docs/benchmarks/creepbgra/CreepBRGa.md
+++ b/web/content/docs/benchmarks/creepbgra/CreepBGRa/index.md
@@ -5,6 +5,8 @@ weight = 171
 project = "ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj"
 author = "Wenqing Wang"
 
+aliases = ["/docs/benchmarks/creepbgra/creepbrga"]
+
 [menu]
   [menu.benchmarks]
     parent = "Thermo-Mechanics"
@@ -135,7 +137,7 @@ $$\begin{aligned}
 
 *Note*: The above rate form of stress integration is implemented in ogs6.
  Alternatively, one can use a absolute stress integration form, which can be found in the attached
- [PDF](../doku_BGRa.pdf).
+ [PDF](doku_BGRa.pdf).
 
 ## Example
 
@@ -179,7 +181,7 @@ $$\begin{gathered}
  The comparison of the result of $\epsilon_z$
 obtained by the present multidimensional scheme with the analytical
 solution is shown in the following figure:
-{{< img src="../bgra0.png" >}}
+{{< img src="bgra0.png" >}}
 
 ### Python code
 
@@ -188,6 +190,7 @@ A short python snippet, to compute the values.
 <summary>
 Insert this into Paraview's ProgrammableFilter:
 </summary>
+
 ```python
 A = self.GetInputDataObject(0, 0)
 numPoints = A.GetNumberOfPoints()
@@ -224,4 +227,5 @@ output.GetPointData().AddArray(outSyy)
 output.GetPointData().AddArray(outSzz)
 output.GetPointData().AddArray(outSxy)
 ```
+
 </details>
diff --git a/web/content/docs/benchmarks/elliptic/drainage_excavation.png b/web/content/docs/benchmarks/elliptic/drainage_diffusion/drainage_excavation.png
similarity index 100%
rename from web/content/docs/benchmarks/elliptic/drainage_excavation.png
rename to web/content/docs/benchmarks/elliptic/drainage_diffusion/drainage_excavation.png
diff --git a/web/content/docs/benchmarks/elliptic/drainage_diffusion.md b/web/content/docs/benchmarks/elliptic/drainage_diffusion/index.md
similarity index 91%
rename from web/content/docs/benchmarks/elliptic/drainage_diffusion.md
rename to web/content/docs/benchmarks/elliptic/drainage_diffusion/index.md
index 4695fbc4d5a7c7edbd003c356864ff76a51a70bd..209a31afc44acd552310ee0c1f38f6b54dd799a2 100644
--- a/web/content/docs/benchmarks/elliptic/drainage_diffusion.md
+++ b/web/content/docs/benchmarks/elliptic/drainage_diffusion/index.md
@@ -18,4 +18,4 @@ We present the drainage of an excavation benchmark in this [this PDF](../web/con
 
 Here's an impression of the problem and its results:
 
-{{< img src="../drainage_excavation.png" >}}
+{{< img src="drainage_excavation.png" >}}
diff --git a/web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term.md b/web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/index.md
similarity index 91%
rename from web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term.md
rename to web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/index.md
index 89856f1a105e9210bc94bc7e1f17e802284a782b..888c5188218280aadd9390877a43119a0a59f175 100644
--- a/web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term.md
+++ b/web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/index.md
@@ -104,11 +104,11 @@ info: OGS terminated on 2018-10-12 06:30:13+020
 
 The numerical solution shown in the following picture is almost a linear
 gradient:
-{{< img src="../square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_VolumetricSourceTerm.png" >}}
+{{< img src="square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_VolumetricSourceTerm.png" >}}
 The line plot along the $x$ axis shows that the solution is a quadratic
 function and is in very good agreement to the analytical solution:
-{{< img src="../square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_AnalyticalSolution_VolumetricSourceTerm.png" >}}
+{{< img src="square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_AnalyticalSolution_VolumetricSourceTerm.png" >}}
 
 The difference between the computed solution and the analytical solution is in
 the range of machine precision and therefore almost negligible:
-{{< img src="../square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_diff_Pressure_AnalyticalSolution_VolumetricSourceTerm.png" >}}
+{{< img src="square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_diff_Pressure_AnalyticalSolution_VolumetricSourceTerm.png" >}}
diff --git a/web/content/docs/benchmarks/elliptic/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_AnalyticalSolution_VolumetricSourceTerm.png b/web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_AnalyticalSolution_VolumetricSourceTerm.png
similarity index 100%
rename from web/content/docs/benchmarks/elliptic/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_AnalyticalSolution_VolumetricSourceTerm.png
rename to web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_AnalyticalSolution_VolumetricSourceTerm.png
diff --git a/web/content/docs/benchmarks/elliptic/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_VolumetricSourceTerm.png b/web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_VolumetricSourceTerm.png
similarity index 100%
rename from web/content/docs/benchmarks/elliptic/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_VolumetricSourceTerm.png
rename to web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_Pressure_VolumetricSourceTerm.png
diff --git a/web/content/docs/benchmarks/elliptic/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_diff_Pressure_AnalyticalSolution_VolumetricSourceTerm.png b/web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_diff_Pressure_AnalyticalSolution_VolumetricSourceTerm.png
similarity index 100%
rename from web/content/docs/benchmarks/elliptic/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_diff_Pressure_AnalyticalSolution_VolumetricSourceTerm.png
rename to web/content/docs/benchmarks/elliptic/elliptic-dirichlet-volumetric-source-term/square_1e2_volumetricsourceterm_pcs_0_ts_1_t_1.000000_diff_Pressure_AnalyticalSolution_VolumetricSourceTerm.png
diff --git a/web/content/docs/benchmarks/elliptic/elliptic-dirichlet.md b/web/content/docs/benchmarks/elliptic/elliptic-dirichlet/index.md
similarity index 97%
rename from web/content/docs/benchmarks/elliptic/elliptic-dirichlet.md
rename to web/content/docs/benchmarks/elliptic/elliptic-dirichlet/index.md
index a58c4d90666f87dd58f7038391555dadcf8b7e9f..0cc4af0b0db375bfd4d9053cc437257457ffd030 100644
--- a/web/content/docs/benchmarks/elliptic/elliptic-dirichlet.md
+++ b/web/content/docs/benchmarks/elliptic/elliptic-dirichlet/index.md
@@ -111,4 +111,4 @@ A major part of the output was produced by the linear equation solver (LIS in th
 
 <!-- {{< vis path="Elliptic/square_1x1_SteadyStateDiffusion/square_1e2_pcs_0_ts_1_t_1.000000.vtu" >}} -->
 
-![The result can be visualized with Paraview.](../square_1e2_pcs_0_ts_1_t_1.000000.png)
+![The result can be visualized with Paraview.](square_1e2_pcs_0_ts_1_t_1.000000.png)
diff --git a/web/content/docs/benchmarks/elliptic/square_1e2_pcs_0_ts_1_t_1.000000.png b/web/content/docs/benchmarks/elliptic/elliptic-dirichlet/square_1e2_pcs_0_ts_1_t_1.000000.png
similarity index 100%
rename from web/content/docs/benchmarks/elliptic/square_1e2_pcs_0_ts_1_t_1.000000.png
rename to web/content/docs/benchmarks/elliptic/elliptic-dirichlet/square_1e2_pcs_0_ts_1_t_1.000000.png
diff --git a/web/content/docs/benchmarks/elliptic/elliptic-neumann.md b/web/content/docs/benchmarks/elliptic/elliptic-neumann/index.md
similarity index 98%
rename from web/content/docs/benchmarks/elliptic/elliptic-neumann.md
rename to web/content/docs/benchmarks/elliptic/elliptic-neumann/index.md
index 0d4a4d9ece83f2b5d99b66880100a47094a198a2..0e7fe7e72d5b5efbbf5481c3a7d0cc92a659afe3 100644
--- a/web/content/docs/benchmarks/elliptic/elliptic-neumann.md
+++ b/web/content/docs/benchmarks/elliptic/elliptic-neumann/index.md
@@ -118,12 +118,12 @@ A last major part of the output was produced by the linear equation solver (LIS
 
 Compared to the analytical solution presented above the results are very good but in a single point:
 
-{{< img src="../square_1e2_neumann_abs_err.png" >}}
+{{< img src="square_1e2_neumann_abs_err.png" >}}
 
 Both Dirichlet boundary conditions are satisfied.
 The values of gradients in x direction along the right side and y directions along the top sides of the domain a shown below:
 
-{{< img src="../square_1e2_neumann_gradients.png" >}}
+{{< img src="square_1e2_neumann_gradients.png" >}}
 
 The homogeneous Neumann boundary condition on the top side is satisfied (ScalarGradient_Y is close to zero).
 The inhomogeneous Neumann boundary condition on the bottom is satisfied only for $y > 0.3$ (where the ScalarGradient_X is close to one) because of incompatible boundary conditions imposed on the bottom right corner of the domain.
diff --git a/web/content/docs/benchmarks/elliptic/square_1e2_neumann_abs_err.png b/web/content/docs/benchmarks/elliptic/elliptic-neumann/square_1e2_neumann_abs_err.png
similarity index 100%
rename from web/content/docs/benchmarks/elliptic/square_1e2_neumann_abs_err.png
rename to web/content/docs/benchmarks/elliptic/elliptic-neumann/square_1e2_neumann_abs_err.png
diff --git a/web/content/docs/benchmarks/elliptic/square_1e2_neumann_gradients.png b/web/content/docs/benchmarks/elliptic/elliptic-neumann/square_1e2_neumann_gradients.png
similarity index 100%
rename from web/content/docs/benchmarks/elliptic/square_1e2_neumann_gradients.png
rename to web/content/docs/benchmarks/elliptic/elliptic-neumann/square_1e2_neumann_gradients.png
diff --git a/web/content/docs/benchmarks/elliptic/circle_1e6_gwf_with_nodal_source_term_analytical_solution_head.png b/web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/circle_1e6_gwf_with_nodal_source_term_analytical_solution_head.png
similarity index 100%
rename from web/content/docs/benchmarks/elliptic/circle_1e6_gwf_with_nodal_source_term_analytical_solution_head.png
rename to web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/circle_1e6_gwf_with_nodal_source_term_analytical_solution_head.png
diff --git a/web/content/docs/benchmarks/elliptic/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head.png b/web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head.png
similarity index 100%
rename from web/content/docs/benchmarks/elliptic/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head.png
rename to web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head.png
diff --git a/web/content/docs/benchmarks/elliptic/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head_log_scale.png b/web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head_log_scale.png
similarity index 100%
rename from web/content/docs/benchmarks/elliptic/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head_log_scale.png
rename to web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head_log_scale.png
diff --git a/web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term.md b/web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/index.md
similarity index 89%
rename from web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term.md
rename to web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/index.md
index 95c0c939f6bb4236a33c6d0c60cc4cb84b85ffc4..7d0037e0c277d9ce6cbcd02c925d317e39278f8c 100644
--- a/web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term.md
+++ b/web/content/docs/benchmarks/elliptic/elliptic-pde-with-dirichlet-and-nodal-source-term/index.md
@@ -71,8 +71,8 @@ It will produce some output and write the computed result into a data array of t
 
 ### Comparison of the analytical solution and the computed solution
 
-{{< img src="../circle_1e6_gwf_with_nodal_source_term_analytical_solution_head.png" >}}
+{{< img src="circle_1e6_gwf_with_nodal_source_term_analytical_solution_head.png" >}}
 
-{{< img src="../circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head.png" >}}
+{{< img src="circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head.png" >}}
 
-{{< img src="../circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head_log_scale.png" >}}
+{{< img src="circle_1e6_gwf_with_nodal_source_term_diff_analytical_solution_head_log_scale.png" >}}
diff --git a/web/content/docs/benchmarks/elliptic/elliptic-robin.md b/web/content/docs/benchmarks/elliptic/elliptic-robin/index.md
similarity index 99%
rename from web/content/docs/benchmarks/elliptic/elliptic-robin.md
rename to web/content/docs/benchmarks/elliptic/elliptic-robin/index.md
index 531c7cd9b4d386672ddf8a1e2788a2b383798482..3a518790a53a30448ce3259b3215403148b8e3ed 100644
--- a/web/content/docs/benchmarks/elliptic/elliptic-robin.md
+++ b/web/content/docs/benchmarks/elliptic/elliptic-robin/index.md
@@ -105,7 +105,7 @@ The left figure shows the pressure along the line, in the right figure the
 difference between the analytical solution and the numerical calculated solution
 is plotted.
 
-{{< img src="../line_1e1_robin_left.png" >}}
+{{< img src="line_1e1_robin_left.png" >}}
 
 ## Second benchmark: Problem specification and analytical solution
 
diff --git a/web/content/docs/benchmarks/elliptic/line_1e1_robin_left.png b/web/content/docs/benchmarks/elliptic/elliptic-robin/line_1e1_robin_left.png
similarity index 100%
rename from web/content/docs/benchmarks/elliptic/line_1e1_robin_left.png
rename to web/content/docs/benchmarks/elliptic/elliptic-robin/line_1e1_robin_left.png
diff --git a/web/content/docs/benchmarks/elliptic/poisson_equation.md b/web/content/docs/benchmarks/elliptic/poisson_equation/index.md
similarity index 95%
rename from web/content/docs/benchmarks/elliptic/poisson_equation.md
rename to web/content/docs/benchmarks/elliptic/poisson_equation/index.md
index 474446c115d11e221e7e6c8c9143862c93aebc11..44484bb2a30b9d7075955a7a0936a9c321b747ba 100644
--- a/web/content/docs/benchmarks/elliptic/poisson_equation.md
+++ b/web/content/docs/benchmarks/elliptic/poisson_equation/index.md
@@ -185,15 +185,15 @@ info: OGS terminated on 2018-10-10 09:22:17+020
 
 ### Comparison of the numerical and analytical solutions
 
-{{< img src="../square_1e3_poisson_sin_x_sin_y_sourceterm_Pressure_PythonSourceTerm.png" >}}
+{{< img src="square_1e3_poisson_sin_x_sin_y_sourceterm_Pressure_PythonSourceTerm.png" >}}
 The above picture shows the numerical result. The solution conforms in the edges
 to the prescribed boundary conditions.
-{{< img src="../square_1e3_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png" >}}
+{{< img src="square_1e3_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png" >}}
 Since a coarse mesh ($32 \times 32$ elements) is used for the simulation the
 difference between the numerical and the analytical solution is relatively large.
 
 #### Comparison for higher resolution mesh ($316 \times 316$ elements)
 
-{{< img src="../square_1e5_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png" >}}
+{{< img src="square_1e5_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png" >}}
 The difference between the numerical and the analytical solution is much smaller
 than in the coarse mesh case.
diff --git a/web/content/docs/benchmarks/elliptic/square_1e3_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png b/web/content/docs/benchmarks/elliptic/poisson_equation/square_1e3_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png
similarity index 100%
rename from web/content/docs/benchmarks/elliptic/square_1e3_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png
rename to web/content/docs/benchmarks/elliptic/poisson_equation/square_1e3_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png
diff --git a/web/content/docs/benchmarks/elliptic/square_1e3_poisson_sin_x_sin_y_sourceterm_Pressure_PythonSourceTerm.png b/web/content/docs/benchmarks/elliptic/poisson_equation/square_1e3_poisson_sin_x_sin_y_sourceterm_Pressure_PythonSourceTerm.png
similarity index 100%
rename from web/content/docs/benchmarks/elliptic/square_1e3_poisson_sin_x_sin_y_sourceterm_Pressure_PythonSourceTerm.png
rename to web/content/docs/benchmarks/elliptic/poisson_equation/square_1e3_poisson_sin_x_sin_y_sourceterm_Pressure_PythonSourceTerm.png
diff --git a/web/content/docs/benchmarks/elliptic/square_1e5_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png b/web/content/docs/benchmarks/elliptic/poisson_equation/square_1e5_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png
similarity index 100%
rename from web/content/docs/benchmarks/elliptic/square_1e5_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png
rename to web/content/docs/benchmarks/elliptic/poisson_equation/square_1e5_poisson_sin_x_sin_y_sourceterm_Diff_Pressure_AnalyticalSolution_PythonSourceTerm.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE_figures/In_out_temperature_comparison.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/In_out_temperature_comparison.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE_figures/In_out_temperature_comparison.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/In_out_temperature_comparison.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE.md b/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/index.md
similarity index 95%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE.md
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/index.md
index f692d9d23fe33875797e5b01a7ad2a98736d0b29..917f6db4c7fc82615c688278e73299ee5f58425b 100644
--- a/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE.md
+++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/index.md
@@ -38,7 +38,7 @@ For this benchmark, Two different scenarios were carried out by applying two dif
 
 The detailed input parameters can be seen from the 3D_2U_BHE.prj file. The inflow temperature of the BHE, which was imposed as boundary condition of the BHE is shown in Figure 1. All the initial temperatures are set as 22 $^{\circ}$C. The flow rate within each U-pipe is set to $2.0\times10^{-4}$ $\mathrm{m^{3} s^{-1}}$ during the whole simulation time.
 
-{{< img src="../3D_2U_BHE_figures/In_out_temperature_comparison.png" width="200">}}
+{{< img src="In_out_temperature_comparison.png" width="200">}}
 
 Figure 1: Inflow temperature curve and outflow temperature comparison
 
@@ -62,7 +62,7 @@ The computed resutls from scenario by adopting the fixed inflow boundary conditi
 The OGS numerical outflow temperature over time was compared against results of the FEFLOW software as shown in the Figure 1. And the vertical distributed temperature of circulating water was presented in Figure 2 after operation for 3300 s.
 The comparison figures demonstrate that the OGS numerical results and FEFLOW results can match very well and the biggest absolute error of outflow temperature is 0.20 $^{\circ}$C after 360 s' operation, while such error decreases to 0.037 $^{\circ}$C after 3600 s' operation. The maximum relative error of vertical temperature is 0.019 \% after operation for 3300 s.
 
-{{< img src="../3D_2U_BHE_figures/vertical_temperature_distribution.png" width="200">}}
+{{< img src="vertical_temperature_distribution.png" width="200">}}
 
 Figure 2: Comparison of vertical temperature distribution from scenario by adopting the fixed inflow boundary condition
 
@@ -75,7 +75,7 @@ Besides, by setting python bindings, the current OGS `Heat_Transport_BHE` proces
 In this way, the computed vertical distributed circulating fluid temperature is updated to the black and red solid line illustrated in the figure 3.
 It shows that in this case, the difference between the OGS and FEFLOW models is becoming much closer to each other, which is about 0.037 $^{\circ}$C.
 
-{{< img src="../3D_2U_BHE_figures/vertical_temperature_distribution_powerBC.png" width="200">}}
+{{< img src="vertical_temperature_distribution_powerBC.png" width="200">}}
 
 Figure 3: Comparison of vertical temperature distribution from scenarios by adopting the power boundary conditions
 
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE_figures/vertical_temperature_distribution.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/vertical_temperature_distribution.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE_figures/vertical_temperature_distribution.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/vertical_temperature_distribution.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE_figures/vertical_temperature_distribution_powerBC.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/vertical_temperature_distribution_powerBC.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE_figures/vertical_temperature_distribution_powerBC.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE/vertical_temperature_distribution_powerBC.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/BHE_network.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/BHE_network.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/BHE_network.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/BHE_network.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/BHE_network_closedloop.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/BHE_network_closedloop.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/BHE_network_closedloop.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/BHE_network_closedloop.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Heat_extraction_rate.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Heat_extraction_rate.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Heat_extraction_rate.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Heat_extraction_rate.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Heat_extraction_rate_closedloop.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Heat_extraction_rate_closedloop.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Heat_extraction_rate_closedloop.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Heat_extraction_rate_closedloop.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Inflow_and_outflow_temperature.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Inflow_and_outflow_temperature.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Inflow_and_outflow_temperature.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Inflow_and_outflow_temperature.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Inflow_temperature_and_flow_rate.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Inflow_temperature_and_flow_rate.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Inflow_temperature_and_flow_rate.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Inflow_temperature_and_flow_rate.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Soil_temperature.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Soil_temperature.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array_figures/Soil_temperature.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/Soil_temperature.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array.md b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/index.md
similarity index 94%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array.md
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/index.md
index e3236781da346b05d901ee543b4c69a0c0e8c52d..b6e29c1f28876c60de2d809eb8388ce3d99b00df 100644
--- a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array.md
+++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array/index.md
@@ -80,7 +80,7 @@ During the calculation of the TESPy solver, the flow density and the related spe
 To check their concrete value under specific temperature and pressure conditions, interested readers may refer to e.g. the 'PropsSI' function introduced in the webpage of CoolProp.
 For the fast execution of this benchmark, the total simulation time is shorten to 600 seconds. If the reader wishes to reproduce the same results, a full simulation of 6 months needs to be performed.
 
-{{< img src="../3D_3BHEs_array_figures/BHE_network.png" width="200">}}
+{{< img src="BHE_network.png" width="200">}}
 
 Figure 1a: One-way pipeline network model
 
@@ -90,7 +90,7 @@ The setup for a closed-loop network model is illustrated in Figure 1b.
 Compared to the configuration in the one-way network, the refrigerant in the closed loop network is circulating through the entire system.
 In this case, the flow rate will be automatically adjusted by the water pump in each time step, as its pressure head is directly linked to the flow rate. Subsequently, the flow rate is determined by the pressure losses in the BHE array.
 
-{{< img src="../3D_3BHEs_array_figures/BHE_network_closedloop.png" width="200">}}
+{{< img src="BHE_network_closedloop.png" width="200">}}
 
 Figure 1b: Closed-loop pipeline network model
 
@@ -114,24 +114,24 @@ Except for the thermal shifiting behavior among the BHEs, the averaged heat extr
 This is due to the fact that additional energy is required to compensate the hydraulic loss of the pipe.
 
 
-{{< img src="../3D_3BHEs_array_figures/Soil_temperature.png" width="200">}}
+{{< img src="Soil_temperature.png" width="200">}}
 
 Figure 2: Evolution of the soil temperature located at the 1 m distance away from each BHE
 
-{{< img src="../3D_3BHEs_array_figures/Inflow_and_outflow_temperature.png" width="200">}}
+{{< img src="Inflow_and_outflow_temperature.png" width="200">}}
 
 Figure 3: Evolution of the inflow and outflow refrigerant temperature of each BHE
 
-{{< img src="../3D_3BHEs_array_figures/Heat_extraction_rate.png" width="200">}}
+{{< img src="Heat_extraction_rate.png" width="200">}}
 
 Figure 4: Evolution of the heat extraction rate of each BHE
 
 
-{{< img src="../3D_3BHEs_array_figures/Inflow_temperature_and_flow_rate.png" width="200">}}
+{{< img src="Inflow_temperature_and_flow_rate.png" width="200">}}
 
 Figure 5: Evolution of the inflow refrigerant temperature and flow rate entering the BHE array
 
-{{< img src="../3D_3BHEs_array_figures/Heat_extraction_rate_closedloop.png" width="200">}}
+{{< img src="Heat_extraction_rate_closedloop.png" width="200">}}
 
 Figure 6: Evolution of the heat extraction rate of each BHE with close loop network model
 ## References
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/BHE_GW_advection_2years.zip b/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/BHE_GW_advection_2years.zip
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/BHE_GW_advection_2years.zip
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/BHE_GW_advection_2years.zip
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection.md b/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/index.md
similarity index 94%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection.md
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/index.md
index 27a633b9c4f120a70b337c74a6fef1676b964472..faf1655c28d0c1d99422cd03a303c2f3baa6bbf8 100644
--- a/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection.md
+++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/index.md
@@ -52,7 +52,7 @@ induced ground temperature.
 ## Model Setup
 
 The input files for the full simulation including the analytical solution for
-the soil temperature can be found [here](../BHE_GW_advection_2years.zip). The
+the soil temperature can be found [here](BHE_GW_advection_2years.zip). The
 geometry of the model is
 illustrated in Figure 1. The depth of the model domain is 15 m with an areal
 extent of 80 m x 80 m. The BHE is 1U-type and is
@@ -76,7 +76,7 @@ The BHE parameters are only relevant for the numerical model and are adopted
 from the [3D Beier sandbox
 benchmark]({{< ref "3D_Beier_sandbox.md" >}}).
 
-{{< img src="../3D_BHE_GW_advection_figures/mesh.png" width="150">}}
+{{< img src="mesh.png" width="150">}}
 
 Figure 1: Geometry and mesh of the BHE model
 
@@ -90,12 +90,12 @@ and analytical solution match very well as the maximum relative error of
 ground temperature is less than 0.2 \%. The largest difference is found near
 the BHE node towards which the analytical solution approaches infinity.
 
-{{< img src="../3D_BHE_GW_advection_figures/temperature_soil_2years.png"
+{{< img src="temperature_soil_2years.png"
 width="150">}}
 
 Figure 2: Ground temperature distribution after two years at $z=-7$ m.
 
-{{< img src="../3D_BHE_GW_advection_figures/rel_err.png" width="150">}}
+{{< img src="rel_err.png" width="150">}}
 
 Figure 3: Comparison of OGS-6 results and analytical solution. Note the
 singularity of the analytical solution at the BHE node.
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection_figures/mesh.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/mesh.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection_figures/mesh.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/mesh.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection_figures/rel_err.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/rel_err.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection_figures/rel_err.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/rel_err.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection_figures/temperature_soil_2years.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/temperature_soil_2years.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection_figures/temperature_soil_2years.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_BHE_GW_advection/temperature_soil_2years.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox_figures/Inflow_temp.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/Inflow_temp.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox_figures/Inflow_temp.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/Inflow_temp.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox_figures/comparison_with_experiment_data_and_OGS5.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/comparison_with_experiment_data_and_OGS5.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox_figures/comparison_with_experiment_data_and_OGS5.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/comparison_with_experiment_data_and_OGS5.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox.md b/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/index.md
similarity index 94%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox.md
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/index.md
index 1700fb1081a89b974accda935548ce0f927b36ba..57206dc67d79499c0c5b159b6853bffb860e8db0 100644
--- a/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox.md
+++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/index.md
@@ -34,7 +34,7 @@ The numerical model was established using dual continuum method Diersch et al. (
 | Grout thermal conductivity         | $\lambda_{g}$      | 0.806               | $\mathrm{W m^{-1} K^{-1}}$  |
 | Grout heat capacity                | $(\rho c)_{grout}$ | $3.8\times10^{6}$   | $\mathrm{Jm^{-3}K^{-1}}$    |
 
-{{< img src="../3D_Beier_sandbox_figures/numerical_geometry_of_BHE.png" width="200">}}
+{{< img src="numerical_geometry_of_BHE.png" width="200">}}
 
 Figure 1: Sandbox model
 
@@ -44,7 +44,7 @@ In Beier's experiment, the inner diameter of aluminum pipe is 12.6 $\mathrm{cm}$
 
 The detailed input file can be seen from the .prj file. The inflow temperature of the BHE, which was imposed as boundary condition of the BHE can be shown in Figure 2. Initial conditions of inflow and outflow temperature for the BHE were directly obtained from the measurements at t=0. For the initial soil temperature, the average value of all sensors placed in the sand and the borehole wall was set in the numerical model.
 
-{{< img src="../3D_Beier_sandbox_figures/Inflow_temp.png" width="200">}}
+{{< img src="Inflow_temp.png" width="200">}}
 
 Figure 2: Inflow temperature curve as the BHE boundary condition
 
@@ -52,11 +52,11 @@ Figure 2: Inflow temperature curve as the BHE boundary condition
 
 The numerical outflow temperature of OGS-5 (Shao et al. (2016)) and OGS-6 was compared with the experimental results, which is presented in the Figure 3. And the soil temperature at different locations among experimental and numerical results were compared and shown in the Figure 4. The comparison figures demonstrate that the numerical results and experimental data can fit very well and the largest relative error is 0.17\% on the wall temperature and 0.014\% on the outflow temperature. The initial temperature of borehole wall in numerical model was set an average value as mentioned in the above, which has initial error of 0.07 K compared to the experimental data. Besides, normally, the error of measuring temperatures during experiment, difference on the real thermal physical parameters of the sand and the BHE are all at the same value range. Therefore, it can be concluded that the numerical model of 1U-type BHE is fully verified.
 
-{{< img src="../3D_Beier_sandbox_figures/comparison_with_experiment_data_and_OGS5.png" width="200">}}
+{{< img src="comparison_with_experiment_data_and_OGS5.png" width="200">}}
 
 Figure 3: Comparison with experiment and OGS-5 results regarding outflow temperature of the BHE
 
-{{< img src="../3D_Beier_sandbox_figures/soil_temp_comparison.png" width="200">}}
+{{< img src="soil_temp_comparison.png" width="200">}}
 
 Figure 4: Comparison of modelled and measured wall and soil temperatures
 
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox_figures/numerical_geometry_of_BHE.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/numerical_geometry_of_BHE.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox_figures/numerical_geometry_of_BHE.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/numerical_geometry_of_BHE.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox_figures/soil_temp_comparison.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/soil_temp_comparison.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox_figures/soil_temp_comparison.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox/soil_temp_comparison.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/Analytical_coaxial_BHE.zip b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/Analytical_coaxial_BHE.zip
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/Analytical_coaxial_BHE.zip
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/Analytical_coaxial_BHE.zip
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE_figures/coaxial_deep_BHE.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/coaxial_deep_BHE.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE_figures/coaxial_deep_BHE.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/coaxial_deep_BHE.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE.md b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/index.md
similarity index 94%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE.md
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/index.md
index 74f0890f9e28135a33b646f4cb169ee75f96fcad..901ff2246f35d97fd61a3c97f23e297d8b7f8b6c 100644
--- a/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE.md
+++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/index.md
@@ -15,9 +15,9 @@ project = "Parabolic/T/3D_deep_BHE/3D_deep_BHE_CXA.prj"
 
 ## Problem description
 
-In recent years, Borehole Heat Exchangers (BHE) are very widely utilized to extract geothermal energy for building heating. For coaxial type of BHEs, an inner pipe is installed inside of an outer pipe, allowing the downward and upward flow to be separated. In some projects, very long coaxial BHEs are installed down to a 2-km depth, in order to extract more energy from the deep subsurface (Kong et al., 2017). Based on the flow directions, there are two types of coaxial BHEs. When downward flow is located in the inner pipe, it is called Coaxial-Centred (CXC) type. On the countary, if the inflow is introduced in the annular space, it is called a CXA type. Detailed schematization of the CXA-type BHE system is shown in Figure 1. In this benchmark, the numerical model in OGS-6 has been tested for the 2 coaxial types of BHEs. The simulation results are compared with previous OGS-5 results and also the analytical solution proposed by [Beier et al. (2014)](../Analytical_coaxial_BHE.zip).
+In recent years, Borehole Heat Exchangers (BHE) are very widely utilized to extract geothermal energy for building heating. For coaxial type of BHEs, an inner pipe is installed inside of an outer pipe, allowing the downward and upward flow to be separated. In some projects, very long coaxial BHEs are installed down to a 2-km depth, in order to extract more energy from the deep subsurface (Kong et al., 2017). Based on the flow directions, there are two types of coaxial BHEs. When downward flow is located in the inner pipe, it is called Coaxial-Centred (CXC) type. On the countary, if the inflow is introduced in the annular space, it is called a CXA type. Detailed schematization of the CXA-type BHE system is shown in Figure 1. In this benchmark, the numerical model in OGS-6 has been tested for the 2 coaxial types of BHEs. The simulation results are compared with previous OGS-5 results and also the analytical solution proposed by [Beier et al. (2014)](Analytical_coaxial_BHE.zip).
 
-{{< img src="../3D_coaxial_deep_BHE_figures/coaxial_deep_BHE.png" width="200">}}
+{{< img src="coaxial_deep_BHE.png" width="200">}}
 
 Figure 1: Coaxial BHE of CXA (Kong et al. (2017))
 
@@ -40,7 +40,7 @@ The implemented numerical model was established based on the dual continuum appr
 | Grout thermal conductivity                         | $\lambda_{g}$     | 0.73                | $\mathrm{W m^{-1} K^{-1}}$  |
 | Grout heat capacity                                | $(\rho c)_{g}$    | $3.8\times10^{6}$   | $\mathrm{Jm^{-3}K^{-1}}$    |
 
-{{< img src="../3D_coaxial_deep_BHE_figures/numerical_geometry_model.png" width="80">}}
+{{< img src="numerical_geometry_model.png" width="80">}}
 
 Figure 2: Geometry and mesh of the coaxial BHE model
 
@@ -56,11 +56,11 @@ where $\rho^r c^r$ is heat capacity of circulating fluid and $Q^r$ is circulatin
 
 In Figure 3, the numerically simulated outflow temperature from OGS-6 was compared against the OGS-5 result, as well as the analytical solution by Beier et al. (2014). Also, the temperature distribution of circulating water inside of the BHE after 3000 seconds was presented in Figure 4. The comparison demonstrates that the numerical results and analytical solution can match very well and the biggest absolute error of outflow temperature is around 1.6 $^{\circ}$C at the starting up stage, while such error will decrease to around 0.5 $^{\circ}$C after 30 days' operation. The maximum relative error regarding temperature distribution of circulating water after operation for 3000 s is around 2 \%. The soil temperature verification can be seen in the Benchmark of 3D Beier sandbox.
 
-{{< img src="../3D_coaxial_deep_BHE_figures/outflow_temperature_over_time_long-term.png" width="120">}}
+{{< img src="outflow_temperature_over_time_long-term.png" width="120">}}
 
 Figure 3: Comparison with analytical solution and OGS-5 results
 
-{{< img src="../3D_coaxial_deep_BHE_figures/temperature_distribution_3000s.png" width="200">}}
+{{< img src="temperature_distribution_3000s.png" width="200">}}
 
 Figure 4: Distributed temperature of circulating water
 
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE_figures/numerical_geometry_model.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/numerical_geometry_model.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE_figures/numerical_geometry_model.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/numerical_geometry_model.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE_figures/outflow_temperature_over_time_long-term.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/outflow_temperature_over_time_long-term.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE_figures/outflow_temperature_over_time_long-term.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/outflow_temperature_over_time_long-term.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE_figures/temperature_distribution_3000s.png b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/temperature_distribution_3000s.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE_figures/temperature_distribution_3000s.png
rename to web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE/temperature_distribution_3000s.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/Analytical_wellbore_heat_transport.zip b/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/Analytical_wellbore_heat_transport.zip
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/Analytical_wellbore_heat_transport.zip
rename to web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/Analytical_wellbore_heat_transport.zip
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE_figures/T_out_comparison.png b/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/T_out_comparison.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE_figures/T_out_comparison.png
rename to web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/T_out_comparison.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE_figures/absolute_error_fluid_T_30d.png b/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/absolute_error_fluid_T_30d.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE_figures/absolute_error_fluid_T_30d.png
rename to web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/absolute_error_fluid_T_30d.png
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE.md b/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/index.md
similarity index 91%
rename from web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE.md
rename to web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/index.md
index 8714d87ad72d1722d8cf71f6a4daad8888e4c3a3..31f9c7121b8b19e005c545446fad8159e5db6111 100644
--- a/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE.md
+++ b/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/index.md
@@ -15,13 +15,13 @@ project = "Parabolic/T/BHE_1P/BHE_1P.prj"
 
 ## Problem description
 
-Ramey (Ramey et al. (1962)) proposed the analytical solution concerning the wellbore heat transmission, which can be used to quantify the fluid temperature change in the wellbore. In order to verify the single pipe flow model in the OGS, the numerical results was compared with the [Ramey's analytical solution](../Analytical_wellbore_heat_transport.zip). The detailed calculation of the Ramey's analytical solution is given below.
+Ramey (Ramey et al. (1962)) proposed the analytical solution concerning the wellbore heat transmission, which can be used to quantify the fluid temperature change in the wellbore. In order to verify the single pipe flow model in the OGS, the numerical results was compared with the [Ramey's analytical solution](Analytical_wellbore_heat_transport.zip). The detailed calculation of the Ramey's analytical solution is given below.
 
 ## Model Setup
 
 In this benchmark, the length of the wellbore is 30 m as shown in Figure 1 and the cold water is injected into the inlet point of the wellbore with temperature of 20 $^{\circ}$C. The initial temperature of the fluid and grout in the wellbore is 20 $^{\circ}$C, and temperature of the surrounding rock is 55 $^{\circ}$C. The wellbore and pipe diameter are 0.28 m and 0.25826 m, respectively. And the flow rate is 0.0002 $m^3/s$.
 
-{{< img src="../pipe_flow_EBHE_figures/pipe_flow_3d_model.png" width="80">}}
+{{< img src="pipe_flow_3d_model.png" width="80">}}
 
 Figure 1: Single pipe flow model
 
@@ -84,11 +84,11 @@ The outlet temperature change over time was compared against analytical solution
 
 In numerical model, the outlet temperature at beginning stage is affected by the initial temperature in the pipe inside the wellbore. The initial fluid temperature set in the benchmark means there is water with 20 $^{\circ}$C filled in the wellbore already before injecting water into the wellbore. But in the analytical solution, no initial temperature is set and the temperature keeps equilibrium state at every moment. The impact of initial temperature condition in numerical model is decreasing with increasement of the operational time as shown in Figure 2.
 
-{{< img src="../pipe_flow_EBHE_figures/T_out_comparison.png" width="120">}}
+{{< img src="T_out_comparison.png" width="120">}}
 
 Figure 2: Comparison with analytical solution results
 
-{{< img src="../pipe_flow_EBHE_figures/absolute_error_fluid_T_30d.png" width="200">}}
+{{< img src="absolute_error_fluid_T_30d.png" width="200">}}
 
 Figure 3: Distributed temperature of fluid and absolute error.
 
diff --git a/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE_figures/pipe_flow_3d_model.png b/web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/pipe_flow_3d_model.png
similarity index 100%
rename from web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE_figures/pipe_flow_3d_model.png
rename to web/content/docs/benchmarks/heat-transport-bhe/pipe_flow_EBHE/pipe_flow_3d_model.png
diff --git a/web/content/docs/benchmarks/heatconduction/bhe_array_analytical_solver.py b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/bhe_array_analytical_solver.py
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/bhe_array_analytical_solver.py
rename to web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/bhe_array_analytical_solver.py
diff --git a/web/content/docs/benchmarks/heatconduction/bhe_array_benchmark.bib b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/bhe_array_benchmark.bib
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/bhe_array_benchmark.bib
rename to web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/bhe_array_benchmark.bib
diff --git a/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_1.png b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_1.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_1.png
rename to web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_1.png
diff --git a/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_2.png b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_2.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_2.png
rename to web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_2.png
diff --git a/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_3.png b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_3.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_3.png
rename to web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_3.png
diff --git a/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_4.png b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_4.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_4.png
rename to web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_4.png
diff --git a/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_5.png b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_5.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/BHE_array_benchmark_figures/figure_5.png
rename to web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/figure_5.png
diff --git a/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark.md b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/index.md
similarity index 95%
rename from web/content/docs/benchmarks/heatconduction/BHE_array_benchmark.md
rename to web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/index.md
index d9fb7bb7905bd25e158de86cc4553186b7e6756d..3d90c5cfd7ff1b0df922ac27195701ff49456baf 100644
--- a/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark.md
+++ b/web/content/docs/benchmarks/heatconduction/BHE_array_benchmark/index.md
@@ -40,7 +40,7 @@ where ${\mathop q\nolimits_k }$ is a sequence of heat extraction pulses at t =1,
          = \sum\limits_{l = 1}^m {\sum\limits_{k = l}^n {\frac{{\mathop q\nolimits_{k,l} }}{{4\pi L\lambda }}} } \left( {E_1\left[ {\frac{{{{\left( {i - \mathop x\nolimits_k } \right)}^2} + {{\left( {j - \mathop y\nolimits_k } \right)}^2}}}{{4\alpha \left( {\mathop t\nolimits_m  - \mathop t\nolimits_{l - 1} } \right)}}} \right] - E_1\left[ {\frac{{{{\left( {i - \mathop x\nolimits_k } \right)}^2} + {{\left( {j - \mathop y\nolimits_k } \right)}^2}}}{{4\alpha \left( {\mathop t\nolimits_m  - \mathop t\nolimits_l } \right)}}} \right]} \right).
     \end{split}\end{equation}
 
-where ${\mathop q\nolimits_{k,l} }$ is the heat extraction of the k-*th* BHE at time step *l*. The equation (3) will be used to calculate the analytical solution of the overall temperature change in this model for validating the numerical results. It is written in python code and can be found [here](../bhe_array_analytical_solver.py).
+where ${\mathop q\nolimits_{k,l} }$ is the heat extraction of the k-*th* BHE at time step *l*. The equation (3) will be used to calculate the analytical solution of the overall temperature change in this model for validating the numerical results. It is written in python code and can be found [here](bhe_array_analytical_solver.py).
 
 ## Numerical model setup
 
@@ -57,7 +57,7 @@ In this model, the quad element was adopted to compose the mesh. The initial tem
 | Heat extraction rate of the BHE  | $q$          | $35$                | $W/m$            |
 | Diameter of the BHE              | $D$          | $0.15$              | $m$              |
 
-{{< img src="../BHE_array_benchmark_figures/figure_1.png" >}}
+{{< img src="figure_1.png" >}}
 
 Figure 1: Model geometry, BHE location, and the observation profile
 
@@ -85,21 +85,21 @@ where $r_b$ is the BHE radius. n denotes the number of surrounding nodes. n = 8
 
 Figure 2 and 3 show the comparison of the temperature distribution along the observation profile (position see Figure 1) using analytical solution with the numerical results from OGS5 and OGS6 for every 4 months in the whole simulated time. It shows the numerical solution has a very good agreement with the analytical solution.
 
-{{< img src="../BHE_array_benchmark_figures/figure_2.png" width="200">}}
+{{< img src="figure_2.png" width="200">}}
 
 Figure 2: The temperature evolution of the BHEs field along the observation profile
 
-{{< img src="../BHE_array_benchmark_figures/figure_3.png" width="200">}}
+{{< img src="figure_3.png" width="200">}}
 
 Figure 3: The temperature evolution of the BHEs field along the observation profile
 
 In order to investigate the impact of mesh density on the accuracy of numerical result, the simulated temperature profile at the observation point A (53 m, 52.5 m) was plotted and compared against the analytical solution. Figure 3 shows the relative difference of the computed temperature between the analytical and numerical solution by using different mesh size (2.5 m, 1 m, 0.5 m, 0.25 m and 0.2 m). The results show that the difference becomes smaller when the mesh size is approaching 0.5 m, which is expected as the optimal mesh size mentioned in Diersch et al. (2011). From Figure 4, it can be found that the absolute error of temperature values at point A should be less than 2.5e-3 if the mesh size is kept denser than 0.5m.
 
-{{< img src="../BHE_array_benchmark_figures/figure_4.png" width="200">}}
+{{< img src="figure_4.png" width="200">}}
 
 Figure 4: The relative difference of computed temperature at point A between the analytical and numerical solution using different mesh size
 
-{{< img src="../BHE_array_benchmark_figures/figure_5.png" width="200">}}
+{{< img src="figure_5.png" width="200">}}
 
 Figure 5: The absolute difference of computed temperature along the diagonal profile between the analytical and numerical solution using different mesh size
 
diff --git a/web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet.md b/web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet/index.md
similarity index 98%
rename from web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet.md
rename to web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet/index.md
index 5d1d8bf17f86157c1891f3a52ee4d5b4e9860e17..3f50d4489b6939cf56b2ebe60540946fea9b2868 100644
--- a/web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet.md
+++ b/web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet/index.md
@@ -70,4 +70,4 @@ The result, written in the `.vtu` file, can be visualized with Paraview, for exa
 
 Loading the `line_60_heat_pcs_0_ts_65_t_5078125.000000.vtu` file in Paraview and Plotting over line. Compared to the analytical solution 'temperature_analytical.vtu', the results are very good:
 
-{{< img src="../validation-1.png" >}}
+{{< img src="validation-1.png" >}}
diff --git a/web/content/docs/benchmarks/heatconduction/validation-1.png b/web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet/validation-1.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/validation-1.png
rename to web/content/docs/benchmarks/heatconduction/heatconduction-dirichlet/validation-1.png
diff --git a/web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/comparison_plot_over_line_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/comparison_plot_over_line_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/comparison_plot_over_line_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png
rename to web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/comparison_plot_over_line_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png
diff --git a/web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/comparison_plot_over_line_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/comparison_plot_over_line_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/comparison_plot_over_line_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png
rename to web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/comparison_plot_over_line_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png
diff --git a/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term.md b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/index.md
similarity index 81%
rename from web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term.md
rename to web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/index.md
index 16ddfb9728b5d1f87649c57d6429e1d77d34d5ba..3a8958ce3da0b1bc7590f4fd13bec9de9f152768 100644
--- a/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term.md
+++ b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/index.md
@@ -43,7 +43,7 @@ is sketched. Furthermore, the mesh resolution is shown in the cylindrical domain
 within the first quadrant of the coordinate system. In the second quadrant the
 simulated temperature distribution is depicted.
 
-{{< img src="../LineSourceTermFigures/temperature_distribution_line_source_term_in_cylinder.png" >}}
+{{< img src="temperature_distribution_line_source_term_in_cylinder.png" >}}
 
 The source term is defined along the line in the center of the cylinder:
 $$
@@ -74,7 +74,7 @@ if (coordsX^2<0.0001 & coordsY^2<0.0001, temperature, -1/(4*asin(1))*ln(sqrt(coo
 
 The following plot shows the temperature along the white line in the figure above.
 
-{{< img src="../LineSourceTermFigures/temperature_profile_line_source_term_in_cylinder.png" >}}
+{{< img src="temperature_profile_line_source_term_in_cylinder.png" >}}
 
 - Comparison with analytical solution:
 
@@ -82,12 +82,12 @@ The differences of analytical and computed solutions for two different domain
 discretizations are small outside of the center. In the finer mesh the error
 outside of the middle region is smaller than in the coarser mesh.
 {{< img
-src="../LineSourceTermFigures/comparison_plot_over_line_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png" >}}
+src="comparison_plot_over_line_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png" >}}
 
 Due to the numerical evaluation of the relative error of the computed solution
 the error grows in the vicinity of the boundary and in the center.
 {{< img
-src="../LineSourceTermFigures/comparison_plot_over_line_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png" >}}
+src="comparison_plot_over_line_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_cylinder.png" >}}
 
 #### Input files
 
@@ -108,18 +108,18 @@ $r=1$ is solved. The cylindrical domain is defined as axisymmetric.
 #### Results and evaluation
 
 {{< img
-src="../LineSourceTermFigures/simulated_temperature_distribution_line_source_term_in_axisymmetric_cylinder.png" >}}
+src="simulated_temperature_distribution_line_source_term_in_axisymmetric_cylinder.png" >}}
 The above figure shows the computed temperature distribution.
 
 The following plot shows the temperature along the white line in the figure above.
 {{< img
-src="../LineSourceTermFigures/temperature_profile_line_source_term_in_axisymmetric_cylinder.png" >}}
+src="temperature_profile_line_source_term_in_axisymmetric_cylinder.png" >}}
 
 The error and relative error shows the same behaviour like in the simulation
 models above. Outside of the center, that has a singularity in the analytical
 solution, the errors decreases very fast.
 {{< img
-src="../LineSourceTermFigures/plot_over_line_diff_and_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_axisymmetric_cylinder.png" >}}
+src="plot_over_line_diff_and_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_axisymmetric_cylinder.png" >}}
 
 #### Input files
 
diff --git a/web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/plot_over_line_diff_and_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_axisymmetric_cylinder.png b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/plot_over_line_diff_and_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_axisymmetric_cylinder.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/plot_over_line_diff_and_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_axisymmetric_cylinder.png
rename to web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/plot_over_line_diff_and_rel_diff_analytical_solution_temperature_and_simulated_temperature_line_source_term_in_axisymmetric_cylinder.png
diff --git a/web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/simulated_temperature_distribution_line_source_term_in_axisymmetric_cylinder.png b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/simulated_temperature_distribution_line_source_term_in_axisymmetric_cylinder.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/simulated_temperature_distribution_line_source_term_in_axisymmetric_cylinder.png
rename to web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/simulated_temperature_distribution_line_source_term_in_axisymmetric_cylinder.png
diff --git a/web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/temperature_distribution_line_source_term_in_cylinder.png b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/temperature_distribution_line_source_term_in_cylinder.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/temperature_distribution_line_source_term_in_cylinder.png
rename to web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/temperature_distribution_line_source_term_in_cylinder.png
diff --git a/web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/temperature_profile_line_source_term_in_axisymmetric_cylinder.png b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/temperature_profile_line_source_term_in_axisymmetric_cylinder.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/temperature_profile_line_source_term_in_axisymmetric_cylinder.png
rename to web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/temperature_profile_line_source_term_in_axisymmetric_cylinder.png
diff --git a/web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/temperature_profile_line_source_term_in_cylinder.png b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/temperature_profile_line_source_term_in_cylinder.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/LineSourceTermFigures/temperature_profile_line_source_term_in_cylinder.png
rename to web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term/temperature_profile_line_source_term_in_cylinder.png
diff --git a/web/content/docs/benchmarks/heatconduction/heatconduction-neumann.md b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/index.md
similarity index 79%
rename from web/content/docs/benchmarks/heatconduction/heatconduction-neumann.md
rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/index.md
index b2dd6917ef73fe6cc1a88a84cdc9083cbb7d5710..ef60d8909f971f7aeaa9e8e88b9402036809b0cd 100644
--- a/web/content/docs/benchmarks/heatconduction/heatconduction-neumann.md
+++ b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/index.md
@@ -76,8 +76,8 @@ tolerances.
 
 |          |                    |
 |----------|--------------------|
-| {{< img title="Time step 1, time 78125s."      src="../picard_vs_newton_ts_1_t_78125.png"      >}} | {{< img title="Time step 3, time 234375s."     src="../picard_vs_newton_ts_3_t_234375.png"     >}} |
-| {{< img title="Time step 65, time 5078125s."   src="../picard_vs_newton_ts_65_t_5078125.png"   >}} | {{< img title="Time step 405, time 31640625s." src="../picard_vs_newton_ts_405_t_31640625.png" >}} |
+| {{< img title="Time step 1, time 78125s."      src="picard_vs_newton_ts_1_t_78125.png"      >}} | {{< img title="Time step 3, time 234375s."     src="picard_vs_newton_ts_3_t_234375.png"     >}} |
+| {{< img title="Time step 65, time 5078125s."   src="picard_vs_newton_ts_65_t_5078125.png"   >}} | {{< img title="Time step 405, time 31640625s." src="picard_vs_newton_ts_405_t_31640625.png" >}} |
 
 ### Mass-lumping and analytical solution
 
@@ -86,5 +86,5 @@ on cost of accuracy as the error is significantly larger.
 
 |          |                    |
 |----------|--------------------|
-| {{< img title="Time step 1, time 78125s."      src="../temperature_error_ts_1_t_78125.png"      >}} | {{< img title="Time step 3, time 234375s."     src="../temperature_error_ts_3_t_234375.png"     >}} |
-| {{< img title="Time step 65, time 5078125s."   src="../temperature_error_ts_65_t_5078125.png"   >}} | {{< img title="Time step 405, time 31640625s." src="../temperature_error_ts_405_t_31640625.png" >}} |
+| {{< img title="Time step 1, time 78125s."      src="temperature_error_ts_1_t_78125.png"      >}} | {{< img title="Time step 3, time 234375s."     src="temperature_error_ts_3_t_234375.png"     >}} |
+| {{< img title="Time step 65, time 5078125s."   src="temperature_error_ts_65_t_5078125.png"   >}} | {{< img title="Time step 405, time 31640625s." src="temperature_error_ts_405_t_31640625.png" >}} |
diff --git a/web/content/docs/benchmarks/heatconduction/picard_vs_newton_ts_1_t_78125.png b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/picard_vs_newton_ts_1_t_78125.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/picard_vs_newton_ts_1_t_78125.png
rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/picard_vs_newton_ts_1_t_78125.png
diff --git a/web/content/docs/benchmarks/heatconduction/picard_vs_newton_ts_3_t_234375.png b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/picard_vs_newton_ts_3_t_234375.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/picard_vs_newton_ts_3_t_234375.png
rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/picard_vs_newton_ts_3_t_234375.png
diff --git a/web/content/docs/benchmarks/heatconduction/picard_vs_newton_ts_405_t_31640625.png b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/picard_vs_newton_ts_405_t_31640625.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/picard_vs_newton_ts_405_t_31640625.png
rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/picard_vs_newton_ts_405_t_31640625.png
diff --git a/web/content/docs/benchmarks/heatconduction/picard_vs_newton_ts_65_t_5078125.png b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/picard_vs_newton_ts_65_t_5078125.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/picard_vs_newton_ts_65_t_5078125.png
rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/picard_vs_newton_ts_65_t_5078125.png
diff --git a/web/content/docs/benchmarks/heatconduction/temperature_error_ts_1_t_78125.png b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/temperature_error_ts_1_t_78125.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/temperature_error_ts_1_t_78125.png
rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/temperature_error_ts_1_t_78125.png
diff --git a/web/content/docs/benchmarks/heatconduction/temperature_error_ts_3_t_234375.png b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/temperature_error_ts_3_t_234375.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/temperature_error_ts_3_t_234375.png
rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/temperature_error_ts_3_t_234375.png
diff --git a/web/content/docs/benchmarks/heatconduction/temperature_error_ts_405_t_31640625.png b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/temperature_error_ts_405_t_31640625.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/temperature_error_ts_405_t_31640625.png
rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/temperature_error_ts_405_t_31640625.png
diff --git a/web/content/docs/benchmarks/heatconduction/temperature_error_ts_65_t_5078125.png b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann/temperature_error_ts_65_t_5078125.png
similarity index 100%
rename from web/content/docs/benchmarks/heatconduction/temperature_error_ts_65_t_5078125.png
rename to web/content/docs/benchmarks/heatconduction/heatconduction-neumann/temperature_error_ts_65_t_5078125.png
diff --git a/web/content/docs/benchmarks/hydro-component/heterogeneous/comparison_2d.png b/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/comparison_2d.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/heterogeneous/comparison_2d.png
rename to web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/comparison_2d.png
diff --git a/web/content/docs/benchmarks/hydro-component/heterogeneous/comparison_3d.png b/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/comparison_3d.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/heterogeneous/comparison_3d.png
rename to web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/comparison_3d.png
diff --git a/web/content/docs/benchmarks/hydro-component/heterogeneous/concentration_2d.png b/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/concentration_2d.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/heterogeneous/concentration_2d.png
rename to web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/concentration_2d.png
diff --git a/web/content/docs/benchmarks/hydro-component/heterogeneous/concentration_3d.png b/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/concentration_3d.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/heterogeneous/concentration_3d.png
rename to web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/concentration_3d.png
diff --git a/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5.md b/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/index.md
similarity index 73%
rename from web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5.md
rename to web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/index.md
index 062f00e8b2027c406daa23bf077078794e57cc00..214f1a1472c99ae7ca2715decfaac9c1c79ee809 100644
--- a/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5.md
+++ b/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/index.md
@@ -25,20 +25,20 @@ The setups are steady-state for flow, with an extent of a $100$ m x $100$ m hori
 
 Porosity is $0.01$, specific storage is $0$, fluid density is $1000$ kg$\cdot$m$^3$, dynamic viscosity is $10^{-3}$ Pa$\cdot$s, molecular diffusion coefficient is $2\cdot 10^{-9}$ m$\cdot$s$^{-2}$, dispersivities are longitudinal $1$ m and transverse $0.1$ m. The heterogeneous parameter fields of intrinsic permeability are shown in the figures below; creation of the tensor field is documented [here](https://github.com/ufz/ogs-utils/tree/master/post/merge-scalar-data-arrays).
 
-{{< img src="../heterogeneous/permeability_2d.png" title="Magnitude of isotropic permeability tensor for 2D setup.">}}
-{{< img src="../heterogeneous/permeability_3d.png" title="Magnitude of isotropic permeability tensor for 3D setup.">}}
+{{< img src="permeability_2d.png" title="Magnitude of isotropic permeability tensor for 2D setup.">}}
+{{< img src="permeability_3d.png" title="Magnitude of isotropic permeability tensor for 3D setup.">}}
 
 ### Model results
 
 The comparison of velocity and hydraulic head are shown below. The numerical results of OGS6 fit very well to the OGS5 results with relative differences for velocity in the order of ca $10^{-2}$ and for hydraulic head in $10^{-4}$.
 
-{{< img src="../heterogeneous/comparison_2d.png" title="Relative differences of 2D simulation results between OGS5 and OGS6. On the top left figure, white lines represent hydraulic head values of OGS5, blue lines of OGS6.">}}
-{{< img src="../heterogeneous/comparison_3d.png" title="Relative differences of 3D simulation results between OGS5 and OGS6. On the top left figure, grey dots represent hydraulic head values of OGS6.">}}
+{{< img src="comparison_2d.png" title="Relative differences of 2D simulation results between OGS5 and OGS6. On the top left figure, white lines represent hydraulic head values of OGS5, blue lines of OGS6.">}}
+{{< img src="comparison_3d.png" title="Relative differences of 3D simulation results between OGS5 and OGS6. On the top left figure, grey dots represent hydraulic head values of OGS6.">}}
 
 The mass transport simulation results (figures below) show an expected heterogeneous mass front moving through the domain.
 
-{{< img src="../heterogeneous/concentration_2d.png" title="Concentration distribution at simulation time $1e8$ s for the 2D setup.">}}
-{{< img src="../heterogeneous/concentration_3d.png" title="Concentration distribution at simulation time $1e8$ s for the 3D setup.">}}
+{{< img src="concentration_2d.png" title="Concentration distribution at simulation time $1e8$ s for the 2D setup.">}}
+{{< img src="concentration_3d.png" title="Concentration distribution at simulation time $1e8$ s for the 3D setup.">}}
 
 [The project files for the 2D setup are here.]({{< data-url "Parabolic/ComponentTransport/heterogeneous/ogs5_H_2D/ogs5_H_2d.prj" >}})
 [The project files for the 3D setup are here.]({{< data-url "Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj" >}})
diff --git a/web/content/docs/benchmarks/hydro-component/heterogeneous/permeability_2d.png b/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/permeability_2d.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/heterogeneous/permeability_2d.png
rename to web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/permeability_2d.png
diff --git a/web/content/docs/benchmarks/hydro-component/heterogeneous/permeability_3d.png b/web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/permeability_3d.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/heterogeneous/permeability_3d.png
rename to web/content/docs/benchmarks/hydro-component/HC_ogs6-vs-ogs5/permeability_3d.png
diff --git a/web/content/docs/benchmarks/hydro-component/contracer/ConTracer1d_results.png b/web/content/docs/benchmarks/hydro-component/contracer/ConTracer/ConTracer1d_results.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/contracer/ConTracer1d_results.png
rename to web/content/docs/benchmarks/hydro-component/contracer/ConTracer/ConTracer1d_results.png
diff --git a/web/content/docs/benchmarks/hydro-component/contracer/ConTracer2d_results.png b/web/content/docs/benchmarks/hydro-component/contracer/ConTracer/ConTracer2d_results.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/contracer/ConTracer2d_results.png
rename to web/content/docs/benchmarks/hydro-component/contracer/ConTracer/ConTracer2d_results.png
diff --git a/web/content/docs/benchmarks/hydro-component/contracer/ConTracer_domain.png b/web/content/docs/benchmarks/hydro-component/contracer/ConTracer/ConTracer_domain.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/contracer/ConTracer_domain.png
rename to web/content/docs/benchmarks/hydro-component/contracer/ConTracer/ConTracer_domain.png
diff --git a/web/content/docs/benchmarks/hydro-component/contracer/ConTracer.md b/web/content/docs/benchmarks/hydro-component/contracer/ConTracer/index.md
similarity index 96%
rename from web/content/docs/benchmarks/hydro-component/contracer/ConTracer.md
rename to web/content/docs/benchmarks/hydro-component/contracer/ConTracer/index.md
index 20a3ff8433fa11c016e10d79c477fe3b3b3b1a2d..8289117c867becffa03265db2aa78622a76fb9cc 100644
--- a/web/content/docs/benchmarks/hydro-component/contracer/ConTracer.md
+++ b/web/content/docs/benchmarks/hydro-component/contracer/ConTracer/index.md
@@ -24,7 +24,7 @@ Hydraulic water influx was 0.768 $\textrm{m}^3~\textrm{d}^{-1}$ at the left side
 The tracer (40.26 g of $\textrm{Br}^-$) was diluted in 12 L of waste water and added as a single impulse event at $t=0$.
 Note, that only 89\% of the tracer was recovered at the outlet.
 
-![Top: Schematic representation of the experiment. Middle and bottom: Simulated domain and input parameters in 1D and 2D, respectively. Modified with permission from Boog *et al.* (2019).](../ConTracer_domain.png)
+![Top: Schematic representation of the experiment. Middle and bottom: Simulated domain and input parameters in 1D and 2D, respectively. Modified with permission from Boog *et al.* (2019).](ConTracer_domain.png)
 
 ## Problem description (1D)
 
@@ -93,9 +93,9 @@ Both models (1D and 2D) fit the experimental tracer breakthrough curves quite we
 The deviance at the peak and tail can be related to the fact that the simulations only consider conservative equilibrium transport (processes that may have occurred in the experimental system such as tracer sorption, non--equilibrium flow and evapotranspiration were not considered in the model).
 The differences between the OGS-6 and OGS-5 simulation were very low (RMSQE$=$1.37e-07).
 
-![Measured (tracer_exp) and simulated tracer breakthrough curves at the outlet (1D scenario)](../ConTracer1d_results.PNG)
+![Measured (tracer_exp) and simulated tracer breakthrough curves at the outlet (1D scenario)](ConTracer1d_results.png)
 
-![Measured (tracer_exp} and simulated tracer breakthrough curves at the outlet (2D scenario)](../ConTracer2d_results.PNG)
+![Measured (tracer_exp} and simulated tracer breakthrough curves at the outlet (2D scenario)](ConTracer2d_results.png)
 
 ## References
 
diff --git a/web/content/docs/benchmarks/hydro-component/gif/elder.gif b/web/content/docs/benchmarks/hydro-component/elder/elder.gif
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/gif/elder.gif
rename to web/content/docs/benchmarks/hydro-component/elder/elder.gif
diff --git a/web/content/docs/benchmarks/hydro-component/elder.md b/web/content/docs/benchmarks/hydro-component/elder/index.md
similarity index 93%
rename from web/content/docs/benchmarks/hydro-component/elder.md
rename to web/content/docs/benchmarks/hydro-component/elder/index.md
index 4810b42733f4c0a21b9d9bc2ae36536cee610aed..e080265bb8c70e985995da54b702f01f9f585aae 100644
--- a/web/content/docs/benchmarks/hydro-component/elder.md
+++ b/web/content/docs/benchmarks/hydro-component/elder/index.md
@@ -27,7 +27,7 @@ The Elder benchmark describes free convection of a dense fluid in mixable, singl
 
 A comparison of the numerical data is shown in the figure below. The numerical results of OGS-6 coincide with those of OGS-5.
 
-{{< img src="../gif/elder.gif" title="Results for numerical (OGS-5 - green, OGS-6 - white) results together with concentration distribution in the domain and mesh resolution for different time steps.">}}
+{{< img src="elder.gif" title="Results for numerical (OGS-5 - green, OGS-6 - white) results together with concentration distribution in the domain and mesh resolution for different time steps.">}}
 
 {{< data-link >}}
 
diff --git a/web/content/docs/benchmarks/hydro-component/Goswami_Exp_Num_Comp.png b/web/content/docs/benchmarks/hydro-component/goswami/Goswami_Exp_Num_Comp.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/Goswami_Exp_Num_Comp.png
rename to web/content/docs/benchmarks/hydro-component/goswami/Goswami_Exp_Num_Comp.png
diff --git a/web/content/docs/benchmarks/hydro-component/Goswami_Transient_States.png b/web/content/docs/benchmarks/hydro-component/goswami/Goswami_Transient_States.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/Goswami_Transient_States.png
rename to web/content/docs/benchmarks/hydro-component/goswami/Goswami_Transient_States.png
diff --git a/web/content/docs/benchmarks/hydro-component/gif/goswami.gif b/web/content/docs/benchmarks/hydro-component/goswami/goswami.gif
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/gif/goswami.gif
rename to web/content/docs/benchmarks/hydro-component/goswami/goswami.gif
diff --git a/web/content/docs/benchmarks/hydro-component/goswami.md b/web/content/docs/benchmarks/hydro-component/goswami/index.md
similarity index 73%
rename from web/content/docs/benchmarks/hydro-component/goswami.md
rename to web/content/docs/benchmarks/hydro-component/goswami/index.md
index 1cedb0e0c1bb45e27e6e45f8d01c48625dab2d58..f41a5a2853858fbda5ec54eff17328b3b759da04 100644
--- a/web/content/docs/benchmarks/hydro-component/goswami.md
+++ b/web/content/docs/benchmarks/hydro-component/goswami/index.md
@@ -27,15 +27,15 @@ The Goswami-Clement benchmark is based on experiment observations for intruding
 
 An example for the intruding salt front is shown below. The numerical results of OGS-6 coincide with those of OGS-5.
 
-{{< img src="../gif/goswami.gif" title="Results for numerical experiment. The steady state SS2 from the original experimental work is well reproduced.">}}
+{{< img src="goswami.gif" title="Results for numerical experiment. The steady state SS2 from the original experimental work is well reproduced.">}}
 
 {{< data-link >}}
 
 A comparison of numerical and laboratory data is shown in the figure below. The numerical results of ogs6 coincide with those of OGS5 and likewise with the laboratory observations.
 
-{{< img src="../Goswami_Exp_Num_Comp.png" title="Results for numerical (colored diamonds) and laboratory data (colored straight lines) on the steady state location of the concentration front (see original research paper).">}}
+{{< img src="Goswami_Exp_Num_Comp.png" title="Results for numerical (colored diamonds) and laboratory data (colored straight lines) on the steady state location of the concentration front (see original research paper).">}}
 
-{{< img src="../Goswami_Transient_States.png" title="Results for numerical (colored diamonds) and laboratory data (colored straight lines) on the transient state locations of the concentration front (see original research paper).">}}
+{{< img src="Goswami_Transient_States.png" title="Results for numerical (colored diamonds) and laboratory data (colored straight lines) on the transient state locations of the concentration front (see original research paper).">}}
 
 ## Literature
 
diff --git a/web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorage.gif b/web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorage.gif
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorage.gif
rename to web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorage.gif
diff --git a/web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndAdvection.gif b/web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndAdvection.gif
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndAdvection.gif
rename to web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndAdvection.gif
diff --git a/web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndAdvectionAndDecay.gif b/web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndAdvectionAndDecay.gif
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndAdvectionAndDecay.gif
rename to web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndAdvectionAndDecay.gif
diff --git a/web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndAdvectionAndDispersion.gif b/web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndAdvectionAndDispersion.gif
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndAdvectionAndDispersion.gif
rename to web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndAdvectionAndDispersion.gif
diff --git a/web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndAdvectionAndDispersionHalf.gif b/web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndAdvectionAndDispersionHalf.gif
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndAdvectionAndDispersionHalf.gif
rename to web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndAdvectionAndDispersionHalf.gif
diff --git a/web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndGravityAndDispersionHalf.gif b/web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndGravityAndDispersionHalf.gif
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/gif/DiffusionAndStorageAndGravityAndDispersionHalf.gif
rename to web/content/docs/benchmarks/hydro-component/hydro-component/DiffusionAndStorageAndGravityAndDispersionHalf.gif
diff --git a/web/content/docs/benchmarks/hydro-component/HC-NonBoussinesq.pdf b/web/content/docs/benchmarks/hydro-component/hydro-component/HC-NonBoussinesq.pdf
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/HC-NonBoussinesq.pdf
rename to web/content/docs/benchmarks/hydro-component/hydro-component/HC-NonBoussinesq.pdf
diff --git a/web/content/docs/benchmarks/hydro-component/HC-Process.pdf b/web/content/docs/benchmarks/hydro-component/hydro-component/HC-Process.pdf
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/HC-Process.pdf
rename to web/content/docs/benchmarks/hydro-component/hydro-component/HC-Process.pdf
diff --git a/web/content/docs/benchmarks/hydro-component/hydro-component.md b/web/content/docs/benchmarks/hydro-component/hydro-component/index.md
similarity index 80%
rename from web/content/docs/benchmarks/hydro-component/hydro-component.md
rename to web/content/docs/benchmarks/hydro-component/hydro-component/index.md
index e0bef7bfc07eb61938bacd2764cc6040018bfe8e..e68b0bd2b4ecd4f0444e1cc4d27519a6a7b2bd76 100644
--- a/web/content/docs/benchmarks/hydro-component/hydro-component.md
+++ b/web/content/docs/benchmarks/hydro-component/hydro-component/index.md
@@ -17,7 +17,7 @@ title = "Saturated Mass Transport"
 
 This benchmark compiles a number of simple, synthetic setups to test different processes of saturated component transport of a solute.
 
-The development of the equation system is given in [this PDF](../HC-Process.pdf). In the following, we present the different setups.
+The development of the equation system is given in [this PDF](HC-Process.pdf). In the following, we present the different setups.
 
 ## Problem description
 
@@ -34,7 +34,7 @@ Left side boundary conditions for these two setups are pressure $p=0$ and concen
 {{< data-link "The *Diffusion only* project file" "Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj" >}}  
 {{< data-link "The *Diffusion and Storage* project file" "Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj" >}}
 
-{{< img src="../gif/DiffusionAndStorage.gif" title="*Diffusion and Storage*">}}
+{{< img src="DiffusionAndStorage.gif" title="*Diffusion and Storage*">}}
 
 #### Diffusion, Storage, and Advection
 
@@ -42,7 +42,7 @@ Left side boundary conditions for this setup are pressure $p=1$ and concentratio
 
 {{< data-link "The *Diffusion, Storage, and Advection* project file" "Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj" >}}
 
-{{< img src="../gif/DiffusionAndStorageAndAdvection.gif" title="*Diffusion, Storage, and Advection*">}}
+{{< img src="DiffusionAndStorageAndAdvection.gif" title="*Diffusion, Storage, and Advection*">}}
 
 #### Diffusion, Storage, Advection, and Dispersion
 
@@ -51,8 +51,8 @@ Left side boundary conditions for these setups are pressure $p=1$ and concentrat
 {{< data-link "The *Diffusion, Storage, Advection, and Dispersion* project file" "Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj" >}}  
 {{< data-link "The *Diffusion, Storage, Advection, and Dispersion Half* project file" "Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj" >}}
 
-{{< img src="../gif/DiffusionAndStorageAndAdvectionAndDispersion.gif" title="*Diffusion, Storage, Advection, and Dispersion*">}}
-{{< img src="../gif/DiffusionAndStorageAndAdvectionAndDispersionHalf.gif" title="*Diffusion, Storage, Advection, and Dispersion Half*">}}
+{{< img src="DiffusionAndStorageAndAdvectionAndDispersion.gif" title="*Diffusion, Storage, Advection, and Dispersion*">}}
+{{< img src="DiffusionAndStorageAndAdvectionAndDispersionHalf.gif" title="*Diffusion, Storage, Advection, and Dispersion Half*">}}
 
 #### Diffusion, Storage, Gravity, and Dispersion
 
@@ -60,7 +60,7 @@ Boundary condition for this setup is pressure $p=0$ for the top left corner and
 
 {{< data-link "The *Diffusion, Storage, Gravity, and Dispersion* project file" "Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj" >}}
 
-{{< img src="../gif/DiffusionAndStorageAndGravityAndDispersionHalf.gif" title="*Diffusion, Storage, Gravity, and Dispersion Half*">}}
+{{< img src="DiffusionAndStorageAndGravityAndDispersionHalf.gif" title="*Diffusion, Storage, Gravity, and Dispersion Half*">}}
 
 #### Diffusion, Storage, Advection, and Decay
 
@@ -68,8 +68,8 @@ Left side boundary conditions for this setup are pressure $p=1$ and concentratio
 
 {{< data-link "The *Diffusion, Storage, Advection, and Decay* project file" "Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj" >}}
 
-{{< img src="../gif/DiffusionAndStorageAndAdvectionAndDecay.gif" title="*Diffusion, Storage, Advection, and Decay*">}}
+{{< img src="DiffusionAndStorageAndAdvectionAndDecay.gif" title="*Diffusion, Storage, Advection, and Decay*">}}
 
 #### Changes With Inclusion of Non Boussinesq-Effects
 
-The changes to the original setup are described in [this PDF](../HC-NonBoussinesq.pdf).
+The changes to the original setup are described in [this PDF](HC-NonBoussinesq.pdf).
diff --git a/web/content/docs/benchmarks/hydro-component/theis/BCs.png b/web/content/docs/benchmarks/hydro-component/theis/HC_Theis/BCs.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/theis/BCs.png
rename to web/content/docs/benchmarks/hydro-component/theis/HC_Theis/BCs.png
diff --git a/web/content/docs/benchmarks/hydro-component/theis/comparison.png b/web/content/docs/benchmarks/hydro-component/theis/HC_Theis/comparison.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/theis/comparison.png
rename to web/content/docs/benchmarks/hydro-component/theis/HC_Theis/comparison.png
diff --git a/web/content/docs/benchmarks/hydro-component/theis/HC_Theis.md b/web/content/docs/benchmarks/hydro-component/theis/HC_Theis/index.md
similarity index 93%
rename from web/content/docs/benchmarks/hydro-component/theis/HC_Theis.md
rename to web/content/docs/benchmarks/hydro-component/theis/HC_Theis/index.md
index d6b8247dea2df6ec2ac3915c4e53b11ac69ed9ee..5727730e0656932734d747d79d178e5e0c4013e8 100644
--- a/web/content/docs/benchmarks/hydro-component/theis/HC_Theis.md
+++ b/web/content/docs/benchmarks/hydro-component/theis/HC_Theis/index.md
@@ -30,7 +30,7 @@ Here, we verify pumping abstraction with Theis for the `ComponentTransport` proc
 
 The setup comprises a 1/8th slice of a full circle (see figure 1).
 
-{{< img src="../BCs.png" title="Mesh and boundary conditions (BC); blue = outer Dirichlet pressure and concentration BC, red = inner Neumann abstraction BC.">}}
+{{< img src="BCs.png" title="Mesh and boundary conditions (BC); blue = outer Dirichlet pressure and concentration BC, red = inner Neumann abstraction BC.">}}
 
 The outer boundary condition is set as Dirichlet with a hydrostatic pressure along the shell surface of the slice equivalent to a head of $h = 0 m$ (i.e. water level equals top of domain). For mass transport, a Dirichlet boundary conditions with concentration $c = 0$ is set at the outer shell. The inner boundary condition is equivalent to the eighth of a total abstraction rate of $Q_t = 15 m^3/d$ for a full cylinder. *NB: In the `ComponentTransport` process, the Neumann BC is given as mass flux and has to be calculated per area, such that the value for the project file is $Q = Q_t / 8 / A \cdot \rho_0 = 2.83542E-03 m^3/s/m^2 \cdot kg/m^3$ (units equal $\frac{kg}{s m^2}$) with fluid reference density $\rho_0 = 1000 kg/m^3$ and abstraction area $A = 7.65 m^2$.*
 
@@ -44,7 +44,7 @@ Initial conditions are $c = 0$ and hydrostatic pressure conditions.
 
 The figure below compares the analytical Theis solution vs. the simulated values from OGS6.
 
-{{< img src="../comparison.png" title="Comparison between numerical (crosses) and analytical (lines) values.">}}
+{{< img src="comparison.png" title="Comparison between numerical (crosses) and analytical (lines) values.">}}
 
 The top figure shows drawdown (i.e. the difference in water level compared to an initial state) over time at distance $r = 30 m$: for a simulation time $t < 40000 s$, the differences between analytical and numerical solutions are marginal; at later simulation times, the drawdown shows lower values than predicted from the analytical solution, as it is influenced by the outer Dirichlet pressure boundary condition.
 
diff --git a/web/content/docs/benchmarks/hydro-component/HC-VDBCTest.pdf b/web/content/docs/benchmarks/hydro-component/vdbc/HC-VDBCTest.pdf
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/HC-VDBCTest.pdf
rename to web/content/docs/benchmarks/hydro-component/vdbc/HC-VDBCTest.pdf
diff --git a/web/content/docs/benchmarks/hydro-component/VDBC_num_ana_comp.png b/web/content/docs/benchmarks/hydro-component/vdbc/VDBC_num_ana_comp.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-component/VDBC_num_ana_comp.png
rename to web/content/docs/benchmarks/hydro-component/vdbc/VDBC_num_ana_comp.png
diff --git a/web/content/docs/benchmarks/hydro-component/vdbc.md b/web/content/docs/benchmarks/hydro-component/vdbc/index.md
similarity index 55%
rename from web/content/docs/benchmarks/hydro-component/vdbc.md
rename to web/content/docs/benchmarks/hydro-component/vdbc/index.md
index 43732ec288d4b8287d639ab8af7dc0086e8fa030..e4a4e23b266b18b9998ee1494438591a43b6fa59 100644
--- a/web/content/docs/benchmarks/hydro-component/vdbc.md
+++ b/web/content/docs/benchmarks/hydro-component/vdbc/index.md
@@ -16,10 +16,10 @@ title = "Variable Dependent Boundary Condition"
 ## Overview
 
 The component transport process is used for the benchmark setup. Here, a analytical solution of a simple setup is derived and compared to the numerical results.
-This Benchmark is described in [this PDF](../HC-VDBCTest.pdf).
+This Benchmark is described in [this PDF](HC-VDBCTest.pdf).
 
 For the setup and parameterization, see the chapter "Density dependent flow - The Goswami Problem" in Kolditz et al. (2012).
 
 ## Results
 
-{{< img src="../VDBC_num_ana_comp.png" title="UPPER PART: Analytical solution on the right boundary in dependence of time $t$ of the problem indicated with red dashed line in comparison to numerical solution indicated by blue crosses; LOWER PART: development of relative error in dependence of time $t$. Grid spacing for simulations: 0.1; widest timestep 10. The relative error is below $5 \times 10^{-5}$ for all simulation times.">}}
+{{< img src="VDBC_num_ana_comp.png" title="UPPER PART: Analytical solution on the right boundary in dependence of time $t$ of the problem indicated with red dashed line in comparison to numerical solution indicated by blue crosses; LOWER PART: development of relative error in dependence of time $t$. Grid spacing for simulations: 0.1; widest timestep 10. The relative error is below $5 \times 10^{-5}$ for all simulation times.">}}
diff --git a/web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation.pdf b/web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation/HM_drainage_excavation.pdf
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation.pdf
rename to web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation/HM_drainage_excavation.pdf
diff --git a/web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation.md b/web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation/index.md
similarity index 88%
rename from web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation.md
rename to web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation/index.md
index 23fe56e986e5ac36243e13f35c51166019a42e77..ce0aac26f9a818c5575202ecfc31a43d361b28b8 100644
--- a/web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation.md
+++ b/web/content/docs/benchmarks/hydro-mechanics/HM_drainage_excavation/index.md
@@ -14,5 +14,5 @@ project = "HydroMechanics/Linear/DrainageEexcavation/HMdrainage.prj"
 
 ## Problem description
 
-We present the hydro-mechanical drainage of an excavation benchmark in this [this PDF](../HM_drainage_excavation.pdf).
+We present the hydro-mechanical drainage of an excavation benchmark in this [this PDF](HM_drainage_excavation.pdf).
 
diff --git a/web/content/docs/benchmarks/hydro-mechanics/InjectionProduction_model.png b/web/content/docs/benchmarks/hydro-mechanics/InjectionProduction/InjectionProduction_model.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/InjectionProduction_model.png
rename to web/content/docs/benchmarks/hydro-mechanics/InjectionProduction/InjectionProduction_model.png
diff --git a/web/content/docs/benchmarks/hydro-mechanics/InjectionProduction_results.png b/web/content/docs/benchmarks/hydro-mechanics/InjectionProduction/InjectionProduction_results.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/InjectionProduction_results.png
rename to web/content/docs/benchmarks/hydro-mechanics/InjectionProduction/InjectionProduction_results.png
diff --git a/web/content/docs/benchmarks/hydro-mechanics/InjectionProduction.md b/web/content/docs/benchmarks/hydro-mechanics/InjectionProduction/index.md
similarity index 98%
rename from web/content/docs/benchmarks/hydro-mechanics/InjectionProduction.md
rename to web/content/docs/benchmarks/hydro-mechanics/InjectionProduction/index.md
index 9bb8f8fa297dc3097f5b700d82386e8f942ee73d..dc3e798014a22b9195910dc1621cab4798c8cb5e 100644
--- a/web/content/docs/benchmarks/hydro-mechanics/InjectionProduction.md
+++ b/web/content/docs/benchmarks/hydro-mechanics/InjectionProduction/index.md
@@ -21,7 +21,7 @@ This benchmark simulates a soil column with fluid injection at the bottom and a
 It is taken from from Kim [[1]](#1), in detail it coincides with one of his examples (case 2, coupling strength $\tau=1.21$).
 A brief description of the used staggered scheme follows at the end.
 
-{{< img src="../InjectionProduction_model.png" >}}
+{{< img src="InjectionProduction_model.png" >}}
 _Simulation model with fluid source, sink, observation point and boundary conditions_
 
 The fluid enters and leaves only via the source and sink in the domain, there is no flow across the boundaries.
@@ -178,7 +178,7 @@ The gravity related terms are neglected in both: the Darcy velocity and the mome
 Note that 100 time steps were used for the following results, whereas the provided input file is set to 1 time step (1 day = 86400 s).
 Kim plots his results over nondimensional time, referring to the time at which the produced fluid volume equals the pore volume of the domain (450 days).
 
-{{< img src="../InjectionProduction_results.png" >}}
+{{< img src="InjectionProduction_results.png" >}}
 _Pressure at observation point (marked by circle) versus time (t=0...100 days) and spatial pressure distribution at t=100 days_
 
 ## Staggered Scheme: Fixed-stress splitting ##
diff --git a/web/content/docs/benchmarks/hydro-mechanics/MandelCryer_mesh.png b/web/content/docs/benchmarks/hydro-mechanics/MandelCryer/MandelCryer_mesh.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/MandelCryer_mesh.png
rename to web/content/docs/benchmarks/hydro-mechanics/MandelCryer/MandelCryer_mesh.png
diff --git a/web/content/docs/benchmarks/hydro-mechanics/MandelCryer_model.png b/web/content/docs/benchmarks/hydro-mechanics/MandelCryer/MandelCryer_model.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/MandelCryer_model.png
rename to web/content/docs/benchmarks/hydro-mechanics/MandelCryer/MandelCryer_model.png
diff --git a/web/content/docs/benchmarks/hydro-mechanics/MandelCryer_results.png b/web/content/docs/benchmarks/hydro-mechanics/MandelCryer/MandelCryer_results.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/MandelCryer_results.png
rename to web/content/docs/benchmarks/hydro-mechanics/MandelCryer/MandelCryer_results.png
diff --git a/web/content/docs/benchmarks/hydro-mechanics/MandelCryer.md b/web/content/docs/benchmarks/hydro-mechanics/MandelCryer/index.md
similarity index 96%
rename from web/content/docs/benchmarks/hydro-mechanics/MandelCryer.md
rename to web/content/docs/benchmarks/hydro-mechanics/MandelCryer/index.md
index 1dd64b8503e6d0855c63c1d68c59cf11df95497c..239303166a4ee422676e2e72ec80d780d77ce136 100644
--- a/web/content/docs/benchmarks/hydro-mechanics/MandelCryer.md
+++ b/web/content/docs/benchmarks/hydro-mechanics/MandelCryer/index.md
@@ -21,13 +21,13 @@ This is a classical example to demonstrate the effect of hydromechanical couplin
 For more details we refer to a textbook [[1]](#1), in which also the analytical solution is derived.
 As domain we consider a sphere, by symmetry we need to simulate only an octant.
 
-{{< img src="../MandelCryer_mesh.png" >}}
+{{< img src="MandelCryer_mesh.png" >}}
 _Mesh_
 
 The boundary conditions of hydraulics are atmospheric pressure on the sphere surface and impermeable elsewhere.
 The boundary conditions of mechanics are an overburden (Neumann) applied as step load on the sphere surface at initial time $t=0$. The remaining sides are fixed in normal direction (Dirichlet).
 
-{{< img src="../MandelCryer_model.png" >}}
+{{< img src="MandelCryer_model.png" >}}
 _Boundary conditions_
 
 The material is isotropic, linear elastic. Solid and fluid are assumed to be incompressible.
@@ -134,7 +134,7 @@ All parameters are concluded in the following tables.
 
 As predicted, the pressure in the center exceeds the applied load and then levels out.
 
-{{< img src="../MandelCryer_results.png" >}}
+{{< img src="MandelCryer_results.png" >}}
 _Pressure at center of sphere_
 
 For more details about the staggered scheme we refer to the [user guide - conventions]({{< ref "conventions.md#staggered-scheme" >}}).
diff --git a/web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel.pdf b/web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel/PermeabilityMohrCoulombFailureIndexModel.pdf
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel.pdf
rename to web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel/PermeabilityMohrCoulombFailureIndexModel.pdf
diff --git a/web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel.md b/web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel/index.md
similarity index 81%
rename from web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel.md
rename to web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel/index.md
index e5d2d4dd66a1125aeb4e847528dfea7c56818625..8a6334bd7de6de515d9133595c8330aa2f9b2016 100644
--- a/web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel.md
+++ b/web/content/docs/benchmarks/hydro-mechanics/PermeabilityMohrCoulombFailureIndexModel/index.md
@@ -14,4 +14,4 @@ author = "Wenqing Wang"
 {{< data-link >}}
 
 For the description of the benchmark and its related permeability model,
-  please read [the PDF](../PermeabilityMohrCoulombFailureIndexModel.pdf).
+  please read [the PDF](PermeabilityMohrCoulombFailureIndexModel.pdf).
diff --git a/web/content/docs/benchmarks/hydro-mechanics/HM_confined_compression_analytical.png b/web/content/docs/benchmarks/hydro-mechanics/hm-linear/HM_confined_compression_analytical.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/HM_confined_compression_analytical.png
rename to web/content/docs/benchmarks/hydro-mechanics/hm-linear/HM_confined_compression_analytical.png
diff --git a/web/content/docs/benchmarks/hydro-mechanics/HM_confined_compression_simulation_error.png b/web/content/docs/benchmarks/hydro-mechanics/hm-linear/HM_confined_compression_simulation_error.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/HM_confined_compression_simulation_error.png
rename to web/content/docs/benchmarks/hydro-mechanics/hm-linear/HM_confined_compression_simulation_error.png
diff --git a/web/content/docs/benchmarks/hydro-mechanics/hm-linear.md b/web/content/docs/benchmarks/hydro-mechanics/hm-linear/index.md
similarity index 90%
rename from web/content/docs/benchmarks/hydro-mechanics/hm-linear.md
rename to web/content/docs/benchmarks/hydro-mechanics/hm-linear/index.md
index 43d5070b1a17b3da9eb70d599f41f3eb48a4abfa..d83481668ce4fd196a61613845f81ee2c691cec5 100644
--- a/web/content/docs/benchmarks/hydro-mechanics/hm-linear.md
+++ b/web/content/docs/benchmarks/hydro-mechanics/hm-linear/index.md
@@ -23,8 +23,8 @@ The analytical solution of the problem can be found in Mov _et.al._ (1980)"Bipha
 
 The result showing initial pore pressure increase in the bottom of the domain due to applied displacement on the top and subsequent pressure drop after the displacement ramp finishes at time 100s:
 
-{{< img src="../HM_confined_compression_analytical.png" >}}
+{{< img src="HM_confined_compression_analytical.png" >}}
 
 Comparison with the numerical solution shows good agreement with the analytical solution:
 
-{{< img src="../HM_confined_compression_simulation_error.png" >}}
+{{< img src="HM_confined_compression_simulation_error.png" >}}
diff --git a/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression.md b/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/index.md
similarity index 94%
rename from web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression.md
rename to web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/index.md
index 0be58e4b1d5b80942044fde068ef9e5b02532e67..f137e77f4b2a7bc0cecbe82d2440ab81b1397421 100644
--- a/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression.md
+++ b/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/index.md
@@ -40,7 +40,7 @@ where $p$ could be pressure, $\mathbf{u}$ could be displacement, $\tilde{\mathbf
 
 We solve a hydro-mechanical linear biphasic model (small deformation, linear elastic, Darcy flow, incompressible constituents) in square domain where on the top boundary a constant displacement boundary is applied. On the right boundary a constant pressure boundary equals zero and zeros traction boundary are applied. All other boundaries are constrained in their normal direction and all boundaries except for outer radius are sealed. The fluid is allowed to escape through the right boundary. The drainage process can be concluded into two stages. During drainage, the total stress is the sum of effective stresses in the solid and the pore pressure. Once the material is fully drained, the pore pressure is zero, so that stress- and displacement fields are determined exclusively by the properties of the solid skeleton. An axisymmetric domain is used in this model. The mesh is refined based on the distance to the outer radius.
 
-{{< img src="../mesh_UC_final.png" >}}
+{{< img src="mesh_UC_final.png" >}}
 
 ## Assumptions
 
@@ -53,12 +53,12 @@ Compression of Articular Cartilage."
 
 The result after 1s shows that due to the direct displacement on the boundary, the displacement on the x direction is quite large. Where the location is close enough to the outer radius, some water has already flowed out, the pore pressure is decreased and the gradient of displacement curve is modified.
 
-{{< img src="../num_ana_1s_refined.png" >}}
+{{< img src="num_ana_1s_refined.png" >}}
 
 The result after 1000s shows that when the drainage process is finished. The displacement has bounced back and the curve is almost straight due to the linear elastic behavior of the solid.
 
-{{< img src="../verification_1000s_new-1.png" >}}
+{{< img src="verification_1000s_new-1.png" >}}
 
 In order to capture the transient process at certain location, a point at the outer boundary is chosen to show the displacement during the whole compression process.
 
-{{< img src="../transient_validation_unconfined_compression.png" >}}
+{{< img src="transient_validation_unconfined_compression.png" >}}
diff --git a/web/content/docs/benchmarks/hydro-mechanics/mesh_UC_final.png b/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/mesh_UC_final.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/mesh_UC_final.png
rename to web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/mesh_UC_final.png
diff --git a/web/content/docs/benchmarks/hydro-mechanics/num_ana_1s_refined.png b/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/num_ana_1s_refined.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/num_ana_1s_refined.png
rename to web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/num_ana_1s_refined.png
diff --git a/web/content/docs/benchmarks/hydro-mechanics/transient_validation_unconfined_compression.png b/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/transient_validation_unconfined_compression.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/transient_validation_unconfined_compression.png
rename to web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/transient_validation_unconfined_compression.png
diff --git a/web/content/docs/benchmarks/hydro-mechanics/verification_1000s_new-1.png b/web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/verification_1000s_new-1.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/verification_1000s_new-1.png
rename to web/content/docs/benchmarks/hydro-mechanics/hm-unconfined-compression/verification_1000s_new-1.png
diff --git a/web/content/docs/benchmarks/hydro-mechanics/LIE_HM.pdf b/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/LIE_HM.pdf
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/LIE_HM.pdf
rename to web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/LIE_HM.pdf
diff --git a/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture.md b/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/index.md
similarity index 82%
rename from web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture.md
rename to web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/index.md
index 839eab452144ac6bc24d007fcc8e746175f249b4..e5e63050e057508187f1f384b5fcd38b5128e48b 100644
--- a/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture.md
+++ b/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/index.md
@@ -18,14 +18,14 @@ author = "Norihiro Watanabe"
 
 We solve a hydromechanics problem (small deformation, linear elastic, Darcy flow) with a pre-existing fracture using the lower-dimensional interface element (LIE) approach.
 
-See [this PDF](../LIE_HM.pdf) for detailed problem description.
+See [this PDF](LIE_HM.pdf) for detailed problem description.
 
 ## Results and evaluation
 
 Result showing pore pressure increase due to the injection and subsequent fracture aperture increases at t=500s. A small discrepancy of the aperture near the injection is due to the interpolation method for converting cell data to point data in ParaView.
 
-{{< img src="../x_p_t500.png" >}}
-{{< img src="../x_b_t500.png" >}}
+{{< img src="x_p_t500.png" >}}
+{{< img src="x_b_t500.png" >}}
 
 ## 3D setup
 
@@ -33,10 +33,8 @@ Same setup as for the given 2D case above with additional plane strain
 conditions in the front and back x-y planes.
 Warp of the 1000-times oversized displacement and the fracture's aperture are
 shown in the following figure.
-{{< img src="../single_fracture_3D.png" >}}
+{{< img src="single_fracture_3D.png" >}}
 
 Comparison with 2D setup yields identical results (up to numerical differences
 in order of 1e-15):
 TODO: Image missing!
-
-<!-- {{< img src="../single_fracture_3D_vs_2D.png" >}} -->
diff --git a/web/content/docs/benchmarks/hydro-mechanics/single_fracture_3D.png b/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/single_fracture_3D.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/single_fracture_3D.png
rename to web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/single_fracture_3D.png
diff --git a/web/content/docs/benchmarks/hydro-mechanics/x_b_t500.png b/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/x_b_t500.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/x_b_t500.png
rename to web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/x_b_t500.png
diff --git a/web/content/docs/benchmarks/hydro-mechanics/x_p_t500.png b/web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/x_p_t500.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/x_p_t500.png
rename to web/content/docs/benchmarks/hydro-mechanics/lie-hm-linear-single-fracture/x_p_t500.png
diff --git a/web/content/docs/benchmarks/hydro-mechanics/nodal_source_test.md b/web/content/docs/benchmarks/hydro-mechanics/nodal_source_test/index.md
similarity index 98%
rename from web/content/docs/benchmarks/hydro-mechanics/nodal_source_test.md
rename to web/content/docs/benchmarks/hydro-mechanics/nodal_source_test/index.md
index 22aecceaec31a8b3fc29f2203c1b9aaee59764f3..f402b6ac766aaed69ee9517b25d04deef2f6de98 100644
--- a/web/content/docs/benchmarks/hydro-mechanics/nodal_source_test.md
+++ b/web/content/docs/benchmarks/hydro-mechanics/nodal_source_test/index.md
@@ -79,4 +79,4 @@ The time period of 86400 is discretised into 100 steps.
 
 The distributions of pressure and displacement at the end time are shown in the
  following figure:
-{{< img src="../nodal_source_test.png" >}}
+{{< img src="nodal_source_test.png" >}}
diff --git a/web/content/docs/benchmarks/hydro-mechanics/nodal_source_test.png b/web/content/docs/benchmarks/hydro-mechanics/nodal_source_test/nodal_source_test.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-mechanics/nodal_source_test.png
rename to web/content/docs/benchmarks/hydro-mechanics/nodal_source_test/nodal_source_test.png
diff --git a/web/content/docs/benchmarks/hydro-thermal/heat_transport_in_stationary_flow_domain.png b/web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow/heat_transport_in_stationary_flow_domain.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-thermal/heat_transport_in_stationary_flow_domain.png
rename to web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow/heat_transport_in_stationary_flow_domain.png
diff --git a/web/content/docs/benchmarks/hydro-thermal/heat_transport_in_stationary_flow_profile.png b/web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow/heat_transport_in_stationary_flow_profile.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-thermal/heat_transport_in_stationary_flow_profile.png
rename to web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow/heat_transport_in_stationary_flow_profile.png
diff --git a/web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow.md b/web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow/index.md
similarity index 95%
rename from web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow.md
rename to web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow/index.md
index 3e8705cf6175c9ad7ec9f6e177b3152766e17999..2442c08f6c2036e2d98af439dcbcf46c2d7dee20 100644
--- a/web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow.md
+++ b/web/content/docs/benchmarks/hydro-thermal/HeatTransportInStationaryFlow/index.md
@@ -63,9 +63,9 @@ This example is also set as one of the benchmarks of
 
 The temperature distribution  at <em>t=</em>  5.e+4 s together with the mesh is
  illustrated in the following figure:
-{{< img src="../heat_transport_in_stationary_flow_domain.png" >}}
+{{< img src="heat_transport_in_stationary_flow_domain.png" >}}
 
 The temperature  profile at <em>t=</em>  5.e+4 s along a horizontal line in the
   2D domain is given in the following figure:
-{{< img src="../heat_transport_in_stationary_flow_profile.png" >}}
+{{< img src="heat_transport_in_stationary_flow_profile.png" >}}
 
diff --git a/web/content/docs/benchmarks/hydro-thermal/InitialPressure.png b/web/content/docs/benchmarks/hydro-thermal/InitialPressure.png
deleted file mode 100644
index 4d53d9f7533a28836644adb81039c13645e026f6..0000000000000000000000000000000000000000
Binary files a/web/content/docs/benchmarks/hydro-thermal/InitialPressure.png and /dev/null differ
diff --git a/web/content/docs/benchmarks/hydro-thermal/TemperatureResult_ts_149-InitialGradient.png b/web/content/docs/benchmarks/hydro-thermal/TemperatureResult_ts_149-InitialGradient.png
deleted file mode 100644
index 82112876c1ca347c4f5cbc7fa0c252b9fc12b4f2..0000000000000000000000000000000000000000
Binary files a/web/content/docs/benchmarks/hydro-thermal/TemperatureResult_ts_149-InitialGradient.png and /dev/null differ
diff --git a/web/content/docs/benchmarks/hydro-thermal/TemperatureResult_ts_149.png b/web/content/docs/benchmarks/hydro-thermal/TemperatureResult_ts_149.png
deleted file mode 100644
index 61b2c75e5fd6a897be9ace320cacfb9afa029ec6..0000000000000000000000000000000000000000
Binary files a/web/content/docs/benchmarks/hydro-thermal/TemperatureResult_ts_149.png and /dev/null differ
diff --git a/web/content/docs/benchmarks/hydro-thermal/HT-Process.pdf b/web/content/docs/benchmarks/hydro-thermal/constant-viscosity/HT-Process.pdf
similarity index 100%
rename from web/content/docs/benchmarks/hydro-thermal/HT-Process.pdf
rename to web/content/docs/benchmarks/hydro-thermal/constant-viscosity/HT-Process.pdf
diff --git a/web/content/docs/benchmarks/hydro-thermal/compare.png b/web/content/docs/benchmarks/hydro-thermal/constant-viscosity/compare.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-thermal/compare.png
rename to web/content/docs/benchmarks/hydro-thermal/constant-viscosity/compare.png
diff --git a/web/content/docs/benchmarks/hydro-thermal/constant-viscosity.md b/web/content/docs/benchmarks/hydro-thermal/constant-viscosity/index.md
similarity index 96%
rename from web/content/docs/benchmarks/hydro-thermal/constant-viscosity.md
rename to web/content/docs/benchmarks/hydro-thermal/constant-viscosity/index.md
index 78c1f934e3961aba154a5431b3c307e17fb82d6f..88fe693e2a0d9c150bc50d9cc0052f481c1a6f8d 100644
--- a/web/content/docs/benchmarks/hydro-thermal/constant-viscosity.md
+++ b/web/content/docs/benchmarks/hydro-thermal/constant-viscosity/index.md
@@ -15,7 +15,7 @@ weight = 161
 
 ## Equations
 
-See [this PDF](../HT-Process.pdf).
+See [this PDF](HT-Process.pdf).
 
 ## Problem description
 
@@ -33,4 +33,4 @@ TODO 3 images
 
 ## Comparison with FEFlow solution
 
-{{< img src="../compare.png" >}}
+{{< img src="compare.png" >}}
diff --git a/web/content/docs/benchmarks/hydro-thermal/decovalex_TH_domain.png b/web/content/docs/benchmarks/hydro-thermal/decovalex-TH/decovalex_TH_domain.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-thermal/decovalex_TH_domain.png
rename to web/content/docs/benchmarks/hydro-thermal/decovalex-TH/decovalex_TH_domain.png
diff --git a/web/content/docs/benchmarks/hydro-thermal/decovalex_TH_domain_pT.png b/web/content/docs/benchmarks/hydro-thermal/decovalex-TH/decovalex_TH_domain_pT.png
similarity index 100%
rename from web/content/docs/benchmarks/hydro-thermal/decovalex_TH_domain_pT.png
rename to web/content/docs/benchmarks/hydro-thermal/decovalex-TH/decovalex_TH_domain_pT.png
diff --git a/web/content/docs/benchmarks/hydro-thermal/decovalex-TH.md b/web/content/docs/benchmarks/hydro-thermal/decovalex-TH/index.md
similarity index 98%
rename from web/content/docs/benchmarks/hydro-thermal/decovalex-TH.md
rename to web/content/docs/benchmarks/hydro-thermal/decovalex-TH/index.md
index fbc1d3d9a8dbc910a6ce1364f3823da6f5dd62fc..37578f184f00381220bfdfe9ca6b60776c619f81 100644
--- a/web/content/docs/benchmarks/hydro-thermal/decovalex-TH.md
+++ b/web/content/docs/benchmarks/hydro-thermal/decovalex-TH/index.md
@@ -33,7 +33,7 @@ The TASK D_THM1 of the DECOVALEX-THMC project studies the coupled thermal hydrau
 </ol>
 <p>With such simplifications, the geometry of the present example is illustrated
  in the following figure:</p>
-{{< img src="../decovalex_TH_domain.png" >}}
+{{< img src="decovalex_TH_domain.png" >}}
 <p>In the above figure, the domain in the annulus sector represents the sealing
  material, bentonite. A heat power, which is generated by the nuclear waste with
  one million year variation, is applied onto the inner arc of the annulus
@@ -126,7 +126,7 @@ The TASK D_THM1 of the DECOVALEX-THMC project studies the coupled thermal hydrau
  domain at the time of 18 years are shown in the following figure, in which the
  thermal convection effective can be seen clearly.</p>
 
-{{< img src="../decovalex_TH_domain_pT.png" >}}
+{{< img src="decovalex_TH_domain_pT.png" >}}
 
 ## Reference
 
diff --git a/web/content/docs/benchmarks/liquid-flow/comparison.png b/web/content/docs/benchmarks/liquid-flow/buildup_test/comparison.png
similarity index 100%
rename from web/content/docs/benchmarks/liquid-flow/comparison.png
rename to web/content/docs/benchmarks/liquid-flow/buildup_test/comparison.png
diff --git a/web/content/docs/benchmarks/liquid-flow/error.png b/web/content/docs/benchmarks/liquid-flow/buildup_test/error.png
similarity index 100%
rename from web/content/docs/benchmarks/liquid-flow/error.png
rename to web/content/docs/benchmarks/liquid-flow/buildup_test/error.png
diff --git a/web/content/docs/benchmarks/liquid-flow/horner.png b/web/content/docs/benchmarks/liquid-flow/buildup_test/horner.png
similarity index 100%
rename from web/content/docs/benchmarks/liquid-flow/horner.png
rename to web/content/docs/benchmarks/liquid-flow/buildup_test/horner.png
diff --git a/web/content/docs/benchmarks/liquid-flow/buildup_test.md b/web/content/docs/benchmarks/liquid-flow/buildup_test/index.md
similarity index 98%
rename from web/content/docs/benchmarks/liquid-flow/buildup_test.md
rename to web/content/docs/benchmarks/liquid-flow/buildup_test/index.md
index a59a42993f57096a2dceef703d5e9e5e02aea334..f1e3b2af98abde368ad1f218d50409936c430144 100644
--- a/web/content/docs/benchmarks/liquid-flow/buildup_test.md
+++ b/web/content/docs/benchmarks/liquid-flow/buildup_test/index.md
@@ -50,7 +50,7 @@ increases in the opposite direction of the *X*-axis. Therefore, the
 linear section appears at the left side of the diagram.
 
 \centering
-{{< img src="../horner.png" >}}
+{{< img src="horner.png" >}}
 
 Figure 1: Horner plot ($p$ vs $(t_p+\Delta t)/\Delta t$) for buildup test showing the inferred Horner straight line
 
@@ -105,11 +105,11 @@ fits with the analytical solution very well. The absolute and relative
 error between the analytical and numerical solution is depicted in
 Figure 3.
 
-{{< img src="../comparison.png" >}}
+{{< img src="comparison.png" >}}
 
 Figure 2: OGS 6 result compared with analytical solution
 
-{{< img src="../error.png" >}}
+{{< img src="error.png" >}}
 
 Figure 3: Absolute and relative error
 
diff --git a/web/content/docs/benchmarks/liquid-flow/drainage_LiquidFlow.pdf b/web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow/drainage_LiquidFlow.pdf
similarity index 100%
rename from web/content/docs/benchmarks/liquid-flow/drainage_LiquidFlow.pdf
rename to web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow/drainage_LiquidFlow.pdf
diff --git a/web/content/docs/benchmarks/liquid-flow/drainage_excavation.png b/web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow/drainage_excavation.png
similarity index 100%
rename from web/content/docs/benchmarks/liquid-flow/drainage_excavation.png
rename to web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow/drainage_excavation.png
diff --git a/web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow.md b/web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow/index.md
similarity index 84%
rename from web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow.md
rename to web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow/index.md
index 31f7965a09b5b434c0183d61f7697a55d143da49..25dbc424d423586701644e8754d7e62007da3256 100644
--- a/web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow.md
+++ b/web/content/docs/benchmarks/liquid-flow/drainage_Liquid_Flow/index.md
@@ -14,8 +14,8 @@ project = "/Parabolic/LiquidFlow/DrainageExcavation/drainage_LiquidFlow.prj"
 
 ## Problem description
 
-We present the drainage of an excavation benchmark in this [this PDF](../drainage_LiquidFlow.pdf).
+We present the drainage of an excavation benchmark in this [this PDF](drainage_LiquidFlow.pdf).
 
 Here's an impression of the problem and its results:
 
-{{< img src="../drainage_excavation.png" >}}
+{{< img src="drainage_excavation.png" >}}
diff --git a/web/content/docs/benchmarks/liquid-flow/inclined_1D_in_3D_sphere.png b/web/content/docs/benchmarks/liquid-flow/flow_in_fracture/inclined_1D_in_3D_sphere.png
similarity index 100%
rename from web/content/docs/benchmarks/liquid-flow/inclined_1D_in_3D_sphere.png
rename to web/content/docs/benchmarks/liquid-flow/flow_in_fracture/inclined_1D_in_3D_sphere.png
diff --git a/web/content/docs/benchmarks/liquid-flow/inclined_2D_in_3D.png b/web/content/docs/benchmarks/liquid-flow/flow_in_fracture/inclined_2D_in_3D.png
similarity index 100%
rename from web/content/docs/benchmarks/liquid-flow/inclined_2D_in_3D.png
rename to web/content/docs/benchmarks/liquid-flow/flow_in_fracture/inclined_2D_in_3D.png
diff --git a/web/content/docs/benchmarks/liquid-flow/inclined_2D_mesh.png b/web/content/docs/benchmarks/liquid-flow/flow_in_fracture/inclined_2D_mesh.png
similarity index 100%
rename from web/content/docs/benchmarks/liquid-flow/inclined_2D_mesh.png
rename to web/content/docs/benchmarks/liquid-flow/flow_in_fracture/inclined_2D_mesh.png
diff --git a/web/content/docs/benchmarks/liquid-flow/flow_in_fracture.md b/web/content/docs/benchmarks/liquid-flow/flow_in_fracture/index.md
similarity index 95%
rename from web/content/docs/benchmarks/liquid-flow/flow_in_fracture.md
rename to web/content/docs/benchmarks/liquid-flow/flow_in_fracture/index.md
index 0c2f96a23f55c5bb3100549e1e607e3bd55fa70d..2b2d27045e376ecb97bf85afbf065daeab93931f 100644
--- a/web/content/docs/benchmarks/liquid-flow/flow_in_fracture.md
+++ b/web/content/docs/benchmarks/liquid-flow/flow_in_fracture/index.md
@@ -28,7 +28,7 @@ Under this topic, there are two benchmarks using the same 2D mesh on an inclined
 For the hydro-steady state one, it gives zero velocity. For the transient
  simulation, the orientation calculated velocity is shown in the following
  figure, which is parallel to the mesh plane as what expected.
-{{< img src="../inclined_2D_mesh.png" >}}
+{{< img src="inclined_2D_mesh.png" >}}
 
 ## Flow in rock matrix with two intersected fractures
  The input files are given in the sub-directory of FractureIn3D.
@@ -47,7 +47,7 @@ the permeability of
  and the gravity. The following figure shows the pressure distribution and
  the flow orientation on the fractures. It can be seen that the flow orientation
  is exactly parallel to the fracture planes as what expected.
-{{< img src="../inclined_2D_in_3D.png" >}}
+{{< img src="inclined_2D_in_3D.png" >}}
 
 ## Line elements on a sphere
 The input files are given in the sub-directory of 1Din3D.
@@ -58,4 +58,4 @@ This an artificial example is used to test the simulation with a mesh only with
 A fixed pressure difference is applied at the two poles of the sphere. As shown
  in the following figure, the computed flow orientation is exactly on
  the tangent of the boundary of the vertical splices of the sphere.
-{{< img src="../inclined_1D_in_3D_sphere.png" >}}
+{{< img src="inclined_1D_in_3D_sphere.png" >}}
diff --git a/web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem.md b/web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem/index.md
similarity index 99%
rename from web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem.md
rename to web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem/index.md
index 9b578cd0c92dcf3826a9701abbbe62febecd40c2..842dd67206cd743219fd3d562d1345f01c7203b2 100644
--- a/web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem.md
+++ b/web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem/index.md
@@ -59,7 +59,7 @@ where $\gamma\approx$ 0.5772 is the Euler-Mascheroni constant. For practical pur
 The following figure compares the analytical solution, the result by ogs5, and
  the result by ogs6 (labeled as `pressure`) within the range that satisfies
  $u <$ 0.05.
-{{< img src="../theis_comparison.png" >}}
+{{< img src="theis_comparison.png" >}}
 The figure shows that there is a good match between the analytical solution and
  the numerical solution obtained by using ogs5 or ogs6.
 
diff --git a/web/content/docs/benchmarks/liquid-flow/theis_comparison.png b/web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem/theis_comparison.png
similarity index 100%
rename from web/content/docs/benchmarks/liquid-flow/theis_comparison.png
rename to web/content/docs/benchmarks/liquid-flow/liquid-flow-theis-problem/theis_comparison.png
diff --git a/web/content/docs/benchmarks/liquid-flow/PVCDBC_1_ts_2.png b/web/content/docs/benchmarks/liquid-flow/primary-variable-constrain-dirichlet-boundary-condition/PVCDBC_1_ts_2.png
similarity index 100%
rename from web/content/docs/benchmarks/liquid-flow/PVCDBC_1_ts_2.png
rename to web/content/docs/benchmarks/liquid-flow/primary-variable-constrain-dirichlet-boundary-condition/PVCDBC_1_ts_2.png
diff --git a/web/content/docs/benchmarks/liquid-flow/primary-variable-constrain-dirichlet-boundary-condition.md b/web/content/docs/benchmarks/liquid-flow/primary-variable-constrain-dirichlet-boundary-condition/index.md
similarity index 98%
rename from web/content/docs/benchmarks/liquid-flow/primary-variable-constrain-dirichlet-boundary-condition.md
rename to web/content/docs/benchmarks/liquid-flow/primary-variable-constrain-dirichlet-boundary-condition/index.md
index a81ac708139f819f3f30947f5f857db24d47ec9b..7e013d3a1c72d7a9171aa1df3cd1e6bdef210e88 100644
--- a/web/content/docs/benchmarks/liquid-flow/primary-variable-constrain-dirichlet-boundary-condition.md
+++ b/web/content/docs/benchmarks/liquid-flow/primary-variable-constrain-dirichlet-boundary-condition/index.md
@@ -64,4 +64,4 @@ At the beginning of the simulation the PVCDBC is inactive. Because of the
 after the first time step and the PVCDBC is activated in the second time step.
 The effect is depicted in the figure:
 
-{{< img src="../PVCDBC_1_ts_2.png" >}}
+{{< img src="PVCDBC_1_ts_2.png" >}}
diff --git a/web/content/docs/benchmarks/liquid-flow/TimeDependentHeterogeneousBoundaryConditionsAndSourceTerm.mp4 b/web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions/TimeDependentHeterogeneousBoundaryConditionsAndSourceTerm.mp4
similarity index 100%
rename from web/content/docs/benchmarks/liquid-flow/TimeDependentHeterogeneousBoundaryConditionsAndSourceTerm.mp4
rename to web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions/TimeDependentHeterogeneousBoundaryConditionsAndSourceTerm.mp4
diff --git a/web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions.md b/web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions/index.md
similarity index 93%
rename from web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions.md
rename to web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions/index.md
index 93eeb49914f7dc094a3dd1335612dff8c482e40c..f399a9e7f122c75cd309d7abee37f04c26c57e6d 100644
--- a/web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions.md
+++ b/web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions/index.md
@@ -77,9 +77,9 @@ quarter as a source, and in the last quarter as a sink again.
 ## Results
 
 <video width="838" height="762" controls>
-<source src="../TimeDependentHeterogeneousBoundaryConditionsAndSourceTerm.mp4" type="video/mp4" />
+<source src="TimeDependentHeterogeneousBoundaryConditionsAndSourceTerm.mp4" type="video/mp4" />
 </video>
 <p>
 <strong>Download Video:</strong>
-<a href="../TimeDependentHeterogeneousBoundaryConditionsAndSourceTerm.mp4">"MP4"</a>
+<a href="TimeDependentHeterogeneousBoundaryConditionsAndSourceTerm.mp4">"MP4"</a>
 </p>
diff --git a/web/content/docs/benchmarks/liquid-flow/Dupuit_Scenario_A.jpg b/web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/Dupuit_Scenario_A.jpg
similarity index 100%
rename from web/content/docs/benchmarks/liquid-flow/Dupuit_Scenario_A.jpg
rename to web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/Dupuit_Scenario_A.jpg
diff --git a/web/content/docs/benchmarks/liquid-flow/Dupuit_Scenario_B.jpg b/web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/Dupuit_Scenario_B.jpg
similarity index 100%
rename from web/content/docs/benchmarks/liquid-flow/Dupuit_Scenario_B.jpg
rename to web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/Dupuit_Scenario_B.jpg
diff --git a/web/content/docs/benchmarks/liquid-flow/Dupuit_Scenario_C.jpg b/web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/Dupuit_Scenario_C.jpg
similarity index 100%
rename from web/content/docs/benchmarks/liquid-flow/Dupuit_Scenario_C.jpg
rename to web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/Dupuit_Scenario_C.jpg
diff --git a/web/content/docs/benchmarks/liquid-flow/Dupuit_Scenario_D.jpg b/web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/Dupuit_Scenario_D.jpg
similarity index 100%
rename from web/content/docs/benchmarks/liquid-flow/Dupuit_Scenario_D.jpg
rename to web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/Dupuit_Scenario_D.jpg
diff --git a/web/content/docs/benchmarks/liquid-flow/unconfined-aquifer.md b/web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/index.md
similarity index 96%
rename from web/content/docs/benchmarks/liquid-flow/unconfined-aquifer.md
rename to web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/index.md
index f598a190c1074d675d6d629b2245d2e88a40c206..609cf1ae3e8104db9c6911879babb0da4b0cda36 100644
--- a/web/content/docs/benchmarks/liquid-flow/unconfined-aquifer.md
+++ b/web/content/docs/benchmarks/liquid-flow/unconfined-aquifer/index.md
@@ -81,26 +81,26 @@ The basic scenario for the two-dimensional unconfined aquifer:
 - In the north there is a fixed head boundary condition with 15 m.
 - The southern boundary has a fixed head boundary condition with 25 m.
 - the Specific Yield is set to $S_y = 0.0$
-{{< img src="../Dupuit_Scenario_A.jpg" >}}
+{{< img src="Dupuit_Scenario_A.jpg" >}}
 
 ### Scenario B
 
 - Like scenario A and additionally
 - with an average groundwater recharge rate = 3.54745E-09 m/s
-{{< img src="../Dupuit_Scenario_B.jpg" >}}
+{{< img src="Dupuit_Scenario_B.jpg" >}}
 
 ### Scenario C
 
 - like scenario A but
 - with an inflow rate of 4.62963E-05 m3/s per meter at the southern boundary
-{{< img src="../Dupuit_Scenario_C.jpg" >}}
+{{< img src="Dupuit_Scenario_C.jpg" >}}
 
 ### Scenario D
 
 - like scenario A but transient and
 - with a Specific Yield $S_y_ = 0.25$.
 - Simulation time = 100 days.
-{{< img src="../Dupuit_Scenario_D.jpg" >}}
+{{< img src="Dupuit_Scenario_D.jpg" >}}
 
 ### References
 
diff --git a/web/content/docs/benchmarks/phase-field/ME2_stress_state_1.pdf b/web/content/docs/benchmarks/phase-field/pf_perc/ME2_stress_state_1.pdf
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/ME2_stress_state_1.pdf
rename to web/content/docs/benchmarks/phase-field/pf_perc/ME2_stress_state_1.pdf
diff --git a/web/content/docs/benchmarks/phase-field/ME2_stress_state_2.pdf b/web/content/docs/benchmarks/phase-field/pf_perc/ME2_stress_state_2.pdf
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/ME2_stress_state_2.pdf
rename to web/content/docs/benchmarks/phase-field/pf_perc/ME2_stress_state_2.pdf
diff --git a/web/content/docs/benchmarks/phase-field/VPF_ME2_case1.png b/web/content/docs/benchmarks/phase-field/pf_perc/VPF_ME2_case1.png
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/VPF_ME2_case1.png
rename to web/content/docs/benchmarks/phase-field/pf_perc/VPF_ME2_case1.png
diff --git a/web/content/docs/benchmarks/phase-field/VPF_ME2_case2.png b/web/content/docs/benchmarks/phase-field/pf_perc/VPF_ME2_case2.png
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/VPF_ME2_case2.png
rename to web/content/docs/benchmarks/phase-field/pf_perc/VPF_ME2_case2.png
diff --git a/web/content/docs/benchmarks/phase-field/Yoshioka_percolation.pdf b/web/content/docs/benchmarks/phase-field/pf_perc/Yoshioka_percolation.pdf
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/Yoshioka_percolation.pdf
rename to web/content/docs/benchmarks/phase-field/pf_perc/Yoshioka_percolation.pdf
diff --git a/web/content/docs/benchmarks/phase-field/pf_perc.md b/web/content/docs/benchmarks/phase-field/pf_perc/index.md
similarity index 67%
rename from web/content/docs/benchmarks/phase-field/pf_perc.md
rename to web/content/docs/benchmarks/phase-field/pf_perc/index.md
index edcc4c598ba6a6316b3cbbf0bf55611e65cdf4a4..8ca6f0b38ceedd66221f0a26e6c8335c38863e0f 100644
--- a/web/content/docs/benchmarks/phase-field/pf_perc.md
+++ b/web/content/docs/benchmarks/phase-field/pf_perc/index.md
@@ -17,13 +17,13 @@ weight = 158
 **Note**, this project file runs only with a modified version of OGS
 which you can find [here](https://github.com/KeitaYoshioka/ogs/tree/H2M_phasefield).
 
-We simulate two different fluid percolation experiments performed on rock salt samples with a true tri-axial loading system as described in [this PDF](../Yoshioka_percolation.pdf). The experiments were performed under two different stress configurations as below.
-{{< img src="../ME2_stress_state_1.pdf" >}}
-{{< img src="../ME2_stress_state_2.pdf" >}}
+We simulate two different fluid percolation experiments performed on rock salt samples with a true tri-axial loading system as described in [this PDF](Yoshioka_percolation.pdf). The experiments were performed under two different stress configurations as below.
+{{< img src="ME2_stress_state_1.pdf" >}}
+{{< img src="ME2_stress_state_2.pdf" >}}
 
 ## Results and evaluation
 
 Simulated crack paths (phase-field) for the two cases are shown below:
 
-{{< img src="../VPF_ME2_case1.png" >}}
-{{< img src="../VPF_ME2_case2.png" >}}
+{{< img src="VPF_ME2_case1.png" >}}
+{{< img src="VPF_ME2_case2.png" >}}
diff --git a/web/content/docs/benchmarks/phase-field/TPB_exp.png b/web/content/docs/benchmarks/phase-field/pf_tpb/TPB_exp.png
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/TPB_exp.png
rename to web/content/docs/benchmarks/phase-field/pf_tpb/TPB_exp.png
diff --git a/web/content/docs/benchmarks/phase-field/VPF_ME1_NF_CMOD_comp.png b/web/content/docs/benchmarks/phase-field/pf_tpb/VPF_ME1_NF_CMOD_comp.png
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/VPF_ME1_NF_CMOD_comp.png
rename to web/content/docs/benchmarks/phase-field/pf_tpb/VPF_ME1_NF_CMOD_comp.png
diff --git a/web/content/docs/benchmarks/phase-field/VPF_ME1_frac.png b/web/content/docs/benchmarks/phase-field/pf_tpb/VPF_ME1_frac.png
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/VPF_ME1_frac.png
rename to web/content/docs/benchmarks/phase-field/pf_tpb/VPF_ME1_frac.png
diff --git a/web/content/docs/benchmarks/phase-field/pf_tpb.md b/web/content/docs/benchmarks/phase-field/pf_tpb/index.md
similarity index 88%
rename from web/content/docs/benchmarks/phase-field/pf_tpb.md
rename to web/content/docs/benchmarks/phase-field/pf_tpb/index.md
index e766938611080487b68054fa599024bd29e4eae4..bfc5b9523a3e5da7563e0c137fecb08740e3b967 100644
--- a/web/content/docs/benchmarks/phase-field/pf_tpb.md
+++ b/web/content/docs/benchmarks/phase-field/pf_tpb/index.md
@@ -18,14 +18,14 @@ weight = 158
 which you can find [here](https://github.com/KeitaYoshioka/ogs/tree/H2M_phasefield).
 
 We simulate a three point bending test performed on Rockville granite as shown below. Details of the experiment can be found in Tarok et al. 2017.
-{{< img src="../TPB_exp.png" >}}
+{{< img src="TPB_exp.png" >}}
 
 ## Results and evaluation
 
 Developed crack (phase-field) and the crack mouth opening displacement (CMOD) vs. the force are shown below.
 
-{{< img src="../VPF_ME1_frac.png" >}}
-{{< img src="../VPF_ME1_NF_CMOD_comp.png" >}}
+{{< img src="VPF_ME1_frac.png" >}}
+{{< img src="VPF_ME1_NF_CMOD_comp.png" >}}
 
 
 The model is able to simulate up to the brittle elastic failure, but as cracked surfaces are currently treated as frictionless, the behavior after the failure deviates from the experiment results.
diff --git a/web/content/docs/benchmarks/phase-field/ME1_ext_2D_orth_result.png b/web/content/docs/benchmarks/phase-field/pf_tpb_ani/ME1_ext_2D_orth_result.png
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/ME1_ext_2D_orth_result.png
rename to web/content/docs/benchmarks/phase-field/pf_tpb_ani/ME1_ext_2D_orth_result.png
diff --git a/web/content/docs/benchmarks/phase-field/ME1_ext_2D_orthogonal_init.png b/web/content/docs/benchmarks/phase-field/pf_tpb_ani/ME1_ext_2D_orthogonal_init.png
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/ME1_ext_2D_orthogonal_init.png
rename to web/content/docs/benchmarks/phase-field/pf_tpb_ani/ME1_ext_2D_orthogonal_init.png
diff --git a/web/content/docs/benchmarks/phase-field/ME1_ext_2D_para_result.png b/web/content/docs/benchmarks/phase-field/pf_tpb_ani/ME1_ext_2D_para_result.png
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/ME1_ext_2D_para_result.png
rename to web/content/docs/benchmarks/phase-field/pf_tpb_ani/ME1_ext_2D_para_result.png
diff --git a/web/content/docs/benchmarks/phase-field/ME1_ext_2D_parallel_init.png b/web/content/docs/benchmarks/phase-field/pf_tpb_ani/ME1_ext_2D_parallel_init.png
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/ME1_ext_2D_parallel_init.png
rename to web/content/docs/benchmarks/phase-field/pf_tpb_ani/ME1_ext_2D_parallel_init.png
diff --git a/web/content/docs/benchmarks/phase-field/VPF_ME1_ex_NF_CMOD.png b/web/content/docs/benchmarks/phase-field/pf_tpb_ani/VPF_ME1_ex_NF_CMOD.png
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/VPF_ME1_ex_NF_CMOD.png
rename to web/content/docs/benchmarks/phase-field/pf_tpb_ani/VPF_ME1_ex_NF_CMOD.png
diff --git a/web/content/docs/benchmarks/phase-field/pf_tpb_ani.md b/web/content/docs/benchmarks/phase-field/pf_tpb_ani/index.md
similarity index 77%
rename from web/content/docs/benchmarks/phase-field/pf_tpb_ani.md
rename to web/content/docs/benchmarks/phase-field/pf_tpb_ani/index.md
index cad5e75125b3817e4c4b1935195248b97c7a9ba6..6c3452959e951216fad79df232458d1e227c9ed4 100644
--- a/web/content/docs/benchmarks/phase-field/pf_tpb_ani.md
+++ b/web/content/docs/benchmarks/phase-field/pf_tpb_ani/index.md
@@ -18,16 +18,16 @@ weight = 158
 which you can find [here](https://github.com/KeitaYoshioka/ogs/tree/H2M_phasefield).
 
 We simulate three point bending tests performed on lamination orthogonal and parallel. The layer lamination is represented through the fracture toughnss $G_c$ as shown below.
-{{< img src="../ME1_ext_2D_orthogonal_init.png" >}}
-{{< img src="../ME1_ext_2D_parallel_init.png" >}}
+{{< img src="ME1_ext_2D_orthogonal_init.png" >}}
+{{< img src="ME1_ext_2D_parallel_init.png" >}}
 
 ## Results and evaluation
 
 Simulated crack path (phase-field) for the lamination orthogonal and the parallel are shown below:
 
-{{< img src="../ME1_ext_2D_orth_result.png" >}}
-{{< img src="../ME1_ext_2D_para_result.png" >}}
+{{< img src="ME1_ext_2D_orth_result.png" >}}
+{{< img src="ME1_ext_2D_para_result.png" >}}
 
 The responses of crack mouth opening displacement (CMOD) vs. force is as follows.
 
-{{< img src="../VPF_ME1_ex_NF_CMOD.png" >}}
\ No newline at end of file
+{{< img src="VPF_ME1_ex_NF_CMOD.png" >}}
\ No newline at end of file
diff --git a/web/content/docs/benchmarks/phase-field/Miao_Biot2017.pdf b/web/content/docs/benchmarks/phase-field/phasefield/Miao_Biot2017.pdf
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/Miao_Biot2017.pdf
rename to web/content/docs/benchmarks/phase-field/phasefield/Miao_Biot2017.pdf
diff --git a/web/content/docs/benchmarks/phase-field/beam.png b/web/content/docs/benchmarks/phase-field/phasefield/beam.png
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/beam.png
rename to web/content/docs/benchmarks/phase-field/phasefield/beam.png
diff --git a/web/content/docs/benchmarks/phase-field/beam_d.png b/web/content/docs/benchmarks/phase-field/phasefield/beam_d.png
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/beam_d.png
rename to web/content/docs/benchmarks/phase-field/phasefield/beam_d.png
diff --git a/web/content/docs/benchmarks/phase-field/beam_u.png b/web/content/docs/benchmarks/phase-field/phasefield/beam_u.png
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/beam_u.png
rename to web/content/docs/benchmarks/phase-field/phasefield/beam_u.png
diff --git a/web/content/docs/benchmarks/phase-field/error_u.png b/web/content/docs/benchmarks/phase-field/phasefield/error_u.png
similarity index 100%
rename from web/content/docs/benchmarks/phase-field/error_u.png
rename to web/content/docs/benchmarks/phase-field/phasefield/error_u.png
diff --git a/web/content/docs/benchmarks/phase-field/phasefield.md b/web/content/docs/benchmarks/phase-field/phasefield/index.md
similarity index 86%
rename from web/content/docs/benchmarks/phase-field/phasefield.md
rename to web/content/docs/benchmarks/phase-field/phasefield/index.md
index 7b98dcf33508f5245699738a10d8bcff195dee34..6c58c7d46ee2fab93b443042000888e3981e61c8 100644
--- a/web/content/docs/benchmarks/phase-field/phasefield.md
+++ b/web/content/docs/benchmarks/phase-field/phasefield/index.md
@@ -15,18 +15,18 @@ weight = 158
 
 ## Problem description
 
-We solve a homogeneous beam model under a given displacement loading. The length of the beam is 2\,mm. Detailed model description can refer [this PDF](../Miao_Biot2017.pdf).
+We solve a homogeneous beam model under a given displacement loading. The length of the beam is 2\,mm. Detailed model description can refer [this PDF](Miao_Biot2017.pdf).
 
 ## Results and evaluation
 
 Results show crack Phase-Field and displacement field distributions through the length of the beam:
 
-{{< img src="../beam.png" >}}
-{{< img src="../beam_d.png" >}}
-{{< img src="../beam_u.png" >}}
+{{< img src="beam.png" >}}
+{{< img src="beam_d.png" >}}
+{{< img src="beam_u.png" >}}
 
 For highlighting the deviation between the analytical and numerical solution, we provide the absolute error of the analytical solution and numerical simulation as follows:
-{{< img src="../error_u.png" >}}
+{{< img src="error_u.png" >}}
 
 The analytical solution is:
 $$
diff --git a/web/content/docs/benchmarks/python-bc/elder-benchmark/elder.md b/web/content/docs/benchmarks/python-bc/elder-benchmark/elder/index.md
similarity index 86%
rename from web/content/docs/benchmarks/python-bc/elder-benchmark/elder.md
rename to web/content/docs/benchmarks/python-bc/elder-benchmark/elder/index.md
index 3c6225747974f3cbc3244c3c4598aae47b27cba5..4b9f6319bb43b9499cffb5ad4b4921c61b659475 100644
--- a/web/content/docs/benchmarks/python-bc/elder-benchmark/elder.md
+++ b/web/content/docs/benchmarks/python-bc/elder-benchmark/elder/index.md
@@ -23,5 +23,5 @@ The aim of this test is:
 
 ## Details
 
-This test is a copy of [this test case]({{< ref "../../Hydro-Component/elder" >}}).
+This test is a copy of [this test case]({{< ref "docs/benchmarks/hydro-component/elder" >}}).
 Please check the original test case for any details.
diff --git a/web/content/docs/benchmarks/python-bc/hertz-contact/contact_radii.png b/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/contact_radii.png
similarity index 100%
rename from web/content/docs/benchmarks/python-bc/hertz-contact/contact_radii.png
rename to web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/contact_radii.png
diff --git a/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.png b/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/hertz-contact.png
similarity index 100%
rename from web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.png
rename to web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/hertz-contact.png
diff --git a/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.svg b/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/hertz-contact.svg
similarity index 100%
rename from web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.svg
rename to web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/hertz-contact.svg
diff --git a/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.md b/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/index.md
similarity index 94%
rename from web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.md
rename to web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/index.md
index 5192589ec623e25ded688dabdbc8795453ff88eb..e660c8b9fdaa2ccbd609603d6d4ff2b58d7e4daa 100644
--- a/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.md
+++ b/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/index.md
@@ -29,7 +29,7 @@ The sphere centers are displaced towards each other by $w_0$, with increasing
 values in every load step.
 Due to symmetry reasons a flat circular contact area of radius $a$ forms.
 
-{{< img src="../hertz-contact.png" >}}
+{{< img src="hertz-contact.png" >}}
 
 The contact between the two spheres is modelled as a Dirichlet BC
 on a varying boundary. The exact boundary and Dirichlet values for the
@@ -78,15 +78,15 @@ $$
 
 Contact radii:
 
-{{<img src="../contact_radii.png">}}
+{{<img src="contact_radii.png">}}
 
 Average pressure $\bar{p}$:
 
-{{<img src="../stress_at_contact.png">}}
+{{<img src="stress_at_contact.png">}}
 
 Total force $F$:
 
-{{<img src="../total_force.png">}}
+{{<img src="total_force.png">}}
 
 The simulation results for contact radii and total force reproduce the
 analytical square root and cubic laws, respectively.
diff --git a/web/content/docs/benchmarks/python-bc/hertz-contact/stress_at_contact.png b/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/stress_at_contact.png
similarity index 100%
rename from web/content/docs/benchmarks/python-bc/hertz-contact/stress_at_contact.png
rename to web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/stress_at_contact.png
diff --git a/web/content/docs/benchmarks/python-bc/hertz-contact/total_force.png b/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/total_force.png
similarity index 100%
rename from web/content/docs/benchmarks/python-bc/hertz-contact/total_force.png
rename to web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact/total_force.png
diff --git a/web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq.md b/web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq/index.md
similarity index 96%
rename from web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq.md
rename to web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq/index.md
index af09d761ec55c9617c93f19230a31859a467402c..eaf57cf227f63f3e561a8dc37fe082a6558a492f 100644
--- a/web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq.md
+++ b/web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq/index.md
@@ -87,9 +87,9 @@ There $n = (1, 0)$, which implies that $a \mathop{\mathrm{grad}} u \cdot n
 
 The numerical result obtained from OpenGeoSys is:
 
-{{< img src="../python_laplace_eq_solution.png" >}}
+{{< img src="python_laplace_eq_solution.png" >}}
 
 The absolute difference between the analytical and numerical solutions is
 smaller than $4 \cdot 10^{-4}$:
 
-{{< img src="../python_laplace_eq_diff.png" >}}
+{{< img src="python_laplace_eq_diff.png" >}}
diff --git a/web/content/docs/benchmarks/python-bc/laplace-equation/python_laplace_eq_diff.png b/web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq/python_laplace_eq_diff.png
similarity index 100%
rename from web/content/docs/benchmarks/python-bc/laplace-equation/python_laplace_eq_diff.png
rename to web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq/python_laplace_eq_diff.png
diff --git a/web/content/docs/benchmarks/python-bc/laplace-equation/python_laplace_eq_solution.png b/web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq/python_laplace_eq_solution.png
similarity index 100%
rename from web/content/docs/benchmarks/python-bc/laplace-equation/python_laplace_eq_solution.png
rename to web/content/docs/benchmarks/python-bc/laplace-equation/python-laplace-eq/python_laplace_eq_solution.png
diff --git a/web/content/docs/benchmarks/python-bc/piston/piston.md b/web/content/docs/benchmarks/python-bc/piston/piston/index.md
similarity index 91%
rename from web/content/docs/benchmarks/python-bc/piston/piston.md
rename to web/content/docs/benchmarks/python-bc/piston/piston/index.md
index 60e7dc5d4b2a4052fdcffe9d2d2426a906ca4251..e6e47a293d9f30678ae13c60bf1ca80e49f3f6b1 100644
--- a/web/content/docs/benchmarks/python-bc/piston/piston.md
+++ b/web/content/docs/benchmarks/python-bc/piston/piston/index.md
@@ -28,18 +28,18 @@ piston. The position of the piston is varied between different load steps.
 Friction between the piston and the chamber wall is neglected.
 For simplicitly, also initially the elastic piston is in an unstressed state.
 
-{{<img src="../sketch-piston.png" >}}
+{{<img src="sketch-piston.png" >}}
 
 ## Results
 
-{{<img src="../load-steps.png" >}}
+{{<img src="load-steps.png" >}}
 
 The figure above shows that the piston is being compressed
 ($y$ displacement has larger negative values at the top)
 by the forces acting on it.
 The initial position of the top part of the piston is indicated as a wireframe.
 
-{{<img src="../pressure-displacement.png" >}}
+{{<img src="pressure-displacement.png" >}}
 
 The plot shows that the relation between the stress in the piston and its
 displacement coincides with the pressure-volume relation of the chamber.
diff --git a/web/content/docs/benchmarks/python-bc/piston/load-steps.png b/web/content/docs/benchmarks/python-bc/piston/piston/load-steps.png
similarity index 100%
rename from web/content/docs/benchmarks/python-bc/piston/load-steps.png
rename to web/content/docs/benchmarks/python-bc/piston/piston/load-steps.png
diff --git a/web/content/docs/benchmarks/python-bc/piston/pressure-displacement.png b/web/content/docs/benchmarks/python-bc/piston/piston/pressure-displacement.png
similarity index 100%
rename from web/content/docs/benchmarks/python-bc/piston/pressure-displacement.png
rename to web/content/docs/benchmarks/python-bc/piston/piston/pressure-displacement.png
diff --git a/web/content/docs/benchmarks/python-bc/piston/sketch-piston.png b/web/content/docs/benchmarks/python-bc/piston/piston/sketch-piston.png
similarity index 100%
rename from web/content/docs/benchmarks/python-bc/piston/sketch-piston.png
rename to web/content/docs/benchmarks/python-bc/piston/piston/sketch-piston.png
diff --git a/web/content/docs/benchmarks/python-bc/piston/sketch-piston.svg b/web/content/docs/benchmarks/python-bc/piston/piston/sketch-piston.svg
similarity index 100%
rename from web/content/docs/benchmarks/python-bc/piston/sketch-piston.svg
rename to web/content/docs/benchmarks/python-bc/piston/piston/sketch-piston.svg
diff --git a/web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/DiffusionThermalGradient.pdf b/web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/ThermalDiffusion/DiffusionThermalGradient.pdf
similarity index 100%
rename from web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/DiffusionThermalGradient.pdf
rename to web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/ThermalDiffusion/DiffusionThermalGradient.pdf
diff --git a/web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/ThermalDiffusion.md b/web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/ThermalDiffusion/index.md
similarity index 97%
rename from web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/ThermalDiffusion.md
rename to web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/ThermalDiffusion/index.md
index 3e3c5b832c55c8b8e8666c679e459ab5670ace56..4725bb77710da87bb41246eaeaa38798ab523bb4 100644
--- a/web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/ThermalDiffusion.md
+++ b/web/content/docs/benchmarks/reactive-transport/ThermalDiffusion/ThermalDiffusion/index.md
@@ -30,4 +30,4 @@ Both models `TemperatureField.prj` and `TemperatureField_transport.prj` run inde
 
 ## Model setup and results
 
-See [this PDF](../DiffusionThermalGradient.pdf).
+See [this PDF](DiffusionThermalGradient.pdf).
diff --git a/web/content/docs/benchmarks/reactive-transport/calcite-Figures/ResultComparison.png b/web/content/docs/benchmarks/reactive-transport/calcite/ResultComparison.png
similarity index 100%
rename from web/content/docs/benchmarks/reactive-transport/calcite-Figures/ResultComparison.png
rename to web/content/docs/benchmarks/reactive-transport/calcite/ResultComparison.png
diff --git a/web/content/docs/benchmarks/reactive-transport/calcite-Figures/ResultComparisonPH.png b/web/content/docs/benchmarks/reactive-transport/calcite/ResultComparisonPH.png
similarity index 100%
rename from web/content/docs/benchmarks/reactive-transport/calcite-Figures/ResultComparisonPH.png
rename to web/content/docs/benchmarks/reactive-transport/calcite/ResultComparisonPH.png
diff --git a/web/content/docs/benchmarks/reactive-transport/calcite-Figures/Scheme.png b/web/content/docs/benchmarks/reactive-transport/calcite/Scheme.png
similarity index 100%
rename from web/content/docs/benchmarks/reactive-transport/calcite-Figures/Scheme.png
rename to web/content/docs/benchmarks/reactive-transport/calcite/Scheme.png
diff --git a/web/content/docs/benchmarks/reactive-transport/calcite.md b/web/content/docs/benchmarks/reactive-transport/calcite/index.md
similarity index 92%
rename from web/content/docs/benchmarks/reactive-transport/calcite.md
rename to web/content/docs/benchmarks/reactive-transport/calcite/index.md
index 27d1cf952653e0028663ba0a918737b41786b8dc..dd89e866bfa5cd9b853df8243c8fb5ee884be3ff 100644
--- a/web/content/docs/benchmarks/reactive-transport/calcite.md
+++ b/web/content/docs/benchmarks/reactive-transport/calcite/index.md
@@ -56,7 +56,7 @@ where $\alpha_L$ (m) and $\alpha_T$ (m) are the longitudinal and transversal dis
 
 A one-dimensional (1D) model domain of 0.5 m discretized into 100 uniform elements has been selected for the spatial discretization of the system. Dirichlet (constant concentration) and Neumannn (no flux) boundary condition are defined for the upstream inflow and the downstream, respectively. A longitudinal dispersivity of 0.0067 m and a time step size of 100 s have been taken into account in the simulation. See Figure below:
 
-{{< img src="../calcite-Figures/Scheme.png" title="Schematic representation of the model setup and parameters.">}}
+{{< img src="Scheme.png" title="Schematic representation of the model setup and parameters.">}}
 
 Thermodynamic data for hydrolysis, aqueous speciation, and dissolution/precipitation reactions between Mg, Ca, Cl, and carbonate were selected from version 12/07 of the PSI/NAGRA chemical thermodynamic database (Thoenen *et al.* 2014). Although several other minerals containing Mg and Ca were available in the PSI/NAGRA database (*i.e.* magnesite), only two solids were allowed to precipitate or dissolve in the studied system (calcite and dolomite (CaMg(CO$_3$)$_2$)).
 
@@ -66,9 +66,9 @@ A comparison of the results obtained with OGS-6#IPhreeqc and OGS-5#IPhreeqc at t
 
 At the simulated time, it can be clearly seen that the MgCl$_2$ solution front has penetrated ~0.3m of the column resulting in the dissolution of calcite and dolomite precipitation. Total aqueous concentration and solid profiles obtained of OGS-6 are in good agreement with those of OGS-5. The absolute error in terms of component concentrations is $2.15\times10^{-5}$ (Cl), $1.13\times10^{-5}$ (Mg), and $4.57\times10^{-6}$ (Ca). Additionally, pH profiles calculated with both codes are in good agreement.
 
-{{< img src="../calcite-Figures/ResultComparison.png" title="Total aqueous concentration and solid profiles obtained with OGS-6#IPhreeqc (empty triangle symbol) and OGS-5#IPhreeqc (empty circle symbol) at 350 min. (C(4) = total carbonate)">}}
+{{< img src="ResultComparison.png" title="Total aqueous concentration and solid profiles obtained with OGS-6#IPhreeqc (empty triangle symbol) and OGS-5#IPhreeqc (empty circle symbol) at 350 min. (C(4) = total carbonate)">}}
 
-{{< img src="../calcite-Figures/ResultComparisonPH.png" title="pH value profiles obtained with OGS-6#IPhreeqc (empty triangle symbol) and OGS-5#IPhreeqc (empty circle symbol) at 350 min.">}}
+{{< img src="ResultComparisonPH.png" title="pH value profiles obtained with OGS-6#IPhreeqc (empty triangle symbol) and OGS-5#IPhreeqc (empty circle symbol) at 350 min.">}}
 
 {{< data-link >}}
 
diff --git a/web/content/docs/benchmarks/reactive-transport/exchange/fig1.png b/web/content/docs/benchmarks/reactive-transport/exchange/exchange/fig1.png
similarity index 100%
rename from web/content/docs/benchmarks/reactive-transport/exchange/fig1.png
rename to web/content/docs/benchmarks/reactive-transport/exchange/exchange/fig1.png
diff --git a/web/content/docs/benchmarks/reactive-transport/exchange/fig2.png b/web/content/docs/benchmarks/reactive-transport/exchange/exchange/fig2.png
similarity index 100%
rename from web/content/docs/benchmarks/reactive-transport/exchange/fig2.png
rename to web/content/docs/benchmarks/reactive-transport/exchange/exchange/fig2.png
diff --git a/web/content/docs/benchmarks/reactive-transport/exchange/exchange.md b/web/content/docs/benchmarks/reactive-transport/exchange/exchange/index.md
similarity index 83%
rename from web/content/docs/benchmarks/reactive-transport/exchange/exchange.md
rename to web/content/docs/benchmarks/reactive-transport/exchange/exchange/index.md
index bc53d0b20c67014a7dc9ccf5d6b197d259da4fca..6fc30cfaa986ef08d9267c418a4c1d3ca9893c85 100644
--- a/web/content/docs/benchmarks/reactive-transport/exchange/exchange.md
+++ b/web/content/docs/benchmarks/reactive-transport/exchange/exchange/index.md
@@ -18,7 +18,7 @@ title = "Transport and Cation Exchange"
 This benchmark simulates the chemical composition of the effluent from a column containing a cation exchanger (Example 11 in the PHREEQC 3 documentation).
 The following setup is used for the simulation:
 
-{{< img src="../fig1.png" title="Model setup for the simulation of the column with a cation exchanger in OGS6.">}}
+{{< img src="fig1.png" title="Model setup for the simulation of the column with a cation exchanger in OGS6.">}}
 
 Full details of the model setup and parameters are given in the PHREEQC3 example (consulted MAY-2021):
 
@@ -26,7 +26,7 @@ https://water.usgs.gov/water-resources/software/PHREEQC/documentation/phreeqc3-h
 
 The benchmark uses the `ComponentTransport` process in OGS-6 coupled with the IPhreeqc software (Parkhurst and Appelo,2013). The results show good agreement between codes. More details about the implementation of the `ComponentTransport` process in OGS-6 can be found in  [HC-Process.pdf](/docs/benchmarks/hydro-component/HC-Process.pdf).
 
-{{< img src="../fig2.png" title="Comparison between PHREEQC and OGS6 of simulated concentrations of solutes at time = 18,000 s reacting with an exchanger.">}}
+{{< img src="fig2.png" title="Comparison between PHREEQC and OGS6 of simulated concentrations of solutes at time = 18,000 s reacting with an exchanger.">}}
 
 {{< data-link >}}
 
diff --git a/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2.gif b/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/KineticReactant2.gif
similarity index 100%
rename from web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2.gif
rename to web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/KineticReactant2.gif
diff --git a/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2_domain.png b/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/KineticReactant2_domain.png
similarity index 100%
rename from web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2_domain.png
rename to web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/KineticReactant2_domain.png
diff --git a/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2.md b/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/index.md
similarity index 95%
rename from web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2.md
rename to web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/index.md
index beb4913d266949fe8c337bf65101e08de3801d0f..4c91a63b4e739c334f5f80a53deb6ceb44e30ed6 100644
--- a/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2.md
+++ b/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2/index.md
@@ -37,7 +37,7 @@ Respective material properties, initial and boundary conditions are listed in th
 The 2d--scenario only differs in the domain geometry and assignment of the boundary conditions.
 The horizontal domain is 0.5 m in x and 0.5 m in y direction, and,  discretized into 10374 quadratic elemtents with an edge size of 0.0025 m.
 
-![Domains for the 1d/2d simulation models](../KineticReactant2_domain.png)
+![Domains for the 1d/2d simulation models](KineticReactant2_domain.png)
 
 -----------------------------------------
 
@@ -83,4 +83,4 @@ Over time, opposed concentration fronts for educts and Product d evolve.
 Both, OGS-6 and OGS-5 simulations yield the same results in the 1d as well as 2d scenario.
 For instance, the difference between the OGS-6 and the OGS-5 computation for the concentration of Product d expressed as root mean squared error is 1.76e-7 mol kg$^{-1}$ water (over all time steps and mesh nodes, 1d scenario); the corresponding median absolute error is 1.0e-7 mol kg$^{-1}$ water.
 This verifies the implementation of OGS-6--IPhreeqc.
-{{< img src="../KineticReactant2.gif" title="Simulated component concentrations over domain length for different time steps (1d scenario) .">}}
+{{< img src="KineticReactant2.gif" title="Simulated component concentrations over domain length for different time steps (1d scenario) .">}}
diff --git a/web/content/docs/benchmarks/reactive-transport/radionuclide/Fig1.png b/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/Fig1.png
similarity index 100%
rename from web/content/docs/benchmarks/reactive-transport/radionuclide/Fig1.png
rename to web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/Fig1.png
diff --git a/web/content/docs/benchmarks/reactive-transport/radionuclide/Fig2.gif b/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/Fig2.gif
similarity index 100%
rename from web/content/docs/benchmarks/reactive-transport/radionuclide/Fig2.gif
rename to web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/Fig2.gif
diff --git a/web/content/docs/benchmarks/reactive-transport/radionuclide/domain.png b/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/domain.png
similarity index 100%
rename from web/content/docs/benchmarks/reactive-transport/radionuclide/domain.png
rename to web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/domain.png
diff --git a/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide.md b/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/index.md
similarity index 89%
rename from web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide.md
rename to web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/index.md
index 92475255f5b31886347ef8fef2bd6cdc33a95e49..1ecbd88974bc5f2ad5bbbd0be4c9856d1e789e45 100644
--- a/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide.md
+++ b/web/content/docs/benchmarks/reactive-transport/radionuclide/radionuclide/index.md
@@ -19,7 +19,7 @@ This benchmark is focused on the simulation of the migration of $U(VI)$ in a por
 
 The benchmark uses the `ComponentTransport` process in OGS-6 (see [HC-Process.pdf](/docs/benchmarks/hydro-component/HC-Process.pdf)) coupled with the IPhreeqc interface (Parkhurst and Appelo,2013) for the chemical speciation calculations. The porewater initial composition and injected for the first 10 000 s is shown in Table 1. The porewater solution is equilibrated with Calcite.
 
-{{< img src="../domain.png" title="Spatial and temporal discretization of the 1D model. Solution concentrations with/without U(VI) are applied at the inflow boundary. Initial concentration of U(VI) in the domain is 0.">}}
+{{< img src="domain.png" title="Spatial and temporal discretization of the 1D model. Solution concentrations with/without U(VI) are applied at the inflow boundary. Initial concentration of U(VI) in the domain is 0.">}}
 
 -----------------------------------------
 
@@ -60,13 +60,13 @@ Table 2: **Surface parameters and characterization used in the simulations.**
 
 Four different combinations can be simulated taking the albite and orthoclase phases of the Feldspars group and the goethite and hematite phases for the Fe(III)-oxids/-hydroxids group. Mineral combinations from 1 to 4 (see Fig. 2) are as follows: 1) albite-goethite, 2) albite-hematite, 3) orthoclase-goethite and 4) orthoclase-hematite. From the concentration profiles in Fig. 2, it is clear that the combination 2 approximates better the profile obtained with the ESTRAL database. We choose this combination for the next part of our simulations. Furthermore, this combination is written in the `RadionuclideSorption.prj` file of this benchmark.
 
-{{< img src="../Fig1.png" title="Comparison of concentration profiles at final simulation time (115 000 s) for various representative minerals of the Feldspar and Fe(III)-oxids/-hydroxids groups. The mineral combinations profiles are obtained using the PSI/Nagra database version 12/07 and the dashed profile is obtained with the ESTRAL database.">}}
+{{< img src="Fig1.png" title="Comparison of concentration profiles at final simulation time (115 000 s) for various representative minerals of the Feldspar and Fe(III)-oxids/-hydroxids groups. The mineral combinations profiles are obtained using the PSI/Nagra database version 12/07 and the dashed profile is obtained with the ESTRAL database.">}}
 
 The temporal evolution of the concentration profiles of the chosen mineral combination (albite-hematite) compared to the ESTRAL database is shown in Fig. 3. In addition, a simulation of the reactive transport treating $U(VI)$ as a non-sorbing radionuclide is presented. Recall that the contaminated solution with $U(VI)$ is injected only for the first 10 000 s of simulation. On the one hand, we note the difference between the profile with the augmented PSI/Nagra database and with the ESTRAL database. This is expected, since different reactions and significant differences in *log K* values are considered for each simulation. However, we note that the trend is similar enough to capture the relevant sorption process happening at the surface.
 
 On the other hand, the enormous difference between sorbing and non-sorbing reactive transport is evident from the resulting concentration profiles. Therefore, we highlight the importance of considering the impact of sorption in the transport of radionuclides, as this is paramount for the safety assessment in the design of nuclear waste repositories. Finally, the CPU time of the simulation taking into account surface complexation is roughly double of the simulation with only aqueous speciation. This posses the necessity of choosing a good compromise between accuracy (large number of reactions and chemical parameters) and performance.
 
-{{< img src="../Fig2.gif" title="Time evolution of mineral combination 2 (albite/hematite) in comparison to the results obtained with the ESTRAL database. The green dotted line shows the temporal evolution of U(IV) as a non-sorbing radionuclide.">}}
+{{< img src="Fig2.gif" title="Time evolution of mineral combination 2 (albite/hematite) in comparison to the results obtained with the ESTRAL database. The green dotted line shows the temporal evolution of U(IV) as a non-sorbing radionuclide.">}}
 
 {{< data-link >}}
 
@@ -76,4 +76,4 @@ Parkhurst, D.L., Appelo, C.A.J., 2013. Description of Input and Examples for PHR
 
 Noseck, U., Britz, S., Fricke, J., Gehrke, A., Fluegge, J., Brendler, V., ... & Lampe, M. (2018). Smart K d-concept for long-term safety assessments. Extension towards more complex applications (No. GRS--500). Gesellschaft fuer Anlagen-und Reaktorsicherheit (GRS) gGmbH.
 
-Thoenen, T., Hummel, W., Berner, U., & Curti, E. (2014). *The PSI/Nagra Chemical Thermodynamic Database 12/07*.
\ No newline at end of file
+Thoenen, T., Hummel, W., Berner, U., & Curti, E. (2014). *The PSI/Nagra Chemical Thermodynamic Database 12/07*.
diff --git a/web/content/docs/benchmarks/reactive-transport/wetland/Wetland_1d.gif b/web/content/docs/benchmarks/reactive-transport/wetland/Wetland/Wetland_1d.gif
similarity index 100%
rename from web/content/docs/benchmarks/reactive-transport/wetland/Wetland_1d.gif
rename to web/content/docs/benchmarks/reactive-transport/wetland/Wetland/Wetland_1d.gif
diff --git a/web/content/docs/benchmarks/reactive-transport/wetland/Wetland_cwm1.png b/web/content/docs/benchmarks/reactive-transport/wetland/Wetland/Wetland_cwm1.png
similarity index 100%
rename from web/content/docs/benchmarks/reactive-transport/wetland/Wetland_cwm1.png
rename to web/content/docs/benchmarks/reactive-transport/wetland/Wetland/Wetland_cwm1.png
diff --git a/web/content/docs/benchmarks/reactive-transport/wetland/Wetland_domain.png b/web/content/docs/benchmarks/reactive-transport/wetland/Wetland/Wetland_domain.png
similarity index 100%
rename from web/content/docs/benchmarks/reactive-transport/wetland/Wetland_domain.png
rename to web/content/docs/benchmarks/reactive-transport/wetland/Wetland/Wetland_domain.png
diff --git a/web/content/docs/benchmarks/reactive-transport/wetland/Wetland.md b/web/content/docs/benchmarks/reactive-transport/wetland/Wetland/index.md
similarity index 95%
rename from web/content/docs/benchmarks/reactive-transport/wetland/Wetland.md
rename to web/content/docs/benchmarks/reactive-transport/wetland/Wetland/index.md
index 79dfa3d7158bbb623a448a607bb7a59e68317aa4..40ac6da10396917ef8d06d7917b37e673587e0be 100644
--- a/web/content/docs/benchmarks/reactive-transport/wetland/Wetland.md
+++ b/web/content/docs/benchmarks/reactive-transport/wetland/Wetland/index.md
@@ -34,7 +34,7 @@ The domain is saturated at start--up with an initial hydrostatic pressure of ($p
 For the water mass influx a constant Neumann boundary condition (BC) is set at the left side ($g_{N,\text{in}}^p$).
 For the water efflux, a constant pressure is defined as boundary ($g_{D,\text{out}}^p$).
 
-![Schematic representation of the experimental system and 1D model domain used in the simulation. The influent and effluent zone in the 1D model are represented by solid lines.](../Wetland_domain.png)
+![Schematic representation of the experimental system and 1D model domain used in the simulation. The influent and effluent zone in the 1D model are represented by solid lines.](Wetland_domain.png)
 
 The microbiological processes are modeled by a complex network of kinetic reactions based on the Constructed Wetland Model No. 1 (CWM1) described in Langergraber (2009).
 The network includes dissolved oxygen ($So$) and nine different soluble and particulated components ("pollutants") that some of them can be metabolized by six bacterial groups resulting in 17 kinetic reactions (Figure 2).
@@ -42,7 +42,7 @@ A "clean" system is assumed at start-up in the basin, therefore, initial concent
 For the wastewater components ("pollutants" and oxygen) entering the system, time-dependent Dirichlet BC are defined at the influx point.
 Respective material properties, initial and boundary conditions are listed in Table 1--2.
 
-![Network of microbiological reactions described by CWM1. $S_I$ = inert soluble organic matter (COD), $X_I$ = inert particulated COD, $X_S$ = Slowly biodegradable particulate COD, $S_F$ = Fermentable, readily biodegradable soluble COD, $S_A$ = Fermentation products as acetate, $S_{NH}$ = Ammonium and ammonia nitrogen, $S_{NO}$ = Nitrate and nitrite nitrogen, $S_O$ = Dissolved oxygen, $S_{SO}$ = Sulphate sulfur, $S_{H2S}$ = Sulphide sulfur; different type of bacterias are identified as $X_H$, $X_A$, $X_{FB}$, $X_{AMB}$, $X_{ASRB}$ and $X_{SOB}$](../Wetland_cwm1.png){width=60%}
+![Network of microbiological reactions described by CWM1. $S_I$ = inert soluble organic matter (COD), $X_I$ = inert particulated COD, $X_S$ = Slowly biodegradable particulate COD, $S_F$ = Fermentable, readily biodegradable soluble COD, $S_A$ = Fermentation products as acetate, $S_{NH}$ = Ammonium and ammonia nitrogen, $S_{NO}$ = Nitrate and nitrite nitrogen, $S_O$ = Dissolved oxygen, $S_{SO}$ = Sulphate sulfur, $S_{H2S}$ = Sulphide sulfur; different type of bacterias are identified as $X_H$, $X_A$, $X_{FB}$, $X_{AMB}$, $X_{ASRB}$ and $X_{SOB}$](Wetland_cwm1.png){width=60%}
 
 -----------------------------------------
 
@@ -98,7 +98,7 @@ For instance, the difference between the OGS-6 and the OGS-5 computation for the
 The relatively high error may be associated with the missing transport or charge in the OGS-6 simulation, which affects computations by Phreeqc.
 Please note that due to the long computation time of the simulation (~13 h), the corresponding test (Wetland_1d.prj) is reduced to the first four time steps (28800 s).
 
-{{< img src="../Wetland_1d.gif" title="Fig. 3: Simulated concentrations of solutes (left) and bacteria (right). Solid lines represent solutions by OGS-5; dashed lines represent solution by OGS-6.">}}
+{{< img src="Wetland_1d.gif" title="Fig. 3: Simulated concentrations of solutes (left) and bacteria (right). Solid lines represent solutions by OGS-5; dashed lines represent solution by OGS-6.">}}
 
 -----------------------------------------
 
diff --git a/web/content/docs/benchmarks/richards-flow/RichardsComponentTransport_Equations.pdf b/web/content/docs/benchmarks/richards-flow/richards-component-transport/RichardsComponentTransport_Equations.pdf
similarity index 100%
rename from web/content/docs/benchmarks/richards-flow/RichardsComponentTransport_Equations.pdf
rename to web/content/docs/benchmarks/richards-flow/richards-component-transport/RichardsComponentTransport_Equations.pdf
diff --git a/web/content/docs/benchmarks/richards-flow/RichardsComponentTransport_Padilla.png b/web/content/docs/benchmarks/richards-flow/richards-component-transport/RichardsComponentTransport_Padilla.png
similarity index 100%
rename from web/content/docs/benchmarks/richards-flow/RichardsComponentTransport_Padilla.png
rename to web/content/docs/benchmarks/richards-flow/richards-component-transport/RichardsComponentTransport_Padilla.png
diff --git a/web/content/docs/benchmarks/richards-flow/richards-component-transport.md b/web/content/docs/benchmarks/richards-flow/richards-component-transport/index.md
similarity index 89%
rename from web/content/docs/benchmarks/richards-flow/richards-component-transport.md
rename to web/content/docs/benchmarks/richards-flow/richards-component-transport/index.md
index a29168f9ee2ebe801ac0b36ef7968398ac7ce0e4..42d5aaa65c5f222a1deb1769a9a6dffa792f9abd 100644
--- a/web/content/docs/benchmarks/richards-flow/richards-component-transport.md
+++ b/web/content/docs/benchmarks/richards-flow/richards-component-transport/index.md
@@ -17,7 +17,7 @@ title = "Unsaturated Mass Transport"
 
 The Richards equation is often used to describe water movement in the unsaturated zone, while the mass transport equation describes solute movement in the liquid phase. Here, we use a monolithic approach to simulate mass transport in an unsaturated medium.
 
-The development of the equation system is given in [this PDF](../RichardsComponentTransport_Equations.pdf). In the following, we present a numerical benchmark that uses experimental data as reference.
+The development of the equation system is given in [this PDF](RichardsComponentTransport_Equations.pdf). In the following, we present a numerical benchmark that uses experimental data as reference.
 
 ## Problem description
 
@@ -38,7 +38,7 @@ Initial conditions are $c = 0$ and hydrostatic pressure conditions with steady s
 
 The figure below shows breakthrough curves vs experimental result at the bottom of the simulation domain, together with averaged saturation values at the two observation points with distance of 0.075 cm from both ends of the column (as stated in Padilla et al., 1999) over pore volume.
 
-{{< img src="../RichardsComponentTransport_Padilla.png" title="Comparison between numerical (lines) and experimental (squares) results for cases 'NaCl1' and 'NaCl6' from Padilla et al. (1999).">}}
+{{< img src="RichardsComponentTransport_Padilla.png" title="Comparison between numerical (lines) and experimental (squares) results for cases 'NaCl1' and 'NaCl6' from Padilla et al. (1999).">}}
 
 It can be seen, that with decreasing saturation, breakthrough curves exhibit stronger dispersion through the decreased angle of the breakthrough curve. Both simulation results follow the experimental observations closely; deviations, especially in the unsaturated case, can be attributed to known tailing effects from secondary porosity.
 
diff --git a/web/content/docs/benchmarks/richards-flow/richards-flow.md b/web/content/docs/benchmarks/richards-flow/richards-flow/index.md
similarity index 87%
rename from web/content/docs/benchmarks/richards-flow/richards-flow.md
rename to web/content/docs/benchmarks/richards-flow/richards-flow/index.md
index 513f5a1a893a18fa50f624099c6fdaf55a8f9d42..12fabbcae3e74ed3fbad535f74801c594b5cd97f 100644
--- a/web/content/docs/benchmarks/richards-flow/richards-flow.md
+++ b/web/content/docs/benchmarks/richards-flow/richards-flow/index.md
@@ -19,4 +19,4 @@ The Richards equation is often used to mathematically describe water movement in
 
 ## Problem setting
 
-See [this PDF](../richards-2.pdf) for the problem setting.
+See [this PDF](richards-2.pdf) for the problem setting.
diff --git a/web/content/docs/benchmarks/richards-flow/richards-2.pdf b/web/content/docs/benchmarks/richards-flow/richards-flow/richards-2.pdf
similarity index 100%
rename from web/content/docs/benchmarks/richards-flow/richards-2.pdf
rename to web/content/docs/benchmarks/richards-flow/richards-flow/richards-2.pdf
diff --git a/web/content/docs/benchmarks/richards-mechanics/BishopsEffectiveStress.png b/web/content/docs/benchmarks/richards-mechanics/bishops-effective-stress/BishopsEffectiveStress.png
similarity index 100%
rename from web/content/docs/benchmarks/richards-mechanics/BishopsEffectiveStress.png
rename to web/content/docs/benchmarks/richards-mechanics/bishops-effective-stress/BishopsEffectiveStress.png
diff --git a/web/content/docs/benchmarks/richards-mechanics/bishops-effective-stress.md b/web/content/docs/benchmarks/richards-mechanics/bishops-effective-stress/index.md
similarity index 95%
rename from web/content/docs/benchmarks/richards-mechanics/bishops-effective-stress.md
rename to web/content/docs/benchmarks/richards-mechanics/bishops-effective-stress/index.md
index b35e15f13ad572add18e702c6e354f9d02ea696c..6099c1c30efb0bb99c519d35bc7efadcea197627 100644
--- a/web/content/docs/benchmarks/richards-mechanics/bishops-effective-stress.md
+++ b/web/content/docs/benchmarks/richards-mechanics/bishops-effective-stress/index.md
@@ -30,4 +30,4 @@ displacement. In the test the medium is desaturated and then saturated again,
 which causes shrinkage and expansion of the domain. Power law with exponents 1,
 1/5, and 5 and saturation cut-off at maximum liquid saturation of 0.95 are
 compared.
-{{< img src="../BishopsEffectiveStress.png" >}}
+{{< img src="BishopsEffectiveStress.png" >}}
diff --git a/web/content/docs/benchmarks/richards-mechanics/liakopoulos.md b/web/content/docs/benchmarks/richards-mechanics/liakopoulos/index.md
similarity index 90%
rename from web/content/docs/benchmarks/richards-mechanics/liakopoulos.md
rename to web/content/docs/benchmarks/richards-mechanics/liakopoulos/index.md
index a2430fcd99fdfa7451c6b2b5426a11ef8c93d743..fff34a3750b79fa4f0c566b40dc34a1d46726da1 100644
--- a/web/content/docs/benchmarks/richards-mechanics/liakopoulos.md
+++ b/web/content/docs/benchmarks/richards-mechanics/liakopoulos/index.md
@@ -17,9 +17,9 @@ This benchmark simulates the Liakopoulos experiment
 {{< data-link >}}
 
 * Saturation profile:
-{{< img src="../liak_S.png" >}}
+{{< img src="liak_S.png" >}}
 * Vertical displacement profile:
-{{< img src="../liak_uy.png" >}}
+{{< img src="liak_uy.png" >}}
 
 
 ## References
diff --git a/web/content/docs/benchmarks/richards-mechanics/liak_S.png b/web/content/docs/benchmarks/richards-mechanics/liakopoulos/liak_S.png
similarity index 100%
rename from web/content/docs/benchmarks/richards-mechanics/liak_S.png
rename to web/content/docs/benchmarks/richards-mechanics/liakopoulos/liak_S.png
diff --git a/web/content/docs/benchmarks/richards-mechanics/liak_uy.png b/web/content/docs/benchmarks/richards-mechanics/liakopoulos/liak_uy.png
similarity index 100%
rename from web/content/docs/benchmarks/richards-mechanics/liak_uy.png
rename to web/content/docs/benchmarks/richards-mechanics/liakopoulos/liak_uy.png
diff --git a/web/content/docs/benchmarks/small-deformations/ModifiedCamClay_report.pdf b/web/content/docs/benchmarks/small-deformations/ModifiedCamClay/ModifiedCamClay_report.pdf
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/ModifiedCamClay_report.pdf
rename to web/content/docs/benchmarks/small-deformations/ModifiedCamClay/ModifiedCamClay_report.pdf
diff --git a/web/content/docs/benchmarks/small-deformations/ModifiedCamClay.md b/web/content/docs/benchmarks/small-deformations/ModifiedCamClay/index.md
similarity index 90%
rename from web/content/docs/benchmarks/small-deformations/ModifiedCamClay.md
rename to web/content/docs/benchmarks/small-deformations/ModifiedCamClay/index.md
index 765d0c6b03814663cf64fb7334a528e1d937fd93..785a25a291ab6e1db505f516ef9c36208736081b 100644
--- a/web/content/docs/benchmarks/small-deformations/ModifiedCamClay.md
+++ b/web/content/docs/benchmarks/small-deformations/ModifiedCamClay/index.md
@@ -23,4 +23,4 @@ Three tests are presented:
 We perform plane strain and axisymmetric mechanical tests using
 the modified Cam clay model revealing both the features and
 the limitations of this material model.
-See [this PDF](../ModifiedCamClay_report.pdf) for the detailed description.
+See [this PDF](ModifiedCamClay_report.pdf) for the detailed description.
diff --git a/web/content/docs/benchmarks/small-deformations/arehs-salt-T_elements.png b/web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/arehs-salt-T_elements.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/arehs-salt-T_elements.png
rename to web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/arehs-salt-T_elements.png
diff --git a/web/content/docs/benchmarks/small-deformations/arehs_saltdome_creep_S.png b/web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/arehs_saltdome_creep_S.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/arehs_saltdome_creep_S.png
rename to web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/arehs_saltdome_creep_S.png
diff --git a/web/content/docs/benchmarks/small-deformations/arehs_saltdome_creep_u.png b/web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/arehs_saltdome_creep_u.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/arehs_saltdome_creep_u.png
rename to web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/arehs_saltdome_creep_u.png
diff --git a/web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref.md b/web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/index.md
similarity index 89%
rename from web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref.md
rename to web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/index.md
index 5d9605d6c4e4e94105dc5538ee6391d2eb09f1c9..46cc0ff14fff8954e1023315eb90baca25af0ef5 100644
--- a/web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref.md
+++ b/web/content/docs/benchmarks/small-deformations/arehs_salt_dome_creep_hete_T_ref/index.md
@@ -33,7 +33,7 @@ The other material parameters are listed in the following table:
 
 The reference temperature is shown in the following figure:
 <p align="center">
-<img  src="../arehs-salt-T_elements.png" alt="drawing" width="400"/>
+<img  src="arehs-salt-T_elements.png" alt="drawing" width="400"/>
 </p>
 The initial stresses were obtained by conducting a simulation of the pure elastic
 deformation in the same domain under the gravitational force.
@@ -43,10 +43,10 @@ As a benchmark, only one thousand years' creep with  six time steps is considere
 The following two figures shown the results of stress magnitude and displacement
 magnitude at the last time step:
 <p align="center">
-<img  src="../arehs_saltdome_creep_S.png" alt="drawing" width="600"/>
+<img  src="arehs_saltdome_creep_S.png" alt="drawing" width="600"/>
 </p>
 <p align="center">
-<img  src="../arehs_saltdome_creep_u.png" alt="drawing" width="600"/>
+<img  src="arehs_saltdome_creep_u.png" alt="drawing" width="600"/>
 </p>
 
 ## References
diff --git a/web/content/docs/benchmarks/small-deformations/LIE_SD_m_result_uy.png b/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/LIE_SD_m_result_uy.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/LIE_SD_m_result_uy.png
rename to web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/LIE_SD_m_result_uy.png
diff --git a/web/content/docs/benchmarks/small-deformations/LIE_fracture_incompressibility.pdf b/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/LIE_fracture_incompressibility.pdf
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/LIE_fracture_incompressibility.pdf
rename to web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/LIE_fracture_incompressibility.pdf
diff --git a/web/content/docs/benchmarks/small-deformations/LIE_small_deformation.pdf b/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/LIE_small_deformation.pdf
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/LIE_small_deformation.pdf
rename to web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/LIE_small_deformation.pdf
diff --git a/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture.md b/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/index.md
similarity index 75%
rename from web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture.md
rename to web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/index.md
index c0b34a153fd3cd6d4bdb2e4550882b32f7056e59..d209b40ddbcb8725c07a8cbf6b8fa80610574297 100644
--- a/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture.md
+++ b/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/index.md
@@ -17,21 +17,21 @@ title = "Linear; Single fracture"
 
 We solve a linear elastic small deformation problem with a pre-existing fracture using the lower-dimensional interface element (LIE) approach.
 
-See [this PDF](../LIE_small_deformation.pdf) for detailed problem description.
+See [this PDF](LIE_small_deformation.pdf) for detailed problem description.
 
 The one-sided incompressibility constraint for fracture models is described in
-[this PDF](../LIE_fracture_incompressibility.pdf).
+[this PDF](LIE_fracture_incompressibility.pdf).
 
 ## Results and evaluation
 
 Result showing sliding of the upper part of the domain along the fracture:
 
-{{< img src="../LIE_SD_m_result_uy.png" >}}
+{{< img src="LIE_SD_m_result_uy.png" >}}
 
 Same benchmark setup with plane strain conditions in 3D:
-{{< img src="../single_joint_3D.png" >}}
+{{< img src="single_joint_3D.png" >}}
 
 Comparison with 2D setup yields identical results (up to numerical differences
 in order of 1e-15); Resulting displacement on the left axis, and error on the
 right:
-{{< img src="../single_joint_3D_2D_results.png" >}}
+{{< img src="single_joint_3D_2D_results.png" >}}
diff --git a/web/content/docs/benchmarks/small-deformations/single_joint_3D.png b/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/single_joint_3D.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/single_joint_3D.png
rename to web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/single_joint_3D.png
diff --git a/web/content/docs/benchmarks/small-deformations/single_joint_3D_2D_results.png b/web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/single_joint_3D_2D_results.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/single_joint_3D_2D_results.png
rename to web/content/docs/benchmarks/small-deformations/lie-m-linear-single-fracture/single_joint_3D_2D_results.png
diff --git a/web/content/docs/benchmarks/small-deformations/Circular_hole.pdf b/web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole/Circular_hole.pdf
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/Circular_hole.pdf
rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole/Circular_hole.pdf
diff --git a/web/content/docs/benchmarks/small-deformations/disc_with_hole_pcs_0_ts_4_t_1.000000.png b/web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole/disc_with_hole_pcs_0_ts_4_t_1.000000.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/disc_with_hole_pcs_0_ts_4_t_1.000000.png
rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole/disc_with_hole_pcs_0_ts_4_t_1.000000.png
diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole.md b/web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole/index.md
similarity index 75%
rename from web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole.md
rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole/index.md
index 70ca56aab1d74e8ef74c6fb45fd17d7173ab7697..8235477b640a5ae9b33c68b5ff60c5a2dc6ff9f5 100644
--- a/web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole.md
+++ b/web/content/docs/benchmarks/small-deformations/mechanics-linear-disc-with-hole/index.md
@@ -17,10 +17,10 @@ weight = 111
 
 We solve a linear elastic small deformation problem on a quarter of a plate with hole put under tension on the top boundary.
 
-See [this PDF](../Circular_hole.pdf) for detailed problem description.
+See [this PDF](Circular_hole.pdf) for detailed problem description.
 
 ## Results and evaluation
 
-![Result showing the displacement field.](../disc_with_hole_pcs_0_ts_4_t_1.000000.png)
+![Result showing the displacement field.](disc_with_hole_pcs_0_ts_4_t_1.000000.png)
 
 <!-- {{< vis path="Mechanics/Linear/disc_with_hole_pcs_0_ts_4_t_1.000000.vtu" >}} -->
diff --git a/web/content/docs/benchmarks/small-deformations/element_deactivation_2D.png b/web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/element_deactivation_2D.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/element_deactivation_2D.png
rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/element_deactivation_2D.png
diff --git a/web/content/docs/benchmarks/small-deformations/element_deactivation_2D_3D_mesh.png b/web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/element_deactivation_2D_3D_mesh.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/element_deactivation_2D_3D_mesh.png
rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/element_deactivation_2D_3D_mesh.png
diff --git a/web/content/docs/benchmarks/small-deformations/element_deactivation_3D.png b/web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/element_deactivation_3D.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/element_deactivation_3D.png
rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/element_deactivation_3D.png
diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation.md b/web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/index.md
similarity index 91%
rename from web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation.md
rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/index.md
index 09234961cc48c601e2fb4088a783554297847349..6d17da499d1ab8c4804e174aedc82eb3dcbbbd88 100644
--- a/web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation.md
+++ b/web/content/docs/benchmarks/small-deformations/mechanics-linear-element_deactivation/index.md
@@ -42,10 +42,10 @@ The input data set of the element deactivation approach is specified inside the
 
 ## Mesh
 
-![2D and 3D meshes](../element_deactivation_2D_3D_mesh.png)
+![2D and 3D meshes](element_deactivation_2D_3D_mesh.png)
 
 ## Results and evaluation
 
-![2D results](../element_deactivation_2D.png)
+![2D results](element_deactivation_2D.png)
 
-![3D results:](../element_deactivation_3D.png)
+![3D results:](element_deactivation_3D.png)
diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states.md b/web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states/index.md
similarity index 82%
rename from web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states.md
rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states/index.md
index b0f596aad3cb3ccf438864e3fd0a27d2dfcf71bf..5ebc949af4b25220b8be0c6d97c11f325d906957 100644
--- a/web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states.md
+++ b/web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states/index.md
@@ -16,7 +16,7 @@ weight = 111
 ## Overview
 
 For detailed description see [technical note
-PDF](../non-equilibrium_initial_states.pdf); here only excerpts from the
+PDF](non-equilibrium_initial_states.pdf); here only excerpts from the
 document are shown.
 
 In certain conditions we want to drive changes in the process only by a change
@@ -24,4 +24,4 @@ in the external driving forces and suppress the initial equilibration.
 Three test cases are showing a full simulation from equilibrium initial state,
 a restart with equilibrium, and calculation from non-equilibrium initial state.
 
-![Non-equilibrium initial states](../non-equilibrium_initial_states.png)
+![Non-equilibrium initial states](non-equilibrium_initial_states.png)
diff --git a/web/content/docs/benchmarks/small-deformations/non-equilibrium_initial_states.pdf b/web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states/non-equilibrium_initial_states.pdf
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/non-equilibrium_initial_states.pdf
rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states/non-equilibrium_initial_states.pdf
diff --git a/web/content/docs/benchmarks/small-deformations/non-equilibrium_initial_states.png b/web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states/non-equilibrium_initial_states.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/non-equilibrium_initial_states.png
rename to web/content/docs/benchmarks/small-deformations/mechanics-linear-nonequilibrium-states/non-equilibrium_initial_states.png
diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction.md b/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/index.md
similarity index 82%
rename from web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction.md
rename to web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/index.md
index b83440b7e9c2be618fb171393acbf4fa72e14d39..b17dbb2eb2721a078ccd5bf200e747502499df96 100644
--- a/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction.md
+++ b/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/index.md
@@ -17,14 +17,14 @@ weight = 112
 
 We solve a non-linear small deformation problem on a cube with shear traction on the top boundary face. The 3D problem is setup identical to the corresponding 2D problem.
 
-See [this PDF](../lubby2.pdf) for detailed problem description.
+See [this PDF](lubby2.pdf) for detailed problem description.
 
 ## Results and evaluation
 
 Result showing the displacement field and distortion relative to the initial configuration:
 
-{{< img src="../lubby2.png" >}}
+{{< img src="lubby2.png" >}}
 
 Displacement of the top surface in the direction of the shear traction over time showing the elastic and viscous deformations (creep):
 
-{{< img src="../lubby2_creep_over_time.png" >}}
+{{< img src="lubby2_creep_over_time.png" >}}
diff --git a/web/content/docs/benchmarks/small-deformations/lubby2.pdf b/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/lubby2.pdf
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/lubby2.pdf
rename to web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/lubby2.pdf
diff --git a/web/content/docs/benchmarks/small-deformations/lubby2.png b/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/lubby2.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/lubby2.png
rename to web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/lubby2.png
diff --git a/web/content/docs/benchmarks/small-deformations/lubby2_creep_over_time.png b/web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/lubby2_creep_over_time.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/lubby2_creep_over_time.png
rename to web/content/docs/benchmarks/small-deformations/mechanics-lubby2-shear-traction/lubby2_creep_over_time.png
diff --git a/web/content/docs/benchmarks/small-deformations/dp_test.png b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager/dp_test.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/dp_test.png
rename to web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager/dp_test.png
diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager.md b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager/index.md
similarity index 92%
rename from web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager.md
rename to web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager/index.md
index 46f4fcdb685b5f56882c6ee3d89245b6e119f6d6..c4337fdb90e334cc610ec044c74c00bd22b11ead 100644
--- a/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager.md
+++ b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager/index.md
@@ -21,8 +21,8 @@ The Ehlers material model can be reduced to the well-known criteria, such as the
 
 Triaxial compression test:
 
-{{< img src="../ss_load.png" >}}
+{{< img src="ss_load.png" >}}
 
 Variations of the stress states and the plastic volumetric strain with a monotonic loading process:
 
-{{< img src="../dp_test.png" >}}
+{{< img src="dp_test.png" >}}
diff --git a/web/content/docs/benchmarks/small-deformations/ss_load.png b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager/ss_load.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/ss_load.png
rename to web/content/docs/benchmarks/small-deformations/mechanics-plasticity-ehlers-specialcase-drucker-prager/ss_load.png
diff --git a/web/content/docs/benchmarks/small-deformations/Plasticity.pdf b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/Plasticity.pdf
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/Plasticity.pdf
rename to web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/Plasticity.pdf
diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface.md b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/index.md
similarity index 80%
rename from web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface.md
rename to web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/index.md
index 76f806fb4d06599c54590385bd7501e6b15a1e1f..83ecd9a511f5cdab8e731bd6524ff377f6673320 100644
--- a/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface.md
+++ b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/index.md
@@ -18,14 +18,14 @@ title = "Ehlers; Single-surface yield function"
 
 We use a seven-parametric yield function for geomaterials to describe the plastic response. The traixial compression test is setup.
 
-See [this PDF](../Plasticity.pdf) for detailed problem description.
+See [this PDF](Plasticity.pdf) for detailed problem description.
 
 ## Results and evaluation
 
 Triaxial compression test:
 
-{{< img src="../ss_load.png" >}}
+{{< img src="ss_load.png" >}}
 
 Variations of the stress states and the plastic volumetric strain with a monotonic loading process:
 
-{{< img src="../plasticity_ss.png" >}}
+{{< img src="plasticity_ss.png" >}}
diff --git a/web/content/docs/benchmarks/small-deformations/plasticity_ss.png b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/plasticity_ss.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/plasticity_ss.png
rename to web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/plasticity_ss.png
diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/ss_load.png b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/ss_load.png
new file mode 120000
index 0000000000000000000000000000000000000000..848945c294176348e61f97b111a19ade8f98f433
--- /dev/null
+++ b/web/content/docs/benchmarks/small-deformations/mechanics-plasticity-single-surface/ss_load.png
@@ -0,0 +1 @@
+../mechanics-plasticity-ehlers-specialcase-drucker-prager/ss_load.png
\ No newline at end of file
diff --git a/web/content/docs/benchmarks/small-deformations/mechanics-slope-stability.md b/web/content/docs/benchmarks/small-deformations/mechanics-slope-stability/index.md
similarity index 83%
rename from web/content/docs/benchmarks/small-deformations/mechanics-slope-stability.md
rename to web/content/docs/benchmarks/small-deformations/mechanics-slope-stability/index.md
index 852357f671286846a0a7049fddb20b8bec3f03d0..6313c98c976d7ba11dbada6546fbbb1a6aeadf8f 100644
--- a/web/content/docs/benchmarks/small-deformations/mechanics-slope-stability.md
+++ b/web/content/docs/benchmarks/small-deformations/mechanics-slope-stability/index.md
@@ -17,4 +17,4 @@ title = "Strength reduction for slope stability"
 ## Problem description
 
 We perform a strength reduction to determine the factor of safety of a slope.
-See [this PDF](../slope_stability.pdf) for detailed problem description.
+See [this PDF](slope_stability.pdf) for detailed problem description.
diff --git a/web/content/docs/benchmarks/small-deformations/slope_stability.pdf b/web/content/docs/benchmarks/small-deformations/mechanics-slope-stability/slope_stability.pdf
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/slope_stability.pdf
rename to web/content/docs/benchmarks/small-deformations/mechanics-slope-stability/slope_stability.pdf
diff --git a/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC.md b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/index.md
similarity index 74%
rename from web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC.md
rename to web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/index.md
index 8e67734af15f3e8c23328cd54e8878f3179f2eae..3ba065bb2405a6767889e8383e29c9429e62c31a 100644
--- a/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC.md
+++ b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/index.md
@@ -13,24 +13,24 @@ weight = 117
 ## Problem description
 
 Five different benchmarks are reported in which pressure boundary conditions are tested: an axisymmetric elastic cylinder, a plain strain elastic cylinder, an axisymmetric elastic sphere, a tri-dimensional elastic sphere and an axisymmetric elasto-plastic sphere.
-See [this PDF](../pressure_bc.pdf) for detailed problem description.
+See [this PDF](pressure_bc.pdf) for detailed problem description.
 
 ## Results and evaluation
 
 Plain strain elastic cylinder comparison between numerical and analytical results:
-{{< img src="../pipe_plane_strain.png" >}}
+{{< img src="pipe_plane_strain.png" >}}
 
 Axisymmetric elastic cylinder comparison between numerical and analytical results.
-{{< img src="../pipe_axisymmetric.png" >}}
+{{< img src="pipe_axisymmetric.png" >}}
 
 Axisymmetric elastic sphere comparison between numerical and analytical results:
-{{< img src="../sphere_axisymmetric.png" >}}
+{{< img src="sphere_axisymmetric.png" >}}
 
 Tri-dimensional elastic sphere comparison between numerical and analytical results:
-{{< img src="../sphere_3d.png" >}}
+{{< img src="sphere_3d.png" >}}
 
 Axisymmetric plastic sphere comparison between numerical and analytical results:
-{{< img src="../sphere_axisymmetric_pl.png" >}}
+{{< img src="sphere_axisymmetric_pl.png" >}}
 
 Axisymmetric plastic sphere residuals of stress:
-{{< img src="../sphere_axisymmetric_pl_residual_stress.png" >}}
+{{< img src="sphere_axisymmetric_pl_residual_stress.png" >}}
diff --git a/web/content/docs/benchmarks/small-deformations/pressure_bc/pipe_axisymmetric.png b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/pipe_axisymmetric.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/pressure_bc/pipe_axisymmetric.png
rename to web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/pipe_axisymmetric.png
diff --git a/web/content/docs/benchmarks/small-deformations/pressure_bc/pipe_plane_strain.png b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/pipe_plane_strain.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/pressure_bc/pipe_plane_strain.png
rename to web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/pipe_plane_strain.png
diff --git a/web/content/docs/benchmarks/small-deformations/pressure_bc/pressure_bc.pdf b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/pressure_bc.pdf
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/pressure_bc/pressure_bc.pdf
rename to web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/pressure_bc.pdf
diff --git a/web/content/docs/benchmarks/small-deformations/pressure_bc/sphere_3d.png b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/sphere_3d.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/pressure_bc/sphere_3d.png
rename to web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/sphere_3d.png
diff --git a/web/content/docs/benchmarks/small-deformations/pressure_bc/sphere_axisymmetric.png b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/sphere_axisymmetric.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/pressure_bc/sphere_axisymmetric.png
rename to web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/sphere_axisymmetric.png
diff --git a/web/content/docs/benchmarks/small-deformations/pressure_bc/sphere_axisymmetric_pl.png b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/sphere_axisymmetric_pl.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/pressure_bc/sphere_axisymmetric_pl.png
rename to web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/sphere_axisymmetric_pl.png
diff --git a/web/content/docs/benchmarks/small-deformations/pressure_bc/sphere_axisymmetric_pl_residual_stress.png b/web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/sphere_axisymmetric_pl_residual_stress.png
similarity index 100%
rename from web/content/docs/benchmarks/small-deformations/pressure_bc/sphere_axisymmetric_pl_residual_stress.png
rename to web/content/docs/benchmarks/small-deformations/pressure_bc/Pressure_BC/sphere_axisymmetric_pl_residual_stress.png
diff --git a/web/content/docs/benchmarks/stokes-flow/Fig1_SchematicDiagram.png b/web/content/docs/benchmarks/stokes-flow/parallel-plate-flow/Fig1_SchematicDiagram.png
similarity index 100%
rename from web/content/docs/benchmarks/stokes-flow/Fig1_SchematicDiagram.png
rename to web/content/docs/benchmarks/stokes-flow/parallel-plate-flow/Fig1_SchematicDiagram.png
diff --git a/web/content/docs/benchmarks/stokes-flow/Fig2_SimulationResults.png b/web/content/docs/benchmarks/stokes-flow/parallel-plate-flow/Fig2_SimulationResults.png
similarity index 100%
rename from web/content/docs/benchmarks/stokes-flow/Fig2_SimulationResults.png
rename to web/content/docs/benchmarks/stokes-flow/parallel-plate-flow/Fig2_SimulationResults.png
diff --git a/web/content/docs/benchmarks/stokes-flow/parallel-plate-flow.md b/web/content/docs/benchmarks/stokes-flow/parallel-plate-flow/index.md
similarity index 86%
rename from web/content/docs/benchmarks/stokes-flow/parallel-plate-flow.md
rename to web/content/docs/benchmarks/stokes-flow/parallel-plate-flow/index.md
index eb5f011022044f9f7ebc2316097a28944535519e..75e3e30ee8aba473021177a24350d35652bf8e97 100644
--- a/web/content/docs/benchmarks/stokes-flow/parallel-plate-flow.md
+++ b/web/content/docs/benchmarks/stokes-flow/parallel-plate-flow/index.md
@@ -17,7 +17,7 @@ title = "Fluid flow through an open parallel-plate channel"
 
 This benchmark deals with fluid flow through an open parallel-plate channel. The figure below gives a pictorial view of the considered scenario.
 
-{{< img src="../Fig1_SchematicDiagram.png" title="Schematic diagram of the parallel-plate flow channel in two-dimensional space.">}}
+{{< img src="Fig1_SchematicDiagram.png" title="Schematic diagram of the parallel-plate flow channel in two-dimensional space.">}}
 
 The model parameters used in the simulation are summarized in the table below.
 
@@ -47,7 +47,7 @@ $$
 v \left(y\right) = \frac{1}{2\mu} \frac{P_{\mathrm{in}} - P_{\mathrm{out}}}{l} y \left( b - y\right).
 \end{equation}$$
 
-{{< img src="../Fig2_SimulationResults.png" title="Simulation results: (a) Hydrualic pressure profile through the parallel-plate flow channel; (b) Transverse velocity component profile over the cross-section of the plane flow channel.">}}
+{{< img src="Fig2_SimulationResults.png" title="Simulation results: (a) Hydrualic pressure profile through the parallel-plate flow channel; (b) Transverse velocity component profile over the cross-section of the plane flow channel.">}}
 
 ## References
 
diff --git a/web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe-problem.pdf b/web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe/heat-pipe-problem.pdf
similarity index 100%
rename from web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe-problem.pdf
rename to web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe/heat-pipe-problem.pdf
diff --git a/web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe.md b/web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe/index.md
similarity index 85%
rename from web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe.md
rename to web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe/index.md
index dd26136be4123bc1a70863aa96a369fb13c5abc4..047d220a48422a1b47dba87f526e116acbd33306 100644
--- a/web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe.md
+++ b/web/content/docs/benchmarks/thermal-two-phase-flow/heat-pipe/index.md
@@ -19,4 +19,4 @@ This benchmark is dedicated to simulating the non-isothermal two-phase flow in p
 
 ## Problem setting
 
-See [this PDF](../heat-pipe-problem.pdf) for the detailed problem setting.
+See [this PDF](heat-pipe-problem.pdf) for the detailed problem setting.
diff --git a/web/content/docs/benchmarks/thermo-hydro-mechanics/images/errordispl_vs_t.png b/web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/errordispl_vs_t.png
similarity index 100%
rename from web/content/docs/benchmarks/thermo-hydro-mechanics/images/errordispl_vs_t.png
rename to web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/errordispl_vs_t.png
diff --git a/web/content/docs/benchmarks/thermo-hydro-mechanics/images/errorpT_vs_t.png b/web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/errorpT_vs_t.png
similarity index 100%
rename from web/content/docs/benchmarks/thermo-hydro-mechanics/images/errorpT_vs_t.png
rename to web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/errorpT_vs_t.png
diff --git a/web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource.md b/web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/index.md
similarity index 96%
rename from web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource.md
rename to web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/index.md
index 146a3f0eb8de8ae07b2a2a694a902a23e6fa77d9..b47a4370772adf2cf43bbfee7b313d495a36f003 100644
--- a/web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource.md
+++ b/web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/index.md
@@ -92,19 +92,19 @@ For the stress components the corrected expressions can be found in the work of
 The analytical expressions (12-16) together with the numerical model can now be evaluated at different points as a function of time or for a given time as a function of their spatial coordinates.
 The results below were taken from the benchmark published in Chaudhry et al. (2019) and might slightly differ from the benchmark in the OGS6 repo.
 
-{{< img src="../images/resp_vs_t_square.png" >}}
+{{< img src="resp_vs_t_square.png" >}}
 
 In the pictures above, the analytical and numerical results for temperature ($T$), pressure ($p$), displacement ($u_i$) and stress ($\sigma_{ij}$) are plotted as function of time ($t$) at point $P=(1.3,0.682,0.0)$ and along the radial coordinate ($r$ ) at time $t=5\cdot 10^5$ (below).
 
-{{< img src="../images/resp_vs_x_square.png" >}}
+{{< img src="resp_vs_x_square.png" >}}
 
 (Figures were taken from Chaudhry et al. (2019).)
 
 The absolute errors between OGS6 and the analytical solution for temperature, pressure, and displacement are depicted below. For all three response variables, one observes that the error reaches its maximum around the same time when also the slope of the response variable is maximal.
 
-{{< img src="../images/errorpT_vs_t.png" >}}
+{{< img src="errorpT_vs_t.png" >}}
 
-{{< img src="../images/errordispl_vs_t.png" >}}
+{{< img src="errordispl_vs_t.png" >}}
 
 ## References
 
diff --git a/web/content/docs/benchmarks/thermo-hydro-mechanics/images/resp_vs_t_square.png b/web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/resp_vs_t_square.png
similarity index 100%
rename from web/content/docs/benchmarks/thermo-hydro-mechanics/images/resp_vs_t_square.png
rename to web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/resp_vs_t_square.png
diff --git a/web/content/docs/benchmarks/thermo-hydro-mechanics/images/resp_vs_x_square.png b/web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/resp_vs_x_square.png
similarity index 100%
rename from web/content/docs/benchmarks/thermo-hydro-mechanics/images/resp_vs_x_square.png
rename to web/content/docs/benchmarks/thermo-hydro-mechanics/consolidation_pointheatsource/resp_vs_x_square.png
diff --git a/web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field.md b/web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/index.md
similarity index 94%
rename from web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field.md
rename to web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/index.md
index b681068a5a2ba8d86e1687d1853f6d0505e1918b..cf9e35c57f859d3d46e2fbeaf0922f93dcfcdf0d 100644
--- a/web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field.md
+++ b/web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/index.md
@@ -24,9 +24,9 @@ The thermal expansion test was implemented by imposing a temperature increase to
 
 Results show Phase-Field evolution in the thermo-mechanical case can follow the mechanical case, and both solutions correspond to the analytical solution:
 
-{{< img src="../uncon_com_bc.png" >}}
-{{< img src="../therm_exp_bc.png" >}}
-{{< img src="../t_pf.png" >}}
+{{< img src="uncon_com_bc.png" >}}
+{{< img src="therm_exp_bc.png" >}}
+{{< img src="t_pf.png" >}}
 
 The analytical solution is: $$d = \dfrac{G\textrm{c}}{G\textrm{c}+4\epsilon \psi_\textrm{e}^+}$$
 where due to negative (elastic) volume strains only the deviatoric energy drives the phase field.
diff --git a/web/content/docs/benchmarks/thermo-mechanical-phase-field/t_pf.png b/web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/t_pf.png
similarity index 100%
rename from web/content/docs/benchmarks/thermo-mechanical-phase-field/t_pf.png
rename to web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/t_pf.png
diff --git a/web/content/docs/benchmarks/thermo-mechanical-phase-field/therm_exp_bc.png b/web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/therm_exp_bc.png
similarity index 100%
rename from web/content/docs/benchmarks/thermo-mechanical-phase-field/therm_exp_bc.png
rename to web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/therm_exp_bc.png
diff --git a/web/content/docs/benchmarks/thermo-mechanical-phase-field/uncon_com_bc.png b/web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/uncon_com_bc.png
similarity index 100%
rename from web/content/docs/benchmarks/thermo-mechanical-phase-field/uncon_com_bc.png
rename to web/content/docs/benchmarks/thermo-mechanical-phase-field/thermo-mechanical-phase-field/uncon_com_bc.png
diff --git a/web/content/docs/benchmarks/thermo-mechanics/thermomechanics.md b/web/content/docs/benchmarks/thermo-mechanics/thermomechanics/index.md
similarity index 93%
rename from web/content/docs/benchmarks/thermo-mechanics/thermomechanics.md
rename to web/content/docs/benchmarks/thermo-mechanics/thermomechanics/index.md
index f40ab2db05523a014cc0becd363feaf5e52adcf6..08f1ac3673fddd021c6a30150c5d767a7f0bc9c1 100644
--- a/web/content/docs/benchmarks/thermo-mechanics/thermomechanics.md
+++ b/web/content/docs/benchmarks/thermo-mechanics/thermomechanics/index.md
@@ -25,8 +25,8 @@ al. \cite Kolditz2012 for detailed problem description.
 Result showing temperature and stresses development with time in the centre node
 of the model:
 
-{{< img src="../temperature.png" >}}
-{{< img src="../stress.png" >}}
+{{< img src="temperature.png" >}}
+{{< img src="stress.png" >}}
 
 The analytical solution of stresses after heating is:
 $$\begin{equation}
diff --git a/web/content/docs/benchmarks/thermo-mechanics/stress.png b/web/content/docs/benchmarks/thermo-mechanics/thermomechanics/stress.png
similarity index 100%
rename from web/content/docs/benchmarks/thermo-mechanics/stress.png
rename to web/content/docs/benchmarks/thermo-mechanics/thermomechanics/stress.png
diff --git a/web/content/docs/benchmarks/thermo-mechanics/temperature.png b/web/content/docs/benchmarks/thermo-mechanics/thermomechanics/temperature.png
similarity index 100%
rename from web/content/docs/benchmarks/thermo-mechanics/temperature.png
rename to web/content/docs/benchmarks/thermo-mechanics/thermomechanics/temperature.png
diff --git a/web/content/docs/benchmarks/thermo-richards-mechanics/CTF1_results_S.jpg b/web/content/docs/benchmarks/thermo-richards-mechanics/CTF1/CTF1_results_S.jpg
similarity index 100%
rename from web/content/docs/benchmarks/thermo-richards-mechanics/CTF1_results_S.jpg
rename to web/content/docs/benchmarks/thermo-richards-mechanics/CTF1/CTF1_results_S.jpg
diff --git a/web/content/docs/benchmarks/thermo-richards-mechanics/CTF1_results_T.jpg b/web/content/docs/benchmarks/thermo-richards-mechanics/CTF1/CTF1_results_T.jpg
similarity index 100%
rename from web/content/docs/benchmarks/thermo-richards-mechanics/CTF1_results_T.jpg
rename to web/content/docs/benchmarks/thermo-richards-mechanics/CTF1/CTF1_results_T.jpg
diff --git a/web/content/docs/benchmarks/thermo-richards-mechanics/CTF1.md b/web/content/docs/benchmarks/thermo-richards-mechanics/CTF1/index.md
similarity index 91%
rename from web/content/docs/benchmarks/thermo-richards-mechanics/CTF1.md
rename to web/content/docs/benchmarks/thermo-richards-mechanics/CTF1/index.md
index cd85497d153f64f3c89ce53cd72f63ca3c833861..921e43af4dcfebfa994f4ab0a939d2f63d4d4e83 100644
--- a/web/content/docs/benchmarks/thermo-richards-mechanics/CTF1.md
+++ b/web/content/docs/benchmarks/thermo-richards-mechanics/CTF1/index.md
@@ -26,8 +26,8 @@ specific heat capacity of solid phase has already taken account of
 The following figures compare the results of this test against the results
  presented in [[2]](#2):
 
-<img src="../CTF1_results_T.jpg" alt="drawing" width="400"/>
-<img src="../CTF1_results_S.jpg" alt="drawing" width="400"/>
+<img src="CTF1_results_T.jpg" alt="drawing" width="400"/>
+<img src="CTF1_results_S.jpg" alt="drawing" width="400"/>
 
 ## References
 <a id="1">[1]</a>
diff --git a/web/content/docs/benchmarks/thermo-richards-mechanics/decovalex_2023_c.png b/web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/decovalex_2023_c.png
similarity index 100%
rename from web/content/docs/benchmarks/thermo-richards-mechanics/decovalex_2023_c.png
rename to web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/decovalex_2023_c.png
diff --git a/web/content/docs/benchmarks/thermo-richards-mechanics/decovalex_2023_c_S_t.png b/web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/decovalex_2023_c_S_t.png
similarity index 100%
rename from web/content/docs/benchmarks/thermo-richards-mechanics/decovalex_2023_c_S_t.png
rename to web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/decovalex_2023_c_S_t.png
diff --git a/web/content/docs/benchmarks/thermo-richards-mechanics/decovalex_2023_c_T_t.png b/web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/decovalex_2023_c_T_t.png
similarity index 100%
rename from web/content/docs/benchmarks/thermo-richards-mechanics/decovalex_2023_c_T_t.png
rename to web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/decovalex_2023_c_T_t.png
diff --git a/web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC.md b/web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/index.md
similarity index 91%
rename from web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC.md
rename to web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/index.md
index bd9a0010784b079292441f59cb8965b44047b0ed..251df7ef2aa02340587f1316c7fc3c3e04a739c7 100644
--- a/web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC.md
+++ b/web/content/docs/benchmarks/thermo-richards-mechanics/DECOVALEX2023-TaskC/index.md
@@ -35,13 +35,13 @@ The test is used to mainly verify the implementation of water vapour diffusion m
  Task C. The following figure shows the distribution of temperature in the domain,
  water saturation in the vicinity of the heater, and displacement magnitude
  in the domain after nearly 3 years' heating:
-{{< img src="../decovalex_2023_c.png" >}}
+{{< img src="decovalex_2023_c.png" >}}
 
 The following two figures show the temporal variations of temperature and water
  saturation, respectively, at a node near the heater:
 
-<img src="../decovalex_2023_c_T_t.png" alt="drawing" width="450"/>
-<img src="../decovalex_2023_c_S_t.png" alt="drawing" width="450"/>
+<img src="decovalex_2023_c_T_t.png" alt="drawing" width="450"/>
+<img src="decovalex_2023_c_S_t.png" alt="drawing" width="450"/>
 
 As shown the water saturation variation curve, the de-saturation -
  re-saturation process is well captured by the numerical simulation.
diff --git a/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos.md b/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos/index.md
similarity index 95%
rename from web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos.md
rename to web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos/index.md
index 01d306ce99016bc282ec98570fac7cb4a920e016..acc84aa4f58d3386ee5b9cb9c0ae0ea8d28198fb 100644
--- a/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos.md
+++ b/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos/index.md
@@ -19,4 +19,4 @@ One benchmark -- Liakopoulos experiment is presented here. The benchmark is appl
 
 ## Results and evaluation
 
-See [this PDF](../main.pdf).
+See [this PDF](main.pdf).
diff --git a/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos/main.pdf b/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos/main.pdf
new file mode 120000
index 0000000000000000000000000000000000000000..6ce042b9c71d7723f4f29d14978ef576232c4d88
--- /dev/null
+++ b/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-liakopoulos/main.pdf
@@ -0,0 +1 @@
+../two-phase-flow-pp-mcwhorter/main.pdf
\ No newline at end of file
diff --git a/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter.md b/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter/index.md
similarity index 96%
rename from web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter.md
rename to web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter/index.md
index 8805ac9059879ed9a6d94f1502b9a1a67bdc28a5..116699f3fd1e545415296e2e83710a8452d5f6e4 100644
--- a/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter.md
+++ b/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter/index.md
@@ -19,4 +19,4 @@ One benchmark -- McWhorter problem is presented here which is dedicated to simul
 
 ## Results and evaluation
 
-See [this PDF](../main.pdf).
+See [this PDF](main.pdf).
diff --git a/web/content/docs/benchmarks/two-phase-flow-pp-form/main.pdf b/web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter/main.pdf
similarity index 100%
rename from web/content/docs/benchmarks/two-phase-flow-pp-form/main.pdf
rename to web/content/docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter/main.pdf
diff --git a/web/content/docs/benchmarks/two-phase-flow/MoMaS.pdf b/web/content/docs/benchmarks/two-phase-flow/momas/MoMaS.pdf
similarity index 100%
rename from web/content/docs/benchmarks/two-phase-flow/MoMaS.pdf
rename to web/content/docs/benchmarks/two-phase-flow/momas/MoMaS.pdf
diff --git a/web/content/docs/benchmarks/two-phase-flow/momas.md b/web/content/docs/benchmarks/two-phase-flow/momas/index.md
similarity index 94%
rename from web/content/docs/benchmarks/two-phase-flow/momas.md
rename to web/content/docs/benchmarks/two-phase-flow/momas/index.md
index 41f736486029a51fc265b32e23dc161c531cba27..f69f429d95397e9937dccf3d3d9096316218b6af 100644
--- a/web/content/docs/benchmarks/two-phase-flow/momas.md
+++ b/web/content/docs/benchmarks/two-phase-flow/momas/index.md
@@ -19,4 +19,4 @@ This benchmark is dedicated to simulate the two-phase two-component flow in poro
 
 ## Results and evaluation
 
-See [this PDF](../MoMaS.pdf).
+See [this PDF](MoMaS.pdf).
diff --git a/web/content/docs/devguide/advanced/compiler-cache.md b/web/content/docs/devguide/advanced/compiler-cache/index.md
similarity index 100%
rename from web/content/docs/devguide/advanced/compiler-cache.md
rename to web/content/docs/devguide/advanced/compiler-cache/index.md
diff --git a/web/content/docs/devguide/advanced/configuration-options.md b/web/content/docs/devguide/advanced/configuration-options/index.md
similarity index 100%
rename from web/content/docs/devguide/advanced/configuration-options.md
rename to web/content/docs/devguide/advanced/configuration-options/index.md
diff --git a/web/content/docs/devguide/advanced/gitlab-migration.md b/web/content/docs/devguide/advanced/gitlab-migration/index.md
similarity index 100%
rename from web/content/docs/devguide/advanced/gitlab-migration.md
rename to web/content/docs/devguide/advanced/gitlab-migration/index.md
diff --git a/web/content/docs/devguide/advanced/log-and-debug-output.md b/web/content/docs/devguide/advanced/log-and-debug-output/index.md
similarity index 100%
rename from web/content/docs/devguide/advanced/log-and-debug-output.md
rename to web/content/docs/devguide/advanced/log-and-debug-output/index.md
diff --git a/web/content/docs/devguide/advanced/offline-build.md b/web/content/docs/devguide/advanced/offline-build/index.md
similarity index 100%
rename from web/content/docs/devguide/advanced/offline-build.md
rename to web/content/docs/devguide/advanced/offline-build/index.md
diff --git a/web/content/docs/devguide/advanced/wsl.md b/web/content/docs/devguide/advanced/wsl/index.md
similarity index 100%
rename from web/content/docs/devguide/advanced/wsl.md
rename to web/content/docs/devguide/advanced/wsl/index.md
diff --git a/web/content/docs/devguide/development-workflows/code-format.md b/web/content/docs/devguide/development-workflows/code-format/index.md
similarity index 100%
rename from web/content/docs/devguide/development-workflows/code-format.md
rename to web/content/docs/devguide/development-workflows/code-format/index.md
diff --git a/web/content/docs/devguide/development-workflows/checkout-branch.png b/web/content/docs/devguide/development-workflows/code-reviews/checkout-branch.png
similarity index 100%
rename from web/content/docs/devguide/development-workflows/checkout-branch.png
rename to web/content/docs/devguide/development-workflows/code-reviews/checkout-branch.png
diff --git a/web/content/docs/devguide/development-workflows/code-reviews.md b/web/content/docs/devguide/development-workflows/code-reviews/index.md
similarity index 98%
rename from web/content/docs/devguide/development-workflows/code-reviews.md
rename to web/content/docs/devguide/development-workflows/code-reviews/index.md
index dea98fc06cd519c5e6a25e2abf2208f856c42cd3..27006d88b9fb79eaddc46c1c977fd19d26e1c0bb 100644
--- a/web/content/docs/devguide/development-workflows/code-reviews.md
+++ b/web/content/docs/devguide/development-workflows/code-reviews/index.md
@@ -35,4 +35,4 @@ If you do not want a reviewer to have a look, e.g. because you are currently wor
 
 On the merge request page in the first box which contains information on the MR author and branch name there is button labelled `Check out branch` which will show you instructions on how to locally checkout this MR:
 
-![](../checkout-branch.png)
+![](checkout-branch.png)
diff --git a/web/content/docs/devguide/development-workflows/GL_CI_screenshot.png b/web/content/docs/devguide/development-workflows/continuous-integration/GL_CI_screenshot.png
similarity index 100%
rename from web/content/docs/devguide/development-workflows/GL_CI_screenshot.png
rename to web/content/docs/devguide/development-workflows/continuous-integration/GL_CI_screenshot.png
diff --git a/web/content/docs/devguide/development-workflows/continuous-integration.md b/web/content/docs/devguide/development-workflows/continuous-integration/index.md
similarity index 96%
rename from web/content/docs/devguide/development-workflows/continuous-integration.md
rename to web/content/docs/devguide/development-workflows/continuous-integration/index.md
index c632c6b7afb0e124667682aa4a1d18418077e528..1c0535c97282f122c01ce7c86b0852fb4eae3d63 100644
--- a/web/content/docs/devguide/development-workflows/continuous-integration.md
+++ b/web/content/docs/devguide/development-workflows/continuous-integration/index.md
@@ -24,7 +24,7 @@ After the system is done with all these tasks the developer can view build repor
 ## CI on OGS
 
 All of this automatically kicks in when you open a [Merge Request](../code-reviews) on GitLab. You will notice a pipeline block at the merge request page:
-![GitLab CI screenshot](../GL_CI_screenshot.png)
+![GitLab CI screenshot](GL_CI_screenshot.png)
 
 Click on the pipeline link or the individual pipeline stage icons (circles) to find out the reason for a failed check. If you add more commits to this merge request all checks are run again.
 
diff --git a/web/content/docs/devguide/development-workflows/clion.png b/web/content/docs/devguide/development-workflows/development-ides/clion.png
similarity index 100%
rename from web/content/docs/devguide/development-workflows/clion.png
rename to web/content/docs/devguide/development-workflows/development-ides/clion.png
diff --git a/web/content/docs/devguide/development-workflows/codeblocks.png b/web/content/docs/devguide/development-workflows/development-ides/codeblocks.png
similarity index 100%
rename from web/content/docs/devguide/development-workflows/codeblocks.png
rename to web/content/docs/devguide/development-workflows/development-ides/codeblocks.png
diff --git a/web/content/docs/devguide/development-workflows/eclipse.png b/web/content/docs/devguide/development-workflows/development-ides/eclipse.png
similarity index 100%
rename from web/content/docs/devguide/development-workflows/eclipse.png
rename to web/content/docs/devguide/development-workflows/development-ides/eclipse.png
diff --git a/web/content/docs/devguide/development-workflows/gdb.png b/web/content/docs/devguide/development-workflows/development-ides/gdb.png
similarity index 100%
rename from web/content/docs/devguide/development-workflows/gdb.png
rename to web/content/docs/devguide/development-workflows/development-ides/gdb.png
diff --git a/web/content/docs/devguide/development-workflows/development-ides.md b/web/content/docs/devguide/development-workflows/development-ides/index.md
similarity index 95%
rename from web/content/docs/devguide/development-workflows/development-ides.md
rename to web/content/docs/devguide/development-workflows/development-ides/index.md
index 96717b8abe92a9f9375c8c65caceb395d6089ce0..6dabf8565080f72bff22f7793650fc17c054b063 100644
--- a/web/content/docs/devguide/development-workflows/development-ides.md
+++ b/web/content/docs/devguide/development-workflows/development-ides/index.md
@@ -42,7 +42,7 @@ __________
 
 <https://www.sourceware.org/gdb/download>
 
-![GDB screenshot](../gdb.png)
+![GDB screenshot](gdb.png)
 
 ### Create project files
 
@@ -71,7 +71,7 @@ __________
 
 Choose "Eclipse IDE for C/C++ Developers"
 
-![Eclipse screenshot](../eclipse.png)
+![Eclipse screenshot](eclipse.png)
 
 ### Import Code
 
@@ -105,7 +105,7 @@ or
 
 The latter includes already plugins for Fortran, in case you want to cross-compile.
 
-![Code::Blocks screenshot](../codeblocks.png)
+![Code::Blocks screenshot](codeblocks.png)
 
 ### Import Code
 
@@ -136,7 +136,7 @@ __________
 
 <https://netbeans.apache.org/download/index.html>
 
-![NetBeans screenshot](../netbeans.png)
+![NetBeans screenshot](netbeans.png)
 
 ### Import project files
 
@@ -163,7 +163,7 @@ __________
 
 Download: <https://www.jetbrains.com/clion/>
 
-![Clion screenshot](../clion.png)
+![Clion screenshot](clion.png)
 
 ### Import project
 
diff --git a/web/content/docs/devguide/development-workflows/netbeans.png b/web/content/docs/devguide/development-workflows/development-ides/netbeans.png
similarity index 100%
rename from web/content/docs/devguide/development-workflows/netbeans.png
rename to web/content/docs/devguide/development-workflows/development-ides/netbeans.png
diff --git a/web/content/docs/devguide/development-workflows/gitlab-login.png b/web/content/docs/devguide/development-workflows/gitlab/gitlab-login.png
similarity index 100%
rename from web/content/docs/devguide/development-workflows/gitlab-login.png
rename to web/content/docs/devguide/development-workflows/gitlab/gitlab-login.png
diff --git a/web/content/docs/devguide/development-workflows/gitlab.md b/web/content/docs/devguide/development-workflows/gitlab/index.md
similarity index 96%
rename from web/content/docs/devguide/development-workflows/gitlab.md
rename to web/content/docs/devguide/development-workflows/gitlab/index.md
index a30a8ff528578591166e954b4b6b458b3a5acba5..cb02160474a9e465d059c8e8ce7e06ba7be0054b 100644
--- a/web/content/docs/devguide/development-workflows/gitlab.md
+++ b/web/content/docs/devguide/development-workflows/gitlab/index.md
@@ -16,7 +16,7 @@ weight = 1012
 ## Setup an account
 
 - Creating a GitLab account can be done by simply using your existing GitHub account: click the GitHub logo (octocat) on the [Gitlab sign-in page](https://gitlab.opengeosys.org/users/sign_in)
-  ![GitLab login page](../gitlab-login.png)
+  ![GitLab login page](gitlab-login.png)
   - You will be redirected to GitHub (please login there) and asked for authorization.
   - Your new user account will be blocked at first, please let us know we will unblock it
 
diff --git a/web/content/docs/devguide/development-workflows/introduction.md b/web/content/docs/devguide/development-workflows/introduction/index.md
similarity index 100%
rename from web/content/docs/devguide/development-workflows/introduction.md
rename to web/content/docs/devguide/development-workflows/introduction/index.md
diff --git a/web/content/docs/devguide/development-workflows/setup-fork.md b/web/content/docs/devguide/development-workflows/setup-fork/index.md
similarity index 100%
rename from web/content/docs/devguide/development-workflows/setup-fork.md
rename to web/content/docs/devguide/development-workflows/setup-fork/index.md
diff --git a/web/content/docs/devguide/development-workflows/web-docs.md b/web/content/docs/devguide/development-workflows/web-docs/index.md
similarity index 100%
rename from web/content/docs/devguide/development-workflows/web-docs.md
rename to web/content/docs/devguide/development-workflows/web-docs/index.md
diff --git a/web/content/docs/devguide/environments/docker.md b/web/content/docs/devguide/environments/docker/index.md
similarity index 100%
rename from web/content/docs/devguide/environments/docker.md
rename to web/content/docs/devguide/environments/docker/index.md
diff --git a/web/content/docs/devguide/environments/redistributable-builds.md b/web/content/docs/devguide/environments/redistributable-builds/index.md
similarity index 100%
rename from web/content/docs/devguide/environments/redistributable-builds.md
rename to web/content/docs/devguide/environments/redistributable-builds/index.md
diff --git a/web/content/docs/devguide/environments/singularity.md b/web/content/docs/devguide/environments/singularity/index.md
similarity index 100%
rename from web/content/docs/devguide/environments/singularity.md
rename to web/content/docs/devguide/environments/singularity/index.md
diff --git a/web/content/docs/devguide/environments/working-on-eve.md b/web/content/docs/devguide/environments/working-on-eve/index.md
similarity index 100%
rename from web/content/docs/devguide/environments/working-on-eve.md
rename to web/content/docs/devguide/environments/working-on-eve/index.md
diff --git a/web/content/docs/devguide/getting-started/build-configuration.md b/web/content/docs/devguide/getting-started/build-configuration/index.md
similarity index 100%
rename from web/content/docs/devguide/getting-started/build-configuration.md
rename to web/content/docs/devguide/getting-started/build-configuration/index.md
diff --git a/web/content/docs/devguide/getting-started/build.md b/web/content/docs/devguide/getting-started/build/index.md
similarity index 100%
rename from web/content/docs/devguide/getting-started/build.md
rename to web/content/docs/devguide/getting-started/build/index.md
diff --git a/web/content/docs/devguide/getting-started/git-url.png b/web/content/docs/devguide/getting-started/get-the-source-code/git-url.png
similarity index 100%
rename from web/content/docs/devguide/getting-started/git-url.png
rename to web/content/docs/devguide/getting-started/get-the-source-code/git-url.png
diff --git a/web/content/docs/devguide/getting-started/get-the-source-code.md b/web/content/docs/devguide/getting-started/get-the-source-code/index.md
similarity index 95%
rename from web/content/docs/devguide/getting-started/get-the-source-code.md
rename to web/content/docs/devguide/getting-started/get-the-source-code/index.md
index 2dd0444215b0fe9774791e59780f25f368a2d253..d8ee53ddc9b7773e059f0540c2eb2abdc9df3536 100644
--- a/web/content/docs/devguide/getting-started/get-the-source-code.md
+++ b/web/content/docs/devguide/getting-started/get-the-source-code/index.md
@@ -19,7 +19,7 @@ weight = 1003
 
 To get the latest source code simply download it from [repository website](https://gitlab.opengeosys.org/ogs/ogs) and extract the archive:
 
-![](../zip-download.png)
+![](zip-download.png)
 
 You can also download and extract with the command line:
 
@@ -32,7 +32,7 @@ tar xf ogs-master.tar.gz
 
 First you need to get the clone url:
 
-![](../git-url.png)
+![](git-url.png)
 
 Then clone the repository with `git`:
 
diff --git a/web/content/docs/devguide/getting-started/zip-download.png b/web/content/docs/devguide/getting-started/get-the-source-code/zip-download.png
similarity index 100%
rename from web/content/docs/devguide/getting-started/zip-download.png
rename to web/content/docs/devguide/getting-started/get-the-source-code/zip-download.png
diff --git a/web/content/docs/devguide/getting-started/introduction.md b/web/content/docs/devguide/getting-started/introduction/index.md
similarity index 100%
rename from web/content/docs/devguide/getting-started/introduction.md
rename to web/content/docs/devguide/getting-started/introduction/index.md
diff --git a/web/content/docs/devguide/getting-started/git-installer-win.png b/web/content/docs/devguide/getting-started/prerequisites/git-installer-win.png
similarity index 100%
rename from web/content/docs/devguide/getting-started/git-installer-win.png
rename to web/content/docs/devguide/getting-started/prerequisites/git-installer-win.png
diff --git a/web/content/docs/devguide/getting-started/prerequisites.md b/web/content/docs/devguide/getting-started/prerequisites/index.md
similarity index 99%
rename from web/content/docs/devguide/getting-started/prerequisites.md
rename to web/content/docs/devguide/getting-started/prerequisites/index.md
index 933ec95b2bd464fe66ad8114b0db82b3304b9f0a..0fb5fd2c9652ef46c28bda650cb994b7881a7cca 100644
--- a/web/content/docs/devguide/getting-started/prerequisites.md
+++ b/web/content/docs/devguide/getting-started/prerequisites/index.md
@@ -119,7 +119,7 @@ Git is a powerful and distributed version control system. OGS source code is hos
 
 **Download** and install git from the [git homepage](http://git-scm.com/download/win). Use the default installer options but also enable `Enable symbolic links` under the *Configuring extra options* page.
 
-![Enable symbolic links option](../git-installer-win.png)
+![Enable symbolic links option](git-installer-win.png)
 
 This install a new command line called *Git Bash* which should be used for all git operations.
 
diff --git a/web/content/docs/devguide/packages/conan-package-manager.md b/web/content/docs/devguide/packages/conan-package-manager/index.md
similarity index 100%
rename from web/content/docs/devguide/packages/conan-package-manager.md
rename to web/content/docs/devguide/packages/conan-package-manager/index.md
diff --git a/web/content/docs/devguide/packages/cpm.md b/web/content/docs/devguide/packages/cpm/index.md
similarity index 100%
rename from web/content/docs/devguide/packages/cpm.md
rename to web/content/docs/devguide/packages/cpm/index.md
diff --git a/web/content/docs/devguide/packages/mfront.md b/web/content/docs/devguide/packages/mfront/index.md
similarity index 100%
rename from web/content/docs/devguide/packages/mfront.md
rename to web/content/docs/devguide/packages/mfront/index.md
diff --git a/web/content/docs/devguide/packages/python-env.md b/web/content/docs/devguide/packages/python-env/index.md
similarity index 100%
rename from web/content/docs/devguide/packages/python-env.md
rename to web/content/docs/devguide/packages/python-env/index.md
diff --git a/web/content/docs/devguide/procedures/publish-a-release.md b/web/content/docs/devguide/procedures/publish-a-release/index.md
similarity index 100%
rename from web/content/docs/devguide/procedures/publish-a-release.md
rename to web/content/docs/devguide/procedures/publish-a-release/index.md
diff --git a/web/content/docs/devguide/testing/GitLab-Pipeline.png b/web/content/docs/devguide/testing/gitlab-ci/GitLab-Pipeline.png
similarity index 100%
rename from web/content/docs/devguide/testing/GitLab-Pipeline.png
rename to web/content/docs/devguide/testing/gitlab-ci/GitLab-Pipeline.png
diff --git a/web/content/docs/devguide/testing/gitlab-ci.md b/web/content/docs/devguide/testing/gitlab-ci/index.md
similarity index 97%
rename from web/content/docs/devguide/testing/gitlab-ci.md
rename to web/content/docs/devguide/testing/gitlab-ci/index.md
index 0effa5fee8da29551b97c43023bb3c17633c84a6..92836b49fb4b3a0d9c390a909f4b822bbf3ff141 100644
--- a/web/content/docs/devguide/testing/gitlab-ci.md
+++ b/web/content/docs/devguide/testing/gitlab-ci/index.md
@@ -20,7 +20,7 @@ The tasks of the CI system are configured in [scripts inside the OGS source code
 A CI run consists of a [pipeline](https://docs.gitlab.com/ee/ci/pipelines/) which contains [stages](https://docs.gitlab.com/ee/ci/yaml/#stages) which in turn contain jobs. A job runs a set of instructions (e.g. checking out the source code, building the code, testing the code) on a [runner](https://docs.gitlab.com/runner/).
 
 Each pipeline run is visualized as follows:
-![GitLab pipeline visualization](../GitLab-Pipeline.png)
+![GitLab pipeline visualization](GitLab-Pipeline.png)
 
 Jobs are belong to a stage and each job will get a status (success, warnings, failure). Some jobs are optional (see the gear icon) and can be manually triggered by pressing the play button.
 
diff --git a/web/content/docs/devguide/testing/test-data.md b/web/content/docs/devguide/testing/test-data/index.md
similarity index 100%
rename from web/content/docs/devguide/testing/test-data.md
rename to web/content/docs/devguide/testing/test-data/index.md
diff --git a/web/content/docs/devguide/testing/unit-testing.md b/web/content/docs/devguide/testing/unit-testing/index.md
similarity index 100%
rename from web/content/docs/devguide/testing/unit-testing.md
rename to web/content/docs/devguide/testing/unit-testing/index.md
diff --git a/web/content/docs/devguide/testing/workflow-testing.md b/web/content/docs/devguide/testing/workflow-testing/index.md
similarity index 100%
rename from web/content/docs/devguide/testing/workflow-testing.md
rename to web/content/docs/devguide/testing/workflow-testing/index.md
diff --git a/web/content/docs/devguide/troubleshooting/build.md b/web/content/docs/devguide/troubleshooting/build/index.md
similarity index 100%
rename from web/content/docs/devguide/troubleshooting/build.md
rename to web/content/docs/devguide/troubleshooting/build/index.md
diff --git a/web/content/docs/devguide/troubleshooting/cmake.md b/web/content/docs/devguide/troubleshooting/cmake/index.md
similarity index 100%
rename from web/content/docs/devguide/troubleshooting/cmake.md
rename to web/content/docs/devguide/troubleshooting/cmake/index.md
diff --git a/web/content/docs/devguide/troubleshooting/conan.md b/web/content/docs/devguide/troubleshooting/conan/index.md
similarity index 100%
rename from web/content/docs/devguide/troubleshooting/conan.md
rename to web/content/docs/devguide/troubleshooting/conan/index.md
diff --git a/web/content/docs/devguide/troubleshooting/get-support.md b/web/content/docs/devguide/troubleshooting/get-support/index.md
similarity index 100%
rename from web/content/docs/devguide/troubleshooting/get-support.md
rename to web/content/docs/devguide/troubleshooting/get-support/index.md
diff --git a/web/content/docs/devguide/troubleshooting/git.md b/web/content/docs/devguide/troubleshooting/git/index.md
similarity index 100%
rename from web/content/docs/devguide/troubleshooting/git.md
rename to web/content/docs/devguide/troubleshooting/git/index.md
diff --git a/web/content/docs/devguide/troubleshooting/run.md b/web/content/docs/devguide/troubleshooting/run/index.md
similarity index 100%
rename from web/content/docs/devguide/troubleshooting/run.md
rename to web/content/docs/devguide/troubleshooting/run/index.md
diff --git a/web/content/docs/tools/fileio/GMSH2OGS/index.md b/web/content/docs/tools/fileio/GMSH2OGS/index.md
index 041d00a7f8b9d09d74b75f0c92db526187c8ad11..14634acfe80b43a3a124bca0bebbc33c83d99dcb 100644
--- a/web/content/docs/tools/fileio/GMSH2OGS/index.md
+++ b/web/content/docs/tools/fileio/GMSH2OGS/index.md
@@ -62,6 +62,6 @@ GMSH2OGS -i A2-gmsh.msh -o A2.vtu
  - Finally specifying both flags (`-e` and `-b`) produces a single VTU file
    without the line elements and additional eight boundary (subdomain) files.
 
-![GMSG2OGS-e-b](./extract_boundary.png#two-third "GMSH2OGS meshes for -e and -b
+![GMSG2OGS-e-b](extract_boundary.png#two-third "GMSH2OGS meshes for -e and -b
 command line flags.")
 
diff --git a/web/content/docs/tools/fileio/GocadTSurfaceReader/index.md b/web/content/docs/tools/fileio/GocadTSurfaceReader/index.md
index 1dc08189c68967a5763001938f908cb2f7145f96..c0131fb8b853a9c8274affb755f500f02e7bbbc0 100644
--- a/web/content/docs/tools/fileio/GocadTSurfaceReader/index.md
+++ b/web/content/docs/tools/fileio/GocadTSurfaceReader/index.md
@@ -63,8 +63,8 @@ GocadTSurfaceReader -i d:\GoCAD_data\Top-Lower_Sandy.ts -o d:\GoCAD_data
 
 **Input:**
 
-![GoCAD-Header](./Surface-GoCad.png#two-third "GoCAD-Header of file containing triangulated surface.")
+![GoCAD-Header](Surface-GoCad.png#two-third "GoCAD-Header of file containing triangulated surface.")
 
 **Output:**
 
-![Converted surface](./Surface-ParaView.png "Converted surface visualised in ParaView with scalar data added to nodes.")
+![Converted surface](Surface-ParaView.png "Converted surface visualised in ParaView with scalar data added to nodes.")
diff --git a/web/content/docs/tools/fileio/Mesh2Shape/index.md b/web/content/docs/tools/fileio/Mesh2Shape/index.md
index 5b19a1b333fe2e8d3e4ae64199319d8c7ae89e73..cb34838b89011902e5b15e532d696ee30b1b97ed 100644
--- a/web/content/docs/tools/fileio/Mesh2Shape/index.md
+++ b/web/content/docs/tools/fileio/Mesh2Shape/index.md
@@ -31,7 +31,7 @@ Where:
 
 **Input data:**
 
-![Input](./Mesh2Shape-input.png "2D surface mesh with scalar data assigned to cells, here displayed via the OGS Data Explorer. In this particular case, the simulation result of groundwater flow simulation (originally assigned to mesh nodes) has been converted onto cells via VTK's PointToCell-Filter.")
+![Input](Mesh2Shape-input.png "2D surface mesh with scalar data assigned to cells, here displayed via the OGS Data Explorer. In this particular case, the simulation result of groundwater flow simulation (originally assigned to mesh nodes) has been converted onto cells via VTK's PointToCell-Filter.")
 
 **Command:**
 
@@ -39,9 +39,9 @@ Where:
 Mesh2Shape -i Mueglitz2D_Point2Cell.vtu -o Mueglitz2D_Point2Cell.shp
 ```
 
-![Exported shapefile](./Mesh2Shape-output1.png "Exported shapefile displayed in a geographic information system (here, QGIS).")
+![Exported shapefile](Mesh2Shape-output1.png "Exported shapefile displayed in a geographic information system (here, QGIS).")
 
-![OGS simulation result](./Mesh2Shape-output2.png "The result of an OGS-simulation showing the groundwater head of the Müglitz-catchment imported into QGIS and combined with other data from an existing GIS-project of this region.")
+![OGS simulation result](Mesh2Shape-output2.png "The result of an OGS-simulation showing the groundwater head of the Müglitz-catchment imported into QGIS and combined with other data from an existing GIS-project of this region.")
 
 ## Application
 
diff --git a/web/content/docs/tools/fileio/TecPlotTools/index.md b/web/content/docs/tools/fileio/TecPlotTools/index.md
index 21fff3bc0b030889cdd6be2b70e99b6849aa9eec..66b16c7fa3d965ecd4585c1c4d30c472289dab6e 100644
--- a/web/content/docs/tools/fileio/TecPlotTools/index.md
+++ b/web/content/docs/tools/fileio/TecPlotTools/index.md
@@ -45,8 +45,8 @@ TecPlotTools -i Lake.plt -o Lake.vtu -c
 
 **Input:**
 
-![TecPlot-Header](./PoyangLake-TecPlot.png "TecPlot-Header of file containing raster data")
+![TecPlot-Header](PoyangLake-TecPlot.png "TecPlot-Header of file containing raster data")
 
 **Output:**
 
-![Converted file](./PoyangLake-ParaView.png "Converted file visualised in ParaView with all scalar data available.")
+![Converted file](PoyangLake-ParaView.png "Converted file visualised in ParaView with all scalar data available.")
diff --git a/web/content/docs/tools/getting-started/overview.md b/web/content/docs/tools/getting-started/overview/index.md
similarity index 100%
rename from web/content/docs/tools/getting-started/overview.md
rename to web/content/docs/tools/getting-started/overview/index.md
diff --git a/web/content/docs/tools/meshing/vtu2grid/index.md b/web/content/docs/tools/meshing/vtu2grid/index.md
index f2f70482442c8a79f5d5dfcd7fb998f1038c4f9a..fb8e063b4dd724897a5ea8318b56d4ebaa35b061 100644
--- a/web/content/docs/tools/meshing/vtu2grid/index.md
+++ b/web/content/docs/tools/meshing/vtu2grid/index.md
@@ -57,7 +57,7 @@ Vtu2Grid -i input.vtu -o output.vtu -x 200
 Vtu2Grid -i input.vtu -o output.vtu -x 100
 ```
 
-![Rasterised grid](./vtu2grid-100.png#two-third "Rasterised grid consisting of 74,048 equilateral hexahedral elements with an edge length of 100m. The result is still undersampled but layers become already visible.")
+![Rasterised grid](vtu2grid-100.png#two-third "Rasterised grid consisting of 74,048 equilateral hexahedral elements with an edge length of 100m. The result is still undersampled but layers become already visible.")
 
 **Command:**
 
@@ -65,7 +65,7 @@ Vtu2Grid -i input.vtu -o output.vtu -x 100
 Vtu2Grid -i input.vtu -o output.vtu -x 50
 ```
 
-![Rasterised grid](./vtu2grid-50.png#two-third "Rasterised grid consisting of 591,757 equilateral hexahedral elements with an edge length of 50m. There's still undersampling in regions containing thin layers but the overall structure is reasonably well represented.")
+![Rasterised grid](vtu2grid-50.png#two-third "Rasterised grid consisting of 591,757 equilateral hexahedral elements with an edge length of 50m. There's still undersampling in regions containing thin layers but the overall structure is reasonably well represented.")
 
 **Command:**
 
@@ -73,7 +73,7 @@ Vtu2Grid -i input.vtu -o output.vtu -x 50
 Vtu2Grid -i input.vtu -o output.vtu -x 50 -y 50 -z 10
 ```
 
-![Rasterised grid](./vtu2grid-50x50x10.png#two-third "Rasterised grid consisting of 2,959,656 cuboid hexahedral elements with an edge length of 50m x 50m x 10m. The structure of the original mesh is very well represented while the number of elements has increased by an order of magnitude.")
+![Rasterised grid](vtu2grid-50x50x10.png#two-third "Rasterised grid consisting of 2,959,656 cuboid hexahedral elements with an edge length of 50m x 50m x 10m. The structure of the original mesh is very well represented while the number of elements has increased by an order of magnitude.")
 
 ## Application
 
diff --git a/web/content/docs/tools/preprocessing/createIntermediateRasters/index.md b/web/content/docs/tools/preprocessing/createIntermediateRasters/index.md
index bac36853dc5b7e2bc6f4b0c3aea6199731e44eaa..fa7eb79a739b826b14b1e07599d6451ac6e32069 100644
--- a/web/content/docs/tools/preprocessing/createIntermediateRasters/index.md
+++ b/web/content/docs/tools/preprocessing/createIntermediateRasters/index.md
@@ -39,7 +39,7 @@ The parameter ```n``` determines how many layers are created between the two inp
 
 **Input data:**
 
-![Two input rasters](./createIntermediateRasters-input.png "Two input rasters as well as their 3D surface representation. Darker pixels represent values at a lower elevation while brighter pixels represent higher elevaton. In the 3D visualisation, the left-most raster is represented by the green surface and the right-most raster by the yellow surface.")
+![Two input rasters](createIntermediateRasters-input.png "Two input rasters as well as their 3D surface representation. Darker pixels represent values at a lower elevation while brighter pixels represent higher elevaton. In the 3D visualisation, the left-most raster is represented by the green surface and the right-most raster by the yellow surface.")
 
 **Command:**
 
@@ -47,7 +47,7 @@ The parameter ```n``` determines how many layers are created between the two inp
 createIntermediateRasters --file1 raster1.asc --file2 raster2.asc -o output.asc -n 1
 ```
 
-![A new raster is created in the exact center between the two input rasters](./createIntermediateRasters-output1.png#two-third "A new raster is created in the exact center between the two input rasters. In the 3D representation, the new layer is shown in red.")
+![A new raster is created in the exact center between the two input rasters](createIntermediateRasters-output1.png#two-third "A new raster is created in the exact center between the two input rasters. In the 3D representation, the new layer is shown in red.")
 
 **Command:**
 
@@ -55,7 +55,7 @@ createIntermediateRasters --file1 raster1.asc --file2 raster2.asc -o output.asc
 createIntermediateRasters --file1 raster1.asc --file2 raster2.asc -o output.asc -n 2
 ```
 
-![](./createIntermediateRasters-output2.png "For ```n>1``` multiple rasters are created at equidistant distances between the two input rasters. For ```n=2```, two new rasters are generated, represented here in red and blue.")
+![](createIntermediateRasters-output2.png "For ```n>1``` multiple rasters are created at equidistant distances between the two input rasters. For ```n=2```, two new rasters are generated, represented here in red and blue.")
 
 ## Application
 
diff --git a/web/content/docs/userguide/basics/cli-arguments.md b/web/content/docs/userguide/basics/cli-arguments/index.md
similarity index 100%
rename from web/content/docs/userguide/basics/cli-arguments.md
rename to web/content/docs/userguide/basics/cli-arguments/index.md
diff --git a/web/content/docs/userguide/basics/container.md b/web/content/docs/userguide/basics/container/index.md
similarity index 100%
rename from web/content/docs/userguide/basics/container.md
rename to web/content/docs/userguide/basics/container/index.md
diff --git a/web/content/docs/userguide/basics/conventions.md b/web/content/docs/userguide/basics/conventions/index.md
similarity index 100%
rename from web/content/docs/userguide/basics/conventions.md
rename to web/content/docs/userguide/basics/conventions/index.md
diff --git a/web/content/docs/userguide/basics/envinf1.md b/web/content/docs/userguide/basics/envinf1/index.md
similarity index 100%
rename from web/content/docs/userguide/basics/envinf1.md
rename to web/content/docs/userguide/basics/envinf1/index.md
diff --git a/web/content/docs/userguide/basics/introduction.md b/web/content/docs/userguide/basics/introduction/index.md
similarity index 100%
rename from web/content/docs/userguide/basics/introduction.md
rename to web/content/docs/userguide/basics/introduction/index.md
diff --git a/web/content/docs/userguide/basics/jupyter-notebooks.md b/web/content/docs/userguide/basics/jupyter-notebooks/index.md
similarity index 100%
rename from web/content/docs/userguide/basics/jupyter-notebooks.md
rename to web/content/docs/userguide/basics/jupyter-notebooks/index.md
diff --git a/web/content/docs/userguide/basics/project-file.md b/web/content/docs/userguide/basics/project-file/index.md
similarity index 100%
rename from web/content/docs/userguide/basics/project-file.md
rename to web/content/docs/userguide/basics/project-file/index.md
diff --git a/web/content/docs/userguide/post-processing/paraview-on-eve.md b/web/content/docs/userguide/post-processing/paraview-on-eve/index.md
similarity index 100%
rename from web/content/docs/userguide/post-processing/paraview-on-eve.md
rename to web/content/docs/userguide/post-processing/paraview-on-eve/index.md
diff --git a/web/content/docs/userguide/process-dependent-configuration/coaxial.png b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE/coaxial.png
similarity index 100%
rename from web/content/docs/userguide/process-dependent-configuration/coaxial.png
rename to web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE/coaxial.png
diff --git a/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE.md b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE/index.md
similarity index 99%
rename from web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE.md
rename to web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE/index.md
index 3458d3614259ae8e367e4c6da71f11b839fe5c17..21eb5da3c00a8f37bc5ddf1201afd78fad89a065 100644
--- a/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE.md
+++ b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE/index.md
@@ -78,9 +78,9 @@ Especially in CXA and CXC type, the direction of the borehole itself could be de
 
 The cross-sections of these 4 types of BHEs are illustrated in the following figures.
 
-{{< img src="../u_type.png" width="50">}}
+{{< img src="u_type.png" width="50">}}
 
-{{< img src="../coaxial.png" width="50">}}
+{{< img src="coaxial.png" width="50">}}
 
 ### < pipes >
 
diff --git a/web/content/docs/userguide/process-dependent-configuration/u_type.png b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE/u_type.png
similarity index 100%
rename from web/content/docs/userguide/process-dependent-configuration/u_type.png
rename to web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE/u_type.png
diff --git a/web/content/docs/userguide/process-dependent-configuration/BHE_PipeNetwork_feature_workflow.png b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork/BHE_PipeNetwork_feature_workflow.png
similarity index 100%
rename from web/content/docs/userguide/process-dependent-configuration/BHE_PipeNetwork_feature_workflow.png
rename to web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork/BHE_PipeNetwork_feature_workflow.png
diff --git a/web/content/docs/userguide/process-dependent-configuration/BHE_network.png b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork/BHE_network.png
similarity index 100%
rename from web/content/docs/userguide/process-dependent-configuration/BHE_network.png
rename to web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork/BHE_network.png
diff --git a/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork.md b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork/index.md
similarity index 99%
rename from web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork.md
rename to web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork/index.md
index 9e8422af0bf980858b0bea23cb66d76af7bd2ed2..bc1b633ed333c34f6faeba71d01c118da859b0ed 100644
--- a/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork.md
+++ b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork/index.md
@@ -35,7 +35,7 @@ Thermal Engineering Systems in Python (software paper: <https://doi.org/10.21105
 
 The coupled model that is going to be built is demonstrated in Figure 1. It consists of a pipeline network connected with 3 BHEs, a water pump, a virtual heat pump as the consumer, a splitter to split up the feeding fluid flow and a merge to returned flow. These devices are all defined as `components` in TESPy. A full list of available components can be found in the TESPy components module. In the pipeline network, these components are connected with each other through `connections` parts, which are illustrated by the black lines in the figure. With these two main parts, a completely TESPy pipeline network model can be set up.
 
-{{< img src="../BHE_network.png" width="200">}}
+{{< img src="BHE_network.png" width="200">}}
 
 Figure 1: Pipeline network model in TESPy
 
@@ -175,7 +175,7 @@ btes.save('tespy_nw')
 
 The work flow of the PipeNetwork feature is illustrated in Figure 2. To explicitly simulate both the BHE and the pipe network, OGS is coupled with the TESPy through a Python interface. Within every time step and each iteration, the outflow temperature `Tout` from each BHE is computed by OGS and transferred to TESPy via the interface. Then TESPy will use these `Tout` temperature and the current hydraulic state as the boundary condition imposed on the pipeline network to calculate the current inflow temperature `Tin` of each BHE and the currently flow rate, which satisfies the overall thermal load of the building. After the calculation, all data will be transferred back to OGS and update the inlet temperature and flow rate of each BHE for the next iteration. The convergence is set to be satisfied when the difference from the last two iteration results is smaller than a preset tolerance value. Additionally, OGS will transfer the currently time step 't' to TESPy within each iteration, which makes TESPy able to adjust its time dependent network boundary conditions according to the user's configuration.
 
-{{< img src="../BHE_PipeNetwork_feature_workflow.png" width="100">}}
+{{< img src="BHE_PipeNetwork_feature_workflow.png" width="100">}}
 
 Figure 2: Work flow of the model with BHEs coupled with a pipe network
 
diff --git a/web/content/docs/userguide/process-dependent-configuration/Multiphase_Flow_Overview.md b/web/content/docs/userguide/process-dependent-configuration/Multiphase_Flow_Overview/index.md
similarity index 89%
rename from web/content/docs/userguide/process-dependent-configuration/Multiphase_Flow_Overview.md
rename to web/content/docs/userguide/process-dependent-configuration/Multiphase_Flow_Overview/index.md
index d049b57d170b6d59b346fc1bbb1c6b68f3dac4df..72be7d270fdbe5814d189b983d7e3ef66d5c6bfd 100644
--- a/web/content/docs/userguide/process-dependent-configuration/Multiphase_Flow_Overview.md
+++ b/web/content/docs/userguide/process-dependent-configuration/Multiphase_Flow_Overview/index.md
@@ -27,8 +27,8 @@ Nomenclature: $P_g$: gas pressure; $P_c$: capillary pressure; $T$: temperature;
 
 Some remarks:
 
-1\. The `TwoPhaseFlowWithPP` process assumes that the two fluid phases are immiscible. Thus, it is most suitable for simulating two-phase flow under capillary effects (e.g. replacement of one phase by another due to gravity). Note that the wetting and non-wetting phases are not limited to water and gas, see the [McWhorter benchmark]({{< ref "../../benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter.md" >}}) for example.
+1\. The `TwoPhaseFlowWithPP` process assumes that the two fluid phases are immiscible. Thus, it is most suitable for simulating two-phase flow under capillary effects (e.g. replacement of one phase by another due to gravity). Note that the wetting and non-wetting phases are not limited to water and gas, see the [McWhorter benchmark]({{< ref "docs/benchmarks/two-phase-flow-pp-form/two-phase-flow-pp-mcwhorter" >}}) for example.
 
-2\. The `TwoPhaseFlowWithPrho` process assumes that the main component of the gas phase can be dissolved in the liquid phase. Water evaporation is neglected here. The appearance/disappearance of the gas phase is controlled by the solubility (given by the Henry's Law) of the gaseous component, e.g. H2. It is therefore most suitable for nuclear waste repository (see the [MoMaS benchmark]({{< ref "../../benchmarks/two-phase-flow/momas.md" >}})) or CO2 storage problems.
+2\. The `TwoPhaseFlowWithPrho` process assumes that the main component of the gas phase can be dissolved in the liquid phase. Water evaporation is neglected here. The appearance/disappearance of the gas phase is controlled by the solubility (given by the Henry's Law) of the gaseous component, e.g. H2. It is therefore most suitable for nuclear waste repository (see the [MoMaS benchmark]({{< ref "docs/benchmarks/two-phase-flow/momas" >}})) or CO2 storage problems.
 
-3\. The `ThermalTwoPhaseFlowWithPP` process simulates the temperature-dependent two-phase flow and moisture transport. Water evaporation and recondensation can be modeled thanks to that the gas phase is compositional. This process is most favorably used for shallow geothermal applications (e.g. borehole thermal energy storage), especially in unsaturated soils (see the [heat pipe benchmark]({{< ref "../../benchmarks/thermal-two-phase-flow/heat-pipe.md" >}})). 
\ No newline at end of file
+3\. The `ThermalTwoPhaseFlowWithPP` process simulates the temperature-dependent two-phase flow and moisture transport. Water evaporation and recondensation can be modeled thanks to that the gas phase is compositional. This process is most favorably used for shallow geothermal applications (e.g. borehole thermal energy storage), especially in unsaturated soils (see the [heat pipe benchmark]({{< ref "docs/benchmarks/thermal-two-phase-flow/heat-pipe" >}})).
diff --git a/web/content/docs/userguide/troubleshooting/general.md b/web/content/docs/userguide/troubleshooting/general/index.md
similarity index 100%
rename from web/content/docs/userguide/troubleshooting/general.md
rename to web/content/docs/userguide/troubleshooting/general/index.md
diff --git a/web/content/docs/userguide/troubleshooting/get-support.md b/web/content/docs/userguide/troubleshooting/get-support/index.md
similarity index 100%
rename from web/content/docs/userguide/troubleshooting/get-support.md
rename to web/content/docs/userguide/troubleshooting/get-support/index.md
diff --git a/web/layouts/_default/baseof.html b/web/layouts/_default/baseof.html
index 142f219d2be16a8032e16cd24f646a34543c7432..456e4ee5b940a5263c8f9d616805fb463d515655 100644
--- a/web/layouts/_default/baseof.html
+++ b/web/layouts/_default/baseof.html
@@ -53,7 +53,7 @@
                 src="https://upload.wikimedia.org/wikipedia/commons/3/38/Jupyter_logo.svg" alt="">
               {{ end }}
               <a href="{{ .URL }}" {{if $currentPage.IsMenuCurrent $subsection . }} class="text-brand-500" {{end}}>
-                {{ .Name }}
+                {{ .Name | markdownify }}
               </a>
             </li>
             {{ end }}
diff --git a/web/layouts/shortcodes/img.html b/web/layouts/shortcodes/img.html
index e35514f8403ad783e340a1abff4c2d30ca640566..62efef869537515c650d410f57ae99584bf0bc9e 100644
--- a/web/layouts/shortcodes/img.html
+++ b/web/layouts/shortcodes/img.html
@@ -1,18 +1,28 @@
 <!-- img -->
-<figure class="img-responsive{{ with .Get "class" }} {{.}}{{ end }}">
-    {{ with .Get "link"}}<a href="{{.}}">{{ end }}
-        <img src="{{ .Get "src" }}" {{ if or (.Get "alt") (.Get "caption") }}alt="{{ with .Get "alt"}}{{.}}{{else}}{{ .Get "caption" }}{{ end }}"{{ end }} />
+<figure class="img-responsive{{ with .Get " class" }} {{.}}{{ end }}">
+  {{ with .Get "link"}}<a href="{{.}}">{{ end }}
+    {{ $src := .Get "src" }}
+    {{ $resource := .Page.Resources.GetMatch $src }}
+    <img src="data:{{ $resource.MediaType }};base64,{{ $resource.Content | base64Encode }}"
+      {{ if or (.Get "alt" ) (.Get "caption" ) }}
+        alt="{{ with .Get " alt"}}{{.}}{{else}}{{ .Get "caption" }}{{ end }}"
+      {{ end }}
+    />
     {{ if .Get "link"}}</a>{{ end }}
-    {{ if or (or (.Get "title") (.Get "caption")) (.Get "attr")}}
-    <figcaption>{{ if isset .Params "title" }}
-        <h4>{{ .Get "title" | markdownify }}</h4>{{ end }}
-        {{ if or (.Get "caption") (.Get "attr")}}<p>
-        {{ .Get "caption" | markdownify }}
-        {{ with .Get "attrlink"}}<a href="{{.}}"> {{ end }}
-            {{ .Get "attr" }}
-        {{ if .Get "attrlink"}}</a> {{ end }}
-        </p> {{ end }}
-    </figcaption>
+  {{ if or (or (.Get "title") (.Get "caption")) (.Get "attr")}}
+  <figcaption>
+    {{ if isset .Params "title" }}
+      <h4>{{ .Get "title" | markdownify }}</h4>
     {{ end }}
+    {{ if or (.Get "caption") (.Get "attr")}}
+      <p>
+      {{ .Get "caption" | markdownify }}
+      {{ with .Get "attrlink"}}<a href="{{.}}"> {{ end }}
+      {{ .Get "attr" }}
+      {{ if .Get "attrlink"}}</a> {{ end }}
+      </p>
+    {{ end }}
+  </figcaption>
+  {{ end }}
 </figure>
 <!-- img -->