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