diff --git a/Device/Resolution/ScanResolution.h b/Device/Resolution/ScanResolution.h
index fddfecd4dd25c964e626c66623dc02580a308f0d..d12f1a4b448fd39d59dc80699244b5022b029caf 100644
--- a/Device/Resolution/ScanResolution.h
+++ b/Device/Resolution/ScanResolution.h
@@ -16,7 +16,7 @@
 #define BORNAGAIN_DEVICE_RESOLUTION_SCANRESOLUTION_H
 
 #include "Base/Types/ICloneable.h"
-#include "Param/Varia/ParameterSample.h"
+#include "Param/Distrib/ParameterSample.h"
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/Param/Distrib/Distributions.cpp b/Param/Distrib/Distributions.cpp
index 4a94a89c64f073f7b615f29949d618b2b3c2e107..b9ade8eb7338fbfe86ef354ad5c296a0db8a26b5 100644
--- a/Param/Distrib/Distributions.cpp
+++ b/Param/Distrib/Distributions.cpp
@@ -15,7 +15,7 @@
 #include "Param/Distrib/Distributions.h"
 #include "Base/Math/Constants.h"
 #include "Base/Py/PyFmt.h"
-#include "Param/Varia/ParameterSample.h"
+#include "Param/Distrib/ParameterSample.h"
 #include <algorithm>
 #include <cmath>
 #include <limits>
diff --git a/Param/Distrib/ParameterDistribution.h b/Param/Distrib/ParameterDistribution.h
index d5b66a050054fcb9a8f97fbbccd0b2bcd023679c..777fb928e6e4ab237a0f49b5ff26224da28b1bac 100644
--- a/Param/Distrib/ParameterDistribution.h
+++ b/Param/Distrib/ParameterDistribution.h
@@ -17,7 +17,7 @@
 
 #include "Fit/Param/RealLimits.h"
 #include "Param/Base/IParametric.h"
-#include "Param/Varia/ParameterSample.h"
+#include "Param/Distrib/ParameterSample.h"
 #include <memory>
 #include <vector>
 
diff --git a/Param/Varia/ParameterSample.h b/Param/Distrib/ParameterSample.h
similarity index 80%
rename from Param/Varia/ParameterSample.h
rename to Param/Distrib/ParameterSample.h
index 0989ad31af4a88776b6b7a56001c3e6b1cf3b818..ca0513467ae8528eb2877ded3da4f74d69aae772 100644
--- a/Param/Varia/ParameterSample.h
+++ b/Param/Distrib/ParameterSample.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Param/Varia/ParameterSample.h
+//! @file      Param/Distrib/ParameterSample.h
 //! @brief     Defines class ParameterSample.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_PARAM_VARIA_PARAMETERSAMPLE_H
-#define BORNAGAIN_PARAM_VARIA_PARAMETERSAMPLE_H
+#ifndef BORNAGAIN_PARAM_DISTRIB_PARAMETERSAMPLE_H
+#define BORNAGAIN_PARAM_DISTRIB_PARAMETERSAMPLE_H
 
 //! A parameter value with a weight, as obtained when sampling from a distribution.
 
@@ -24,4 +24,4 @@ public:
     double weight;
 };
 
-#endif // BORNAGAIN_PARAM_VARIA_PARAMETERSAMPLE_H
+#endif // BORNAGAIN_PARAM_DISTRIB_PARAMETERSAMPLE_H
diff --git a/Param/Distrib/RangedDistributions.cpp b/Param/Distrib/RangedDistributions.cpp
index 4db2d7f22677e11714d5b44df82ae9d8004376c3..58dafb624382e76dcd77fe41e8d18c76dcb4b5e7 100644
--- a/Param/Distrib/RangedDistributions.cpp
+++ b/Param/Distrib/RangedDistributions.cpp
@@ -14,7 +14,7 @@
 
 #include "Param/Distrib/RangedDistributions.h"
 #include "Param/Distrib/Distributions.h"
-#include "Param/Varia/ParameterSample.h"
+#include "Param/Distrib/ParameterSample.h"
 #include <cmath>
 #include <limits>
 
diff --git a/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp b/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp
index 8cb0ed93d8488ff6a7b067264370aaed630493cf..9ba64f6ddef05735af2a4bd4c27902b963d446ac 100644
--- a/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp
+++ b/Sample/SoftParticle/FormFactorSphereLogNormalRadius.cpp
@@ -15,7 +15,7 @@
 #include "Sample/SoftParticle/FormFactorSphereLogNormalRadius.h"
 #include "Base/Py/PyFmt.h"
 #include "Param/Distrib/Distributions.h"
-#include "Param/Varia/ParameterSample.h"
+#include "Param/Distrib/ParameterSample.h"
 #include "Sample/LibFF/SomeFormFactors.h"
 #include "Sample/Shapes/TruncatedEllipsoid.h"
 
diff --git a/Tests/Unit/Param/DistributionsTest.cpp b/Tests/Unit/Param/DistributionsTest.cpp
index f23838472d0bc7a1b977475734390bfae959ae2a..79a4db53d159793cc9d10cce32d23e20464d7d0a 100644
--- a/Tests/Unit/Param/DistributionsTest.cpp
+++ b/Tests/Unit/Param/DistributionsTest.cpp
@@ -1,6 +1,6 @@
 #include "Param/Distrib/Distributions.h"
 #include "Base/Math/Constants.h"
-#include "Param/Varia/ParameterSample.h"
+#include "Param/Distrib/ParameterSample.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <cmath>
 #include <memory>
diff --git a/Tests/Unit/Param/RangedDistributionTest.cpp b/Tests/Unit/Param/RangedDistributionTest.cpp
index 2ffcb40a88564aa09543908682e9abe09868ed46..87a687c994110e1e525960a4831f224840d3208e 100644
--- a/Tests/Unit/Param/RangedDistributionTest.cpp
+++ b/Tests/Unit/Param/RangedDistributionTest.cpp
@@ -1,6 +1,6 @@
 #include "Param/Distrib/Distributions.h"
 #include "Param/Distrib/RangedDistributions.h"
-#include "Param/Varia/ParameterSample.h"
+#include "Param/Distrib/ParameterSample.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class RangedDistributionTest : public ::testing::Test {
diff --git a/Wrap/Swig/libBornAgainParam.i b/Wrap/Swig/libBornAgainParam.i
index 469e2781a312400151b6986051455f131f25fb63..1b5e80d5582cee1a7afba102470d7f0e32fee9b3 100644
--- a/Wrap/Swig/libBornAgainParam.i
+++ b/Wrap/Swig/libBornAgainParam.i
@@ -47,5 +47,5 @@
 %include "Param/Distrib/ParameterDistribution.h"
 %include "Param/Distrib/RangedDistributions.h"
 
-%include "Param/Varia/ParameterSample.h"
+%include "Param/Distrib/ParameterSample.h"
 %template(ParameterSampleVector) std::vector<ParameterSample>;
diff --git a/auto/Wrap/doxygenParam.i b/auto/Wrap/doxygenParam.i
index f275695762dd526dd27f9a2ad32a2fccb8e90624..d56c52002c6f98a9206a3de947aa95c6ca0e9e8a 100644
--- a/auto/Wrap/doxygenParam.i
+++ b/auto/Wrap/doxygenParam.i
@@ -1202,7 +1202,7 @@ Returns distribution name for python-formatted text.
 // File: namespace_0d4.xml
 
 
-// File: namespace_0d8.xml
+// File: namespace_0d9.xml
 
 
 // File: namespaceNodeUtils.xml
@@ -1236,6 +1236,9 @@ Returns a vector of triples (descendant, depth, parent)
 // File: ParameterDistribution_8h.xml
 
 
+// File: ParameterSample_8h.xml
+
+
 // File: RangedDistributions_8cpp.xml
 
 
@@ -1261,9 +1264,6 @@ Returns a vector of triples (descendant, depth, parent)
 // File: NodeUtils_8h.xml
 
 
-// File: ParameterSample_8h.xml
-
-
 // File: dir_a1f38e94e849d0203a55ad5a19f2f15a.xml
 
 
@@ -1275,6 +1275,3 @@ Returns a vector of triples (descendant, depth, parent)
 
 // File: dir_d452a16c8784395bb8c21da516e88a7f.xml
 
-
-// File: dir_dda74d2e7a2b62d18fb900593a370493.xml
-