diff --git a/Base/Element/DepthprobeElement.cpp b/Resample/Element/DepthprobeElement.cpp
similarity index 94%
rename from Base/Element/DepthprobeElement.cpp
rename to Resample/Element/DepthprobeElement.cpp
index 477bb109e1d8befced04e51e470308efb8219800..1698f061bd86c767dde9567ca77b39ce532ad2f9 100644
--- a/Base/Element/DepthprobeElement.cpp
+++ b/Resample/Element/DepthprobeElement.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Base/Element/DepthprobeElement.cpp
+//! @file      Resample/Element/DepthprobeElement.cpp
 //! @brief     Implements class DepthprobeElement.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Base/Element/DepthprobeElement.h"
+#include "Resample/Element/DepthprobeElement.h"
 #include "Base/Axis/IAxis.h"
 #include "Base/Vector/GisasDirection.h"
 
diff --git a/Base/Element/DepthprobeElement.h b/Resample/Element/DepthprobeElement.h
similarity index 89%
rename from Base/Element/DepthprobeElement.h
rename to Resample/Element/DepthprobeElement.h
index ed358582e2c4c1a851252bb26727d3e80b6404aa..0d4beafe9a299a31146d2d9c815eb083f43703d9 100644
--- a/Base/Element/DepthprobeElement.h
+++ b/Resample/Element/DepthprobeElement.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Base/Element/DepthprobeElement.h
+//! @file      Resample/Element/DepthprobeElement.h
 //! @brief     Defines class DepthprobeElement.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,10 +15,10 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_BASE_ELEMENT_DEPTHPROBEELEMENT_H
-#define BORNAGAIN_BASE_ELEMENT_DEPTHPROBEELEMENT_H
+#ifndef BORNAGAIN_RESAMPLE_ELEMENT_DEPTHPROBEELEMENT_H
+#define BORNAGAIN_RESAMPLE_ELEMENT_DEPTHPROBEELEMENT_H
 
-#include "Base/Element/IElement.h"
+#include "Resample/Element/IElement.h"
 #include <heinz/Vectors3D.h>
 #include <valarray>
 
@@ -64,4 +64,4 @@ private:
     const bool m_calculation_flag;
 };
 
-#endif // BORNAGAIN_BASE_ELEMENT_DEPTHPROBEELEMENT_H
+#endif // BORNAGAIN_RESAMPLE_ELEMENT_DEPTHPROBEELEMENT_H
diff --git a/Resample/Element/DiffuseElement.h b/Resample/Element/DiffuseElement.h
index 2abc0c48babf2fa32c6433448e7b9cb9056ea3c2..f5b26f0c92187ecacabee653bbbf99820ad1c7cd 100644
--- a/Resample/Element/DiffuseElement.h
+++ b/Resample/Element/DiffuseElement.h
@@ -18,7 +18,7 @@
 #ifndef BORNAGAIN_RESAMPLE_ELEMENT_DIFFUSEELEMENT_H
 #define BORNAGAIN_RESAMPLE_ELEMENT_DIFFUSEELEMENT_H
 
-#include "Base/Element/IElement.h"
+#include "Resample/Element/IElement.h"
 #include <heinz/Vectors3D.h>
 #include <memory>
 #include <vector>
diff --git a/Base/Element/IElement.h b/Resample/Element/IElement.h
similarity index 86%
rename from Base/Element/IElement.h
rename to Resample/Element/IElement.h
index 1c08128758d94effb8f0c2bb117b88d09ec4135b..428b1fe927d11f1255e1121257d1ec8135410911 100644
--- a/Base/Element/IElement.h
+++ b/Resample/Element/IElement.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Base/Element/IElement.h
+//! @file      Resample/Element/IElement.h
 //! @brief     Defines class IElement.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_BASE_ELEMENT_IELEMENT_H
-#define BORNAGAIN_BASE_ELEMENT_IELEMENT_H
+#ifndef BORNAGAIN_RESAMPLE_ELEMENT_IELEMENT_H
+#define BORNAGAIN_RESAMPLE_ELEMENT_IELEMENT_H
 
 #include "Base/Spin/SpinMatrix.h"
 
@@ -40,4 +40,4 @@ protected:
     const SpinMatrix m_analyzer{SpinMatrix::One()};
 };
 
-#endif // BORNAGAIN_BASE_ELEMENT_IELEMENT_H
+#endif // BORNAGAIN_RESAMPLE_ELEMENT_IELEMENT_H
diff --git a/Resample/Element/SpecularElement.h b/Resample/Element/SpecularElement.h
index e860320deefd0092e9aad00f12f8a15215aa786e..1b4f4efc06fb0896601508d8e7e93a60e0cb7a5c 100644
--- a/Resample/Element/SpecularElement.h
+++ b/Resample/Element/SpecularElement.h
@@ -18,7 +18,7 @@
 #ifndef BORNAGAIN_RESAMPLE_ELEMENT_SPECULARELEMENT_H
 #define BORNAGAIN_RESAMPLE_ELEMENT_SPECULARELEMENT_H
 
-#include "Base/Element/IElement.h"
+#include "Resample/Element/IElement.h"
 #include <functional>
 #include <heinz/Complex.h>
 #include <heinz/Vectors3D.h>
diff --git a/Sim/Computation/DepthprobeComputation.cpp b/Sim/Computation/DepthprobeComputation.cpp
index 896de64ff318a2e68694a12a5a6084df2c202d37..46973a2029053a5551f48bb91754220baf3ef83e 100644
--- a/Sim/Computation/DepthprobeComputation.cpp
+++ b/Sim/Computation/DepthprobeComputation.cpp
@@ -14,7 +14,7 @@
 
 #include "Sim/Computation/DepthprobeComputation.h"
 #include "Base/Axis/IAxis.h"
-#include "Base/Element/DepthprobeElement.h"
+#include "Resample/Element/DepthprobeElement.h"
 #include "Base/Progress/ProgressHandler.h"
 #include "Base/Util/Assert.h"
 #include "Resample/Flux/ScalarFlux.h"
diff --git a/Sim/Simulation/DepthprobeSimulation.cpp b/Sim/Simulation/DepthprobeSimulation.cpp
index 795f47d5049cc9d4b51ec34b40c10657d8712808..5f06f483b73227bd3d07f77965d69c5aa999f00a 100644
--- a/Sim/Simulation/DepthprobeSimulation.cpp
+++ b/Sim/Simulation/DepthprobeSimulation.cpp
@@ -16,7 +16,7 @@
 #include "Base/Axis/Bin.h"
 #include "Base/Axis/FixedBinAxis.h"
 #include "Base/Axis/Frame.h"
-#include "Base/Element/DepthprobeElement.h"
+#include "Resample/Element/DepthprobeElement.h"
 #include "Base/Util/Assert.h"
 #include "Device/Beam/Beam.h"
 #include "Device/Beam/IFootprintFactor.h"