From 45a31ae8a9995b34ebe84a7cc3b7ab2502011659 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:31:34 +0100
Subject: [PATCH] rename Sample/StandardSamples/ -> Sample/StandardSample

---
 GUI/Model/FromCore/GUIExamplesFactory.cpp     |  2 +-
 .../BoxCompositionBuilder.cpp                 |  6 +--
 .../BoxCompositionBuilder.h                   |  8 +--
 .../BoxesSquareLatticeBuilder.cpp             |  6 +--
 .../BoxesSquareLatticeBuilder.h               |  8 +--
 .../CompoundBuilder.cpp                       |  6 +--
 .../CompoundBuilder.h                         |  8 +--
 .../CoreAndShellBuilder.cpp                   |  6 +--
 .../CoreAndShellBuilder.h                     |  8 +--
 .../CustomMorphologyBuilder.cpp               |  6 +--
 .../CustomMorphologyBuilder.h                 |  8 +--
 .../CylindersAndPrismsBuilder.cpp             |  6 +--
 .../CylindersAndPrismsBuilder.h               |  8 +--
 .../CylindersBuilder.cpp                      |  6 +--
 .../CylindersBuilder.h                        |  8 +--
 Sample/StandardSample/ExemplarySamples.h      | 53 +++++++++++++++++++
 .../FeNiBilayerBuilder.cpp                    |  4 +-
 .../FeNiBilayerBuilder.h                      |  8 +--
 .../HomogeneousMultilayerBuilder.cpp          |  4 +-
 .../HomogeneousMultilayerBuilder.h            |  8 +--
 .../LatticeBuilder.cpp                        |  6 +--
 .../LatticeBuilder.h                          |  8 +--
 .../LayersWithAbsorptionBuilder.cpp           |  6 +--
 .../LayersWithAbsorptionBuilder.h             |  8 +--
 .../LayersWithAbsorptionBySLDBuilder.cpp      |  4 +-
 .../LayersWithAbsorptionBySLDBuilder.h        |  8 +--
 .../MagneticLayersBuilder.cpp                 |  4 +-
 .../MagneticLayersBuilder.h                   |  8 +--
 .../MagneticParticlesBuilder.cpp              |  4 +-
 .../MagneticParticlesBuilder.h                |  8 +--
 .../MesocrystalBuilder.cpp                    |  6 +--
 .../MesocrystalBuilder.h                      |  8 +--
 .../MultiLayerWithNCRoughnessBuilder.cpp      |  4 +-
 .../MultiLayerWithNCRoughnessBuilder.h        | 10 ++--
 .../MultiLayerWithRoughnessBuilder.cpp        |  4 +-
 .../MultiLayerWithRoughnessBuilder.h          |  8 +--
 .../MultipleLayoutBuilder.cpp                 |  6 +--
 .../MultipleLayoutBuilder.h                   |  8 +--
 .../ParacrystalBuilder.cpp                    |  6 +--
 .../ParacrystalBuilder.h                      |  8 +--
 .../ParticleDistributionsBuilder.cpp          |  6 +--
 .../ParticleDistributionsBuilder.h            |  8 +--
 .../ParticleInVacuumBuilder.cpp               |  6 +--
 .../ParticleInVacuumBuilder.h                 |  8 +--
 .../PercusYevickBuilder.cpp                   |  6 +--
 .../PercusYevickBuilder.h                     |  8 +--
 .../PlainMultiLayerBySLDBuilder.cpp           |  4 +-
 .../PlainMultiLayerBySLDBuilder.h             |  8 +--
 .../ReferenceMaterials.h                      |  8 +--
 .../ResonatorBuilder.cpp                      |  4 +-
 .../ResonatorBuilder.h                        |  8 +--
 .../RipplesBuilder.cpp                        |  6 +--
 .../RipplesBuilder.h                          |  8 +--
 .../RotatedPyramidsBuilder.cpp                |  6 +--
 .../RotatedPyramidsBuilder.h                  |  8 +--
 .../SimpleLayerBuilder.cpp                    |  6 +--
 .../SimpleLayerBuilder.h                      |  8 +--
 .../SimpleLayersBuilder.h                     |  8 +--
 .../SizeDistributionModelsBuilder.cpp         |  6 +--
 .../SizeDistributionModelsBuilder.h           |  8 +--
 .../SlicedCompositionBuilder.cpp              |  6 +--
 .../SlicedCompositionBuilder.h                |  8 +--
 .../SlicedCylindersBuilder.cpp                |  4 +-
 .../SlicedCylindersBuilder.h                  |  8 +--
 .../ThickAbsorptiveSampleBuilder.cpp          |  4 +-
 .../ThickAbsorptiveSampleBuilder.h            |  8 +--
 .../TransformationsBuilder.cpp                |  6 +--
 .../TransformationsBuilder.h                  |  8 +--
 .../TwoDimLatticeBuilder.cpp                  |  6 +--
 .../TwoDimLatticeBuilder.h                    |  8 +--
 Sample/StandardSamples/ExemplarySamples.h     | 53 -------------------
 .../Consistence/ConsistenceTests.cpp          |  4 +-
 Tests/Functional/Fitting/FitTests.cpp         |  2 +-
 Tests/Suite/Common/TestSuite.h                |  2 +-
 Tests/Unit/Resample/KzComputationTest.cpp     |  2 +-
 75 files changed, 288 insertions(+), 288 deletions(-)
 rename Sample/{StandardSamples => StandardSample}/BoxCompositionBuilder.cpp (96%)
 rename Sample/{StandardSamples => StandardSample}/BoxCompositionBuilder.h (85%)
 rename Sample/{StandardSamples => StandardSample}/BoxesSquareLatticeBuilder.cpp (90%)
 rename Sample/{StandardSamples => StandardSample}/BoxesSquareLatticeBuilder.h (75%)
 rename Sample/{StandardSamples => StandardSample}/CompoundBuilder.cpp (94%)
 rename Sample/{StandardSamples => StandardSample}/CompoundBuilder.h (79%)
 rename Sample/{StandardSamples => StandardSample}/CoreAndShellBuilder.cpp (94%)
 rename Sample/{StandardSamples => StandardSample}/CoreAndShellBuilder.h (80%)
 rename Sample/{StandardSamples => StandardSample}/CustomMorphologyBuilder.cpp (95%)
 rename Sample/{StandardSamples => StandardSample}/CustomMorphologyBuilder.h (75%)
 rename Sample/{StandardSamples => StandardSample}/CylindersAndPrismsBuilder.cpp (88%)
 rename Sample/{StandardSamples => StandardSample}/CylindersAndPrismsBuilder.h (75%)
 rename Sample/{StandardSamples => StandardSample}/CylindersBuilder.cpp (93%)
 rename Sample/{StandardSamples => StandardSample}/CylindersBuilder.h (82%)
 create mode 100644 Sample/StandardSample/ExemplarySamples.h
 rename Sample/{StandardSamples => StandardSample}/FeNiBilayerBuilder.cpp (98%)
 rename Sample/{StandardSamples => StandardSample}/FeNiBilayerBuilder.h (84%)
 rename Sample/{StandardSamples => StandardSample}/HomogeneousMultilayerBuilder.cpp (92%)
 rename Sample/{StandardSamples => StandardSample}/HomogeneousMultilayerBuilder.h (77%)
 rename Sample/{StandardSamples => StandardSample}/LatticeBuilder.cpp (91%)
 rename Sample/{StandardSamples => StandardSample}/LatticeBuilder.h (77%)
 rename Sample/{StandardSamples => StandardSample}/LayersWithAbsorptionBuilder.cpp (89%)
 rename Sample/{StandardSamples => StandardSample}/LayersWithAbsorptionBuilder.h (77%)
 rename Sample/{StandardSamples => StandardSample}/LayersWithAbsorptionBySLDBuilder.cpp (93%)
 rename Sample/{StandardSamples => StandardSample}/LayersWithAbsorptionBySLDBuilder.h (77%)
 rename Sample/{StandardSamples => StandardSample}/MagneticLayersBuilder.cpp (98%)
 rename Sample/{StandardSamples => StandardSample}/MagneticLayersBuilder.h (86%)
 rename Sample/{StandardSamples => StandardSample}/MagneticParticlesBuilder.cpp (97%)
 rename Sample/{StandardSamples => StandardSample}/MagneticParticlesBuilder.h (81%)
 rename Sample/{StandardSamples => StandardSample}/MesocrystalBuilder.cpp (94%)
 rename Sample/{StandardSamples => StandardSample}/MesocrystalBuilder.h (79%)
 rename Sample/{StandardSamples => StandardSample}/MultiLayerWithNCRoughnessBuilder.cpp (85%)
 rename Sample/{StandardSamples => StandardSample}/MultiLayerWithNCRoughnessBuilder.h (69%)
 rename Sample/{StandardSamples => StandardSample}/MultiLayerWithRoughnessBuilder.cpp (93%)
 rename Sample/{StandardSamples => StandardSample}/MultiLayerWithRoughnessBuilder.h (73%)
 rename Sample/{StandardSamples => StandardSample}/MultipleLayoutBuilder.cpp (90%)
 rename Sample/{StandardSamples => StandardSample}/MultipleLayoutBuilder.h (77%)
 rename Sample/{StandardSamples => StandardSample}/ParacrystalBuilder.cpp (96%)
 rename Sample/{StandardSamples => StandardSample}/ParacrystalBuilder.h (86%)
 rename Sample/{StandardSamples => StandardSample}/ParticleDistributionsBuilder.cpp (98%)
 rename Sample/{StandardSamples => StandardSample}/ParticleDistributionsBuilder.h (86%)
 rename Sample/{StandardSamples => StandardSample}/ParticleInVacuumBuilder.cpp (86%)
 rename Sample/{StandardSamples => StandardSample}/ParticleInVacuumBuilder.h (77%)
 rename Sample/{StandardSamples => StandardSample}/PercusYevickBuilder.cpp (90%)
 rename Sample/{StandardSamples => StandardSample}/PercusYevickBuilder.h (76%)
 rename Sample/{StandardSamples => StandardSample}/PlainMultiLayerBySLDBuilder.cpp (93%)
 rename Sample/{StandardSamples => StandardSample}/PlainMultiLayerBySLDBuilder.h (77%)
 rename Sample/{StandardSamples => StandardSample}/ReferenceMaterials.h (84%)
 rename Sample/{StandardSamples => StandardSample}/ResonatorBuilder.cpp (94%)
 rename Sample/{StandardSamples => StandardSample}/ResonatorBuilder.h (77%)
 rename Sample/{StandardSamples => StandardSample}/RipplesBuilder.cpp (93%)
 rename Sample/{StandardSamples => StandardSample}/RipplesBuilder.h (83%)
 rename Sample/{StandardSamples => StandardSample}/RotatedPyramidsBuilder.cpp (89%)
 rename Sample/{StandardSamples => StandardSample}/RotatedPyramidsBuilder.h (76%)
 rename Sample/{StandardSamples => StandardSample}/SimpleLayerBuilder.cpp (85%)
 rename Sample/{StandardSamples => StandardSample}/SimpleLayerBuilder.h (77%)
 rename Sample/{StandardSamples => StandardSample}/SimpleLayersBuilder.h (79%)
 rename Sample/{StandardSamples => StandardSample}/SizeDistributionModelsBuilder.cpp (96%)
 rename Sample/{StandardSamples => StandardSample}/SizeDistributionModelsBuilder.h (85%)
 rename Sample/{StandardSamples => StandardSample}/SlicedCompositionBuilder.cpp (91%)
 rename Sample/{StandardSamples => StandardSample}/SlicedCompositionBuilder.h (76%)
 rename Sample/{StandardSamples => StandardSample}/SlicedCylindersBuilder.cpp (97%)
 rename Sample/{StandardSamples => StandardSample}/SlicedCylindersBuilder.h (83%)
 rename Sample/{StandardSamples => StandardSample}/ThickAbsorptiveSampleBuilder.cpp (91%)
 rename Sample/{StandardSamples => StandardSample}/ThickAbsorptiveSampleBuilder.h (73%)
 rename Sample/{StandardSamples => StandardSample}/TransformationsBuilder.cpp (90%)
 rename Sample/{StandardSamples => StandardSample}/TransformationsBuilder.h (75%)
 rename Sample/{StandardSamples => StandardSample}/TwoDimLatticeBuilder.cpp (97%)
 rename Sample/{StandardSamples => StandardSample}/TwoDimLatticeBuilder.h (87%)
 delete mode 100644 Sample/StandardSamples/ExemplarySamples.h

diff --git a/GUI/Model/FromCore/GUIExamplesFactory.cpp b/GUI/Model/FromCore/GUIExamplesFactory.cpp
index 38021184c5b..1cc4beef14d 100644
--- a/GUI/Model/FromCore/GUIExamplesFactory.cpp
+++ b/GUI/Model/FromCore/GUIExamplesFactory.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Model/FromCore/GUIExamplesFactory.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/FromCore/ItemizeSample.h"
-#include "Sample/StandardSamples/ExemplarySamples.h"
+#include "Sample/StandardSample/ExemplarySamples.h"
 #include <QMap>
 
 namespace {
diff --git a/Sample/StandardSamples/BoxCompositionBuilder.cpp b/Sample/StandardSample/BoxCompositionBuilder.cpp
similarity index 96%
rename from Sample/StandardSamples/BoxCompositionBuilder.cpp
rename to Sample/StandardSample/BoxCompositionBuilder.cpp
index 7f9b166a446..f4c312ec574 100644
--- a/Sample/StandardSamples/BoxCompositionBuilder.cpp
+++ b/Sample/StandardSample/BoxCompositionBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/BoxCompositionBuilder.cpp
+//! @file      Sample/StandardSample/BoxCompositionBuilder.cpp
 //! @brief     Implements class BoxCompositionBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/BoxCompositionBuilder.h"
+#include "Sample/StandardSample/BoxCompositionBuilder.h"
 #include "Base/Const/Units.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/Polyhedra.h"
@@ -21,7 +21,7 @@
 #include "Sample/Particle/Compound.h"
 #include "Sample/Particle/Particle.h"
 #include "Sample/Scattering/Rotations.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 using Units::deg;
 
diff --git a/Sample/StandardSamples/BoxCompositionBuilder.h b/Sample/StandardSample/BoxCompositionBuilder.h
similarity index 85%
rename from Sample/StandardSamples/BoxCompositionBuilder.h
rename to Sample/StandardSample/BoxCompositionBuilder.h
index 3ca74b750fc..d71e0bf5893 100644
--- a/Sample/StandardSamples/BoxCompositionBuilder.h
+++ b/Sample/StandardSample/BoxCompositionBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/BoxCompositionBuilder.h
+//! @file      Sample/StandardSample/BoxCompositionBuilder.h
 //! @brief     Defines classes of BoxCompositionBuilder family.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_BOXCOMPOSITIONBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_BOXCOMPOSITIONBUILDER_H
 
 class MultiLayer;
 
@@ -60,4 +60,4 @@ MultiLayer* createBoxStackComposition();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_BOXCOMPOSITIONBUILDER_H
diff --git a/Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp b/Sample/StandardSample/BoxesSquareLatticeBuilder.cpp
similarity index 90%
rename from Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp
rename to Sample/StandardSample/BoxesSquareLatticeBuilder.cpp
index 7e0420ab692..8e8aabbb388 100644
--- a/Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp
+++ b/Sample/StandardSample/BoxesSquareLatticeBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp
+//! @file      Sample/StandardSample/BoxesSquareLatticeBuilder.cpp
 //! @brief     Implements class BoxesSquareLattice2DBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/BoxesSquareLatticeBuilder.h"
+#include "Sample/StandardSample/BoxesSquareLatticeBuilder.h"
 #include "Sample/Aggregate/Interference2DLattice.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/Correlation/Profiles2D.h"
@@ -20,7 +20,7 @@
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 namespace {
 MultiLayer* createBoxesSquareLattice2D(double length, double height, double lattice)
diff --git a/Sample/StandardSamples/BoxesSquareLatticeBuilder.h b/Sample/StandardSample/BoxesSquareLatticeBuilder.h
similarity index 75%
rename from Sample/StandardSamples/BoxesSquareLatticeBuilder.h
rename to Sample/StandardSample/BoxesSquareLatticeBuilder.h
index 0e2e4b76083..dd7928352d0 100644
--- a/Sample/StandardSamples/BoxesSquareLatticeBuilder.h
+++ b/Sample/StandardSample/BoxesSquareLatticeBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/BoxesSquareLatticeBuilder.h
+//! @file      Sample/StandardSample/BoxesSquareLatticeBuilder.h
 //! @brief     Defines class BoxesSquareLattice2DBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_BOXESSQUARELATTICEBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_BOXESSQUARELATTICEBUILDER_H
 
 class MultiLayer;
 
@@ -30,4 +30,4 @@ MultiLayer* createBoxesLayer();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_BOXESSQUARELATTICEBUILDER_H
diff --git a/Sample/StandardSamples/CompoundBuilder.cpp b/Sample/StandardSample/CompoundBuilder.cpp
similarity index 94%
rename from Sample/StandardSamples/CompoundBuilder.cpp
rename to Sample/StandardSample/CompoundBuilder.cpp
index fdf92ab7a6e..e4f9af45552 100644
--- a/Sample/StandardSamples/CompoundBuilder.cpp
+++ b/Sample/StandardSample/CompoundBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/CompoundBuilder.cpp
+//! @file      Sample/StandardSample/CompoundBuilder.cpp
 //! @brief     Implements class CompoundBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/CompoundBuilder.h"
+#include "Sample/StandardSample/CompoundBuilder.h"
 #include "Sample/Aggregate/Interference2DLattice.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/Correlation/Profiles2D.h"
@@ -22,7 +22,7 @@
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Compound.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 // --- CompoundBuilder ---
 
diff --git a/Sample/StandardSamples/CompoundBuilder.h b/Sample/StandardSample/CompoundBuilder.h
similarity index 79%
rename from Sample/StandardSamples/CompoundBuilder.h
rename to Sample/StandardSample/CompoundBuilder.h
index 5ec33ba791f..dadf56e37df 100644
--- a/Sample/StandardSamples/CompoundBuilder.h
+++ b/Sample/StandardSample/CompoundBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/CompoundBuilder.h
+//! @file      Sample/StandardSample/CompoundBuilder.h
 //! @brief     Defines class CompoundBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_COMPOUNDBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_COMPOUNDBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_COMPOUNDBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_COMPOUNDBUILDER_H
 
 class MultiLayer;
 
@@ -32,4 +32,4 @@ MultiLayer* createCompoundPlus();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_COMPOUNDBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_COMPOUNDBUILDER_H
diff --git a/Sample/StandardSamples/CoreAndShellBuilder.cpp b/Sample/StandardSample/CoreAndShellBuilder.cpp
similarity index 94%
rename from Sample/StandardSamples/CoreAndShellBuilder.cpp
rename to Sample/StandardSample/CoreAndShellBuilder.cpp
index 98a478ec9b1..4c12c03998c 100644
--- a/Sample/StandardSamples/CoreAndShellBuilder.cpp
+++ b/Sample/StandardSample/CoreAndShellBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/CoreAndShellBuilder.cpp
+//! @file      Sample/StandardSample/CoreAndShellBuilder.cpp
 //! @brief     Implements class CoreShellParticleBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/CoreAndShellBuilder.h"
+#include "Sample/StandardSample/CoreAndShellBuilder.h"
 #include "Base/Const/Units.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/Polyhedra.h"
@@ -21,7 +21,7 @@
 #include "Sample/Particle/CoreAndShell.h"
 #include "Sample/Particle/Particle.h"
 #include "Sample/Scattering/Rotations.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 using Units::deg;
 
diff --git a/Sample/StandardSamples/CoreAndShellBuilder.h b/Sample/StandardSample/CoreAndShellBuilder.h
similarity index 80%
rename from Sample/StandardSamples/CoreAndShellBuilder.h
rename to Sample/StandardSample/CoreAndShellBuilder.h
index a9f3544cf6a..0a718884978 100644
--- a/Sample/StandardSamples/CoreAndShellBuilder.h
+++ b/Sample/StandardSample/CoreAndShellBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/CoreAndShellBuilder.h
+//! @file      Sample/StandardSample/CoreAndShellBuilder.h
 //! @brief     Defines class CoreShellParticleBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_COREANDSHELLBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_COREANDSHELLBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_COREANDSHELLBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_COREANDSHELLBUILDER_H
 
 class MultiLayer;
 
@@ -36,4 +36,4 @@ MultiLayer* createCoreShellBoxRotateZandY();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_COREANDSHELLBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_COREANDSHELLBUILDER_H
diff --git a/Sample/StandardSamples/CustomMorphologyBuilder.cpp b/Sample/StandardSample/CustomMorphologyBuilder.cpp
similarity index 95%
rename from Sample/StandardSamples/CustomMorphologyBuilder.cpp
rename to Sample/StandardSample/CustomMorphologyBuilder.cpp
index 3e4871e587d..b35b87b5689 100644
--- a/Sample/StandardSamples/CustomMorphologyBuilder.cpp
+++ b/Sample/StandardSample/CustomMorphologyBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/CustomMorphologyBuilder.cpp
+//! @file      Sample/StandardSample/CustomMorphologyBuilder.cpp
 //! @brief     Implements class CustomMorphologyBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/CustomMorphologyBuilder.h"
+#include "Sample/StandardSample/CustomMorphologyBuilder.h"
 #include "Base/Const/Units.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/Polyhedra.h"
@@ -20,7 +20,7 @@
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
 #include "Sample/Scattering/Rotations.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 using Units::deg;
 
diff --git a/Sample/StandardSamples/CustomMorphologyBuilder.h b/Sample/StandardSample/CustomMorphologyBuilder.h
similarity index 75%
rename from Sample/StandardSamples/CustomMorphologyBuilder.h
rename to Sample/StandardSample/CustomMorphologyBuilder.h
index feae8f4b650..46c07d1d588 100644
--- a/Sample/StandardSamples/CustomMorphologyBuilder.h
+++ b/Sample/StandardSample/CustomMorphologyBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/CustomMorphologyBuilder.h
+//! @file      Sample/StandardSample/CustomMorphologyBuilder.h
 //! @brief     Defines class CustomMorphologyBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_CUSTOMMORPHOLOGYBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_CUSTOMMORPHOLOGYBUILDER_H
 
 class MultiLayer;
 
@@ -28,4 +28,4 @@ MultiLayer* createCustomMorphology();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_CUSTOMMORPHOLOGYBUILDER_H
diff --git a/Sample/StandardSamples/CylindersAndPrismsBuilder.cpp b/Sample/StandardSample/CylindersAndPrismsBuilder.cpp
similarity index 88%
rename from Sample/StandardSamples/CylindersAndPrismsBuilder.cpp
rename to Sample/StandardSample/CylindersAndPrismsBuilder.cpp
index b712bdfdb6e..7fc1ef6816d 100644
--- a/Sample/StandardSamples/CylindersAndPrismsBuilder.cpp
+++ b/Sample/StandardSample/CylindersAndPrismsBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/CylindersAndPrismsBuilder.cpp
+//! @file      Sample/StandardSample/CylindersAndPrismsBuilder.cpp
 //! @brief     Implements class CylindersAndPrismsBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,14 +12,14 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/CylindersAndPrismsBuilder.h"
+#include "Sample/StandardSample/CylindersAndPrismsBuilder.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/Cylinder.h"
 #include "Sample/HardParticle/Polyhedra.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 MultiLayer* ExemplarySamples::createCylindersAndPrisms()
 {
diff --git a/Sample/StandardSamples/CylindersAndPrismsBuilder.h b/Sample/StandardSample/CylindersAndPrismsBuilder.h
similarity index 75%
rename from Sample/StandardSamples/CylindersAndPrismsBuilder.h
rename to Sample/StandardSample/CylindersAndPrismsBuilder.h
index 6513b6ec6cf..9149892d187 100644
--- a/Sample/StandardSamples/CylindersAndPrismsBuilder.h
+++ b/Sample/StandardSample/CylindersAndPrismsBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/CylindersAndPrismsBuilder.h
+//! @file      Sample/StandardSample/CylindersAndPrismsBuilder.h
 //! @brief     Defines class CylindersAndPrismsBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_CYLINDERSANDPRISMSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_CYLINDERSANDPRISMSBUILDER_H
 
 class MultiLayer;
 
@@ -28,4 +28,4 @@ MultiLayer* createCylindersAndPrisms();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_CYLINDERSANDPRISMSBUILDER_H
diff --git a/Sample/StandardSamples/CylindersBuilder.cpp b/Sample/StandardSample/CylindersBuilder.cpp
similarity index 93%
rename from Sample/StandardSamples/CylindersBuilder.cpp
rename to Sample/StandardSample/CylindersBuilder.cpp
index 7b3bf16c721..e3232dc2daa 100644
--- a/Sample/StandardSamples/CylindersBuilder.cpp
+++ b/Sample/StandardSample/CylindersBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/CylindersBuilder.cpp
+//! @file      Sample/StandardSample/CylindersBuilder.cpp
 //! @brief     Implements classes of CylindersBuilder family.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,14 +12,14 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/CylindersBuilder.h"
+#include "Sample/StandardSample/CylindersBuilder.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/Cylinder.h"
 #include "Sample/Interface/LayerInterface.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 MultiLayer* ExemplarySamples::createCylindersInDWBA()
 {
diff --git a/Sample/StandardSamples/CylindersBuilder.h b/Sample/StandardSample/CylindersBuilder.h
similarity index 82%
rename from Sample/StandardSamples/CylindersBuilder.h
rename to Sample/StandardSample/CylindersBuilder.h
index d299e13f631..2a4321d2255 100644
--- a/Sample/StandardSamples/CylindersBuilder.h
+++ b/Sample/StandardSample/CylindersBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/CylindersBuilder.h
+//! @file      Sample/StandardSample/CylindersBuilder.h
 //! @brief     Defines classes of CylindersBuilder family.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_CYLINDERSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_CYLINDERSBUILDER_H
 
 class MultiLayer;
 
@@ -33,4 +33,4 @@ MultiLayer* createLargeCylindersInDWBA(double height = 1000, double radius = 500
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_CYLINDERSBUILDER_H
diff --git a/Sample/StandardSample/ExemplarySamples.h b/Sample/StandardSample/ExemplarySamples.h
new file mode 100644
index 00000000000..6287cd40c57
--- /dev/null
+++ b/Sample/StandardSample/ExemplarySamples.h
@@ -0,0 +1,53 @@
+//  ************************************************************************************************
+//
+//  BornAgain: simulate and fit reflection and scattering
+//
+//! @file      Sample/StandardSample/ExemplarySamples.h
+//! @brief     includes all StandardSample headers.
+//!
+//! @homepage  http://www.bornagainproject.org
+//! @license   GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+//  ************************************************************************************************
+
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_EXEMPLARYSAMPLES_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_EXEMPLARYSAMPLES_H
+
+class MultiLayer;
+
+#include "Sample/StandardSample/BoxCompositionBuilder.h"
+#include "Sample/StandardSample/BoxesSquareLatticeBuilder.h"
+#include "Sample/StandardSample/CompoundBuilder.h"
+#include "Sample/StandardSample/CoreAndShellBuilder.h"
+#include "Sample/StandardSample/CustomMorphologyBuilder.h"
+#include "Sample/StandardSample/CylindersAndPrismsBuilder.h"
+#include "Sample/StandardSample/CylindersBuilder.h"
+#include "Sample/StandardSample/FeNiBilayerBuilder.h"
+#include "Sample/StandardSample/HomogeneousMultilayerBuilder.h"
+#include "Sample/StandardSample/LatticeBuilder.h"
+#include "Sample/StandardSample/LayersWithAbsorptionBuilder.h"
+#include "Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.h"
+#include "Sample/StandardSample/MagneticLayersBuilder.h"
+#include "Sample/StandardSample/MagneticParticlesBuilder.h"
+#include "Sample/StandardSample/MesocrystalBuilder.h"
+#include "Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.h"
+#include "Sample/StandardSample/MultipleLayoutBuilder.h"
+#include "Sample/StandardSample/ParacrystalBuilder.h"
+#include "Sample/StandardSample/ParticleDistributionsBuilder.h"
+#include "Sample/StandardSample/ParticleInVacuumBuilder.h"
+#include "Sample/StandardSample/PercusYevickBuilder.h"
+#include "Sample/StandardSample/PlainMultiLayerBySLDBuilder.h"
+#include "Sample/StandardSample/ResonatorBuilder.h"
+#include "Sample/StandardSample/RipplesBuilder.h"
+#include "Sample/StandardSample/RotatedPyramidsBuilder.h"
+#include "Sample/StandardSample/SimpleLayerBuilder.h"
+#include "Sample/StandardSample/SizeDistributionModelsBuilder.h"
+#include "Sample/StandardSample/SlicedCompositionBuilder.h"
+#include "Sample/StandardSample/SlicedCylindersBuilder.h"
+#include "Sample/StandardSample/ThickAbsorptiveSampleBuilder.h"
+#include "Sample/StandardSample/TransformationsBuilder.h"
+#include "Sample/StandardSample/TwoDimLatticeBuilder.h"
+
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_EXEMPLARYSAMPLES_H
diff --git a/Sample/StandardSamples/FeNiBilayerBuilder.cpp b/Sample/StandardSample/FeNiBilayerBuilder.cpp
similarity index 98%
rename from Sample/StandardSamples/FeNiBilayerBuilder.cpp
rename to Sample/StandardSample/FeNiBilayerBuilder.cpp
index 0df3954766b..40bcc800dcf 100644
--- a/Sample/StandardSamples/FeNiBilayerBuilder.cpp
+++ b/Sample/StandardSample/FeNiBilayerBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/FeNiBilayerBuilder.cpp
+//! @file      Sample/StandardSample/FeNiBilayerBuilder.cpp
 //! @brief     Defines various sample builder classes to.
 //!            test polarized specular computations
 //!
@@ -13,7 +13,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/FeNiBilayerBuilder.h"
+#include "Sample/StandardSample/FeNiBilayerBuilder.h"
 #include "Base/Const/PhysicalConstants.h"
 #include "Base/Const/Units.h"
 #include "Sample/Interface/LayerRoughness.h"
diff --git a/Sample/StandardSamples/FeNiBilayerBuilder.h b/Sample/StandardSample/FeNiBilayerBuilder.h
similarity index 84%
rename from Sample/StandardSamples/FeNiBilayerBuilder.h
rename to Sample/StandardSample/FeNiBilayerBuilder.h
index c2f18eb3a04..c5b1f25758d 100644
--- a/Sample/StandardSamples/FeNiBilayerBuilder.h
+++ b/Sample/StandardSample/FeNiBilayerBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/FeNiBilayerBuilder.h
+//! @file      Sample/StandardSample/FeNiBilayerBuilder.h
 //! @brief     Defines various sample builder classes to.
 //!            test polarized specular computations
 //!
@@ -16,8 +16,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_FENIBILAYERBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_FENIBILAYERBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_FENIBILAYERBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_FENIBILAYERBUILDER_H
 
 class MultiLayer;
 
@@ -57,4 +57,4 @@ MultiLayer* createFeNiBilayerSpinFlipNC();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_FENIBILAYERBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_FENIBILAYERBUILDER_H
diff --git a/Sample/StandardSamples/HomogeneousMultilayerBuilder.cpp b/Sample/StandardSample/HomogeneousMultilayerBuilder.cpp
similarity index 92%
rename from Sample/StandardSamples/HomogeneousMultilayerBuilder.cpp
rename to Sample/StandardSample/HomogeneousMultilayerBuilder.cpp
index cf44ffee424..6f9d7c30ee4 100644
--- a/Sample/StandardSamples/HomogeneousMultilayerBuilder.cpp
+++ b/Sample/StandardSample/HomogeneousMultilayerBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/HomogeneousMultilayerBuilder.cpp
+//! @file      Sample/StandardSample/HomogeneousMultilayerBuilder.cpp
 //! @brief     Implements class HomogeneousMultilayerBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/HomogeneousMultilayerBuilder.h"
+#include "Sample/StandardSample/HomogeneousMultilayerBuilder.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
diff --git a/Sample/StandardSamples/HomogeneousMultilayerBuilder.h b/Sample/StandardSample/HomogeneousMultilayerBuilder.h
similarity index 77%
rename from Sample/StandardSamples/HomogeneousMultilayerBuilder.h
rename to Sample/StandardSample/HomogeneousMultilayerBuilder.h
index 7ddee607be3..a7a8f58dca2 100644
--- a/Sample/StandardSamples/HomogeneousMultilayerBuilder.h
+++ b/Sample/StandardSample/HomogeneousMultilayerBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/HomogeneousMultilayerBuilder.h
+//! @file      Sample/StandardSample/HomogeneousMultilayerBuilder.h
 //! @brief     Defines class HomogeneousMultilayerBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_HOMOGENEOUSMULTILAYERBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_HOMOGENEOUSMULTILAYERBUILDER_H
 
 class MultiLayer;
 
@@ -30,4 +30,4 @@ MultiLayer* createHomogeneousMultilayer();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_HOMOGENEOUSMULTILAYERBUILDER_H
diff --git a/Sample/StandardSamples/LatticeBuilder.cpp b/Sample/StandardSample/LatticeBuilder.cpp
similarity index 91%
rename from Sample/StandardSamples/LatticeBuilder.cpp
rename to Sample/StandardSample/LatticeBuilder.cpp
index d68eb0952b3..cd20ffebb5e 100644
--- a/Sample/StandardSamples/LatticeBuilder.cpp
+++ b/Sample/StandardSample/LatticeBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/LatticeBuilder.cpp
+//! @file      Sample/StandardSample/LatticeBuilder.cpp
 //! @brief     Implements class Lattice1DBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/LatticeBuilder.h"
+#include "Sample/StandardSample/LatticeBuilder.h"
 #include "Base/Const/Units.h"
 #include "Sample/Aggregate/Interference1DLattice.h"
 #include "Sample/Aggregate/ParticleLayout.h"
@@ -22,7 +22,7 @@
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 using Units::deg;
 
diff --git a/Sample/StandardSamples/LatticeBuilder.h b/Sample/StandardSample/LatticeBuilder.h
similarity index 77%
rename from Sample/StandardSamples/LatticeBuilder.h
rename to Sample/StandardSample/LatticeBuilder.h
index 12931acc57c..da5a722c365 100644
--- a/Sample/StandardSamples/LatticeBuilder.h
+++ b/Sample/StandardSample/LatticeBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/LatticeBuilder.h
+//! @file      Sample/StandardSample/LatticeBuilder.h
 //! @brief     Defines class Lattice1DBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_LATTICEBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_LATTICEBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_LATTICEBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_LATTICEBUILDER_H
 
 class MultiLayer;
 
@@ -28,4 +28,4 @@ MultiLayer* createLattice1D();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_LATTICEBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_LATTICEBUILDER_H
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp b/Sample/StandardSample/LayersWithAbsorptionBuilder.cpp
similarity index 89%
rename from Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
rename to Sample/StandardSample/LayersWithAbsorptionBuilder.cpp
index d66ad4fa999..29378c7256f 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
+++ b/Sample/StandardSample/LayersWithAbsorptionBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
+//! @file      Sample/StandardSample/LayersWithAbsorptionBuilder.cpp
 //! @brief     Implements class LayersWithAbsorptionBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/LayersWithAbsorptionBuilder.h"
+#include "Sample/StandardSample/LayersWithAbsorptionBuilder.h"
 #include "Base/Const/Units.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/Sphere.h"
@@ -20,7 +20,7 @@
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
 #include "Sample/Scattering/Rotations.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 using Units::deg;
 
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBuilder.h b/Sample/StandardSample/LayersWithAbsorptionBuilder.h
similarity index 77%
rename from Sample/StandardSamples/LayersWithAbsorptionBuilder.h
rename to Sample/StandardSample/LayersWithAbsorptionBuilder.h
index 02d20cc3cec..919c284f343 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBuilder.h
+++ b/Sample/StandardSample/LayersWithAbsorptionBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/LayersWithAbsorptionBuilder.h
+//! @file      Sample/StandardSample/LayersWithAbsorptionBuilder.h
 //! @brief     Defines class LayersWithAbsorptionBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_LAYERSWITHABSORPTIONBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_LAYERSWITHABSORPTIONBUILDER_H
 
 class IFormFactor;
 class MultiLayer;
@@ -32,4 +32,4 @@ MultiLayer* createLayersWithAbsorptionWithFF(const IFormFactor*);
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_LAYERSWITHABSORPTIONBUILDER_H
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp b/Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.cpp
similarity index 93%
rename from Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
rename to Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.cpp
index 9322ac34a18..3e98e0c5a9f 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
+++ b/Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
+//! @file      Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.cpp
 //! @brief     Implements class LayersWithAbsorptionBySLDBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h"
+#include "Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.h"
 #include "Base/Const/Units.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/Sphere.h"
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h b/Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.h
similarity index 77%
rename from Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h
rename to Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.h
index e0fc218ac6e..8cc9eeac406 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h
+++ b/Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h
+//! @file      Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.h
 //! @brief     Defines class LayersWithAbsorptionBySLDBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_LAYERSWITHABSORPTIONBYSLDBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_LAYERSWITHABSORPTIONBYSLDBUILDER_H
 
 class MultiLayer;
 
@@ -30,4 +30,4 @@ MultiLayer* createLayersWithAbsorptionBySLD();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_LAYERSWITHABSORPTIONBYSLDBUILDER_H
diff --git a/Sample/StandardSamples/MagneticLayersBuilder.cpp b/Sample/StandardSample/MagneticLayersBuilder.cpp
similarity index 98%
rename from Sample/StandardSamples/MagneticLayersBuilder.cpp
rename to Sample/StandardSample/MagneticLayersBuilder.cpp
index 66c338c2f21..77dfc3a4e5f 100644
--- a/Sample/StandardSamples/MagneticLayersBuilder.cpp
+++ b/Sample/StandardSample/MagneticLayersBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/MagneticLayersBuilder.cpp
+//! @file      Sample/StandardSample/MagneticLayersBuilder.cpp
 //! @brief    Implements class to build samples with magnetic layers.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/MagneticLayersBuilder.h"
+#include "Sample/StandardSample/MagneticLayersBuilder.h"
 #include "Base/Const/Units.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Aggregate/ParticleLayout.h"
diff --git a/Sample/StandardSamples/MagneticLayersBuilder.h b/Sample/StandardSample/MagneticLayersBuilder.h
similarity index 86%
rename from Sample/StandardSamples/MagneticLayersBuilder.h
rename to Sample/StandardSample/MagneticLayersBuilder.h
index 915eb4221af..d7943f40bd1 100644
--- a/Sample/StandardSamples/MagneticLayersBuilder.h
+++ b/Sample/StandardSample/MagneticLayersBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/MagneticLayersBuilder.h
+//! @file      Sample/StandardSample/MagneticLayersBuilder.h
 //! @brief    Defines class to build samples with magnetic layers.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_MAGNETICLAYERSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_MAGNETICLAYERSBUILDER_H
 
 class MultiLayer;
 
@@ -62,4 +62,4 @@ MultiLayer* createMagneticRotation();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_MAGNETICLAYERSBUILDER_H
diff --git a/Sample/StandardSamples/MagneticParticlesBuilder.cpp b/Sample/StandardSample/MagneticParticlesBuilder.cpp
similarity index 97%
rename from Sample/StandardSamples/MagneticParticlesBuilder.cpp
rename to Sample/StandardSample/MagneticParticlesBuilder.cpp
index 729c3913167..ee6321dbc4a 100644
--- a/Sample/StandardSamples/MagneticParticlesBuilder.cpp
+++ b/Sample/StandardSample/MagneticParticlesBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/MagneticParticlesBuilder.cpp
+//! @file      Sample/StandardSample/MagneticParticlesBuilder.cpp
 //! @brief     Implements classes to build magnetic samples.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/MagneticParticlesBuilder.h"
+#include "Sample/StandardSample/MagneticParticlesBuilder.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/Cylinder.h"
 #include "Sample/HardParticle/Sphere.h"
diff --git a/Sample/StandardSamples/MagneticParticlesBuilder.h b/Sample/StandardSample/MagneticParticlesBuilder.h
similarity index 81%
rename from Sample/StandardSamples/MagneticParticlesBuilder.h
rename to Sample/StandardSample/MagneticParticlesBuilder.h
index 5eff113f38a..03195cd670d 100644
--- a/Sample/StandardSamples/MagneticParticlesBuilder.h
+++ b/Sample/StandardSample/MagneticParticlesBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/MagneticParticlesBuilder.h
+//! @file      Sample/StandardSample/MagneticParticlesBuilder.h
 //! @brief    Defines class to build magnetic samples.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_MAGNETICPARTICLESBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_MAGNETICPARTICLESBUILDER_H
 
 class MultiLayer;
 
@@ -44,4 +44,4 @@ MultiLayer* createMagneticSpheres();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_MAGNETICPARTICLESBUILDER_H
diff --git a/Sample/StandardSamples/MesocrystalBuilder.cpp b/Sample/StandardSample/MesocrystalBuilder.cpp
similarity index 94%
rename from Sample/StandardSamples/MesocrystalBuilder.cpp
rename to Sample/StandardSample/MesocrystalBuilder.cpp
index c35103519dc..bd4f97fd5f9 100644
--- a/Sample/StandardSamples/MesocrystalBuilder.cpp
+++ b/Sample/StandardSample/MesocrystalBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/MesocrystalBuilder.cpp
+//! @file      Sample/StandardSample/MesocrystalBuilder.cpp
 //! @brief     Implements class MesocrystalBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/MesocrystalBuilder.h"
+#include "Sample/StandardSample/MesocrystalBuilder.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/Cylinder.h"
 #include "Sample/HardParticle/Polyhedra.h"
@@ -23,7 +23,7 @@
 #include "Sample/Particle/Crystal.h"
 #include "Sample/Particle/Mesocrystal.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 MultiLayer* ExemplarySamples::createMesocrystal()
 {
diff --git a/Sample/StandardSamples/MesocrystalBuilder.h b/Sample/StandardSample/MesocrystalBuilder.h
similarity index 79%
rename from Sample/StandardSamples/MesocrystalBuilder.h
rename to Sample/StandardSample/MesocrystalBuilder.h
index 7448093fece..0f48baa9ca6 100644
--- a/Sample/StandardSamples/MesocrystalBuilder.h
+++ b/Sample/StandardSample/MesocrystalBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/MesocrystalBuilder.h
+//! @file      Sample/StandardSample/MesocrystalBuilder.h
 //! @brief     Defines class MesocrystalBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_MESOCRYSTALBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_MESOCRYSTALBUILDER_H
 
 class MultiLayer;
 
@@ -32,4 +32,4 @@ MultiLayer* createMesocrystalPlus();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_MESOCRYSTALBUILDER_H
diff --git a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp b/Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.cpp
similarity index 85%
rename from Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
rename to Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.cpp
index 247e45c8506..31228462c37 100644
--- a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
+++ b/Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
+//! @file      Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.cpp
 //! @brief     Implement class MultiLayerWithNCRoughnessBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h"
+#include "Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.h"
 #include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Multilayer/MultiLayer.h"
 
diff --git a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h b/Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.h
similarity index 69%
rename from Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
rename to Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.h
index 44466c07670..b2382caab79 100644
--- a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
+++ b/Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
+//! @file      Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.h
 //! @brief     Defines class MultiLayerWithNCRoughnessBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,12 +15,12 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTILAYERWITHNCROUGHNESSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTILAYERWITHNCROUGHNESSBUILDER_H
 
 class MultiLayer;
 
-#include "Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h"
+#include "Sample/StandardSample/MultiLayerWithRoughnessBuilder.h"
 
 //! Builds sample: layers with correlated roughness.
 
@@ -30,4 +30,4 @@ MultiLayer* createMultiLayerWithNCRoughness();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTILAYERWITHNCROUGHNESSBUILDER_H
diff --git a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp b/Sample/StandardSample/MultiLayerWithRoughnessBuilder.cpp
similarity index 93%
rename from Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
rename to Sample/StandardSample/MultiLayerWithRoughnessBuilder.cpp
index 30c59abf582..d47c50ac1de 100644
--- a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
+++ b/Sample/StandardSample/MultiLayerWithRoughnessBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
+//! @file      Sample/StandardSample/MultiLayerWithRoughnessBuilder.cpp
 //! @brief     Implement class MultiLayerWithRoughnessBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h"
+#include "Sample/StandardSample/MultiLayerWithRoughnessBuilder.h"
 #include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
diff --git a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h b/Sample/StandardSample/MultiLayerWithRoughnessBuilder.h
similarity index 73%
rename from Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h
rename to Sample/StandardSample/MultiLayerWithRoughnessBuilder.h
index bf58867e2ad..4115c3084f3 100644
--- a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h
+++ b/Sample/StandardSample/MultiLayerWithRoughnessBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h
+//! @file      Sample/StandardSample/MultiLayerWithRoughnessBuilder.h
 //! @brief     Defines class MultiLayerWithRoughnessBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTILAYERWITHROUGHNESSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTILAYERWITHROUGHNESSBUILDER_H
 
 class MultiLayer;
 
@@ -28,4 +28,4 @@ MultiLayer* createMultiLayerWithRoughness();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTILAYERWITHROUGHNESSBUILDER_H
diff --git a/Sample/StandardSamples/MultipleLayoutBuilder.cpp b/Sample/StandardSample/MultipleLayoutBuilder.cpp
similarity index 90%
rename from Sample/StandardSamples/MultipleLayoutBuilder.cpp
rename to Sample/StandardSample/MultipleLayoutBuilder.cpp
index f70025583d1..0da086ceb99 100644
--- a/Sample/StandardSamples/MultipleLayoutBuilder.cpp
+++ b/Sample/StandardSample/MultipleLayoutBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/MultipleLayoutBuilder.cpp
+//! @file      Sample/StandardSample/MultipleLayoutBuilder.cpp
 //! @brief     Implements class MultipleLayoutBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,14 +12,14 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/MultipleLayoutBuilder.h"
+#include "Sample/StandardSample/MultipleLayoutBuilder.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/Cylinder.h"
 #include "Sample/HardParticle/Polyhedra.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 MultiLayer* ExemplarySamples::createMultipleLayout()
 {
diff --git a/Sample/StandardSamples/MultipleLayoutBuilder.h b/Sample/StandardSample/MultipleLayoutBuilder.h
similarity index 77%
rename from Sample/StandardSamples/MultipleLayoutBuilder.h
rename to Sample/StandardSample/MultipleLayoutBuilder.h
index 5b4f020ccaf..4de79862808 100644
--- a/Sample/StandardSamples/MultipleLayoutBuilder.h
+++ b/Sample/StandardSample/MultipleLayoutBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/MultipleLayoutBuilder.h
+//! @file      Sample/StandardSample/MultipleLayoutBuilder.h
 //! @brief     Defines class MultipleLayoutBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTIPLELAYOUTBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTIPLELAYOUTBUILDER_H
 
 class MultiLayer;
 
@@ -29,4 +29,4 @@ MultiLayer* createMultipleLayout();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTIPLELAYOUTBUILDER_H
diff --git a/Sample/StandardSamples/ParacrystalBuilder.cpp b/Sample/StandardSample/ParacrystalBuilder.cpp
similarity index 96%
rename from Sample/StandardSamples/ParacrystalBuilder.cpp
rename to Sample/StandardSample/ParacrystalBuilder.cpp
index 7335e9739a5..6ccccf5d168 100644
--- a/Sample/StandardSamples/ParacrystalBuilder.cpp
+++ b/Sample/StandardSample/ParacrystalBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/ParacrystalBuilder.cpp
+//! @file      Sample/StandardSample/ParacrystalBuilder.cpp
 //! @brief     Implements class ParacrystalBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/ParacrystalBuilder.h"
+#include "Sample/StandardSample/ParacrystalBuilder.h"
 #include "Base/Const/Units.h"
 #include "Base/Util/Assert.h"
 #include "Sample/Aggregate/Interference2DParacrystal.h"
@@ -22,7 +22,7 @@
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 using Units::deg;
 
diff --git a/Sample/StandardSamples/ParacrystalBuilder.h b/Sample/StandardSample/ParacrystalBuilder.h
similarity index 86%
rename from Sample/StandardSamples/ParacrystalBuilder.h
rename to Sample/StandardSample/ParacrystalBuilder.h
index 39fa5fdf8b2..f00a368bf16 100644
--- a/Sample/StandardSamples/ParacrystalBuilder.h
+++ b/Sample/StandardSample/ParacrystalBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/ParacrystalBuilder.h
+//! @file      Sample/StandardSample/ParacrystalBuilder.h
 //! @brief     Defines classes of ParacrystalBuilder family.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARACRYSTALBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARACRYSTALBUILDER_H
 
 class IProfile2D;
 class MultiLayer;
@@ -55,4 +55,4 @@ MultiLayer* createRectParacrystal();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARACRYSTALBUILDER_H
diff --git a/Sample/StandardSamples/ParticleDistributionsBuilder.cpp b/Sample/StandardSample/ParticleDistributionsBuilder.cpp
similarity index 98%
rename from Sample/StandardSamples/ParticleDistributionsBuilder.cpp
rename to Sample/StandardSample/ParticleDistributionsBuilder.cpp
index 129dc4bca83..90d90cb205d 100644
--- a/Sample/StandardSamples/ParticleDistributionsBuilder.cpp
+++ b/Sample/StandardSample/ParticleDistributionsBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/ParticleDistributionsBuilder.cpp
+//! @file      Sample/StandardSample/ParticleDistributionsBuilder.cpp
 //! @brief     Implements classes of with different types of particle distributions.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/ParticleDistributionsBuilder.h"
+#include "Sample/StandardSample/ParticleDistributionsBuilder.h"
 #include "Param/Distrib/Distributions.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/Cone.h"
@@ -22,7 +22,7 @@
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 MultiLayer* ExemplarySamples::createCylindersWithSizeDistribution()
 {
diff --git a/Sample/StandardSamples/ParticleDistributionsBuilder.h b/Sample/StandardSample/ParticleDistributionsBuilder.h
similarity index 86%
rename from Sample/StandardSamples/ParticleDistributionsBuilder.h
rename to Sample/StandardSample/ParticleDistributionsBuilder.h
index 680c80664e6..e9cbec98f0c 100644
--- a/Sample/StandardSamples/ParticleDistributionsBuilder.h
+++ b/Sample/StandardSample/ParticleDistributionsBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/ParticleDistributionsBuilder.h
+//! @file      Sample/StandardSample/ParticleDistributionsBuilder.h
 //! @brief     Defines classes of with different types of particle distributions.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARTICLEDISTRIBUTIONSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARTICLEDISTRIBUTIONSBUILDER_H
 
 class MultiLayer;
 
@@ -68,4 +68,4 @@ MultiLayer* createLinkedBoxDistribution();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARTICLEDISTRIBUTIONSBUILDER_H
diff --git a/Sample/StandardSamples/ParticleInVacuumBuilder.cpp b/Sample/StandardSample/ParticleInVacuumBuilder.cpp
similarity index 86%
rename from Sample/StandardSamples/ParticleInVacuumBuilder.cpp
rename to Sample/StandardSample/ParticleInVacuumBuilder.cpp
index 166b0065b7f..705c2fbf689 100644
--- a/Sample/StandardSamples/ParticleInVacuumBuilder.cpp
+++ b/Sample/StandardSample/ParticleInVacuumBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/ParticleInVacuumBuilder.cpp
+//! @file      Sample/StandardSample/ParticleInVacuumBuilder.cpp
 //! @brief     Implements class ParticleInVacuumBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,13 +12,13 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/ParticleInVacuumBuilder.h"
+#include "Sample/StandardSample/ParticleInVacuumBuilder.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/Sphere.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 #include <iostream>
 
 MultiLayer* ExemplarySamples::createParticleInVacuumWithFF(const IFormFactor* ff)
diff --git a/Sample/StandardSamples/ParticleInVacuumBuilder.h b/Sample/StandardSample/ParticleInVacuumBuilder.h
similarity index 77%
rename from Sample/StandardSamples/ParticleInVacuumBuilder.h
rename to Sample/StandardSample/ParticleInVacuumBuilder.h
index 970761e7192..f4b21fe0f2e 100644
--- a/Sample/StandardSamples/ParticleInVacuumBuilder.h
+++ b/Sample/StandardSample/ParticleInVacuumBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/ParticleInVacuumBuilder.h
+//! @file      Sample/StandardSample/ParticleInVacuumBuilder.h
 //! @brief     Defines class ParticleInVacuumBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEINVACUUMBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEINVACUUMBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARTICLEINVACUUMBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARTICLEINVACUUMBUILDER_H
 
 class IFormFactor;
 class MultiLayer;
@@ -30,4 +30,4 @@ MultiLayer* createParticleInVacuumWithFF(const IFormFactor*);
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEINVACUUMBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARTICLEINVACUUMBUILDER_H
diff --git a/Sample/StandardSamples/PercusYevickBuilder.cpp b/Sample/StandardSample/PercusYevickBuilder.cpp
similarity index 90%
rename from Sample/StandardSamples/PercusYevickBuilder.cpp
rename to Sample/StandardSample/PercusYevickBuilder.cpp
index be6a3deac61..806f07c5718 100644
--- a/Sample/StandardSamples/PercusYevickBuilder.cpp
+++ b/Sample/StandardSample/PercusYevickBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/PercusYevickBuilder.cpp
+//! @file      Sample/StandardSample/PercusYevickBuilder.cpp
 //! @brief     Implements class PercusYevickBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,14 +12,14 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/PercusYevickBuilder.h"
+#include "Sample/StandardSample/PercusYevickBuilder.h"
 #include "Sample/Aggregate/InterferenceHardDisk.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/Cylinder.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 MultiLayer* ExemplarySamples::createHardDisk()
 {
diff --git a/Sample/StandardSamples/PercusYevickBuilder.h b/Sample/StandardSample/PercusYevickBuilder.h
similarity index 76%
rename from Sample/StandardSamples/PercusYevickBuilder.h
rename to Sample/StandardSample/PercusYevickBuilder.h
index 4eff14427e7..1e324570861 100644
--- a/Sample/StandardSamples/PercusYevickBuilder.h
+++ b/Sample/StandardSample/PercusYevickBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/PercusYevickBuilder.h
+//! @file      Sample/StandardSample/PercusYevickBuilder.h
 //! @brief     Defines classes of PercusYevickBuilder family.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_PERCUSYEVICKBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_PERCUSYEVICKBUILDER_H
 
 class MultiLayer;
 
@@ -28,4 +28,4 @@ MultiLayer* createHardDisk();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_PERCUSYEVICKBUILDER_H
diff --git a/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.cpp b/Sample/StandardSample/PlainMultiLayerBySLDBuilder.cpp
similarity index 93%
rename from Sample/StandardSamples/PlainMultiLayerBySLDBuilder.cpp
rename to Sample/StandardSample/PlainMultiLayerBySLDBuilder.cpp
index f39e69c963f..56b610a1448 100644
--- a/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.cpp
+++ b/Sample/StandardSample/PlainMultiLayerBySLDBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/PlainMultiLayerBySLDBuilder.cpp
+//! @file      Sample/StandardSample/PlainMultiLayerBySLDBuilder.cpp
 //! @brief     Implements class PlainMultiLayerBySLDBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h"
+#include "Sample/StandardSample/PlainMultiLayerBySLDBuilder.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
diff --git a/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h b/Sample/StandardSample/PlainMultiLayerBySLDBuilder.h
similarity index 77%
rename from Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h
rename to Sample/StandardSample/PlainMultiLayerBySLDBuilder.h
index accf8853c96..835ee60b93e 100644
--- a/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h
+++ b/Sample/StandardSample/PlainMultiLayerBySLDBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h
+//! @file      Sample/StandardSample/PlainMultiLayerBySLDBuilder.h
 //! @brief     Declares class the PlainMultiLayerBySLDBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_PLAINMULTILAYERBYSLDBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_PLAINMULTILAYERBYSLDBUILDER_H
 
 class MultiLayer;
 
@@ -29,4 +29,4 @@ MultiLayer* createPlainMultiLayerBySLD(int n_layers = 10, double thick_ti = 3.0)
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_PLAINMULTILAYERBYSLDBUILDER_H
diff --git a/Sample/StandardSamples/ReferenceMaterials.h b/Sample/StandardSample/ReferenceMaterials.h
similarity index 84%
rename from Sample/StandardSamples/ReferenceMaterials.h
rename to Sample/StandardSample/ReferenceMaterials.h
index 6bacfa2ca8e..7c9227cedcd 100644
--- a/Sample/StandardSamples/ReferenceMaterials.h
+++ b/Sample/StandardSample/ReferenceMaterials.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/ReferenceMaterials.h
+//! @file      Sample/StandardSample/ReferenceMaterials.h
 //! @brief     Defines materials in namespace refMat.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_REFERENCEMATERIALS_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_REFERENCEMATERIALS_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_REFERENCEMATERIALS_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_REFERENCEMATERIALS_H
 
 class MultiLayer;
 
@@ -38,4 +38,4 @@ const Material Substrate2 = RefractiveMaterial("Substrate2", 3.212e-6, 3.244e-8)
 
 } // namespace refMat
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_REFERENCEMATERIALS_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_REFERENCEMATERIALS_H
diff --git a/Sample/StandardSamples/ResonatorBuilder.cpp b/Sample/StandardSample/ResonatorBuilder.cpp
similarity index 94%
rename from Sample/StandardSamples/ResonatorBuilder.cpp
rename to Sample/StandardSample/ResonatorBuilder.cpp
index 3ced2372999..89b480235b5 100644
--- a/Sample/StandardSamples/ResonatorBuilder.cpp
+++ b/Sample/StandardSample/ResonatorBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/ResonatorBuilder.cpp
+//! @file      Sample/StandardSample/ResonatorBuilder.cpp
 //! @brief     Implements class ResonatorBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/ResonatorBuilder.h"
+#include "Sample/StandardSample/ResonatorBuilder.h"
 #include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
diff --git a/Sample/StandardSamples/ResonatorBuilder.h b/Sample/StandardSample/ResonatorBuilder.h
similarity index 77%
rename from Sample/StandardSamples/ResonatorBuilder.h
rename to Sample/StandardSample/ResonatorBuilder.h
index 5ced26c27b5..cd2c8ef0b27 100644
--- a/Sample/StandardSamples/ResonatorBuilder.h
+++ b/Sample/StandardSample/ResonatorBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/ResonatorBuilder.h
+//! @file      Sample/StandardSample/ResonatorBuilder.h
 //! @brief     Defines class ResonatorBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_RESONATORBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_RESONATORBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_RESONATORBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_RESONATORBUILDER_H
 
 class MultiLayer;
 
@@ -28,4 +28,4 @@ MultiLayer* createResonator(double ti_thickness = 13.0);
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_RESONATORBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_RESONATORBUILDER_H
diff --git a/Sample/StandardSamples/RipplesBuilder.cpp b/Sample/StandardSample/RipplesBuilder.cpp
similarity index 93%
rename from Sample/StandardSamples/RipplesBuilder.cpp
rename to Sample/StandardSample/RipplesBuilder.cpp
index 484e1c6b15c..e4a0fb69359 100644
--- a/Sample/StandardSamples/RipplesBuilder.cpp
+++ b/Sample/StandardSample/RipplesBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/RipplesBuilder.cpp
+//! @file      Sample/StandardSample/RipplesBuilder.cpp
 //! @brief     Implement classes to build various ripples.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/RipplesBuilder.h"
+#include "Sample/StandardSample/RipplesBuilder.h"
 #include "Sample/Aggregate/InterferenceRadialParacrystal.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/CosineRipple.h"
@@ -20,7 +20,7 @@
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 MultiLayer* ExemplarySamples::createCosineRipple()
 {
diff --git a/Sample/StandardSamples/RipplesBuilder.h b/Sample/StandardSample/RipplesBuilder.h
similarity index 83%
rename from Sample/StandardSamples/RipplesBuilder.h
rename to Sample/StandardSample/RipplesBuilder.h
index d4c3fd16cab..a16f88fa5e1 100644
--- a/Sample/StandardSamples/RipplesBuilder.h
+++ b/Sample/StandardSample/RipplesBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/RipplesBuilder.h
+//! @file      Sample/StandardSample/RipplesBuilder.h
 //! @brief     Defines classes to build various ripples.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_RIPPLESBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_RIPPLESBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_RIPPLESBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_RIPPLESBUILDER_H
 
 class MultiLayer;
 
@@ -42,4 +42,4 @@ MultiLayer* createAsymRipple();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_RIPPLESBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_RIPPLESBUILDER_H
diff --git a/Sample/StandardSamples/RotatedPyramidsBuilder.cpp b/Sample/StandardSample/RotatedPyramidsBuilder.cpp
similarity index 89%
rename from Sample/StandardSamples/RotatedPyramidsBuilder.cpp
rename to Sample/StandardSample/RotatedPyramidsBuilder.cpp
index 8c5b0efe9de..0a498108b15 100644
--- a/Sample/StandardSamples/RotatedPyramidsBuilder.cpp
+++ b/Sample/StandardSample/RotatedPyramidsBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/RotatedPyramidsBuilder.cpp
+//! @file      Sample/StandardSample/RotatedPyramidsBuilder.cpp
 //! @brief     Implements classe RotatedPyramidsBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/RotatedPyramidsBuilder.h"
+#include "Sample/StandardSample/RotatedPyramidsBuilder.h"
 #include "Base/Const/Units.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/Polyhedra.h"
@@ -20,7 +20,7 @@
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
 #include "Sample/Scattering/Rotations.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 using Units::deg;
 
diff --git a/Sample/StandardSamples/RotatedPyramidsBuilder.h b/Sample/StandardSample/RotatedPyramidsBuilder.h
similarity index 76%
rename from Sample/StandardSamples/RotatedPyramidsBuilder.h
rename to Sample/StandardSample/RotatedPyramidsBuilder.h
index 36e98816c58..891e9b1fb84 100644
--- a/Sample/StandardSamples/RotatedPyramidsBuilder.h
+++ b/Sample/StandardSample/RotatedPyramidsBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/RotatedPyramidsBuilder.h
+//! @file      Sample/StandardSample/RotatedPyramidsBuilder.h
 //! @brief     Defines class RotatedPyramidsBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_ROTATEDPYRAMIDSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_ROTATEDPYRAMIDSBUILDER_H
 
 class MultiLayer;
 
@@ -28,4 +28,4 @@ MultiLayer* createRotatedPyramids();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_ROTATEDPYRAMIDSBUILDER_H
diff --git a/Sample/StandardSamples/SimpleLayerBuilder.cpp b/Sample/StandardSample/SimpleLayerBuilder.cpp
similarity index 85%
rename from Sample/StandardSamples/SimpleLayerBuilder.cpp
rename to Sample/StandardSample/SimpleLayerBuilder.cpp
index 8a693cdbd32..cebccb1bd06 100644
--- a/Sample/StandardSamples/SimpleLayerBuilder.cpp
+++ b/Sample/StandardSample/SimpleLayerBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/SimpleLayerBuilder.cpp
+//! @file      Sample/StandardSample/SimpleLayerBuilder.cpp
 //! @brief     Implements class SimpleLayerBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,10 +12,10 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/SimpleLayerBuilder.h"
+#include "Sample/StandardSample/SimpleLayerBuilder.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 MultiLayer* ExemplarySamples::createSimpleLayer()
 {
diff --git a/Sample/StandardSamples/SimpleLayerBuilder.h b/Sample/StandardSample/SimpleLayerBuilder.h
similarity index 77%
rename from Sample/StandardSamples/SimpleLayerBuilder.h
rename to Sample/StandardSample/SimpleLayerBuilder.h
index c4f4eb094ba..b5afbb067b3 100644
--- a/Sample/StandardSamples/SimpleLayerBuilder.h
+++ b/Sample/StandardSample/SimpleLayerBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/SimpleLayerBuilder.h
+//! @file      Sample/StandardSample/SimpleLayerBuilder.h
 //! @brief     Defines class SimpleLayerBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIMPLELAYERBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIMPLELAYERBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIMPLELAYERBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIMPLELAYERBUILDER_H
 
 class IFormFactor;
 class MultiLayer;
@@ -29,4 +29,4 @@ MultiLayer* createSimpleLayer();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIMPLELAYERBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIMPLELAYERBUILDER_H
diff --git a/Sample/StandardSamples/SimpleLayersBuilder.h b/Sample/StandardSample/SimpleLayersBuilder.h
similarity index 79%
rename from Sample/StandardSamples/SimpleLayersBuilder.h
rename to Sample/StandardSample/SimpleLayersBuilder.h
index 487982417a5..bbff11f9499 100644
--- a/Sample/StandardSamples/SimpleLayersBuilder.h
+++ b/Sample/StandardSample/SimpleLayersBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/SimpleLayersBuilder.h
+//! @file      Sample/StandardSample/SimpleLayersBuilder.h
 //! @brief     Defines class LayersWithAbsorptionBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIMPLELAYERSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIMPLELAYERSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIMPLELAYERSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIMPLELAYERSBUILDER_H
 
 class IFormFactor;
 class MultiLayer;
@@ -32,4 +32,4 @@ MultiLayer* createLayersWithAbsorptionWithFF(const IFormFactor*);
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIMPLELAYERSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIMPLELAYERSBUILDER_H
diff --git a/Sample/StandardSamples/SizeDistributionModelsBuilder.cpp b/Sample/StandardSample/SizeDistributionModelsBuilder.cpp
similarity index 96%
rename from Sample/StandardSamples/SizeDistributionModelsBuilder.cpp
rename to Sample/StandardSample/SizeDistributionModelsBuilder.cpp
index 4726471c05b..717d0221fa6 100644
--- a/Sample/StandardSamples/SizeDistributionModelsBuilder.cpp
+++ b/Sample/StandardSample/SizeDistributionModelsBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/SizeDistributionModelsBuilder.cpp
+//! @file      Sample/StandardSample/SizeDistributionModelsBuilder.cpp
 //! @brief     Implements class ParticlesInSSCABuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/SizeDistributionModelsBuilder.h"
+#include "Sample/StandardSample/SizeDistributionModelsBuilder.h"
 #include "Param/Distrib/Distributions.h"
 #include "Sample/Aggregate/InterferenceRadialParacrystal.h"
 #include "Sample/Aggregate/ParticleLayout.h"
@@ -20,7 +20,7 @@
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 MultiLayer* ExemplarySamples::createSizeDistributionDAModel()
 {
diff --git a/Sample/StandardSamples/SizeDistributionModelsBuilder.h b/Sample/StandardSample/SizeDistributionModelsBuilder.h
similarity index 85%
rename from Sample/StandardSamples/SizeDistributionModelsBuilder.h
rename to Sample/StandardSample/SizeDistributionModelsBuilder.h
index 8eeae8dc253..9c8f9289416 100644
--- a/Sample/StandardSamples/SizeDistributionModelsBuilder.h
+++ b/Sample/StandardSample/SizeDistributionModelsBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/SizeDistributionModelsBuilder.h
+//! @file      Sample/StandardSample/SizeDistributionModelsBuilder.h
 //! @brief     Defines various sample builder classes to test DA, LMA, SSCA approximations.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIZEDISTRIBUTIONMODELSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIZEDISTRIBUTIONMODELSBUILDER_H
 
 class MultiLayer;
 
@@ -55,4 +55,4 @@ MultiLayer* createCylindersInSSCA();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIZEDISTRIBUTIONMODELSBUILDER_H
diff --git a/Sample/StandardSamples/SlicedCompositionBuilder.cpp b/Sample/StandardSample/SlicedCompositionBuilder.cpp
similarity index 91%
rename from Sample/StandardSamples/SlicedCompositionBuilder.cpp
rename to Sample/StandardSample/SlicedCompositionBuilder.cpp
index ce9ca9256e6..4f0dadf06e7 100644
--- a/Sample/StandardSamples/SlicedCompositionBuilder.cpp
+++ b/Sample/StandardSample/SlicedCompositionBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/SlicedCompositionBuilder.cpp
+//! @file      Sample/StandardSample/SlicedCompositionBuilder.cpp
 //! @brief     Defines classes to build various particles crossing interfaces.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/SlicedCompositionBuilder.h"
+#include "Sample/StandardSample/SlicedCompositionBuilder.h"
 #include "Base/Const/Units.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/TruncatedSphere.h"
@@ -21,7 +21,7 @@
 #include "Sample/Particle/Compound.h"
 #include "Sample/Particle/Particle.h"
 #include "Sample/Scattering/Rotations.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 using Units::deg;
 
diff --git a/Sample/StandardSamples/SlicedCompositionBuilder.h b/Sample/StandardSample/SlicedCompositionBuilder.h
similarity index 76%
rename from Sample/StandardSamples/SlicedCompositionBuilder.h
rename to Sample/StandardSample/SlicedCompositionBuilder.h
index 31f413f1aa4..daea45c43a3 100644
--- a/Sample/StandardSamples/SlicedCompositionBuilder.h
+++ b/Sample/StandardSample/SlicedCompositionBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/SlicedCompositionBuilder.h
+//! @file      Sample/StandardSample/SlicedCompositionBuilder.h
 //! @brief     Defines classes to build various particles crossing interfaces.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCOMPOSITIONBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCOMPOSITIONBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_SLICEDCOMPOSITIONBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_SLICEDCOMPOSITIONBUILDER_H
 
 class MultiLayer;
 
@@ -28,4 +28,4 @@ MultiLayer* createSlicedComposition();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCOMPOSITIONBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_SLICEDCOMPOSITIONBUILDER_H
diff --git a/Sample/StandardSamples/SlicedCylindersBuilder.cpp b/Sample/StandardSample/SlicedCylindersBuilder.cpp
similarity index 97%
rename from Sample/StandardSamples/SlicedCylindersBuilder.cpp
rename to Sample/StandardSample/SlicedCylindersBuilder.cpp
index 97e27c7cef5..2a00d4ac54d 100644
--- a/Sample/StandardSamples/SlicedCylindersBuilder.cpp
+++ b/Sample/StandardSample/SlicedCylindersBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/SlicedCylindersBuilder.cpp
+//! @file      Sample/StandardSample/SlicedCylindersBuilder.cpp
 //! @brief     Implements classes for testing slicing machinery.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/SlicedCylindersBuilder.h"
+#include "Sample/StandardSample/SlicedCylindersBuilder.h"
 #include "Base/Const/Units.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/Cylinder.h"
diff --git a/Sample/StandardSamples/SlicedCylindersBuilder.h b/Sample/StandardSample/SlicedCylindersBuilder.h
similarity index 83%
rename from Sample/StandardSamples/SlicedCylindersBuilder.h
rename to Sample/StandardSample/SlicedCylindersBuilder.h
index b6349471092..a165384ab63 100644
--- a/Sample/StandardSamples/SlicedCylindersBuilder.h
+++ b/Sample/StandardSample/SlicedCylindersBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/SlicedCylindersBuilder.h
+//! @file      Sample/StandardSample/SlicedCylindersBuilder.h
 //! @brief     Defines classes for testing slicing machinery.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_SLICEDCYLINDERSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_SLICEDCYLINDERSBUILDER_H
 
 class MultiLayer;
 
@@ -47,4 +47,4 @@ MultiLayer* createAveragedSlicedCylinders();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_SLICEDCYLINDERSBUILDER_H
diff --git a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp b/Sample/StandardSample/ThickAbsorptiveSampleBuilder.cpp
similarity index 91%
rename from Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
rename to Sample/StandardSample/ThickAbsorptiveSampleBuilder.cpp
index 57a6374cf98..7a72ac74a21 100644
--- a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
+++ b/Sample/StandardSample/ThickAbsorptiveSampleBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
+//! @file      Sample/StandardSample/ThickAbsorptiveSampleBuilder.cpp
 //! @brief     Implements class to build thick highly-absorptive sample with roughness.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h"
+#include "Sample/StandardSample/ThickAbsorptiveSampleBuilder.h"
 #include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
diff --git a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h b/Sample/StandardSample/ThickAbsorptiveSampleBuilder.h
similarity index 73%
rename from Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h
rename to Sample/StandardSample/ThickAbsorptiveSampleBuilder.h
index 2a8d9c4bcd4..c2d45be5338 100644
--- a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h
+++ b/Sample/StandardSample/ThickAbsorptiveSampleBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h
+//! @file      Sample/StandardSample/ThickAbsorptiveSampleBuilder.h
 //! @brief     Defines class to build thick highly-absorptive sample with roughness.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_THICKABSORPTIVESAMPLEBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_THICKABSORPTIVESAMPLEBUILDER_H
 
 class MultiLayer;
 
@@ -26,4 +26,4 @@ MultiLayer* createThickAbsorptiveSample();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_THICKABSORPTIVESAMPLEBUILDER_H
diff --git a/Sample/StandardSamples/TransformationsBuilder.cpp b/Sample/StandardSample/TransformationsBuilder.cpp
similarity index 90%
rename from Sample/StandardSamples/TransformationsBuilder.cpp
rename to Sample/StandardSample/TransformationsBuilder.cpp
index 549d9835c85..77795ab44cf 100644
--- a/Sample/StandardSamples/TransformationsBuilder.cpp
+++ b/Sample/StandardSample/TransformationsBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/TransformationsBuilder.cpp
+//! @file      Sample/StandardSample/TransformationsBuilder.cpp
 //! @brief     Implements classes to build samples with different transformations.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/TransformationsBuilder.h"
+#include "Sample/StandardSample/TransformationsBuilder.h"
 #include "Base/Const/Units.h"
 #include "Sample/Aggregate/ParticleLayout.h"
 #include "Sample/HardParticle/Polyhedra.h"
@@ -20,7 +20,7 @@
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
 #include "Sample/Scattering/Rotations.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 using Units::deg;
 
diff --git a/Sample/StandardSamples/TransformationsBuilder.h b/Sample/StandardSample/TransformationsBuilder.h
similarity index 75%
rename from Sample/StandardSamples/TransformationsBuilder.h
rename to Sample/StandardSample/TransformationsBuilder.h
index 0c6d0d12aeb..841250cad36 100644
--- a/Sample/StandardSamples/TransformationsBuilder.h
+++ b/Sample/StandardSample/TransformationsBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/TransformationsBuilder.h
+//! @file      Sample/StandardSample/TransformationsBuilder.h
 //! @brief     Defines classes to build samples with different transformations.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_TRANSFORMATIONSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_TRANSFORMATIONSBUILDER_H
 
 class MultiLayer;
 
@@ -28,4 +28,4 @@ MultiLayer* createTransformBox();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_TRANSFORMATIONSBUILDER_H
diff --git a/Sample/StandardSamples/TwoDimLatticeBuilder.cpp b/Sample/StandardSample/TwoDimLatticeBuilder.cpp
similarity index 97%
rename from Sample/StandardSamples/TwoDimLatticeBuilder.cpp
rename to Sample/StandardSample/TwoDimLatticeBuilder.cpp
index ffdd30a954b..b1588ff4290 100644
--- a/Sample/StandardSamples/TwoDimLatticeBuilder.cpp
+++ b/Sample/StandardSample/TwoDimLatticeBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/TwoDimLatticeBuilder.cpp
+//! @file      Sample/StandardSample/TwoDimLatticeBuilder.cpp
 //! @brief     Implements class IsGISAXS06Builder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/StandardSamples/TwoDimLatticeBuilder.h"
+#include "Sample/StandardSample/TwoDimLatticeBuilder.h"
 #include "Base/Const/Units.h"
 #include "Sample/Aggregate/Interference2DLattice.h"
 #include "Sample/Aggregate/Interference2DSuperLattice.h"
@@ -24,7 +24,7 @@
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Compound.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
 
 using Units::deg;
 
diff --git a/Sample/StandardSamples/TwoDimLatticeBuilder.h b/Sample/StandardSample/TwoDimLatticeBuilder.h
similarity index 87%
rename from Sample/StandardSamples/TwoDimLatticeBuilder.h
rename to Sample/StandardSample/TwoDimLatticeBuilder.h
index c3d84fa8de4..2a2da8b6e6f 100644
--- a/Sample/StandardSamples/TwoDimLatticeBuilder.h
+++ b/Sample/StandardSample/TwoDimLatticeBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/StandardSamples/TwoDimLatticeBuilder.h
+//! @file      Sample/StandardSample/TwoDimLatticeBuilder.h
 //! @brief     Defines class IsGISAXS06Builder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_TWODIMLATTICEBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_TWODIMLATTICEBUILDER_H
 
 class MultiLayer;
 
@@ -68,4 +68,4 @@ MultiLayer* createSuperLattice();
 
 } // namespace ExemplarySamples
 
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_TWODIMLATTICEBUILDER_H
diff --git a/Sample/StandardSamples/ExemplarySamples.h b/Sample/StandardSamples/ExemplarySamples.h
deleted file mode 100644
index ea25d3806e3..00000000000
--- a/Sample/StandardSamples/ExemplarySamples.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//  ************************************************************************************************
-//
-//  BornAgain: simulate and fit reflection and scattering
-//
-//! @file      Sample/StandardSamples/ExemplarySamples.h
-//! @brief     includes all StandardSample headers.
-//!
-//! @homepage  http://www.bornagainproject.org
-//! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-//  ************************************************************************************************
-
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_EXEMPLARYSAMPLES_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_EXEMPLARYSAMPLES_H
-
-class MultiLayer;
-
-#include "Sample/StandardSamples/BoxCompositionBuilder.h"
-#include "Sample/StandardSamples/BoxesSquareLatticeBuilder.h"
-#include "Sample/StandardSamples/CompoundBuilder.h"
-#include "Sample/StandardSamples/CoreAndShellBuilder.h"
-#include "Sample/StandardSamples/CustomMorphologyBuilder.h"
-#include "Sample/StandardSamples/CylindersAndPrismsBuilder.h"
-#include "Sample/StandardSamples/CylindersBuilder.h"
-#include "Sample/StandardSamples/FeNiBilayerBuilder.h"
-#include "Sample/StandardSamples/HomogeneousMultilayerBuilder.h"
-#include "Sample/StandardSamples/LatticeBuilder.h"
-#include "Sample/StandardSamples/LayersWithAbsorptionBuilder.h"
-#include "Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h"
-#include "Sample/StandardSamples/MagneticLayersBuilder.h"
-#include "Sample/StandardSamples/MagneticParticlesBuilder.h"
-#include "Sample/StandardSamples/MesocrystalBuilder.h"
-#include "Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h"
-#include "Sample/StandardSamples/MultipleLayoutBuilder.h"
-#include "Sample/StandardSamples/ParacrystalBuilder.h"
-#include "Sample/StandardSamples/ParticleDistributionsBuilder.h"
-#include "Sample/StandardSamples/ParticleInVacuumBuilder.h"
-#include "Sample/StandardSamples/PercusYevickBuilder.h"
-#include "Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h"
-#include "Sample/StandardSamples/ResonatorBuilder.h"
-#include "Sample/StandardSamples/RipplesBuilder.h"
-#include "Sample/StandardSamples/RotatedPyramidsBuilder.h"
-#include "Sample/StandardSamples/SimpleLayerBuilder.h"
-#include "Sample/StandardSamples/SizeDistributionModelsBuilder.h"
-#include "Sample/StandardSamples/SlicedCompositionBuilder.h"
-#include "Sample/StandardSamples/SlicedCylindersBuilder.h"
-#include "Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h"
-#include "Sample/StandardSamples/TransformationsBuilder.h"
-#include "Sample/StandardSamples/TwoDimLatticeBuilder.h"
-
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_EXEMPLARYSAMPLES_H
diff --git a/Tests/Functional/Consistence/ConsistenceTests.cpp b/Tests/Functional/Consistence/ConsistenceTests.cpp
index f44bfd2b149..0b71d7843c9 100644
--- a/Tests/Functional/Consistence/ConsistenceTests.cpp
+++ b/Tests/Functional/Consistence/ConsistenceTests.cpp
@@ -16,8 +16,8 @@
 // some other tests, coincide within reasonable numeric error margins.
 
 #include "Device/Data/Datafield.h"
-#include "Sample/StandardSamples/CylindersAndPrismsBuilder.h"
-#include "Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h"
+#include "Sample/StandardSample/CylindersAndPrismsBuilder.h"
+#include "Sample/StandardSample/PlainMultiLayerBySLDBuilder.h"
 #include "Sim/Simulation/ScatteringSimulation.h"
 #include "Sim/Simulation/SpecularSimulation.h"
 #include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Functional/Fitting/FitTests.cpp b/Tests/Functional/Fitting/FitTests.cpp
index 7299d4c84ac..c8ee332ca85 100644
--- a/Tests/Functional/Fitting/FitTests.cpp
+++ b/Tests/Functional/Fitting/FitTests.cpp
@@ -20,7 +20,7 @@
 #include "Device/Mask/Rectangle.h"
 #include "Fit/Kernel/Minimizer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/StandardSamples/ExemplarySamples.h"
+#include "Sample/StandardSample/ExemplarySamples.h"
 #include "Sim/Fitting/FitObjective.h"
 #include "Sim/Simulation/OffspecSimulation.h"
 #include "Sim/Simulation/ScatteringSimulation.h"
diff --git a/Tests/Suite/Common/TestSuite.h b/Tests/Suite/Common/TestSuite.h
index c508e93ed77..d6a63799462 100644
--- a/Tests/Suite/Common/TestSuite.h
+++ b/Tests/Suite/Common/TestSuite.h
@@ -24,7 +24,7 @@
 #include "Sample/ComponentBuilder/FormFactorComponents.h"
 #include "Sample/ComponentBuilder/Profile2DComponents.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/StandardSamples/ExemplarySamples.h"
+#include "Sample/StandardSample/ExemplarySamples.h"
 #include "Sim/Background/ConstantBackground.h"
 #include "Sim/Simulation/includeSimulations.h"
 #include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/Resample/KzComputationTest.cpp b/Tests/Unit/Resample/KzComputationTest.cpp
index 491d16bbe7a..87a00e1cf28 100644
--- a/Tests/Unit/Resample/KzComputationTest.cpp
+++ b/Tests/Unit/Resample/KzComputationTest.cpp
@@ -6,7 +6,7 @@
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h"
+#include "Sample/StandardSample/PlainMultiLayerBySLDBuilder.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 TEST(KzComputationTest, initial)
-- 
GitLab