diff --git a/Core/Computation/ProcessedLayout.cpp b/Core/Computation/ProcessedLayout.cpp
index 1aa711018301ef29e4699794fd631625471248b4..5f5321d64d52ea08b8c82c8e730bff0d41507b6d 100644
--- a/Core/Computation/ProcessedLayout.cpp
+++ b/Core/Computation/ProcessedLayout.cpp
@@ -18,7 +18,7 @@
 #include "Core/Scattering/FormFactorBAPol.h"
 #include "Core/Multilayer/FormFactorCoherentSum.h"
 #include "Core/Scattering/FormFactorDWBA.h"
-#include "Core/Multilayer/FormFactorDWBAPol.h"
+#include "Core/Scattering/FormFactorDWBAPol.h"
 #include "Core/Multilayer/Slice.h"
 #include "Core/Multilayer/SlicedFormFactorList.h"
 #include "Core/Particle/IParticle.h"
diff --git a/Core/Multilayer/FormFactorDWBAPol.cpp b/Core/Scattering/FormFactorDWBAPol.cpp
similarity index 99%
rename from Core/Multilayer/FormFactorDWBAPol.cpp
rename to Core/Scattering/FormFactorDWBAPol.cpp
index a3b861282a9c5e91b3ab242445023e790b88a86d..aaa62ad2eb02bab7ce674a43117f1f0ab9235dc2 100644
--- a/Core/Multilayer/FormFactorDWBAPol.cpp
+++ b/Core/Scattering/FormFactorDWBAPol.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Multilayer/FormFactorDWBAPol.cpp
+//! @file      Core/Scattering/FormFactorDWBAPol.cpp
 //! @brief     Defines class FormFactorDWBAPol.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 // ************************************************************************** //
 
-#include "Core/Multilayer/FormFactorDWBAPol.h"
+#include "Core/Scattering/FormFactorDWBAPol.h"
 #include "Core/Material/WavevectorInfo.h"
 #include "Core/RT/ILayerRTCoefficients.h"
 
diff --git a/Core/Multilayer/FormFactorDWBAPol.h b/Core/Scattering/FormFactorDWBAPol.h
similarity index 97%
rename from Core/Multilayer/FormFactorDWBAPol.h
rename to Core/Scattering/FormFactorDWBAPol.h
index 4fa0ce95a0ae16a5a1a8c3a16c01c9869cb2dfd4..2c283c077bec5d40bf55347e7bfd710cec3b8efc 100644
--- a/Core/Multilayer/FormFactorDWBAPol.h
+++ b/Core/Scattering/FormFactorDWBAPol.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Multilayer/FormFactorDWBAPol.h
+//! @file      Core/Scattering/FormFactorDWBAPol.h
 //! @brief     Defines class FormFactorDWBAPol.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/auto/Wrap/doxygenCore.i b/auto/Wrap/doxygenCore.i
index cf177cb5841f1dfedd74764c701bb741926309f8..ac16bb4bda02f2b862a8789072f224c75bdb019d 100644
--- a/auto/Wrap/doxygenCore.i
+++ b/auto/Wrap/doxygenCore.i
@@ -13409,13 +13409,13 @@ C++ includes: ZLimits.h
 // File: namespace_0D314.xml
 
 
-// File: namespace_0D326.xml
+// File: namespace_0D333.xml
 
 
-// File: namespace_0D335.xml
+// File: namespace_0D337.xml
 
 
-// File: namespace_0D339.xml
+// File: namespace_0D347.xml
 
 
 // File: namespace_0D349.xml
@@ -13424,7 +13424,7 @@ C++ includes: ZLimits.h
 // File: namespace_0D351.xml
 
 
-// File: namespace_0D353.xml
+// File: namespace_0D357.xml
 
 
 // File: namespace_0D359.xml
@@ -13442,37 +13442,37 @@ C++ includes: ZLimits.h
 // File: namespace_0D367.xml
 
 
-// File: namespace_0D369.xml
+// File: namespace_0D371.xml
 
 
 // File: namespace_0D373.xml
 
 
-// File: namespace_0D375.xml
+// File: namespace_0D389.xml
 
 
-// File: namespace_0D391.xml
+// File: namespace_0D4.xml
 
 
-// File: namespace_0D4.xml
+// File: namespace_0D417.xml
 
 
-// File: namespace_0D419.xml
+// File: namespace_0D422.xml
 
 
 // File: namespace_0D424.xml
 
 
-// File: namespace_0D426.xml
+// File: namespace_0D434.xml
 
 
-// File: namespace_0D436.xml
+// File: namespace_0D440.xml
 
 
-// File: namespace_0D442.xml
+// File: namespace_0D444.xml
 
 
-// File: namespace_0D446.xml
+// File: namespace_0D456.xml
 
 
 // File: namespace_0D458.xml
@@ -15293,12 +15293,6 @@ magnetization (in A/m)
 // File: FormFactorCoherentSum_8h.xml
 
 
-// File: FormFactorDWBAPol_8cpp.xml
-
-
-// File: FormFactorDWBAPol_8h.xml
-
-
 // File: IFresnelMap_8cpp.xml
 
 
@@ -15697,6 +15691,12 @@ Creates averaged material. Square refractive index of returned material is arith
 // File: FormFactorDWBA_8h.xml
 
 
+// File: FormFactorDWBAPol_8cpp.xml
+
+
+// File: FormFactorDWBAPol_8h.xml
+
+
 // File: IFormFactor_8cpp.xml
 %feature("docstring")  createTransformedFormFactor "IFormFactor* createTransformedFormFactor(const IFormFactor &formfactor, const IRotation &rot, kvector_t translation)
 ";