diff --git a/Core/Computation/RoughMultiLayerComputation.cpp b/Core/Computation/RoughMultiLayerComputation.cpp
index 2776b56cad6bd923d63e6c375a03adb6d05af335..30470d4f1b3ba8bfd3569250f7d9bff54c875ba5 100644
--- a/Core/Computation/RoughMultiLayerComputation.cpp
+++ b/Core/Computation/RoughMultiLayerComputation.cpp
@@ -20,8 +20,8 @@
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Processed/ProcessedSample.h"
 #include "Sample/RT/ILayerRTCoefficients.h"
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
 
diff --git a/Core/Export/SampleToPython.cpp b/Core/Export/SampleToPython.cpp
index 2894d72b52ea4e6ccb6509688f783ebeb8c4f3ed..1cc492c3f1053b2572ef600c93ace1456df2b75d 100644
--- a/Core/Export/SampleToPython.cpp
+++ b/Core/Export/SampleToPython.cpp
@@ -30,8 +30,8 @@
 #include "Sample/Particle/ParticleComposition.h"
 #include "Sample/Particle/ParticleCoreShell.h"
 #include "Sample/Scattering/IFormFactor.h"
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include <iomanip>
 #include <map>
 #include <set>
diff --git a/GUI/Models/TransformFromDomain.cpp b/GUI/Models/TransformFromDomain.cpp
index 5d1509068150a68239968d19d3bac66cc0993725..1de625ebcd833100be534ae21fa8022f84c3b05b 100644
--- a/GUI/Models/TransformFromDomain.cpp
+++ b/GUI/Models/TransformFromDomain.cpp
@@ -52,8 +52,8 @@
 #include "Param/Distrib/RangedDistributions.h"
 #include "Sample/Aggregate/InterferenceFunctions.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 using namespace node_progeny;
 
diff --git a/GUI/Models/TransformToDomain.h b/GUI/Models/TransformToDomain.h
index b03d50f0eeb342852fe017275e97669d5021c837..6e9e2ee6608f9389d64b8a0bc6a08a1b8816865a 100644
--- a/GUI/Models/TransformToDomain.h
+++ b/GUI/Models/TransformToDomain.h
@@ -23,7 +23,7 @@
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/IParticle.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include <memory>
 
 class AngularSpecScan;
diff --git a/Sample/Slice/LayerInterface.cpp b/Sample/Interface/LayerInterface.cpp
similarity index 94%
rename from Sample/Slice/LayerInterface.cpp
rename to Sample/Interface/LayerInterface.cpp
index 40dfb228f60b0a75bce4d22cbd26262ff51e3f28..d39e80a3b72d4f7652797193774d1e3cd9bb5f5c 100644
--- a/Sample/Slice/LayerInterface.cpp
+++ b/Sample/Interface/LayerInterface.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/LayerInterface.cpp
+//! @file      Sample/Interface/LayerInterface.cpp
 //! @brief     Implements class LayerInterface.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 LayerInterface::LayerInterface() : m_topLayer(nullptr), m_bottomLayer(nullptr)
 {
diff --git a/Sample/Slice/LayerInterface.h b/Sample/Interface/LayerInterface.h
similarity index 92%
rename from Sample/Slice/LayerInterface.h
rename to Sample/Interface/LayerInterface.h
index c4d5962ba81ba1afc139a457e9aee4b54c91a16c..d55ef945c16cdc570d2cd7838499628dcff65f0a 100644
--- a/Sample/Slice/LayerInterface.h
+++ b/Sample/Interface/LayerInterface.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/LayerInterface.h
+//! @file      Sample/Interface/LayerInterface.h
 //! @brief     Defines class LayerInterface.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,8 +17,8 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_SAMPLE_SLICE_LAYERINTERFACE_H
-#define BORNAGAIN_SAMPLE_SLICE_LAYERINTERFACE_H
+#ifndef BORNAGAIN_SAMPLE_INTERFACE_LAYERINTERFACE_H
+#define BORNAGAIN_SAMPLE_INTERFACE_LAYERINTERFACE_H
 
 #include "Sample/Scattering/ISampleNode.h"
 #include <memory>
@@ -79,5 +79,5 @@ inline const Layer* LayerInterface::bottomLayer() const
     return m_bottomLayer;
 }
 
-#endif // BORNAGAIN_SAMPLE_SLICE_LAYERINTERFACE_H
+#endif // BORNAGAIN_SAMPLE_INTERFACE_LAYERINTERFACE_H
 #endif // USER_API
diff --git a/Sample/Slice/LayerRoughness.cpp b/Sample/Interface/LayerRoughness.cpp
similarity index 96%
rename from Sample/Slice/LayerRoughness.cpp
rename to Sample/Interface/LayerRoughness.cpp
index 1c0ef2cae7711c3f8dcd14848e6b5d37bb88df2c..5875ada9e1e76aef77ede01ec885312fa45d1c49 100644
--- a/Sample/Slice/LayerRoughness.cpp
+++ b/Sample/Interface/LayerRoughness.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/LayerRoughness.cpp
+//! @file      Sample/Interface/LayerRoughness.cpp
 //! @brief     Implements class LayerRoughness.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Base/Math/Constants.h"
 #include "Base/Py/PyFmt.h"
 #include "Fit/Param/RealLimits.h"
diff --git a/Sample/Slice/LayerRoughness.h b/Sample/Interface/LayerRoughness.h
similarity index 92%
rename from Sample/Slice/LayerRoughness.h
rename to Sample/Interface/LayerRoughness.h
index f4b6b6730ddf3e3f3ea483f8030c47b64a9ba69d..998d44bfcec39e130fda226811f74b2c62d0d06b 100644
--- a/Sample/Slice/LayerRoughness.h
+++ b/Sample/Interface/LayerRoughness.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Sample/Slice/LayerRoughness.h
+//! @file      Sample/Interface/LayerRoughness.h
 //! @brief     Defines class LayerRoughness.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_SAMPLE_SLICE_LAYERROUGHNESS_H
-#define BORNAGAIN_SAMPLE_SLICE_LAYERROUGHNESS_H
+#ifndef BORNAGAIN_SAMPLE_INTERFACE_LAYERROUGHNESS_H
+#define BORNAGAIN_SAMPLE_INTERFACE_LAYERROUGHNESS_H
 
 #include "Sample/Scattering/ISampleNode.h"
 
@@ -70,4 +70,4 @@ private:
     double m_lateralCorrLength; //!< lateral correlation length of the roughness
 };
 
-#endif // BORNAGAIN_SAMPLE_SLICE_LAYERROUGHNESS_H
+#endif // BORNAGAIN_SAMPLE_INTERFACE_LAYERROUGHNESS_H
diff --git a/Sample/Multilayer/MultiLayer.cpp b/Sample/Multilayer/MultiLayer.cpp
index 59d8ff689584e60f11ceaf15a5f76b6ebee64320..ad35513db32f424525f47518a8d08b0a85997fc7 100644
--- a/Sample/Multilayer/MultiLayer.cpp
+++ b/Sample/Multilayer/MultiLayer.cpp
@@ -19,8 +19,8 @@
 #include "Sample/Material/MaterialUtils.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultilayerUtils.h"
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 MultiLayer::MultiLayer() : m_crossCorrLength(0)
 {
diff --git a/Sample/Multilayer/MultilayerUtils.cpp b/Sample/Multilayer/MultilayerUtils.cpp
index f2c34d03116d0588e76935718abe4aa0c04cc42c..7832959fe95e4589efa6df1577ead2a8e767daf8 100644
--- a/Sample/Multilayer/MultilayerUtils.cpp
+++ b/Sample/Multilayer/MultilayerUtils.cpp
@@ -16,7 +16,7 @@
 #include "Sample/Material/MaterialUtils.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Slice/LayerInterface.h"
+#include "Sample/Interface/LayerInterface.h"
 
 const LayerRoughness* SampleUtils::Multilayer::LayerTopRoughness(const MultiLayer& multilayer,
                                                                  size_t i)
diff --git a/Sample/Processed/ProcessedSample.cpp b/Sample/Processed/ProcessedSample.cpp
index 5ab59e13947d238ece53b19ed5ef85ed7666c41d..02b100ccd19af6557fef91c84c86eef9c64153a1 100644
--- a/Sample/Processed/ProcessedSample.cpp
+++ b/Sample/Processed/ProcessedSample.cpp
@@ -25,7 +25,7 @@
 #include "Sample/Processed/ProcessedLayout.h"
 #include "Sample/RT/SimulationOptions.h"
 #include "Sample/Scattering/ZLimits.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
 #include "Sample/Specular/SpecularStrategyBuilder.h"
diff --git a/Sample/Processed/ProfileHelper.cpp b/Sample/Processed/ProfileHelper.cpp
index c0986fd6f9cb06b69892a053307ebae877066454..6b30ae7a9a291966c702308dbe8f6a034735fba0 100644
--- a/Sample/Processed/ProfileHelper.cpp
+++ b/Sample/Processed/ProfileHelper.cpp
@@ -14,7 +14,7 @@
 
 #include "Sample/Processed/ProfileHelper.h"
 #include "Sample/Processed/ProcessedSample.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
 
diff --git a/Sample/Slice/Slice.cpp b/Sample/Slice/Slice.cpp
index 3ced4b005564e2032bfa836d073574986dcaec67..57ad513fac4251fc26435c3ad17729e58afef6a2 100644
--- a/Sample/Slice/Slice.cpp
+++ b/Sample/Slice/Slice.cpp
@@ -14,7 +14,7 @@
 
 #include "Sample/Slice/Slice.h"
 #include "Sample/Material/MaterialUtils.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Slice/SliceStack.h"
 
 Slice::Slice(const ZLimits& zRange, const Material& material, const kvector_t& B_field,
diff --git a/Sample/Specular/SpecularMagneticStrategy.cpp b/Sample/Specular/SpecularMagneticStrategy.cpp
index fb95fdf2badc6f7c1411cb94b73d3a6b3deaa57e..ccc900c35e82b0766d4ea12dbdcc773df2e98016 100644
--- a/Sample/Specular/SpecularMagneticStrategy.cpp
+++ b/Sample/Specular/SpecularMagneticStrategy.cpp
@@ -15,7 +15,7 @@
 #include "Sample/Specular/SpecularMagneticStrategy.h"
 #include "Base/Const/PhysicalConstants.h"
 #include "Sample/Slice/KzComputation.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
 
diff --git a/Sample/Specular/SpecularScalarStrategy.cpp b/Sample/Specular/SpecularScalarStrategy.cpp
index 8220c094babc83aecfc23f898409a0a1f2a28871..3d00c676eb3a12f5565ead3f5fa300c5aaaedb07 100644
--- a/Sample/Specular/SpecularScalarStrategy.cpp
+++ b/Sample/Specular/SpecularScalarStrategy.cpp
@@ -15,7 +15,7 @@
 #include "Sample/Specular/SpecularScalarStrategy.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Slice/KzComputation.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Slice/Slice.h"
 #include "Sample/Slice/SliceStack.h"
 #include <Eigen/Dense>
diff --git a/Sample/StandardSamples/CylindersBuilder.cpp b/Sample/StandardSamples/CylindersBuilder.cpp
index 98bdd4ba6ee88b271a7cb07eb66ee8a7a28d455d..d83885177e96e17c8ed79a15c0ff03063384306f 100644
--- a/Sample/StandardSamples/CylindersBuilder.cpp
+++ b/Sample/StandardSamples/CylindersBuilder.cpp
@@ -20,7 +20,7 @@
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/Slice/LayerInterface.h"
+#include "Sample/Interface/LayerInterface.h"
 #include "Sample/StandardSamples/ReferenceMaterials.h"
 
 // -----------------------------------------------------------------------------
diff --git a/Sample/StandardSamples/FeNiBilayerBuilder.cpp b/Sample/StandardSamples/FeNiBilayerBuilder.cpp
index af7e9d54c6bab0a840b9dc902cd874b72c4481fe..89e47280775d6343086ff552455b068a53370c55 100644
--- a/Sample/StandardSamples/FeNiBilayerBuilder.cpp
+++ b/Sample/StandardSamples/FeNiBilayerBuilder.cpp
@@ -19,7 +19,7 @@
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 namespace {
 auto constexpr rhoMconst = -PhysConsts::m_n * PhysConsts::g_factor_n * PhysConsts::mu_N
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp b/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
index e944abec59fe2136b7441a6e5441e9c604d20a17..74f6619c7b7fc1ac57c5a4013ffa4be838d663ab 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
+++ b/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
@@ -20,7 +20,7 @@
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
 #include "Sample/SampleBuilderEngine/FormFactorComponents.h"
-#include "Sample/Slice/LayerInterface.h"
+#include "Sample/Interface/LayerInterface.h"
 #include "Sample/StandardSamples/ReferenceMaterials.h"
 
 namespace {
diff --git a/Sample/StandardSamples/MagneticLayersBuilder.cpp b/Sample/StandardSamples/MagneticLayersBuilder.cpp
index 815faaa8a0ea80634d55602c182c1409e1b350c2..eccbf86d9ce7ffcbf89340de23a1d992b11458b2 100644
--- a/Sample/StandardSamples/MagneticLayersBuilder.cpp
+++ b/Sample/StandardSamples/MagneticLayersBuilder.cpp
@@ -21,7 +21,7 @@
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 namespace {
 
diff --git a/Sample/StandardSamples/MagneticParticlesBuilder.cpp b/Sample/StandardSamples/MagneticParticlesBuilder.cpp
index 6c41b350a5dafa151c55835aa4b13a456fe88443..32ce8ea21d3497cf88e27a076111df962e387764 100644
--- a/Sample/StandardSamples/MagneticParticlesBuilder.cpp
+++ b/Sample/StandardSamples/MagneticParticlesBuilder.cpp
@@ -21,8 +21,8 @@
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 // ----------------------------------------------------------------------------
 // Magnetic cylinders and zero magnetic field
diff --git a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp b/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
index 175bc42ca9e856034c93b33806e571f9b0ef3389..5326271dcc46370a0fe66912d85391f5c4a2e896 100644
--- a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
+++ b/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
@@ -14,7 +14,7 @@
 
 #include "Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 MultiLayer* MultiLayerWithNCRoughnessBuilder::buildSample() const
 {
diff --git a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp b/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
index e32ae748af674c5659c45242d9ffb591cf614720..7c6da53f4ab22039ba062db443a092a291f33572 100644
--- a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
+++ b/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
@@ -17,7 +17,7 @@
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 MultiLayer* MultiLayerWithRoughnessBuilder::buildSample() const
 {
diff --git a/Sample/StandardSamples/ResonatorBuilder.cpp b/Sample/StandardSamples/ResonatorBuilder.cpp
index 99a4e64154b6cdd354266168d337b3a3b6cd9419..418ed423e8014b213bdc8eaafe39d21102507812 100644
--- a/Sample/StandardSamples/ResonatorBuilder.cpp
+++ b/Sample/StandardSamples/ResonatorBuilder.cpp
@@ -18,7 +18,7 @@
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include <memory>
 
 ResonatorBuilder::ResonatorBuilder(double ti_thickness)
diff --git a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp b/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
index 3e8aec2f96ed859ee9ed59f33c54c96b2ca8e3c9..87955b58941686b58efaf96ecfc41b37dec675c1 100644
--- a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
+++ b/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
@@ -17,7 +17,7 @@
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 
 MultiLayer* ThickAbsorptiveSampleBuilder::buildSample() const
 {
diff --git a/Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp b/Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp
index a46c8f65cbd575213db63b7b08cf27cac12a2a83..26205e48be94cc834804191772d49f0d596a2da3 100644
--- a/Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp
+++ b/Sample/StandardSamples/TwoLayerRoughnessBuilder.cpp
@@ -16,7 +16,7 @@
 #include "Base/Const/Units.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/StandardSamples/ReferenceMaterials.h"
 
 MultiLayer* TwoLayerRoughnessBuilder::buildSample() const
diff --git a/Tests/Performance/Core/Mesocrystal.cpp b/Tests/Performance/Core/Mesocrystal.cpp
index f20413831ffdc4a1494ff467bb1972d429366e05..1bf3c6c738a4ece09473ce5dfc37607c388bc58c 100644
--- a/Tests/Performance/Core/Mesocrystal.cpp
+++ b/Tests/Performance/Core/Mesocrystal.cpp
@@ -27,7 +27,7 @@
 #include "Sample/Particle/Particle.h"
 #include "Sample/Particle/ParticleComposition.h"
 #include "Sample/SampleBuilderEngine/ISampleBuilder.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/SoftParticle/FormFactorSphereLogNormalRadius.h"
 #include <iostream>
 
diff --git a/Tests/UnitTests/Core/Core/PythonFormattingTest.cpp b/Tests/UnitTests/Core/Core/PythonFormattingTest.cpp
index 8cb152a704c87f0f6c3c119979753f3b0f0fbe65..3e604c89f7652b5f1eae716078a72f3b72753422 100644
--- a/Tests/UnitTests/Core/Core/PythonFormattingTest.cpp
+++ b/Tests/UnitTests/Core/Core/PythonFormattingTest.cpp
@@ -34,7 +34,7 @@
 #include "Sample/HardParticle/FormFactorTruncatedCube.h"
 #include "Sample/HardParticle/FormFactorTruncatedSphere.h"
 #include "Sample/HardParticle/FormFactorTruncatedSpheroid.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/SoftParticle/FormFactorGauss.h"
 #include "Sample/SoftParticle/FormFactorSphereGaussianRadius.h"
 #include "Sample/SoftParticle/FormFactorSphereLogNormalRadius.h"
diff --git a/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp b/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp
index b1388454d674921c94310e63d72c91414b460fa0..4ba98f4fe63ca993c522217dabfbd008c0cf8235 100644
--- a/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp
+++ b/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp
@@ -1,7 +1,7 @@
-#include "Sample/Slice/LayerInterface.h"
+#include "Sample/Interface/LayerInterface.h"
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <memory>
 
diff --git a/Tests/UnitTests/Core/Sample/LayerRoughnessTest.cpp b/Tests/UnitTests/Core/Sample/LayerRoughnessTest.cpp
index a6a0665e86bdb21ee5f73861094d96c62a2c8db1..3f66042d63d471f55a25ba80f7282f6dbe1cc618 100644
--- a/Tests/UnitTests/Core/Sample/LayerRoughnessTest.cpp
+++ b/Tests/UnitTests/Core/Sample/LayerRoughnessTest.cpp
@@ -1,4 +1,4 @@
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class LayerRoughnessTest : public ::testing::Test {
diff --git a/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp b/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
index 727ca2f6e336c935bd722a967e4b273071f1631a..b34e08af35f06d841a03cc25fa5943e9c125faba 100644
--- a/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
+++ b/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp
@@ -5,8 +5,8 @@
 #include "Sample/Material/MaterialFactoryFuncs.h"
 #include "Sample/Multilayer/Layer.h"
 #include "Sample/Multilayer/MultilayerUtils.h"
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class MultiLayerTest : public ::testing::Test {
diff --git a/Tests/UnitTests/Core/Sample/RTTest.cpp b/Tests/UnitTests/Core/Sample/RTTest.cpp
index 7edd8f0ff1f3b47f9fa38aeb95b8464595030c6f..ff93dc23e347a392af892f736c135336b2c6c180 100644
--- a/Tests/UnitTests/Core/Sample/RTTest.cpp
+++ b/Tests/UnitTests/Core/Sample/RTTest.cpp
@@ -5,8 +5,8 @@
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/Processed/ProcessedSample.h"
 #include "Sample/RT/SimulationOptions.h"
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/Specular/SpecularScalarTanhStrategy.h"
 #include "Tests/GTestWrapper/google_test.h"
 
diff --git a/Wrap/Swig/libBornAgainSample.i b/Wrap/Swig/libBornAgainSample.i
index ea9b47602e2ac9ce17a1806343d3e2169abd91de..fcff62cdd6d22e9822646ea496972a76e1bdefbe 100644
--- a/Wrap/Swig/libBornAgainSample.i
+++ b/Wrap/Swig/libBornAgainSample.i
@@ -96,8 +96,8 @@
 #include "Sample/RT/SimulationOptions.h"
 #include "Sample/SampleBuilderEngine/ISampleBuilder.h"
 #include "Sample/Scattering/IFormFactorDecorator.h"
-#include "Sample/Slice/LayerInterface.h"
-#include "Sample/Slice/LayerRoughness.h"
+#include "Sample/Interface/LayerInterface.h"
+#include "Sample/Interface/LayerRoughness.h"
 #include "Sample/SoftParticle/FormFactorGauss.h"
 #include "Sample/SoftParticle/FormFactorSphereGaussianRadius.h"
 #include "Sample/SoftParticle/FormFactorSphereLogNormalRadius.h"
@@ -175,7 +175,7 @@
 %include "Sample/Aggregate/InterferenceFunctionTwin.h"
 %include "Sample/Aggregate/ParticleLayout.h"
 
-%include "Sample/Slice/LayerRoughness.h"
+%include "Sample/Interface/LayerRoughness.h"
 %include "Sample/Processed/MultiLayerFuncs.h"
 
 %include "Sample/Multilayer/Layer.h"
diff --git a/gui2/quicksimeditor/profilehelper.cpp b/gui2/quicksimeditor/profilehelper.cpp
index 88435ee47687bd3344a483175a3f9c89e0e4e346..3de310189812e45b6afe4a8b3a5f4a5c8293c57d 100644
--- a/gui2/quicksimeditor/profilehelper.cpp
+++ b/gui2/quicksimeditor/profilehelper.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "gui2/quicksimeditor/profilehelper.h"
-#include <Sample/Slice/LayerRoughness.h>
+#include <Sample/Interface/LayerRoughness.h>
 #include <Sample/Slice/Slice.h>
 
 namespace {
diff --git a/gui2/quicksimeditor/quicksimutils.cpp b/gui2/quicksimeditor/quicksimutils.cpp
index 623bb35416aacabbc54798e2ba8cf7145cbb2d1f..86e0c6af60b43230af4e8119f36d1926d98dfc44 100644
--- a/gui2/quicksimeditor/quicksimutils.cpp
+++ b/gui2/quicksimeditor/quicksimutils.cpp
@@ -19,7 +19,7 @@
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/sessionmodel.h"
 #include <Sample/Material/MaterialFactoryFuncs.h>
-#include <Sample/Slice/LayerRoughness.h>
+#include <Sample/Interface/LayerRoughness.h>
 #include <Sample/Slice/Slice.h>
 #include <stdexcept>