diff --git a/Examples/varia/CustomFormFactor.py b/Examples/scatter2d/CustomFormFactor.py
similarity index 100%
rename from Examples/varia/CustomFormFactor.py
rename to Examples/scatter2d/CustomFormFactor.py
diff --git a/Tests/Examples/CMakeLists.txt b/Tests/Examples/CMakeLists.txt
index 6caab781f23d5f94e7f5bfbba8c8f50cdb999a59..08345c18d2dc605bcf50c7d73c9656ac1d55c2ed 100644
--- a/Tests/Examples/CMakeLists.txt
+++ b/Tests/Examples/CMakeLists.txt
@@ -97,6 +97,7 @@ test_example(scatter2d/ConstantBackground 2e-10)
 test_example(scatter2d/CoreShellNanoparticles 2e-10)
 test_example(scatter2d/CorrelatedRoughness 2e-10)
 test_example(scatter2d/CosineRipplesAtRectLattice 2e-10)
+test_example(scatter2d/CustomFormFactor 2e-10)
 test_example(scatter2d/Cylinders 2e-10)
 test_example(scatter2d/CylindersAndPrisms 2e-10)
 test_example(scatter2d/CylindersInAverageLayer 2e-10)
@@ -145,7 +146,6 @@ test_example(specular/FootprintCorrection 2e-10)
 test_example(specular/SpecularSimulationWithRoughness 3e-10)
 test_example(specular/RoughnessModel 3e-10)
 
-test_example(varia/CustomFormFactor 2e-10)
 test_example(varia/DepthProbe 2e-10)
 test_example(varia/Interference1DLattice 1.5)
 test_example(varia/OffSpecularSimulation 2e-10)
diff --git a/Tests/ReferenceData/ExamplesMini/varia/CustomFormFactor.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/CustomFormFactor.int.gz
similarity index 100%
rename from Tests/ReferenceData/ExamplesMini/varia/CustomFormFactor.int.gz
rename to Tests/ReferenceData/ExamplesMini/scatter2d/CustomFormFactor.int.gz
diff --git a/hugo/content/py/result/find-peaks/index.md b/hugo/content/py/result/find-peaks/index.md
index 8e77ab6ee140f88df7823316135408800caed0f9..3b0e01cf58c77b8233cafb90a124b5aec2d75a59 100644
--- a/hugo/content/py/result/find-peaks/index.md
+++ b/hugo/content/py/result/find-peaks/index.md
@@ -15,9 +15,9 @@ To find the intensity peaks from a GISAXS simulation, the result must be casted
 ```
 
 {{< galleryscg >}}
-{{< figscg src="/img/auto/todo/FindPeaks.png" width="670px" caption="Intensity images">}}
+{{< figscg src="/img/auto/scatter2d/FindPeaks.png" width="670px" caption="Intensity images">}}
 {{< /galleryscg >}}
 
 The following script offers a complete example in which the peaks are found after carrying on a GISAXS simulation. This particular example uses as a sample a grating of long boxes distributed along a 1D lattice.
 
-{{< highlightfile file="Examples/varia/FindPeaks.py" >}}
+{{< highlightfile file="Examples/scatter2d/FindPeaks.py" >}}
diff --git a/hugo/content/py/sample/particle/ff/custom/index.md b/hugo/content/py/sample/particle/ff/custom/index.md
index ea114dae8322a97e06f1ba69f1bd4619d1774dcd..9cf89aa460eb524643cc857239b798b4f8e61d45 100644
--- a/hugo/content/py/sample/particle/ff/custom/index.md
+++ b/hugo/content/py/sample/particle/ff/custom/index.md
@@ -16,7 +16,7 @@ Scattering from a monodisperse distribution of particles, whose form factor is d
 
 {{< galleryscg >}}
 {{< figscg src="CustomFormFactor_setup.jpg" width="350px" caption="Real-space model">}}
-{{< figscg src="/img/auto/specular/CustomFormFactor.png" width="350px" caption="Intensity image">}}
+{{< figscg src="/img/auto/scatter2d/CustomFormFactor.png" width="350px" caption="Intensity image">}}
 {{< /galleryscg >}}
 
-{{< highlightfile file="Examples/varia/CustomFormFactor.py" >}}
+{{< highlightfile file="Examples/scatter2d/CustomFormFactor.py" >}}
diff --git a/hugo/static/img/auto/varia/CustomFormFactor.png b/hugo/static/img/auto/scatter2d/CustomFormFactor.png
similarity index 100%
rename from hugo/static/img/auto/varia/CustomFormFactor.png
rename to hugo/static/img/auto/scatter2d/CustomFormFactor.png