diff --git a/Core/Computation/DWBAComputation.cpp b/Core/Computation/DWBAComputation.cpp
index 648552caac2b43670ba1f28986b805ec38173a6c..c573c63b7a6586a147eefa465e01bd880d057c82 100644
--- a/Core/Computation/DWBAComputation.cpp
+++ b/Core/Computation/DWBAComputation.cpp
@@ -18,7 +18,7 @@
 #include "Core/Computation/GISASSpecularComputation.h"
 #include "Core/Computation/ParticleLayoutComputation.h"
 #include "Core/Computation/RoughMultiLayerComputation.h"
-#include "Sample/Fresnel/IFresnelMap.h"
+#include "Resample/Fresnel/IFresnelMap.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Resample/Processed/ProcessedSample.h"
 
diff --git a/Core/Computation/GISASSpecularComputation.cpp b/Core/Computation/GISASSpecularComputation.cpp
index b339b94f008a094bd22137c6397b4f925007a835..52f97d537d2784011c35d3d89572aa8971bfbefa 100644
--- a/Core/Computation/GISASSpecularComputation.cpp
+++ b/Core/Computation/GISASSpecularComputation.cpp
@@ -14,7 +14,7 @@
 
 #include "Core/Computation/GISASSpecularComputation.h"
 #include "Base/Pixel/SimulationElement.h"
-#include "Sample/Fresnel/IFresnelMap.h"
+#include "Resample/Fresnel/IFresnelMap.h"
 #include "Sample/RT/ILayerRTCoefficients.h"
 
 GISASSpecularComputation::GISASSpecularComputation(const IFresnelMap* p_fresnel_map)
diff --git a/Core/Computation/ParticleLayoutComputation.cpp b/Core/Computation/ParticleLayoutComputation.cpp
index d37678b9f8dbabd1e73ce32b5dc0816f6c7fa71f..f68db3ce508e068adfa944639de19469b4c52d3b 100644
--- a/Core/Computation/ParticleLayoutComputation.cpp
+++ b/Core/Computation/ParticleLayoutComputation.cpp
@@ -15,8 +15,8 @@
 #include "Core/Computation/ParticleLayoutComputation.h"
 #include "Base/Pixel/SimulationElement.h"
 #include "Sample/Aggregate/InterferenceFunctionRadialParaCrystal.h"
-#include "Sample/Interference/DecouplingApproximationStrategy.h"
-#include "Sample/Interference/SSCApproximationStrategy.h"
+#include "Resample/Interference/DecouplingApproximationStrategy.h"
+#include "Resample/Interference/SSCApproximationStrategy.h"
 #include "Resample/Processed/ProcessedLayout.h"
 
 namespace {
diff --git a/Core/Computation/RoughMultiLayerComputation.cpp b/Core/Computation/RoughMultiLayerComputation.cpp
index 54309675d0a0cd74dc77ab4920a984f22cbc16eb..83e57d4e482d22deaf4d28cecd9cb9896055903f 100644
--- a/Core/Computation/RoughMultiLayerComputation.cpp
+++ b/Core/Computation/RoughMultiLayerComputation.cpp
@@ -15,15 +15,15 @@
 #include "Core/Computation/RoughMultiLayerComputation.h"
 #include "Base/Math/Constants.h"
 #include "Base/Pixel/SimulationElement.h"
-#include "Sample/Fresnel/IFresnelMap.h"
+#include "Resample/Fresnel/IFresnelMap.h"
 #include "Sample/Interface/LayerInterface.h"
 #include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Resample/Processed/ProcessedSample.h"
 #include "Sample/RT/ILayerRTCoefficients.h"
-#include "Sample/Slice/Slice.h"
-#include "Sample/Slice/SliceStack.h"
+#include "Resample/Slice/Slice.h"
+#include "Resample/Slice/SliceStack.h"
 
 #include <cerfcpp.h>
 
diff --git a/Core/Element/SpecularSimulationElement.cpp b/Core/Element/SpecularSimulationElement.cpp
index 9d25627e4a9109b2ca9423f9975cf1ecf3583e75..9c5fbf6abbc678636d9be09303eb6cd0c009ca5e 100644
--- a/Core/Element/SpecularSimulationElement.cpp
+++ b/Core/Element/SpecularSimulationElement.cpp
@@ -15,7 +15,7 @@
 #include "Core/Element/SpecularSimulationElement.h"
 #include "Device/Detector/IDetector.h"
 #include "Device/Instrument/Instrument.h"
-#include "Sample/Slice/KzComputation.h"
+#include "Resample/Slice/KzComputation.h"
 
 SpecularSimulationElement::SpecularSimulationElement(double kz, const Instrument& instrument,
                                                      bool computable)
diff --git a/Core/Term/DepthProbeComputationTerm.cpp b/Core/Term/DepthProbeComputationTerm.cpp
index 01acdb56592a5105b544e03ddfd71f38d903c8e6..cef49db7697bede7e7d94e85f51eee33678cb09b 100644
--- a/Core/Term/DepthProbeComputationTerm.cpp
+++ b/Core/Term/DepthProbeComputationTerm.cpp
@@ -16,7 +16,7 @@
 #include "Base/Axis/IAxis.h"
 #include "Base/Progress/DelayedProgressCounter.h"
 #include "Core/Element/DepthProbeElement.h"
-#include "Sample/Fresnel/IFresnelMap.h"
+#include "Resample/Fresnel/IFresnelMap.h"
 #include "Resample/Processed/ProcessedSample.h"
 #include "Sample/RT/ILayerRTCoefficients.h"
 
diff --git a/Core/Term/SpecularComputationTerm.cpp b/Core/Term/SpecularComputationTerm.cpp
index 911792883d07fb2c7788a62616b467b7cc20ddf4..7f03910baad7264ed2679940cb44da0fc0a39401 100644
--- a/Core/Term/SpecularComputationTerm.cpp
+++ b/Core/Term/SpecularComputationTerm.cpp
@@ -16,7 +16,7 @@
 #include "Base/Progress/DelayedProgressCounter.h"
 #include "Core/Element/SpecularSimulationElement.h"
 #include "Sample/RT/ILayerRTCoefficients.h"
-#include "Sample/Specular/SpecularStrategyBuilder.h"
+#include "Resample/Specular/SpecularStrategyBuilder.h"
 
 //  ************************************************************************************************
 //  class SpecularComputationTerm
diff --git a/Core/Term/SpecularComputationTerm.h b/Core/Term/SpecularComputationTerm.h
index 459c346392d6158876663c07d59ebe969e1ea6c9..67c8ab4b25663c9a94ec79e1ee747683e138a00e 100644
--- a/Core/Term/SpecularComputationTerm.h
+++ b/Core/Term/SpecularComputationTerm.h
@@ -20,7 +20,7 @@
 #ifndef BORNAGAIN_CORE_TERM_SPECULARCOMPUTATIONTERM_H
 #define BORNAGAIN_CORE_TERM_SPECULARCOMPUTATIONTERM_H
 
-#include "Sample/Slice/ISpecularStrategy.h"
+#include "Resample/Slice/ISpecularStrategy.h"
 #include <memory>
 #include <vector>
 
diff --git a/Sample/FFCompute/ComputeBA.cpp b/Resample/FFCompute/ComputeBA.cpp
similarity index 91%
rename from Sample/FFCompute/ComputeBA.cpp
rename to Resample/FFCompute/ComputeBA.cpp
index 7784c1465c628778ecce06f88356fa520b354847..773e4de4970b5949613c54ce28883996bda4e7a9 100644
--- a/Sample/FFCompute/ComputeBA.cpp
+++ b/Resample/FFCompute/ComputeBA.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/FFCompute/ComputeBA.cpp
+//! @file      Resample/FFCompute/ComputeBA.cpp
 //! @brief     Implements class ComputeBA.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/FFCompute/ComputeBA.h"
+#include "Resample/FFCompute/ComputeBA.h"
 #include "Sample/Material/WavevectorInfo.h"
 #include "Sample/Scattering/IFormFactor.h"
 
diff --git a/Sample/FFCompute/ComputeBA.h b/Resample/FFCompute/ComputeBA.h
similarity index 82%
rename from Sample/FFCompute/ComputeBA.h
rename to Resample/FFCompute/ComputeBA.h
index e86784ceffb80f7ff1e77117dfa1e90adb2641e3..dcff187db01f4ddb8a9807ab44dadf38c4508ef0 100644
--- a/Sample/FFCompute/ComputeBA.h
+++ b/Resample/FFCompute/ComputeBA.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/FFCompute/ComputeBA.h
+//! @file      Resample/FFCompute/ComputeBA.h
 //! @brief     Defines class ComputeBA.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,10 +17,10 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_FFCOMPUTE_COMPUTEBA_H
-#define BORNAGAIN_SAMPLE_FFCOMPUTE_COMPUTEBA_H
+#ifndef BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEBA_H
+#define BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEBA_H
 
-#include "Sample/FFCompute/IComputeFF.h"
+#include "Resample/FFCompute/IComputeFF.h"
 #include <memory>
 
 //! Provides scalar form factor evaluation in Born Approximation for given IFormFactor.
@@ -38,5 +38,5 @@ public:
     complex_t evaluate(const WavevectorInfo& wavevectors) const override;
 };
 
-#endif // BORNAGAIN_SAMPLE_FFCOMPUTE_COMPUTEBA_H
+#endif // BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEBA_H
 #endif // USER_API
diff --git a/Sample/FFCompute/ComputeBAPol.cpp b/Resample/FFCompute/ComputeBAPol.cpp
similarity index 93%
rename from Sample/FFCompute/ComputeBAPol.cpp
rename to Resample/FFCompute/ComputeBAPol.cpp
index 53a7d1139d3590700d335173a290946697622e23..00b0bcc4ec1e8d5154a95bd614e52fe85fdcc2ea 100644
--- a/Sample/FFCompute/ComputeBAPol.cpp
+++ b/Resample/FFCompute/ComputeBAPol.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/FFCompute/ComputeBAPol.cpp
+//! @file      Resample/FFCompute/ComputeBAPol.cpp
 //! @brief     Defines class ComputeBAPol.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/FFCompute/ComputeBAPol.h"
+#include "Resample/FFCompute/ComputeBAPol.h"
 #include "Sample/Material/WavevectorInfo.h"
 #include <stdexcept>
 
diff --git a/Sample/FFCompute/ComputeBAPol.h b/Resample/FFCompute/ComputeBAPol.h
similarity index 83%
rename from Sample/FFCompute/ComputeBAPol.h
rename to Resample/FFCompute/ComputeBAPol.h
index e8e55863782847242facfa9a33fb29a2164dccab..5934d86d7b7e3855b635c33c288e40ea207d4edd 100644
--- a/Sample/FFCompute/ComputeBAPol.h
+++ b/Resample/FFCompute/ComputeBAPol.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/FFCompute/ComputeBAPol.h
+//! @file      Resample/FFCompute/ComputeBAPol.h
 //! @brief     Defines class ComputeBAPol.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,10 +17,10 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_FFCOMPUTE_COMPUTEBAPOL_H
-#define BORNAGAIN_SAMPLE_FFCOMPUTE_COMPUTEBAPOL_H
+#ifndef BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEBAPOL_H
+#define BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEBAPOL_H
 
-#include "Sample/FFCompute/IComputeFF.h"
+#include "Resample/FFCompute/IComputeFF.h"
 #include "Sample/Scattering/IFormFactor.h"
 #include <memory>
 
@@ -42,5 +42,5 @@ public:
     Eigen::Matrix2cd evaluatePol(const WavevectorInfo& wavevectors) const override;
 };
 
-#endif // BORNAGAIN_SAMPLE_FFCOMPUTE_COMPUTEBAPOL_H
+#endif // BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEBAPOL_H
 #endif // USER_API
diff --git a/Sample/FFCompute/ComputeDWBA.cpp b/Resample/FFCompute/ComputeDWBA.cpp
similarity index 97%
rename from Sample/FFCompute/ComputeDWBA.cpp
rename to Resample/FFCompute/ComputeDWBA.cpp
index 7a89ef7a1a495cc13a0442abb5c44056b23c5d6d..a9a9db167a29a6482f75cb2cd4d9cec2fa76b85f 100644
--- a/Sample/FFCompute/ComputeDWBA.cpp
+++ b/Resample/FFCompute/ComputeDWBA.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/FFCompute/ComputeDWBA.cpp
+//! @file      Resample/FFCompute/ComputeDWBA.cpp
 //! @brief     Implements class ComputeDWBA.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/FFCompute/ComputeDWBA.h"
+#include "Resample/FFCompute/ComputeDWBA.h"
 #include "Sample/Material/WavevectorInfo.h"
 #include "Sample/RT/ILayerRTCoefficients.h"
 #include "Sample/Scattering/IFormFactor.h"
diff --git a/Sample/FFCompute/ComputeDWBA.h b/Resample/FFCompute/ComputeDWBA.h
similarity index 85%
rename from Sample/FFCompute/ComputeDWBA.h
rename to Resample/FFCompute/ComputeDWBA.h
index 1fda2cb6e92433ada26e785425eb1117dc472422..15cebab05a5d1057596fd510d143c0301e31f765 100644
--- a/Sample/FFCompute/ComputeDWBA.h
+++ b/Resample/FFCompute/ComputeDWBA.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/FFCompute/ComputeDWBA.h
+//! @file      Resample/FFCompute/ComputeDWBA.h
 //! @brief     Defines class ComputeDWBA.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,10 +17,10 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_FFCOMPUTE_COMPUTEDWBA_H
-#define BORNAGAIN_SAMPLE_FFCOMPUTE_COMPUTEDWBA_H
+#ifndef BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEDWBA_H
+#define BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEDWBA_H
 
-#include "Sample/FFCompute/IComputeFF.h"
+#include "Resample/FFCompute/IComputeFF.h"
 #include <memory>
 
 class ILayerRTCoefficients;
@@ -49,5 +49,5 @@ private:
     std::unique_ptr<const ILayerRTCoefficients> m_out_coeffs;
 };
 
-#endif // BORNAGAIN_SAMPLE_FFCOMPUTE_COMPUTEDWBA_H
+#endif // BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEDWBA_H
 #endif // USER_API
diff --git a/Sample/FFCompute/ComputeDWBAPol.cpp b/Resample/FFCompute/ComputeDWBAPol.cpp
similarity index 99%
rename from Sample/FFCompute/ComputeDWBAPol.cpp
rename to Resample/FFCompute/ComputeDWBAPol.cpp
index c47bd34008031df32c745c8fc338af97b3e214bc..92667c63eac6ec1eae6ca2e7d9fe2d3964223600 100644
--- a/Sample/FFCompute/ComputeDWBAPol.cpp
+++ b/Resample/FFCompute/ComputeDWBAPol.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/FFCompute/ComputeDWBAPol.cpp
+//! @file      Resample/FFCompute/ComputeDWBAPol.cpp
 //! @brief     Defines class ComputeDWBAPol.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/FFCompute/ComputeDWBAPol.h"
+#include "Resample/FFCompute/ComputeDWBAPol.h"
 #include "Sample/Material/WavevectorInfo.h"
 #include "Sample/RT/ILayerRTCoefficients.h"
 #include "Sample/Scattering/IFormFactor.h"
diff --git a/Sample/FFCompute/ComputeDWBAPol.h b/Resample/FFCompute/ComputeDWBAPol.h
similarity index 86%
rename from Sample/FFCompute/ComputeDWBAPol.h
rename to Resample/FFCompute/ComputeDWBAPol.h
index 9939d4cc1150fd905cd0b3c6781de2938ed9936a..d1ee62843b7a56ac3a38c494dde99652a58467af 100644
--- a/Sample/FFCompute/ComputeDWBAPol.h
+++ b/Resample/FFCompute/ComputeDWBAPol.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/FFCompute/ComputeDWBAPol.h
+//! @file      Resample/FFCompute/ComputeDWBAPol.h
 //! @brief     Defines class ComputeDWBAPol.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,10 +17,10 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_FFCOMPUTE_COMPUTEDWBAPOL_H
-#define BORNAGAIN_SAMPLE_FFCOMPUTE_COMPUTEDWBAPOL_H
+#ifndef BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEDWBAPOL_H
+#define BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEDWBAPOL_H
 
-#include "Sample/FFCompute/IComputeFF.h"
+#include "Resample/FFCompute/IComputeFF.h"
 #include <memory>
 
 class ILayerRTCoefficients;
@@ -52,5 +52,5 @@ private:
     std::unique_ptr<const ILayerRTCoefficients> m_out_coeffs;
 };
 
-#endif // BORNAGAIN_SAMPLE_FFCOMPUTE_COMPUTEDWBAPOL_H
+#endif // BORNAGAIN_RESAMPLE_FFCOMPUTE_COMPUTEDWBAPOL_H
 #endif // USER_API
diff --git a/Sample/FFCompute/IComputeFF.cpp b/Resample/FFCompute/IComputeFF.cpp
similarity index 94%
rename from Sample/FFCompute/IComputeFF.cpp
rename to Resample/FFCompute/IComputeFF.cpp
index 4af2aaaf7b06975095526b24ca2488feb95bce6f..2fec9fbc610b587fec6492779f8d7bb12b2da853 100644
--- a/Sample/FFCompute/IComputeFF.cpp
+++ b/Resample/FFCompute/IComputeFF.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/FFCompute/IComputeFF.cpp
+//! @file      Resample/FFCompute/IComputeFF.cpp
 //! @brief     Implements interface class IFormFactor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/FFCompute/IComputeFF.h"
+#include "Resample/FFCompute/IComputeFF.h"
 #include "Sample/RT/ILayerRTCoefficients.h" // required by VS19 compiler
 #include "Sample/Scattering/IFormFactor.h"
 #include <stdexcept>
diff --git a/Sample/FFCompute/IComputeFF.h b/Resample/FFCompute/IComputeFF.h
similarity index 90%
rename from Sample/FFCompute/IComputeFF.h
rename to Resample/FFCompute/IComputeFF.h
index 7980a0b5109872b331102fd1fcc09756cf30dcc3..9e08e18c5e001e1b15f32465c4309f808df0d75e 100644
--- a/Sample/FFCompute/IComputeFF.h
+++ b/Resample/FFCompute/IComputeFF.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/FFCompute/IComputeFF.h
+//! @file      Resample/FFCompute/IComputeFF.h
 //! @brief     Defines and implements interface IFormFactor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,8 +17,8 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_FFCOMPUTE_ICOMPUTEFF_H
-#define BORNAGAIN_SAMPLE_FFCOMPUTE_ICOMPUTEFF_H
+#ifndef BORNAGAIN_RESAMPLE_FFCOMPUTE_ICOMPUTEFF_H
+#define BORNAGAIN_RESAMPLE_FFCOMPUTE_ICOMPUTEFF_H
 
 #include "Base/Types/Complex.h"
 #include <Eigen/Core>
@@ -62,5 +62,5 @@ protected:
     std::unique_ptr<IFormFactor> m_ff;
 };
 
-#endif // BORNAGAIN_SAMPLE_FFCOMPUTE_ICOMPUTEFF_H
+#endif // BORNAGAIN_RESAMPLE_FFCOMPUTE_ICOMPUTEFF_H
 #endif // USER_API
diff --git a/Sample/Fresnel/FormFactorCoherentPart.cpp b/Resample/Fresnel/FormFactorCoherentPart.cpp
similarity index 92%
rename from Sample/Fresnel/FormFactorCoherentPart.cpp
rename to Resample/Fresnel/FormFactorCoherentPart.cpp
index 7c668d82c292ca40cb6a86b57d60931d4c239b1b..d2c6132134404c75c77d1ce980723fd98cc026db 100644
--- a/Sample/Fresnel/FormFactorCoherentPart.cpp
+++ b/Resample/Fresnel/FormFactorCoherentPart.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Fresnel/FormFactorCoherentPart.cpp
+//! @file      Resample/Fresnel/FormFactorCoherentPart.cpp
 //! @brief     Implements class FormFactorCoherentPart.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Fresnel/FormFactorCoherentPart.h"
+#include "Resample/Fresnel/FormFactorCoherentPart.h"
 #include "Base/Pixel/SimulationElement.h"
 #include "Base/Utils/Assert.h"
-#include "Sample/FFCompute/IComputeFF.h"
-#include "Sample/Fresnel/IFresnelMap.h"
+#include "Resample/FFCompute/IComputeFF.h"
+#include "Resample/Fresnel/IFresnelMap.h"
 #include "Sample/Material/WavevectorInfo.h"
 #include "Sample/RT/ILayerRTCoefficients.h"
 
diff --git a/Sample/Fresnel/FormFactorCoherentPart.h b/Resample/Fresnel/FormFactorCoherentPart.h
similarity index 86%
rename from Sample/Fresnel/FormFactorCoherentPart.h
rename to Resample/Fresnel/FormFactorCoherentPart.h
index 4ddc5abcbab78550223321182a0b79add50268c8..05b04ef7e02f963fb5846f63679716522f12d9ec 100644
--- a/Sample/Fresnel/FormFactorCoherentPart.h
+++ b/Resample/Fresnel/FormFactorCoherentPart.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Fresnel/FormFactorCoherentPart.h
+//! @file      Resample/Fresnel/FormFactorCoherentPart.h
 //! @brief     Defines class FormFactorCoherentPart.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,8 +17,8 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_FRESNEL_FORMFACTORCOHERENTPART_H
-#define BORNAGAIN_SAMPLE_FRESNEL_FORMFACTORCOHERENTPART_H
+#ifndef BORNAGAIN_RESAMPLE_FRESNEL_FORMFACTORCOHERENTPART_H
+#define BORNAGAIN_RESAMPLE_FRESNEL_FORMFACTORCOHERENTPART_H
 
 #include "Base/Types/Complex.h"
 #include "Base/Vector/EigenCore.h"
@@ -50,5 +50,5 @@ private:
     const size_t m_layer_index;
 };
 
-#endif // BORNAGAIN_SAMPLE_FRESNEL_FORMFACTORCOHERENTPART_H
+#endif // BORNAGAIN_RESAMPLE_FRESNEL_FORMFACTORCOHERENTPART_H
 #endif // USER_API
diff --git a/Sample/Fresnel/FormFactorCoherentSum.cpp b/Resample/Fresnel/FormFactorCoherentSum.cpp
similarity index 93%
rename from Sample/Fresnel/FormFactorCoherentSum.cpp
rename to Resample/Fresnel/FormFactorCoherentSum.cpp
index 2b374188c5e82a2f9184520e3a99e6cbab437e4e..c7aec64163eb491a7097e3c8a789a08f75bcaf06 100644
--- a/Sample/Fresnel/FormFactorCoherentSum.cpp
+++ b/Resample/Fresnel/FormFactorCoherentSum.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Fresnel/FormFactorCoherentSum.cpp
+//! @file      Resample/Fresnel/FormFactorCoherentSum.cpp
 //! @brief     Implements class FormFactorCoherentSum.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Fresnel/FormFactorCoherentSum.h"
+#include "Resample/Fresnel/FormFactorCoherentSum.h"
 
 FormFactorCoherentSum::FormFactorCoherentSum(double abundance,
                                              const std::vector<FormFactorCoherentPart>& parts)
diff --git a/Sample/Fresnel/FormFactorCoherentSum.h b/Resample/Fresnel/FormFactorCoherentSum.h
similarity index 82%
rename from Sample/Fresnel/FormFactorCoherentSum.h
rename to Resample/Fresnel/FormFactorCoherentSum.h
index c3d931fdfba56903d42288fde4007bbf79e8e49a..1bafa19151e26fd320ace54068656b268e239c18 100644
--- a/Sample/Fresnel/FormFactorCoherentSum.h
+++ b/Resample/Fresnel/FormFactorCoherentSum.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Fresnel/FormFactorCoherentSum.h
+//! @file      Resample/Fresnel/FormFactorCoherentSum.h
 //! @brief     Defines class FormFactorCoherentSum.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,10 +17,10 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_FRESNEL_FORMFACTORCOHERENTSUM_H
-#define BORNAGAIN_SAMPLE_FRESNEL_FORMFACTORCOHERENTSUM_H
+#ifndef BORNAGAIN_RESAMPLE_FRESNEL_FORMFACTORCOHERENTSUM_H
+#define BORNAGAIN_RESAMPLE_FRESNEL_FORMFACTORCOHERENTSUM_H
 
-#include "Sample/Fresnel/FormFactorCoherentPart.h"
+#include "Resample/Fresnel/FormFactorCoherentPart.h"
 #include <vector>
 
 class SimulationElement;
@@ -47,5 +47,5 @@ private:
     const std::vector<FormFactorCoherentPart> m_parts;
 };
 
-#endif // BORNAGAIN_SAMPLE_FRESNEL_FORMFACTORCOHERENTSUM_H
+#endif // BORNAGAIN_RESAMPLE_FRESNEL_FORMFACTORCOHERENTSUM_H
 #endif // USER_API
diff --git a/Sample/Fresnel/IFresnelMap.cpp b/Resample/Fresnel/IFresnelMap.cpp
similarity index 81%
rename from Sample/Fresnel/IFresnelMap.cpp
rename to Resample/Fresnel/IFresnelMap.cpp
index 1c1cdcbb75b8745b0d33fcdad97e1c32b68b81f6..e5d2285a80b2a867d6e17b56dd5c4bde9aa2621d 100644
--- a/Sample/Fresnel/IFresnelMap.cpp
+++ b/Resample/Fresnel/IFresnelMap.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Fresnel/IFresnelMap.cpp
+//! @file      Resample/Fresnel/IFresnelMap.cpp
 //! @brief     Implements interface IFresnelMap.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,10 +12,10 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Fresnel/IFresnelMap.h"
-#include "Sample/Slice/ISpecularStrategy.h"
-#include "Sample/Slice/Slice.h"
-#include "Sample/Slice/SliceStack.h"
+#include "Resample/Fresnel/IFresnelMap.h"
+#include "Resample/Slice/ISpecularStrategy.h"
+#include "Resample/Slice/Slice.h"
+#include "Resample/Slice/SliceStack.h"
 
 IFresnelMap::IFresnelMap(const SliceStack& stack, std::unique_ptr<ISpecularStrategy>&& strategy,
                          bool useCache)
diff --git a/Sample/Fresnel/IFresnelMap.h b/Resample/Fresnel/IFresnelMap.h
similarity index 89%
rename from Sample/Fresnel/IFresnelMap.h
rename to Resample/Fresnel/IFresnelMap.h
index 427895829ed7affe6cc3f4fc70082dd0dd94358b..1e15d712fddef66dc7c997ba73291dcd1a31ecec 100644
--- a/Sample/Fresnel/IFresnelMap.h
+++ b/Resample/Fresnel/IFresnelMap.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Fresnel/IFresnelMap.h
+//! @file      Resample/Fresnel/IFresnelMap.h
 //! @brief     Defines interface IFresnelMap.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,11 +17,11 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_FRESNEL_IFRESNELMAP_H
-#define BORNAGAIN_SAMPLE_FRESNEL_IFRESNELMAP_H
+#ifndef BORNAGAIN_RESAMPLE_FRESNEL_IFRESNELMAP_H
+#define BORNAGAIN_RESAMPLE_FRESNEL_IFRESNELMAP_H
 
 #include "Base/Vector/Vectors3D.h"
-#include "Sample/Slice/SliceStack.h"
+#include "Resample/Slice/SliceStack.h"
 #include <memory>
 
 class ILayerRTCoefficients;
@@ -62,5 +62,5 @@ protected:
     const bool m_use_cache;
 };
 
-#endif // BORNAGAIN_SAMPLE_FRESNEL_IFRESNELMAP_H
+#endif // BORNAGAIN_RESAMPLE_FRESNEL_IFRESNELMAP_H
 #endif // USER_API
diff --git a/Sample/Fresnel/MatrixFresnelMap.cpp b/Resample/Fresnel/MatrixFresnelMap.cpp
similarity index 93%
rename from Sample/Fresnel/MatrixFresnelMap.cpp
rename to Resample/Fresnel/MatrixFresnelMap.cpp
index 87b8e3ea1c2a419c33ba9dd1a8ac3d86281925cd..e91f6deaa1b417976ef7555127792c9164764b8c 100644
--- a/Sample/Fresnel/MatrixFresnelMap.cpp
+++ b/Resample/Fresnel/MatrixFresnelMap.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Fresnel/MatrixFresnelMap.cpp
+//! @file      Resample/Fresnel/MatrixFresnelMap.cpp
 //! @brief     Implements class MatrixFresnelMap.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Fresnel/MatrixFresnelMap.h"
+#include "Resample/Fresnel/MatrixFresnelMap.h"
 #include "Base/Pixel/SimulationElement.h"
 #include "Sample/RT/ILayerRTCoefficients.h"
-#include "Sample/Slice/Slice.h"
-#include "Sample/Slice/SliceStack.h"
+#include "Resample/Slice/Slice.h"
+#include "Resample/Slice/SliceStack.h"
 
 MatrixFresnelMap::MatrixFresnelMap(const SliceStack& stack,
                                    std::unique_ptr<ISpecularStrategy>&& strategy, bool useCache)
diff --git a/Sample/Fresnel/MatrixFresnelMap.h b/Resample/Fresnel/MatrixFresnelMap.h
similarity index 88%
rename from Sample/Fresnel/MatrixFresnelMap.h
rename to Resample/Fresnel/MatrixFresnelMap.h
index 8be9294e1fc4d5028f7b816f04f7a4c8c58ed7f6..96b59812a9ddd20d9c793e1f1c15d200d2be9df3 100644
--- a/Sample/Fresnel/MatrixFresnelMap.h
+++ b/Resample/Fresnel/MatrixFresnelMap.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Fresnel/MatrixFresnelMap.h
+//! @file      Resample/Fresnel/MatrixFresnelMap.h
 //! @brief     Defines class MatrixFresnelMap.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,11 +17,11 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_FRESNEL_MATRIXFRESNELMAP_H
-#define BORNAGAIN_SAMPLE_FRESNEL_MATRIXFRESNELMAP_H
+#ifndef BORNAGAIN_RESAMPLE_FRESNEL_MATRIXFRESNELMAP_H
+#define BORNAGAIN_RESAMPLE_FRESNEL_MATRIXFRESNELMAP_H
 
-#include "Sample/Fresnel/IFresnelMap.h"
-#include "Sample/Slice/ISpecularStrategy.h"
+#include "Resample/Fresnel/IFresnelMap.h"
+#include "Resample/Slice/ISpecularStrategy.h"
 #include <unordered_map>
 
 class ILayerRTCoefficients;
@@ -64,5 +64,5 @@ private:
     mutable CoefficientHash m_hash_table_in;
 };
 
-#endif // BORNAGAIN_SAMPLE_FRESNEL_MATRIXFRESNELMAP_H
+#endif // BORNAGAIN_RESAMPLE_FRESNEL_MATRIXFRESNELMAP_H
 #endif // USER_API
diff --git a/Sample/Fresnel/ScalarFresnelMap.cpp b/Resample/Fresnel/ScalarFresnelMap.cpp
similarity index 95%
rename from Sample/Fresnel/ScalarFresnelMap.cpp
rename to Resample/Fresnel/ScalarFresnelMap.cpp
index 4bc33133348ac96a190421608e90980a6acf5ce3..a54dc19fdc9065a4939e680ae6aa4d0717a88363 100644
--- a/Sample/Fresnel/ScalarFresnelMap.cpp
+++ b/Resample/Fresnel/ScalarFresnelMap.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Fresnel/ScalarFresnelMap.cpp
+//! @file      Resample/Fresnel/ScalarFresnelMap.cpp
 //! @brief     Implements class ScalarFresnelMap.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Fresnel/ScalarFresnelMap.h"
+#include "Resample/Fresnel/ScalarFresnelMap.h"
 #include "Base/Pixel/SimulationElement.h"
 #include "Sample/RT/ILayerRTCoefficients.h"
 
diff --git a/Sample/Fresnel/ScalarFresnelMap.h b/Resample/Fresnel/ScalarFresnelMap.h
similarity index 86%
rename from Sample/Fresnel/ScalarFresnelMap.h
rename to Resample/Fresnel/ScalarFresnelMap.h
index 1edfbd97f201b943207d362543045c25aebf95d6..ca6a43d540a7890ac845db4244cea65e84f22d45 100644
--- a/Sample/Fresnel/ScalarFresnelMap.h
+++ b/Resample/Fresnel/ScalarFresnelMap.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Fresnel/ScalarFresnelMap.h
+//! @file      Resample/Fresnel/ScalarFresnelMap.h
 //! @brief     Defines class ScalarFresnelMap.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,11 +17,11 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_FRESNEL_SCALARFRESNELMAP_H
-#define BORNAGAIN_SAMPLE_FRESNEL_SCALARFRESNELMAP_H
+#ifndef BORNAGAIN_RESAMPLE_FRESNEL_SCALARFRESNELMAP_H
+#define BORNAGAIN_RESAMPLE_FRESNEL_SCALARFRESNELMAP_H
 
-#include "Sample/Fresnel/IFresnelMap.h"
-#include "Sample/Slice/ISpecularStrategy.h"
+#include "Resample/Fresnel/IFresnelMap.h"
+#include "Resample/Slice/ISpecularStrategy.h"
 #include <unordered_map>
 #include <utility> // pair
 
@@ -57,5 +57,5 @@ private:
         m_cache;
 };
 
-#endif // BORNAGAIN_SAMPLE_FRESNEL_SCALARFRESNELMAP_H
+#endif // BORNAGAIN_RESAMPLE_FRESNEL_SCALARFRESNELMAP_H
 #endif // USER_API
diff --git a/Sample/Interference/DecouplingApproximationStrategy.cpp b/Resample/Interference/DecouplingApproximationStrategy.cpp
similarity index 94%
rename from Sample/Interference/DecouplingApproximationStrategy.cpp
rename to Resample/Interference/DecouplingApproximationStrategy.cpp
index 45fc857d88cb0bb80d73a505449e7c94b8b43d1a..dc7becafeb04fec9620cc19bf08b7882c3cb2a6f 100644
--- a/Sample/Interference/DecouplingApproximationStrategy.cpp
+++ b/Resample/Interference/DecouplingApproximationStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Interference/DecouplingApproximationStrategy.cpp
+//! @file      Resample/Interference/DecouplingApproximationStrategy.cpp
 //! @brief     Implements class DecouplingApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Interference/DecouplingApproximationStrategy.h"
+#include "Resample/Interference/DecouplingApproximationStrategy.h"
 #include "Base/Math/Functions.h"
 #include "Base/Pixel/SimulationElement.h"
 #include "Sample/Aggregate/InterferenceFunctionNone.h"
-#include "Sample/Fresnel/FormFactorCoherentSum.h"
+#include "Resample/Fresnel/FormFactorCoherentSum.h"
 
 DecouplingApproximationStrategy::DecouplingApproximationStrategy(
     const std::vector<FormFactorCoherentSum>& weighted_formfactors,
diff --git a/Sample/Interference/DecouplingApproximationStrategy.h b/Resample/Interference/DecouplingApproximationStrategy.h
similarity index 80%
rename from Sample/Interference/DecouplingApproximationStrategy.h
rename to Resample/Interference/DecouplingApproximationStrategy.h
index d89d7fa367e56603c8acd738b66fbaa00a2ad278..f584b88307f464b151d019a33ef0a274830b96fd 100644
--- a/Sample/Interference/DecouplingApproximationStrategy.h
+++ b/Resample/Interference/DecouplingApproximationStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Interference/DecouplingApproximationStrategy.h
+//! @file      Resample/Interference/DecouplingApproximationStrategy.h
 //! @brief     Defines class DecouplingApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,10 +17,10 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_INTERFERENCE_DECOUPLINGAPPROXIMATIONSTRATEGY_H
-#define BORNAGAIN_SAMPLE_INTERFERENCE_DECOUPLINGAPPROXIMATIONSTRATEGY_H
+#ifndef BORNAGAIN_RESAMPLE_INTERFERENCE_DECOUPLINGAPPROXIMATIONSTRATEGY_H
+#define BORNAGAIN_RESAMPLE_INTERFERENCE_DECOUPLINGAPPROXIMATIONSTRATEGY_H
 
-#include "Sample/Interference/IInterferenceFunctionStrategy.h"
+#include "Resample/Interference/IInterferenceFunctionStrategy.h"
 
 class SimulationElement;
 
@@ -41,5 +41,5 @@ private:
     std::unique_ptr<IInterferenceFunction> m_iff;
 };
 
-#endif // BORNAGAIN_SAMPLE_INTERFERENCE_DECOUPLINGAPPROXIMATIONSTRATEGY_H
+#endif // BORNAGAIN_RESAMPLE_INTERFERENCE_DECOUPLINGAPPROXIMATIONSTRATEGY_H
 #endif // USER_API
diff --git a/Sample/Interference/IInterferenceFunctionStrategy.cpp b/Resample/Interference/IInterferenceFunctionStrategy.cpp
similarity index 93%
rename from Sample/Interference/IInterferenceFunctionStrategy.cpp
rename to Resample/Interference/IInterferenceFunctionStrategy.cpp
index daafb0d8a3c2c890658d0ec88fbf211368392710..70d7ccf9366e52edb661aa36c33f84dcaca06d0e 100644
--- a/Sample/Interference/IInterferenceFunctionStrategy.cpp
+++ b/Resample/Interference/IInterferenceFunctionStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Interference/IInterferenceFunctionStrategy.cpp
+//! @file      Resample/Interference/IInterferenceFunctionStrategy.cpp
 //! @brief     Implements default behaviour of IInterferenceFunctionStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Interference/IInterferenceFunctionStrategy.h"
+#include "Resample/Interference/IInterferenceFunctionStrategy.h"
 #include "Base/Math/IntegratorMCMiser.h"
 #include "Base/Pixel/SimulationElement.h"
 #include "Base/Utils/Assert.h"
-#include "Sample/Fresnel/FormFactorCoherentSum.h"
+#include "Resample/Fresnel/FormFactorCoherentSum.h"
 
 IInterferenceFunctionStrategy::IInterferenceFunctionStrategy(
     const std::vector<FormFactorCoherentSum>& weighted_formfactors,
diff --git a/Sample/Interference/IInterferenceFunctionStrategy.h b/Resample/Interference/IInterferenceFunctionStrategy.h
similarity index 90%
rename from Sample/Interference/IInterferenceFunctionStrategy.h
rename to Resample/Interference/IInterferenceFunctionStrategy.h
index 4ff644e12bf9a7e1e9f8611c739e79c16774a828..93116b7c6e90fb98afbe0f7467e660d2558178b0 100644
--- a/Sample/Interference/IInterferenceFunctionStrategy.h
+++ b/Resample/Interference/IInterferenceFunctionStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Interference/IInterferenceFunctionStrategy.h
+//! @file      Resample/Interference/IInterferenceFunctionStrategy.h
 //! @brief     Defines interface IInterferenceFunctionStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,8 +17,8 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_INTERFERENCE_IINTERFERENCEFUNCTIONSTRATEGY_H
-#define BORNAGAIN_SAMPLE_INTERFERENCE_IINTERFERENCEFUNCTIONSTRATEGY_H
+#ifndef BORNAGAIN_RESAMPLE_INTERFERENCE_IINTERFERENCEFUNCTIONSTRATEGY_H
+#define BORNAGAIN_RESAMPLE_INTERFERENCE_IINTERFERENCEFUNCTIONSTRATEGY_H
 
 #include "Base/Types/Complex.h"
 #include "Sample/RT/SimulationOptions.h"
@@ -72,5 +72,5 @@ private:
 #endif
 };
 
-#endif // BORNAGAIN_SAMPLE_INTERFERENCE_IINTERFERENCEFUNCTIONSTRATEGY_H
+#endif // BORNAGAIN_RESAMPLE_INTERFERENCE_IINTERFERENCEFUNCTIONSTRATEGY_H
 #endif // USER_API
diff --git a/Sample/Interference/SSCApproximationStrategy.cpp b/Resample/Interference/SSCApproximationStrategy.cpp
similarity index 96%
rename from Sample/Interference/SSCApproximationStrategy.cpp
rename to Resample/Interference/SSCApproximationStrategy.cpp
index a91fcb509c13591fe8bda555616fdbcffb2dc0c0..b0370ff76b9ee2b8ac301dfd7b17b5028320ff2c 100644
--- a/Sample/Interference/SSCApproximationStrategy.cpp
+++ b/Resample/Interference/SSCApproximationStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Interference/SSCApproximationStrategy.cpp
+//! @file      Resample/Interference/SSCApproximationStrategy.cpp
 //! @brief     Implements class SSCApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,10 +12,10 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Interference/SSCApproximationStrategy.h"
+#include "Resample/Interference/SSCApproximationStrategy.h"
 #include "Base/Pixel/SimulationElement.h"
 #include "Sample/Aggregate/InterferenceFunctionRadialParaCrystal.h"
-#include "Sample/Fresnel/FormFactorCoherentSum.h"
+#include "Resample/Fresnel/FormFactorCoherentSum.h"
 
 SSCApproximationStrategy::SSCApproximationStrategy(
     const std::vector<FormFactorCoherentSum>& weighted_formfactors,
diff --git a/Sample/Interference/SSCApproximationStrategy.h b/Resample/Interference/SSCApproximationStrategy.h
similarity index 85%
rename from Sample/Interference/SSCApproximationStrategy.h
rename to Resample/Interference/SSCApproximationStrategy.h
index d80f6a77f7ce366039808e1a6f266b07b64b63a2..5d3079022dbba50e75f92781df33b080c9813f3e 100644
--- a/Sample/Interference/SSCApproximationStrategy.h
+++ b/Resample/Interference/SSCApproximationStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Interference/SSCApproximationStrategy.h
+//! @file      Resample/Interference/SSCApproximationStrategy.h
 //! @brief     Defines class SSCApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,10 +17,10 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_INTERFERENCE_SSCAPPROXIMATIONSTRATEGY_H
-#define BORNAGAIN_SAMPLE_INTERFERENCE_SSCAPPROXIMATIONSTRATEGY_H
+#ifndef BORNAGAIN_RESAMPLE_INTERFERENCE_SSCAPPROXIMATIONSTRATEGY_H
+#define BORNAGAIN_RESAMPLE_INTERFERENCE_SSCAPPROXIMATIONSTRATEGY_H
 
-#include "Sample/Interference/IInterferenceFunctionStrategy.h"
+#include "Resample/Interference/IInterferenceFunctionStrategy.h"
 #include <Eigen/StdVector>
 
 class InterferenceFunctionRadialParaCrystal;
@@ -52,5 +52,5 @@ private:
     double m_mean_radius;
 };
 
-#endif // BORNAGAIN_SAMPLE_INTERFERENCE_SSCAPPROXIMATIONSTRATEGY_H
+#endif // BORNAGAIN_RESAMPLE_INTERFERENCE_SSCAPPROXIMATIONSTRATEGY_H
 #endif // USER_API
diff --git a/Resample/Processed/MaterialSlicer.cpp b/Resample/Processed/MaterialSlicer.cpp
index d68869cecbb020f310538087da12bb23af750848..b4e28a13e952e2e2ba8de82701931d28c1792fb0 100644
--- a/Resample/Processed/MaterialSlicer.cpp
+++ b/Resample/Processed/MaterialSlicer.cpp
@@ -19,8 +19,8 @@
 #include "Sample/Material/MaterialUtils.h"
 #include "Sample/Material/RefractiveMaterialImpl.h"
 #include "Resample/Processed/ProcessedLayout.h"
-#include "Sample/Slice/Slice.h"
-#include "Sample/Slice/SliceStack.h"
+#include "Resample/Slice/Slice.h"
+#include "Resample/Slice/SliceStack.h"
 
 namespace {
 
diff --git a/Resample/Processed/ProcessedLayout.cpp b/Resample/Processed/ProcessedLayout.cpp
index 9f05205a6798109d732b93c128857e91cd95a551..71a4a630b9abe81cb8e8bf3f5660027f6d845e12 100644
--- a/Resample/Processed/ProcessedLayout.cpp
+++ b/Resample/Processed/ProcessedLayout.cpp
@@ -15,16 +15,16 @@
 #include "Resample/Processed/ProcessedLayout.h"
 #include "Sample/Aggregate/IInterferenceFunction.h"
 #include "Sample/Aggregate/ParticleLayout.h"
-#include "Sample/FFCompute/ComputeBA.h"
-#include "Sample/FFCompute/ComputeBAPol.h"
-#include "Sample/FFCompute/ComputeDWBA.h"
-#include "Sample/FFCompute/ComputeDWBAPol.h"
-#include "Sample/Fresnel/FormFactorCoherentSum.h"
+#include "Resample/FFCompute/ComputeBA.h"
+#include "Resample/FFCompute/ComputeBAPol.h"
+#include "Resample/FFCompute/ComputeDWBA.h"
+#include "Resample/FFCompute/ComputeDWBAPol.h"
+#include "Resample/Fresnel/FormFactorCoherentSum.h"
 #include "Sample/Material/HomogeneousRegion.h"
 #include "Sample/Particle/IParticle.h"
-#include "Sample/Slice/Slice.h"
-#include "Sample/Slice/SliceStack.h"
-#include "Sample/Slice/SlicedFormFactorList.h"
+#include "Resample/Slice/Slice.h"
+#include "Resample/Slice/SliceStack.h"
+#include "Resample/Slice/SlicedFormFactorList.h"
 
 //  ************************************************************************************************
 //  class ProcessedLayout
diff --git a/Resample/Processed/ProcessedSample.cpp b/Resample/Processed/ProcessedSample.cpp
index 480d6a54c1c008b99d5509cfdd79d52c830792e0..8f50f9c70e960b783cf876501b9b027395931772 100644
--- a/Resample/Processed/ProcessedSample.cpp
+++ b/Resample/Processed/ProcessedSample.cpp
@@ -15,8 +15,8 @@
 #include "Resample/Processed/ProcessedSample.h"
 #include "Base/Const/Units.h"
 #include "Base/Utils/Assert.h"
-#include "Sample/Fresnel/MatrixFresnelMap.h"
-#include "Sample/Fresnel/ScalarFresnelMap.h"
+#include "Resample/Fresnel/MatrixFresnelMap.h"
+#include "Resample/Fresnel/ScalarFresnelMap.h"
 #include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
@@ -26,9 +26,9 @@
 #include "Resample/Processed/ProcessedLayout.h"
 #include "Sample/RT/SimulationOptions.h"
 #include "Sample/Scattering/ZLimits.h"
-#include "Sample/Slice/Slice.h"
-#include "Sample/Slice/SliceStack.h"
-#include "Sample/Specular/SpecularStrategyBuilder.h"
+#include "Resample/Slice/Slice.h"
+#include "Resample/Slice/SliceStack.h"
+#include "Resample/Specular/SpecularStrategyBuilder.h"
 
 namespace {
 
diff --git a/Resample/Processed/ProcessedSample.h b/Resample/Processed/ProcessedSample.h
index 78ec21cfe834bd3c2dd24564e492c1cb6ab7290e..c1e1ed92738fdfe24e530098a57732bfa71cf94a 100644
--- a/Resample/Processed/ProcessedSample.h
+++ b/Resample/Processed/ProcessedSample.h
@@ -21,7 +21,7 @@
 #define BORNAGAIN_RESAMPLE_PROCESSED_PROCESSEDSAMPLE_H
 
 #include "Base/Vector/Vectors3D.h"
-#include "Sample/Slice/SliceStack.h"
+#include "Resample/Slice/SliceStack.h"
 #include <memory>
 #include <vector>
 
diff --git a/Resample/Processed/ProfileHelper.cpp b/Resample/Processed/ProfileHelper.cpp
index 55c58afc1c4ef1551a644062d82c95731cfed6f4..8eec34de944f85638e699e6e17f602a4c9886ce8 100644
--- a/Resample/Processed/ProfileHelper.cpp
+++ b/Resample/Processed/ProfileHelper.cpp
@@ -15,8 +15,8 @@
 #include "Resample/Processed/ProfileHelper.h"
 #include "Sample/Interface/LayerRoughness.h"
 #include "Resample/Processed/ProcessedSample.h"
-#include "Sample/Slice/Slice.h"
-#include "Sample/Slice/SliceStack.h"
+#include "Resample/Slice/Slice.h"
+#include "Resample/Slice/SliceStack.h"
 
 namespace {
 
diff --git a/Sample/Slice/ISpecularStrategy.h b/Resample/Slice/ISpecularStrategy.h
similarity index 88%
rename from Sample/Slice/ISpecularStrategy.h
rename to Resample/Slice/ISpecularStrategy.h
index 9d046cd094266d459dee3a416ac91c3ae639396b..4a16f4980b5f2140963c9d9d3caa135089af366b 100644
--- a/Sample/Slice/ISpecularStrategy.h
+++ b/Resample/Slice/ISpecularStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/ISpecularStrategy.h
+//! @file      Resample/Slice/ISpecularStrategy.h
 //! @brief     Defines and implements class ISpecularStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,8 +17,8 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_SLICE_ISPECULARSTRATEGY_H
-#define BORNAGAIN_SAMPLE_SLICE_ISPECULARSTRATEGY_H
+#ifndef BORNAGAIN_RESAMPLE_SLICE_ISPECULARSTRATEGY_H
+#define BORNAGAIN_RESAMPLE_SLICE_ISPECULARSTRATEGY_H
 
 #include "Base/Vector/EigenCore.h"
 #include "Base/Vector/Vectors3D.h"
@@ -52,5 +52,5 @@ public:
     computeTopLayerR(const SliceStack& slices, const std::vector<complex_t>& kz) const = 0;
 };
 
-#endif // BORNAGAIN_SAMPLE_SLICE_ISPECULARSTRATEGY_H
+#endif // BORNAGAIN_RESAMPLE_SLICE_ISPECULARSTRATEGY_H
 #endif // USER_API
diff --git a/Sample/Slice/KzComputation.cpp b/Resample/Slice/KzComputation.cpp
similarity index 95%
rename from Sample/Slice/KzComputation.cpp
rename to Resample/Slice/KzComputation.cpp
index b9fdccc9b87c7964e294e394aadd29d9857ad564..3bccfaeba37ec5ecb6034c94cdb58b986c5e06c1 100644
--- a/Sample/Slice/KzComputation.cpp
+++ b/Resample/Slice/KzComputation.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/KzComputation.cpp
+//! @file      Resample/Slice/KzComputation.cpp
 //! @brief     Implements functions in namespace KzComputation.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,10 +12,10 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Slice/KzComputation.h"
+#include "Resample/Slice/KzComputation.h"
 #include "Base/Const/Units.h"
-#include "Sample/Slice/Slice.h"
-#include "Sample/Slice/SliceStack.h"
+#include "Resample/Slice/Slice.h"
+#include "Resample/Slice/SliceStack.h"
 
 namespace {
 complex_t normalizedSLD(const Material& material)
diff --git a/Sample/Slice/KzComputation.h b/Resample/Slice/KzComputation.h
similarity index 91%
rename from Sample/Slice/KzComputation.h
rename to Resample/Slice/KzComputation.h
index 5539c859994f4967974d68c420a964f9be9b23b4..3a615650fc6afbd3141d8622bdf9950ecb401279 100644
--- a/Sample/Slice/KzComputation.h
+++ b/Resample/Slice/KzComputation.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/KzComputation.h
+//! @file      Resample/Slice/KzComputation.h
 //! @brief     Declares functions in namespace KzComputation.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,8 +17,8 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_SLICE_KZCOMPUTATION_H
-#define BORNAGAIN_SAMPLE_SLICE_KZCOMPUTATION_H
+#ifndef BORNAGAIN_RESAMPLE_SLICE_KZCOMPUTATION_H
+#define BORNAGAIN_RESAMPLE_SLICE_KZCOMPUTATION_H
 
 #include "Base/Vector/Vectors3D.h"
 #include <vector>
@@ -57,5 +57,5 @@ std::vector<complex_t> computeKzFromRefIndices(const SliceStack& slices, kvector
 
 } // namespace SampleUtils
 
-#endif // BORNAGAIN_SAMPLE_SLICE_KZCOMPUTATION_H
+#endif // BORNAGAIN_RESAMPLE_SLICE_KZCOMPUTATION_H
 #endif // USER_API
diff --git a/Sample/Slice/Slice.cpp b/Resample/Slice/Slice.cpp
similarity index 96%
rename from Sample/Slice/Slice.cpp
rename to Resample/Slice/Slice.cpp
index 2522903c3bad13bbf143a16a6218fb8c68aacbbd..fbd12da1e346cea46ea771ba71fa89da41728838 100644
--- a/Sample/Slice/Slice.cpp
+++ b/Resample/Slice/Slice.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/Slice.cpp
+//! @file      Resample/Slice/Slice.cpp
 //! @brief     Implements class Slice.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,10 +12,10 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Slice/Slice.h"
+#include "Resample/Slice/Slice.h"
 #include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Material/MaterialUtils.h"
-#include "Sample/Slice/SliceStack.h"
+#include "Resample/Slice/SliceStack.h"
 
 Slice::Slice(const ZLimits& zRange, const Material& material, const kvector_t& B_field,
              LayerRoughness* const roughness)
diff --git a/Sample/Slice/Slice.h b/Resample/Slice/Slice.h
similarity index 93%
rename from Sample/Slice/Slice.h
rename to Resample/Slice/Slice.h
index e9183d2cd19f4edc37f86a26caa36d5a03a4d0bb..bb1a6eb8e1abf18046c279dffc2af8af3593a5e8 100644
--- a/Sample/Slice/Slice.h
+++ b/Resample/Slice/Slice.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/Slice.h
+//! @file      Resample/Slice/Slice.h
 //! @brief     Defines class Slice.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,8 +17,8 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_SLICE_SLICE_H
-#define BORNAGAIN_SAMPLE_SLICE_SLICE_H
+#ifndef BORNAGAIN_RESAMPLE_SLICE_SLICE_H
+#define BORNAGAIN_RESAMPLE_SLICE_SLICE_H
 
 #include "Sample/Material/Material.h"
 #include "Sample/Scattering/ZLimits.h"
@@ -71,5 +71,5 @@ private:
     std::unique_ptr<const LayerRoughness> m_top_roughness;
 };
 
-#endif // BORNAGAIN_SAMPLE_SLICE_SLICE_H
+#endif // BORNAGAIN_RESAMPLE_SLICE_SLICE_H
 #endif // USER_API
diff --git a/Sample/Slice/SliceStack.cpp b/Resample/Slice/SliceStack.cpp
similarity index 95%
rename from Sample/Slice/SliceStack.cpp
rename to Resample/Slice/SliceStack.cpp
index 838aeb1a9f1036f52970b2b85079a01e5941ebe9..05ee78445180a289e908ed8f217f67dab5a500ac 100644
--- a/Sample/Slice/SliceStack.cpp
+++ b/Resample/Slice/SliceStack.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/SliceStack.h
+//! @file      Resample/Slice/SliceStack.cpp
 //! @brief     Implements class SliceStack.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,9 +12,9 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Slice/SliceStack.h"
+#include "Resample/Slice/SliceStack.h"
 #include "Base/Utils/Assert.h"
-#include "Sample/Slice/Slice.h"
+#include "Resample/Slice/Slice.h"
 
 void SliceStack::addTopSlice(double zbottom, const Material& material)
 {
diff --git a/Sample/Slice/SliceStack.h b/Resample/Slice/SliceStack.h
similarity index 87%
rename from Sample/Slice/SliceStack.h
rename to Resample/Slice/SliceStack.h
index 430162ae03dbe74ce2ae6bbb53dd51853ae4c347..b565a2582d73479719030888053ee1dad3728ee6 100644
--- a/Sample/Slice/SliceStack.h
+++ b/Resample/Slice/SliceStack.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/SliceStack.h
+//! @file      Resample/Slice/SliceStack.h
 //! @brief     Defines class SliceStack.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,8 +17,8 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_SLICE_SLICESTACK_H
-#define BORNAGAIN_SAMPLE_SLICE_SLICESTACK_H
+#ifndef BORNAGAIN_RESAMPLE_SLICE_SLICESTACK_H
+#define BORNAGAIN_RESAMPLE_SLICE_SLICESTACK_H
 
 #include "Base/Vector/Vectors3D.h"
 #include <vector>
@@ -44,5 +44,5 @@ public:
     bool containsMagneticMaterial() const;
 };
 
-#endif // BORNAGAIN_SAMPLE_SLICE_SLICESTACK_H
+#endif // BORNAGAIN_RESAMPLE_SLICE_SLICESTACK_H
 #endif // USER_API
diff --git a/Sample/Slice/SlicedFormFactorList.cpp b/Resample/Slice/SlicedFormFactorList.cpp
similarity index 96%
rename from Sample/Slice/SlicedFormFactorList.cpp
rename to Resample/Slice/SlicedFormFactorList.cpp
index c62caa0daa059b83b5df437bc2c6d7be1086f771..ce3df1e993c5c622f08ced006a691b99b025f1b0 100644
--- a/Sample/Slice/SlicedFormFactorList.cpp
+++ b/Resample/Slice/SlicedFormFactorList.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/SlicedFormFactorList.cpp
+//! @file      Resample/Slice/SlicedFormFactorList.cpp
 //! @brief     Defines class SlicedFormFactorList.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,15 +12,15 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Slice/SlicedFormFactorList.h"
+#include "Resample/Slice/SlicedFormFactorList.h"
 #include "Base/Utils/Assert.h"
 #include "Sample/Material/HomogeneousRegion.h"
 #include "Sample/Particle/IParticle.h"
 #include "Sample/Particle/SlicedParticle.h"
 #include "Sample/Scattering/IFormFactor.h"
 #include "Sample/Scattering/Rotations.h"
-#include "Sample/Slice/Slice.h"
-#include "Sample/Slice/SliceStack.h"
+#include "Resample/Slice/Slice.h"
+#include "Resample/Slice/SliceStack.h"
 #include <utility>
 
 namespace {
diff --git a/Sample/Slice/SlicedFormFactorList.h b/Resample/Slice/SlicedFormFactorList.h
similarity index 87%
rename from Sample/Slice/SlicedFormFactorList.h
rename to Resample/Slice/SlicedFormFactorList.h
index 85ed04f77208065840eb323c4c64393222107869..faf7f4838331040407c7365eb09d2085b4e573b6 100644
--- a/Sample/Slice/SlicedFormFactorList.h
+++ b/Resample/Slice/SlicedFormFactorList.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/SlicedFormFactorList.h
+//! @file      Resample/Slice/SlicedFormFactorList.h
 //! @brief     Defines class SlicedFormFactorList.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,8 +17,8 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_SLICE_SLICEDFORMFACTORLIST_H
-#define BORNAGAIN_SAMPLE_SLICE_SLICEDFORMFACTORLIST_H
+#ifndef BORNAGAIN_RESAMPLE_SLICE_SLICEDFORMFACTORLIST_H
+#define BORNAGAIN_RESAMPLE_SLICE_SLICEDFORMFACTORLIST_H
 
 #include <map>
 #include <memory>
@@ -53,5 +53,5 @@ private:
     std::map<size_t, std::vector<HomogeneousRegion>> m_region_map;
 };
 
-#endif // BORNAGAIN_SAMPLE_SLICE_SLICEDFORMFACTORLIST_H
+#endif // BORNAGAIN_RESAMPLE_SLICE_SLICEDFORMFACTORLIST_H
 #endif // USER_API
diff --git a/Sample/Specular/SpecularMagneticNCStrategy.cpp b/Resample/Specular/SpecularMagneticNCStrategy.cpp
similarity index 96%
rename from Sample/Specular/SpecularMagneticNCStrategy.cpp
rename to Resample/Specular/SpecularMagneticNCStrategy.cpp
index c00ee172f8db027a8d85bdb7a0aad59a22daed6c..2eba4a64f1e886503196ca309ee2d321252aa023 100644
--- a/Sample/Specular/SpecularMagneticNCStrategy.cpp
+++ b/Resample/Specular/SpecularMagneticNCStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Specular/SpecularMagneticNCStrategy.cpp
+//! @file      Resample/Specular/SpecularMagneticNCStrategy.cpp
 //! @brief     Implements class SpecularMagneticNCStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Specular/SpecularMagneticNCStrategy.h"
+#include "Resample/Specular/SpecularMagneticNCStrategy.h"
 
 namespace {
 
diff --git a/Sample/Specular/SpecularMagneticNCStrategy.h b/Resample/Specular/SpecularMagneticNCStrategy.h
similarity index 83%
rename from Sample/Specular/SpecularMagneticNCStrategy.h
rename to Resample/Specular/SpecularMagneticNCStrategy.h
index fd1c9d10a1d769a20135c7b1631a499f6ec47003..6b8d2b98e08f5c2383a803caf8b0d9a300ecefed 100644
--- a/Sample/Specular/SpecularMagneticNCStrategy.h
+++ b/Resample/Specular/SpecularMagneticNCStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Specular/SpecularMagneticNCStrategy.h
+//! @file      Resample/Specular/SpecularMagneticNCStrategy.h
 //! @brief     Defines class SpecularMagneticNCStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,10 +17,10 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICNCSTRATEGY_H
-#define BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICNCSTRATEGY_H
+#ifndef BORNAGAIN_RESAMPLE_SPECULAR_SPECULARMAGNETICNCSTRATEGY_H
+#define BORNAGAIN_RESAMPLE_SPECULAR_SPECULARMAGNETICNCSTRATEGY_H
 
-#include "Sample/Specular/SpecularMagneticStrategy.h"
+#include "Resample/Specular/SpecularMagneticStrategy.h"
 #include <memory>
 #include <vector>
 
@@ -43,5 +43,5 @@ private:
                                 const MatrixRTCoefficients& coeff_i1, double sigma) const;
 };
 
-#endif // BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICNCSTRATEGY_H
+#endif // BORNAGAIN_RESAMPLE_SPECULAR_SPECULARMAGNETICNCSTRATEGY_H
 #endif // USER_API
diff --git a/Sample/Specular/SpecularMagneticStrategy.cpp b/Resample/Specular/SpecularMagneticStrategy.cpp
similarity index 97%
rename from Sample/Specular/SpecularMagneticStrategy.cpp
rename to Resample/Specular/SpecularMagneticStrategy.cpp
index 8f80cbb658b2157583b7e4b34b92e45df404a9ea..8396b9d12c3cbb4972a405038619fedae27d601f 100644
--- a/Sample/Specular/SpecularMagneticStrategy.cpp
+++ b/Resample/Specular/SpecularMagneticStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Specular/SpecularMagneticStrategy.cpp
+//! @file      Resample/Specular/SpecularMagneticStrategy.cpp
 //! @brief     Implements class SpecularMagneticStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,12 +12,12 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Specular/SpecularMagneticStrategy.h"
+#include "Resample/Specular/SpecularMagneticStrategy.h"
 #include "Base/Const/PhysicalConstants.h"
 #include "Sample/Interface/LayerRoughness.h"
-#include "Sample/Slice/KzComputation.h"
-#include "Sample/Slice/Slice.h"
-#include "Sample/Slice/SliceStack.h"
+#include "Resample/Slice/KzComputation.h"
+#include "Resample/Slice/Slice.h"
+#include "Resample/Slice/SliceStack.h"
 
 namespace {
 
diff --git a/Sample/Specular/SpecularMagneticStrategy.h b/Resample/Specular/SpecularMagneticStrategy.h
similarity index 90%
rename from Sample/Specular/SpecularMagneticStrategy.h
rename to Resample/Specular/SpecularMagneticStrategy.h
index be9c4c9cae6b0041f0d80a2c46fbd30ceb584b5b..fdb703889eb90f2c06a31e6b73b7cd173435f76e 100644
--- a/Sample/Specular/SpecularMagneticStrategy.h
+++ b/Resample/Specular/SpecularMagneticStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Specular/SpecularMagneticStrategy.h
+//! @file      Resample/Specular/SpecularMagneticStrategy.h
 //! @brief     Defines class SpecularMagneticStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,11 +17,11 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICSTRATEGY_H
-#define BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICSTRATEGY_H
+#ifndef BORNAGAIN_RESAMPLE_SPECULAR_SPECULARMAGNETICSTRATEGY_H
+#define BORNAGAIN_RESAMPLE_SPECULAR_SPECULARMAGNETICSTRATEGY_H
 
 #include "Sample/RT/MatrixRTCoefficients.h"
-#include "Sample/Slice/ISpecularStrategy.h"
+#include "Resample/Slice/ISpecularStrategy.h"
 #include <memory>
 #include <vector>
 
@@ -70,5 +70,5 @@ private:
     void calculateUpwards(std::vector<MatrixRTCoefficients>& coeff, const SliceStack& slices) const;
 };
 
-#endif // BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICSTRATEGY_H
+#endif // BORNAGAIN_RESAMPLE_SPECULAR_SPECULARMAGNETICSTRATEGY_H
 #endif // USER_API
diff --git a/Sample/Specular/SpecularMagneticTanhStrategy.cpp b/Resample/Specular/SpecularMagneticTanhStrategy.cpp
similarity index 96%
rename from Sample/Specular/SpecularMagneticTanhStrategy.cpp
rename to Resample/Specular/SpecularMagneticTanhStrategy.cpp
index f9effe26e93e61c362cef654e18396be5d055097..3f9e04534e95aeb44193c53d02af89fe9420a263 100644
--- a/Sample/Specular/SpecularMagneticTanhStrategy.cpp
+++ b/Resample/Specular/SpecularMagneticTanhStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Specular/SpecularMagneticTanhStrategy.cpp
+//! @file      Resample/Specular/SpecularMagneticTanhStrategy.cpp
 //! @brief     Implements class SpecularMagneticTanhStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Specular/SpecularMagneticTanhStrategy.h"
+#include "Resample/Specular/SpecularMagneticTanhStrategy.h"
 #include "Base/Math/Constants.h"
 #include "Base/Math/Functions.h"
 
diff --git a/Sample/Specular/SpecularMagneticTanhStrategy.h b/Resample/Specular/SpecularMagneticTanhStrategy.h
similarity index 82%
rename from Sample/Specular/SpecularMagneticTanhStrategy.h
rename to Resample/Specular/SpecularMagneticTanhStrategy.h
index 14ad64ba2a4d83727ed8647b6d266e80b5757a8e..d383147c24d3a073a4e8b4610406f3b96dcecf3d 100644
--- a/Sample/Specular/SpecularMagneticTanhStrategy.h
+++ b/Resample/Specular/SpecularMagneticTanhStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Specular/SpecularMagneticTanhStrategy.h
+//! @file      Resample/Specular/SpecularMagneticTanhStrategy.h
 //! @brief     Defines class SpecularMagneticTanhStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,10 +17,10 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICTANHSTRATEGY_H
-#define BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICTANHSTRATEGY_H
+#ifndef BORNAGAIN_RESAMPLE_SPECULAR_SPECULARMAGNETICTANHSTRATEGY_H
+#define BORNAGAIN_RESAMPLE_SPECULAR_SPECULARMAGNETICTANHSTRATEGY_H
 
-#include "Sample/Specular/SpecularMagneticStrategy.h"
+#include "Resample/Specular/SpecularMagneticStrategy.h"
 
 //! Implements the magnetic Fresnel computation with the analytical Tanh roughness
 //!
@@ -40,5 +40,5 @@ private:
                                             bool inverse = false) const;
 };
 
-#endif // BORNAGAIN_SAMPLE_SPECULAR_SPECULARMAGNETICTANHSTRATEGY_H
+#endif // BORNAGAIN_RESAMPLE_SPECULAR_SPECULARMAGNETICTANHSTRATEGY_H
 #endif // USER_API
diff --git a/Sample/Specular/SpecularScalarNCStrategy.cpp b/Resample/Specular/SpecularScalarNCStrategy.cpp
similarity index 91%
rename from Sample/Specular/SpecularScalarNCStrategy.cpp
rename to Resample/Specular/SpecularScalarNCStrategy.cpp
index 63166d15eec2762ae33b63675b310ebb5cdabf87..d964b279ca3a15d0b25087969827231102352015 100644
--- a/Sample/Specular/SpecularScalarNCStrategy.cpp
+++ b/Resample/Specular/SpecularScalarNCStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Specular/SpecularScalarNCStrategy.cpp
+//! @file      Resample/Specular/SpecularScalarNCStrategy.cpp
 //! @brief     Implements class SpecularScalarNCStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Specular/SpecularScalarNCStrategy.h"
+#include "Resample/Specular/SpecularScalarNCStrategy.h"
 #include <Eigen/Dense>
 
 std::pair<complex_t, complex_t> SpecularScalarNCStrategy::transition(complex_t kzi, complex_t kzi1,
diff --git a/Sample/Specular/SpecularScalarNCStrategy.h b/Resample/Specular/SpecularScalarNCStrategy.h
similarity index 83%
rename from Sample/Specular/SpecularScalarNCStrategy.h
rename to Resample/Specular/SpecularScalarNCStrategy.h
index 5a344c00c246209ae1a1349c9c6ac6533f1bd00a..997eff78b5ad63e113a9c760f8394b79574c8b1e 100644
--- a/Sample/Specular/SpecularScalarNCStrategy.h
+++ b/Resample/Specular/SpecularScalarNCStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Specular/SpecularScalarNCStrategy.h
+//! @file      Resample/Specular/SpecularScalarNCStrategy.h
 //! @brief     Defines class SpecularScalarNCStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,10 +17,10 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARNCSTRATEGY_H
-#define BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARNCSTRATEGY_H
+#ifndef BORNAGAIN_RESAMPLE_SPECULAR_SPECULARSCALARNCSTRATEGY_H
+#define BORNAGAIN_RESAMPLE_SPECULAR_SPECULARSCALARNCSTRATEGY_H
 
-#include "Sample/Specular/SpecularScalarStrategy.h"
+#include "Resample/Specular/SpecularScalarStrategy.h"
 
 //! Implements Nevot-Croce roughness for a scaler computation.
 //!
@@ -40,5 +40,5 @@ private:
                                                        double sigma) const override;
 };
 
-#endif // BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARNCSTRATEGY_H
+#endif // BORNAGAIN_RESAMPLE_SPECULAR_SPECULARSCALARNCSTRATEGY_H
 #endif // USER_API
diff --git a/Sample/Specular/SpecularScalarStrategy.cpp b/Resample/Specular/SpecularScalarStrategy.cpp
similarity index 95%
rename from Sample/Specular/SpecularScalarStrategy.cpp
rename to Resample/Specular/SpecularScalarStrategy.cpp
index 78abcc2131b7e93c89041589014dce351d92e6fd..a9aa64022bded913e8094fdbab368d9aa14800df 100644
--- a/Sample/Specular/SpecularScalarStrategy.cpp
+++ b/Resample/Specular/SpecularScalarStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Specular/SpecularScalarStrategy.cpp
+//! @file      Resample/Specular/SpecularScalarStrategy.cpp
 //! @brief     Implements class SpecularScalarStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,12 +12,12 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Specular/SpecularScalarStrategy.h"
+#include "Resample/Specular/SpecularScalarStrategy.h"
 #include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/KzComputation.h"
-#include "Sample/Slice/Slice.h"
-#include "Sample/Slice/SliceStack.h"
+#include "Resample/Slice/KzComputation.h"
+#include "Resample/Slice/Slice.h"
+#include "Resample/Slice/SliceStack.h"
 #include <Eigen/Dense>
 #include <stdexcept>
 
diff --git a/Sample/Specular/SpecularScalarStrategy.h b/Resample/Specular/SpecularScalarStrategy.h
similarity index 90%
rename from Sample/Specular/SpecularScalarStrategy.h
rename to Resample/Specular/SpecularScalarStrategy.h
index 6f2d3c28e0a7bdf685aaa4117e8da4798204c582..573c84d5a3f90737724c79c0eabe0448b2a26e54 100644
--- a/Sample/Specular/SpecularScalarStrategy.h
+++ b/Resample/Specular/SpecularScalarStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Specular/SpecularScalarStrategy.h
+//! @file      Resample/Specular/SpecularScalarStrategy.h
 //! @brief     Defines class SpecularScalarStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,11 +17,11 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARSTRATEGY_H
-#define BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARSTRATEGY_H
+#ifndef BORNAGAIN_RESAMPLE_SPECULAR_SPECULARSCALARSTRATEGY_H
+#define BORNAGAIN_RESAMPLE_SPECULAR_SPECULARSCALARSTRATEGY_H
 
 #include "Sample/RT/ScalarRTCoefficients.h"
-#include "Sample/Slice/ISpecularStrategy.h"
+#include "Resample/Slice/ISpecularStrategy.h"
 #include <memory>
 #include <vector>
 
@@ -67,5 +67,5 @@ private:
                               const std::vector<complex_t>& kz) const;
 };
 
-#endif // BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARSTRATEGY_H
+#endif // BORNAGAIN_RESAMPLE_SPECULAR_SPECULARSCALARSTRATEGY_H
 #endif // USER_API
diff --git a/Sample/Specular/SpecularScalarTanhStrategy.cpp b/Resample/Specular/SpecularScalarTanhStrategy.cpp
similarity index 91%
rename from Sample/Specular/SpecularScalarTanhStrategy.cpp
rename to Resample/Specular/SpecularScalarTanhStrategy.cpp
index b30a1974915302dc8b9e8a30f389b798c6d60cde..bd6579853c3ce79b0acb39d63b18cccde6c3ff1a 100644
--- a/Sample/Specular/SpecularScalarTanhStrategy.cpp
+++ b/Resample/Specular/SpecularScalarTanhStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Specular/SpecularScalarTanhStrategy.cpp
+//! @file      Resample/Specular/SpecularScalarTanhStrategy.cpp
 //! @brief     Implements class SpecularScalarTanhStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Specular/SpecularScalarTanhStrategy.h"
+#include "Resample/Specular/SpecularScalarTanhStrategy.h"
 #include "Base/Math/Constants.h"
 #include "Base/Math/Functions.h"
 #include <Eigen/Dense>
diff --git a/Sample/Specular/SpecularScalarTanhStrategy.h b/Resample/Specular/SpecularScalarTanhStrategy.h
similarity index 82%
rename from Sample/Specular/SpecularScalarTanhStrategy.h
rename to Resample/Specular/SpecularScalarTanhStrategy.h
index 086dd944c06aca1fe789b07fccd698273c4e13b9..bb0d47c8a1068aa06a47594a56e71b57dfb3770f 100644
--- a/Sample/Specular/SpecularScalarTanhStrategy.h
+++ b/Resample/Specular/SpecularScalarTanhStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Specular/SpecularScalarTanhStrategy.h
+//! @file      Resample/Specular/SpecularScalarTanhStrategy.h
 //! @brief     Defines class SpecularScalarTanhStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,10 +17,10 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARTANHSTRATEGY_H
-#define BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARTANHSTRATEGY_H
+#ifndef BORNAGAIN_RESAMPLE_SPECULAR_SPECULARSCALARTANHSTRATEGY_H
+#define BORNAGAIN_RESAMPLE_SPECULAR_SPECULARSCALARTANHSTRATEGY_H
 
-#include "Sample/Specular/SpecularScalarStrategy.h"
+#include "Resample/Specular/SpecularScalarStrategy.h"
 
 //! Implements an tanh transition function to model roughness in a scaler computation.
 //!
@@ -37,5 +37,5 @@ private:
                                                        double sigma) const override;
 };
 
-#endif // BORNAGAIN_SAMPLE_SPECULAR_SPECULARSCALARTANHSTRATEGY_H
+#endif // BORNAGAIN_RESAMPLE_SPECULAR_SPECULARSCALARTANHSTRATEGY_H
 #endif // USER_API
diff --git a/Sample/Specular/SpecularStrategyBuilder.cpp b/Resample/Specular/SpecularStrategyBuilder.cpp
similarity index 82%
rename from Sample/Specular/SpecularStrategyBuilder.cpp
rename to Resample/Specular/SpecularStrategyBuilder.cpp
index 04581776d9fb1f59834d61f1341249b331005f69..59510a9f71503a00553db2467d85d9e5eee9922b 100644
--- a/Sample/Specular/SpecularStrategyBuilder.cpp
+++ b/Resample/Specular/SpecularStrategyBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Specular/SpecularStrategyBuilder.cpp
+//! @file      Resample/Specular/SpecularStrategyBuilder.cpp
 //! @brief     Implements class SpecularStrategyBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,12 +12,12 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Specular/SpecularStrategyBuilder.h"
+#include "Resample/Specular/SpecularStrategyBuilder.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Specular/SpecularMagneticNCStrategy.h"
-#include "Sample/Specular/SpecularMagneticTanhStrategy.h"
-#include "Sample/Specular/SpecularScalarNCStrategy.h"
-#include "Sample/Specular/SpecularScalarTanhStrategy.h"
+#include "Resample/Specular/SpecularMagneticNCStrategy.h"
+#include "Resample/Specular/SpecularMagneticTanhStrategy.h"
+#include "Resample/Specular/SpecularScalarNCStrategy.h"
+#include "Resample/Specular/SpecularScalarTanhStrategy.h"
 
 std::unique_ptr<SpecularScalarStrategy>
 SampleUtils::SpecularStrategyBuilder::buildScalar(const MultiLayer& sample)
diff --git a/Sample/Specular/SpecularStrategyBuilder.h b/Resample/Specular/SpecularStrategyBuilder.h
similarity index 73%
rename from Sample/Specular/SpecularStrategyBuilder.h
rename to Resample/Specular/SpecularStrategyBuilder.h
index 74a8cf39a18fa8e74e4e575e68283c77f79b56f6..12e151eeb25cb90056f38434b8ba647fed4ac1f1 100644
--- a/Sample/Specular/SpecularStrategyBuilder.h
+++ b/Resample/Specular/SpecularStrategyBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Specular/SpecularStrategyBuilder.h
+//! @file      Resample/Specular/SpecularStrategyBuilder.h
 //! @brief     Defines class SpecularStrategyBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,11 +17,11 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_SPECULAR_SPECULARSTRATEGYBUILDER_H
-#define BORNAGAIN_SAMPLE_SPECULAR_SPECULARSTRATEGYBUILDER_H
+#ifndef BORNAGAIN_RESAMPLE_SPECULAR_SPECULARSTRATEGYBUILDER_H
+#define BORNAGAIN_RESAMPLE_SPECULAR_SPECULARSTRATEGYBUILDER_H
 
-#include "Sample/Specular/SpecularMagneticStrategy.h"
-#include "Sample/Specular/SpecularScalarStrategy.h"
+#include "Resample/Specular/SpecularMagneticStrategy.h"
+#include "Resample/Specular/SpecularScalarStrategy.h"
 #include <memory>
 
 class MultiLayer;
@@ -34,5 +34,5 @@ std::unique_ptr<SpecularMagneticStrategy> buildMagnetic(const MultiLayer& sample
 } // namespace SampleUtils::SpecularStrategyBuilder
 
 
-#endif // BORNAGAIN_SAMPLE_SPECULAR_SPECULARSTRATEGYBUILDER_H
+#endif // BORNAGAIN_RESAMPLE_SPECULAR_SPECULARSTRATEGYBUILDER_H
 #endif // USER_API
diff --git a/Tests/UnitTests/Core/Fresnel/KzComputationTest.cpp b/Tests/UnitTests/Core/Fresnel/KzComputationTest.cpp
index 85a3c4340f57d5181e417e8df4b0162b6b7cc54f..a906f34d1450fdf2ecb9cf1bbf2d387c4c75e037 100644
--- a/Tests/UnitTests/Core/Fresnel/KzComputationTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/KzComputationTest.cpp
@@ -1,4 +1,4 @@
-#include "Sample/Slice/KzComputation.h"
+#include "Resample/Slice/KzComputation.h"
 #include "Base/Const/Units.h"
 #include "Base/Vector/Direction.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp
index 2b1540c668ef8f08ee87d59fae649ff3d05a9f70..f08f19aaf679aacc62cec4a6223fd52964e8390f 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp
@@ -5,9 +5,9 @@
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Resample/Processed/ProcessedSample.h"
 #include "Sample/RT/SimulationOptions.h"
-#include "Sample/Slice/KzComputation.h"
-#include "Sample/Specular/SpecularMagneticTanhStrategy.h"
-#include "Sample/Specular/SpecularScalarTanhStrategy.h"
+#include "Resample/Slice/KzComputation.h"
+#include "Resample/Specular/SpecularMagneticTanhStrategy.h"
+#include "Resample/Specular/SpecularScalarTanhStrategy.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <utility>
 
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
index 3cffac065eed362e5fa80e53247eaadfa40c04e7..6e9e61a6290fba76a4715319d7d9e9f7abb1f8af 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularScanTest.cpp
@@ -8,8 +8,8 @@
 #include "Device/Resolution/ScanResolution.h"
 #include "Param/Distrib/RangedDistributions.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
-#include "Sample/Slice/Slice.h"
-#include "Sample/Slice/SliceStack.h"
+#include "Resample/Slice/Slice.h"
+#include "Resample/Slice/SliceStack.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class SpecularScanTest : public ::testing::Test {
diff --git a/Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.cpp b/Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.cpp
index 8016a1e6621a55bd78e9b0989f40a8e1a198f538..244ef027470aafe475719f7b08d1a63ec8452016 100644
--- a/Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.cpp
+++ b/Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.cpp
@@ -1,5 +1,5 @@
-#include "Sample/Fresnel/FormFactorCoherentSum.h"
-#include "Sample/FFCompute/ComputeBA.h"
+#include "Resample/Fresnel/FormFactorCoherentSum.h"
+#include "Resample/FFCompute/ComputeBA.h"
 #include "Sample/HardParticle/FormFactorFullSphere.h"
 #include "Tests/GTestWrapper/google_test.h"
 
diff --git a/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp b/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp
index f8b9b40684ee5132312855d2ededb7f430d26b13..e52c5e0d28836dabcbbb1f32276c2690635714d4 100644
--- a/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp
+++ b/Tests/UnitTests/Core/Sample/MultilayerAveragingTest.cpp
@@ -7,8 +7,8 @@
 #include "Sample/Particle/Particle.h"
 #include "Resample/Processed/ProcessedSample.h"
 #include "Sample/RT/SimulationOptions.h"
-#include "Sample/Slice/Slice.h"
-#include "Sample/Slice/SliceStack.h"
+#include "Resample/Slice/Slice.h"
+#include "Resample/Slice/SliceStack.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class MultilayerAveragingTest : public ::testing::Test {
diff --git a/Tests/UnitTests/Core/Sample/RTTest.cpp b/Tests/UnitTests/Core/Sample/RTTest.cpp
index 915c5af1c6610c14348cd561cb7c01346c643e4b..084e0274f94b7fb01efc41f26201bafe61aeaf08 100644
--- a/Tests/UnitTests/Core/Sample/RTTest.cpp
+++ b/Tests/UnitTests/Core/Sample/RTTest.cpp
@@ -7,7 +7,7 @@
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Resample/Processed/ProcessedSample.h"
 #include "Sample/RT/SimulationOptions.h"
-#include "Sample/Specular/SpecularScalarTanhStrategy.h"
+#include "Resample/Specular/SpecularScalarTanhStrategy.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class RTTest : public ::testing::Test {
diff --git a/gui2/quicksimeditor/materialprofile.cpp b/gui2/quicksimeditor/materialprofile.cpp
index e6ccb8cabcbc59eb80b57eb843a8c3f9257ce624..0b1e11836a51f28ad57095100be1792c95e36a41 100644
--- a/gui2/quicksimeditor/materialprofile.cpp
+++ b/gui2/quicksimeditor/materialprofile.cpp
@@ -15,7 +15,7 @@
 #include "gui2/quicksimeditor/materialprofile.h"
 #include "gui2/quicksimeditor/profilehelper.h"
 #include "gui2/quicksimeditor/quicksimutils.h"
-#include <Sample/Slice/Slice.h>
+#include <Resample/Slice/Slice.h>
 
 namespace gui2 {
 
diff --git a/gui2/quicksimeditor/profilehelper.cpp b/gui2/quicksimeditor/profilehelper.cpp
index 3de310189812e45b6afe4a8b3a5f4a5c8293c57d..b006e79879d6159bd2df1c9bce67c2c1f9e76cee 100644
--- a/gui2/quicksimeditor/profilehelper.cpp
+++ b/gui2/quicksimeditor/profilehelper.cpp
@@ -14,7 +14,7 @@
 
 #include "gui2/quicksimeditor/profilehelper.h"
 #include <Sample/Interface/LayerRoughness.h>
-#include <Sample/Slice/Slice.h>
+#include <Resample/Slice/Slice.h>
 
 namespace {
 const double prefactor = std::sqrt(2.0 / M_PI);
diff --git a/gui2/quicksimeditor/profilehelper.h b/gui2/quicksimeditor/profilehelper.h
index 0f6b4c9b4fb0f074e199877d9b1bdcc8fe6ec326..34b3bf93e566afc8e9b725e674019a659848e632 100644
--- a/gui2/quicksimeditor/profilehelper.h
+++ b/gui2/quicksimeditor/profilehelper.h
@@ -16,7 +16,7 @@
 #define BORNAGAIN_GUI2_QUICKSIMEDITOR_PROFILEHELPER_H
 
 #include "darefl_export.h"
-#include <Sample/Slice/Slice.h>
+#include <Resample/Slice/Slice.h>
 #include <utility>
 #include <vector>
 
diff --git a/gui2/quicksimeditor/quicksimutils.cpp b/gui2/quicksimeditor/quicksimutils.cpp
index 2c4ee95538ace988b9bde06885129db475057e07..ca74a46ec3c9b5246b1a968b241021f7fbb08ed4 100644
--- a/gui2/quicksimeditor/quicksimutils.cpp
+++ b/gui2/quicksimeditor/quicksimutils.cpp
@@ -20,7 +20,7 @@
 #include "mvvm/model/sessionmodel.h"
 #include <Sample/Interface/LayerRoughness.h>
 #include <Sample/Material/MaterialFactoryFuncs.h>
-#include <Sample/Slice/Slice.h>
+#include <Resample/Slice/Slice.h>
 #include <stdexcept>
 
 namespace gui2 {
diff --git a/gui2/quicksimeditor/speculartoysimulation.cpp b/gui2/quicksimeditor/speculartoysimulation.cpp
index d05ae83f88af8da8c73172a4e39dbb3f6d72b499..4c49535e380b28a5976de76a02972cb3ef81d518 100644
--- a/gui2/quicksimeditor/speculartoysimulation.cpp
+++ b/gui2/quicksimeditor/speculartoysimulation.cpp
@@ -17,9 +17,9 @@
 #include "gui2/quicksimeditor/quicksimutils.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/utils/containerutils.h"
-#include <Sample/Slice/KzComputation.h>
-#include <Sample/Slice/Slice.h>
-#include <Sample/Specular/SpecularScalarTanhStrategy.h>
+#include <Resample/Slice/KzComputation.h>
+#include <Resample/Slice/Slice.h>
+#include <Resample/Specular/SpecularScalarTanhStrategy.h>
 #include <algorithm>
 #include <stdexcept>