diff --git a/hugo/content/py/fitting/advanced/find-background/index.md b/hugo/content/py/fitting/advanced/find-background/index.md
index 615281f8c20e5e86067dc04acec1d5a9c1edfa82..af5c31841edaffc24ce3cc2667fc217658fb5c7e 100644
--- a/hugo/content/py/fitting/advanced/find-background/index.md
+++ b/hugo/content/py/fitting/advanced/find-background/index.md
@@ -16,4 +16,4 @@ Here we are simulating cylinders on top of a substrate without interference. The
 The radius and height of the cylinders are passed to the function constructing the multi layer
 while the scale and background values are used to initialize the instrument.
 
-{{< highlightfile file="Examples/fit52_Advanced/find_background.py" >}}
+{{< highlightfile file="Examples/fit/scatter2d/find_background.py" >}}
diff --git a/hugo/content/py/fitting/advanced/fit-along-slices/index.md b/hugo/content/py/fitting/advanced/fit-along-slices/index.md
index 7589d7e5303026bb9703e4a14ab239ea87cacde0..976b943f150b64fba3ca0bec3c0b4d993b06be84 100644
--- a/hugo/content/py/fitting/advanced/fit-along-slices/index.md
+++ b/hugo/content/py/fitting/advanced/fit-along-slices/index.md
@@ -19,4 +19,4 @@ Technically, the idea is to mask the whole detector except thin lines, one verti
 {{< figscg src="fit_along_slices.png" width="600px" caption="Fit window">}}
 {{< /galleryscg >}}
 
-{{< highlightfile file="Examples/fit52_Advanced/fit_along_slices.py" >}}
+{{< highlightfile file="Examples/fit/scatter2d/fit_along_slices.py" >}}
diff --git a/hugo/content/py/fitting/advanced/fit-with-masks/index.md b/hugo/content/py/fitting/advanced/fit-with-masks/index.md
index a0e766d7a6210751eca993e70dbcf7e865c671fa..44bbcb05e0a33c2cd0041ff59b30e178ae95fa7e 100644
--- a/hugo/content/py/fitting/advanced/fit-with-masks/index.md
+++ b/hugo/content/py/fitting/advanced/fit-with-masks/index.md
@@ -22,4 +22,4 @@ where `Rectangle` is related to the shape of the mask in detector coordinates, `
 {{< figscg src="fit_with_masks.png" width="600px" caption="Fit window">}}
 {{< /galleryscg >}}
 
-{{< highlightfile file="Examples/fit52_Advanced/fit_with_masks.py" >}}
+{{< highlightfile file="Examples/fit/scatter2d/fit_with_masks.py" >}}
diff --git a/hugo/content/py/fitting/advanced/multiple-datasets/index.md b/hugo/content/py/fitting/advanced/multiple-datasets/index.md
index 0fa22e2b6e0b498eba651dad5b166bf239e6f459..cb3da7669d598c07fb9f5d044d84a25b4ffc4c3b 100644
--- a/hugo/content/py/fitting/advanced/multiple-datasets/index.md
+++ b/hugo/content/py/fitting/advanced/multiple-datasets/index.md
@@ -21,4 +21,4 @@ To do this, we define one dataset (a pair of real data and corresponding simulat
 {{< figscg src="multiple_datasets.png" width="600px" caption="Fit window">}}
 {{< /galleryscg >}}
 
-{{< highlightfile file="Examples/fit52_Advanced/multiple_datasets.py" >}}
+{{< highlightfile file="Examples/fit/scatter2d/multiple_datasets.py" >}}
diff --git a/hugo/content/py/fitting/basic/consecutive-fitting/index.md b/hugo/content/py/fitting/basic/consecutive-fitting/index.md
index 982736fb2997a36b07454bd3bb8d1fa69e54591a..718202c396ee57f54684b63fdf332e7d8235bb9f 100644
--- a/hugo/content/py/fitting/basic/consecutive-fitting/index.md
+++ b/hugo/content/py/fitting/basic/consecutive-fitting/index.md
@@ -11,4 +11,4 @@ This example demonstrates how to run two fits one after the other using differen
 * During the first (started at line 101) fit we are setting the initial values of the fit parameters to be quite far from the expected values and use a genetic minimizer to explore a large parameter space.
 * The second fit at line 112 starts from the best parameter values found in the previous step and uses one of the gradient descent algorithms to find the precise location of the minimum.
 
-{{< highlightfile file="Examples/fit51_Basic/consecutive_fitting.py" >}}
+{{< highlightfile file="Examples/fit/scatter2d/consecutive_fitting.py" >}}
diff --git a/hugo/content/py/fitting/basic/minimizer-settings/index.md b/hugo/content/py/fitting/basic/minimizer-settings/index.md
index 4a272616ca4eade18a9d40c4f48fed84728a5d82..1cc6c335ac3424611b4ae7d9264773c041f9ed73 100644
--- a/hugo/content/py/fitting/basic/minimizer-settings/index.md
+++ b/hugo/content/py/fitting/basic/minimizer-settings/index.md
@@ -24,4 +24,4 @@ print(ba.MinimizerFactory().catalogueDetailsToString())
 For more information, see the
 [minimizer settings tutorial]({{% ref-py "fitting/minimizers/index.md" %}}).
 
-{{< highlightfile file="Examples/fit51_Basic/minimizer_settings.py" >}}
+{{< highlightfile file="Examples/fit/scatter2d/minimizer_settings.py" >}}
diff --git a/hugo/content/py/fitting/extended/custom-objective-function/index.md b/hugo/content/py/fitting/extended/custom-objective-function/index.md
index 1f0437d398699d01bbae5fe00e2bcd1e6bbe7494..3039d0cea4fc3cd412b840a1cc12b656ae370e8a 100644
--- a/hugo/content/py/fitting/extended/custom-objective-function/index.md
+++ b/hugo/content/py/fitting/extended/custom-objective-function/index.md
@@ -20,4 +20,4 @@ This is done by defining our own `MyObjective` class at line 14. It is derived f
 
 Later in the code, the `MyObjective.evaluate_residual` function is used to setup a custom objective function for the minimizer (line 116).
 
-{{< highlightfile file="Examples/fit53_CustomObjective/custom_objective_function.py" >}}
+{{< highlightfile file="Examples/fit/scatter2d/custom_objective_function.py" >}}
diff --git a/hugo/content/py/fitting/extended/experiment-at-galaxi/index.md b/hugo/content/py/fitting/extended/experiment-at-galaxi/index.md
index d04d685d600974874e23a6bce9b536262901d056..8e1db0e81b8be1e16b77c2c1a2d4ed31fa575950 100644
--- a/hugo/content/py/fitting/extended/experiment-at-galaxi/index.md
+++ b/hugo/content/py/fitting/extended/experiment-at-galaxi/index.md
@@ -17,7 +17,7 @@ This is an example of a real data fit. We use our own measurements performed at
 * The sample is generated with the help of a `SampleBuilder`, which is able to create samples depending on parameters defined in the constructor and passed through to the `create_sample` method.
 * The nanoparticles have a broad log-normal size distribution.
 
-{{< highlightfile file="Examples/fit61_Galaxi/sample_builder.py" >}}
+{{< highlightfile file="Examples/fit/scatter2d/sample_builder.py" >}}
 
 <hr>
 
@@ -27,4 +27,4 @@ This is an example of a real data fit. We use our own measurements performed at
 * The real data is loaded from a tiff file into a histogram representing the detector's channels.
 * The `run_fitting()` function contains the initialization of the fitting kernel: loading experimental data, assignment of fit pair, fit parameters selection (line 62).
 
-{{< highlightfile file="Examples/fit61_Galaxi/fit_galaxi_data.py" >}}
+{{< highlightfile file="Examples/fit/scatter2d/fit_galaxi_data.py" >}}
diff --git a/hugo/content/py/fitting/extended/external-minimizer-with-plotting/index.md b/hugo/content/py/fitting/extended/external-minimizer-with-plotting/index.md
index 1fce3b0d66bee2a5887be54efb92827b3242744f..988661978b5ba14d311abadc625bf3fef79d2d68 100644
--- a/hugo/content/py/fitting/extended/external-minimizer-with-plotting/index.md
+++ b/hugo/content/py/fitting/extended/external-minimizer-with-plotting/index.md
@@ -37,4 +37,4 @@ The complete script to plot the fitting progress and the image produced by it ar
 
 
 
-{{< highlightfile file="Examples/fit54_ExternalMinimizer/lmfit_with_plotting.py" >}}
+{{< highlightfile file="Examples/fit/scatter2d/lmfit_with_plotting.py" >}}
diff --git a/hugo/content/py/fitting/extended/external-minimizer/index.md b/hugo/content/py/fitting/extended/external-minimizer/index.md
index 97d62ec58753cb97561e8b1b2d6fa6bea32df9b7..ecb7eb780ce348d43a1565af9333d9646c5a247b 100644
--- a/hugo/content/py/fitting/extended/external-minimizer/index.md
+++ b/hugo/content/py/fitting/extended/external-minimizer/index.md
@@ -42,4 +42,4 @@ print(result.params.pretty_print())
 
 The complete script for the `lmfit` based fitting is shown below.
 
-{{< highlightfile file="Examples/fit54_ExternalMinimizer/lmfit_basics.py" >}}
+{{< highlightfile file="Examples/fit/scatter2d/lmfit_basics.py" >}}
diff --git a/hugo/content/py/fitting/extended/fit-with-uncertainties/index.md b/hugo/content/py/fitting/extended/fit-with-uncertainties/index.md
index 5f1d39f8b8cef9e7d701b7f594e4314f9979c9e4..63b52986cee3cb00d5c2e00303fd384a2a5be499 100644
--- a/hugo/content/py/fitting/extended/fit-with-uncertainties/index.md
+++ b/hugo/content/py/fitting/extended/fit-with-uncertainties/index.md
@@ -20,6 +20,6 @@ This example follows closely the tutorial on [Fitting reflectometry data](/py/fi
 
 {{% figure src="FitWithUncertainties.png" command="Resize" options="450x" caption="Fitting with uncertainties plot. Notice the $RQ^4$ scale of the Intensity axis" class="center" %}}
 
-{{< highlightfile file="Examples/fit55_SpecularBasic/FitWithUncertainties.py" >}}
+{{< highlightfile file="Examples/fit/specular/FitWithUncertainties.py" >}}
 
 Data to be fitted: {{% ref-src "Examples/data/genx_interchanging_layers.dat.gz" %}}
diff --git a/hugo/content/py/fitting/extended/polarized-spinasymmetry-fit/index.md b/hugo/content/py/fitting/extended/polarized-spinasymmetry-fit/index.md
index 29c24740aadbae57596bc60835672cade3e3c341..d14c8f44f178bea1b451e1482b917f5ffe6ea20a 100644
--- a/hugo/content/py/fitting/extended/polarized-spinasymmetry-fit/index.md
+++ b/hugo/content/py/fitting/extended/polarized-spinasymmetry-fit/index.md
@@ -97,4 +97,4 @@ python3 PolarizedSpinAsymmetryFit.py
 
 Here is the complete example:
 
-{{< highlightfile file="Examples/fit55_SpecularBasic/PolarizedSpinAsymmetryFit.py" >}}
+{{< highlightfile file="Examples/fit/specular/PolarizedSpinAsymmetryFit.py" >}}
diff --git a/hugo/content/py/fitting/extended/real-life-reflectometry/index.md b/hugo/content/py/fitting/extended/real-life-reflectometry/index.md
index ed3b614031d407f04428a7c6ead1d99af265aa04..7ef417f613561c15a04ef3efeda130be9319ac9f 100644
--- a/hugo/content/py/fitting/extended/real-life-reflectometry/index.md
+++ b/hugo/content/py/fitting/extended/real-life-reflectometry/index.md
@@ -26,6 +26,6 @@ Be patient, since it takes some time to run.
 {{% figure src="Figure.png" command="Resize" options="450x" caption="Figure obtained after running the script below" class="center" %}}
 
 
-{{< highlightfile file="Examples/fit55_SpecularBasic/RealLifeReflectometryFitting.py" >}}
+{{< highlightfile file="Examples/fit/specular/RealLifeReflectometryFitting.py" >}}
 
 Data to be fitted: {{% ref-src "Examples/data/mg6a_Merged.txt.gz" %}}
diff --git a/hugo/content/py/fitting/extended/reflectometry-honeycomb/index.md b/hugo/content/py/fitting/extended/reflectometry-honeycomb/index.md
index b89eaf4436a33c7a3b083ee858da8902173c647b..d91a99976384e0d608be25f547a1ad463917eee7 100644
--- a/hugo/content/py/fitting/extended/reflectometry-honeycomb/index.md
+++ b/hugo/content/py/fitting/extended/reflectometry-honeycomb/index.md
@@ -146,6 +146,6 @@ On a four-core workstation, the fitting procedure takes roughly 45 minutes to co
 
 As can be seen from the plot of the SLDs, the magnetization is indeed larger for the measurement at lower temperature, exactly as expected.
 
-{{< highlightfile file="Examples/fit56_SpecularAdvanced/Honeycomb_fit.py" >}}
+{{< highlightfile file="Examples/fit/scatter2d/Honeycomb_fit.py" >}}
 
 Reference data: {{% ref-src "Examples/data/honeycomb" %}}
diff --git a/hugo/content/py/fitting/extended/reflectometry-pt-layer/index.md b/hugo/content/py/fitting/extended/reflectometry-pt-layer/index.md
index 30173d053242cd011d9a528c1a304ec989860d15..f1dda76215c3732ae3260a89f926ec73efcd5184 100644
--- a/hugo/content/py/fitting/extended/reflectometry-pt-layer/index.md
+++ b/hugo/content/py/fitting/extended/reflectometry-pt-layer/index.md
@@ -98,6 +98,6 @@ python3 Pt_layer_fit.py
 a simulation is performed with our fit results and one should obtain the result shown above.
 
 
-{{< highlightfile file="Examples/fit56_SpecularAdvanced/Pt_layer_fit.py" >}}
+{{< highlightfile file="Examples/fit/scatter2d/Pt_layer_fit.py" >}}
 
 Data to be fitted: {{% ref-src "Examples/data/RvsQ_36563_36662.txt.gz" %}}