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-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