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