diff --git a/Core/Computation/ProcessedLayout.cpp b/Core/Computation/ProcessedLayout.cpp
index 1bfab8c6fcefc4ff46d03890f76be882a00410f7..1aa711018301ef29e4699794fd631625471248b4 100644
--- a/Core/Computation/ProcessedLayout.cpp
+++ b/Core/Computation/ProcessedLayout.cpp
@@ -17,7 +17,7 @@
 #include "Core/Correlations/ILayout.h"
 #include "Core/Scattering/FormFactorBAPol.h"
 #include "Core/Multilayer/FormFactorCoherentSum.h"
-#include "Core/Multilayer/FormFactorDWBA.h"
+#include "Core/Scattering/FormFactorDWBA.h"
 #include "Core/Multilayer/FormFactorDWBAPol.h"
 #include "Core/Multilayer/Slice.h"
 #include "Core/Multilayer/SlicedFormFactorList.h"
diff --git a/Core/Multilayer/FormFactorDWBA.cpp b/Core/Scattering/FormFactorDWBA.cpp
similarity index 97%
rename from Core/Multilayer/FormFactorDWBA.cpp
rename to Core/Scattering/FormFactorDWBA.cpp
index 70f0a4940a07143afb9771702c36842a4d42ba41..6fd82b7b17c95555d57213da209b13c1369131f8 100644
--- a/Core/Multilayer/FormFactorDWBA.cpp
+++ b/Core/Scattering/FormFactorDWBA.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Multilayer/FormFactorDWBA.cpp
+//! @file      Core/Scattering/FormFactorDWBA.cpp
 //! @brief     Implements class FormFactorDWBA.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 // ************************************************************************** //
 
-#include "Core/Multilayer/FormFactorDWBA.h"
+#include "Core/Scattering/FormFactorDWBA.h"
 #include "Core/Material/WavevectorInfo.h"
 #include "Core/RT/ILayerRTCoefficients.h"
 
diff --git a/Core/Multilayer/FormFactorDWBA.h b/Core/Scattering/FormFactorDWBA.h
similarity index 97%
rename from Core/Multilayer/FormFactorDWBA.h
rename to Core/Scattering/FormFactorDWBA.h
index 39e65d68496cad5678b03d30bc436d499e95b72b..6c3f08d38781260edef6712b60a1c24427a06847 100644
--- a/Core/Multilayer/FormFactorDWBA.h
+++ b/Core/Scattering/FormFactorDWBA.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Multilayer/FormFactorDWBA.h
+//! @file      Core/Scattering/FormFactorDWBA.h
 //! @brief     Defines class FormFactorDWBA.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/auto/Wrap/doxygenCore.i b/auto/Wrap/doxygenCore.i
index ca632dbb6d953189767e8aec4e906847e45761da..cf177cb5841f1dfedd74764c701bb741926309f8 100644
--- a/auto/Wrap/doxygenCore.i
+++ b/auto/Wrap/doxygenCore.i
@@ -13316,10 +13316,10 @@ C++ includes: WavevectorInfo.h
 ";
 
 
-// File: classFourierTransform_1_1Workspace.xml
+// File: classConvolve_1_1Workspace.xml
 
 
-// File: classConvolve_1_1Workspace.xml
+// File: classFourierTransform_1_1Workspace.xml
 
 
 // File: classZLimits.xml
@@ -13409,13 +13409,16 @@ C++ includes: ZLimits.h
 // File: namespace_0D314.xml
 
 
-// File: namespace_0D328.xml
+// File: namespace_0D326.xml
+
+
+// File: namespace_0D335.xml
 
 
-// File: namespace_0D337.xml
+// File: namespace_0D339.xml
 
 
-// File: namespace_0D341.xml
+// File: namespace_0D349.xml
 
 
 // File: namespace_0D351.xml
@@ -13424,7 +13427,7 @@ C++ includes: ZLimits.h
 // File: namespace_0D353.xml
 
 
-// File: namespace_0D355.xml
+// File: namespace_0D359.xml
 
 
 // File: namespace_0D361.xml
@@ -13442,37 +13445,34 @@ C++ includes: ZLimits.h
 // File: namespace_0D369.xml
 
 
-// File: namespace_0D371.xml
+// File: namespace_0D373.xml
 
 
 // File: namespace_0D375.xml
 
 
-// File: namespace_0D377.xml
-
-
-// File: namespace_0D393.xml
+// File: namespace_0D391.xml
 
 
 // File: namespace_0D4.xml
 
 
-// File: namespace_0D421.xml
+// File: namespace_0D419.xml
 
 
-// File: namespace_0D426.xml
+// File: namespace_0D424.xml
 
 
-// File: namespace_0D428.xml
+// File: namespace_0D426.xml
 
 
-// File: namespace_0D438.xml
+// File: namespace_0D436.xml
 
 
-// File: namespace_0D444.xml
+// File: namespace_0D442.xml
 
 
-// File: namespace_0D448.xml
+// File: namespace_0D446.xml
 
 
 // File: namespace_0D458.xml
@@ -15293,12 +15293,6 @@ magnetization (in A/m)
 // File: FormFactorCoherentSum_8h.xml
 
 
-// File: FormFactorDWBA_8cpp.xml
-
-
-// File: FormFactorDWBA_8h.xml
-
-
 // File: FormFactorDWBAPol_8cpp.xml
 
 
@@ -15697,6 +15691,12 @@ Creates averaged material. Square refractive index of returned material is arith
 // File: FormFactorDecoratorRotation_8h.xml
 
 
+// File: FormFactorDWBA_8cpp.xml
+
+
+// File: FormFactorDWBA_8h.xml
+
+
 // File: IFormFactor_8cpp.xml
 %feature("docstring")  createTransformedFormFactor "IFormFactor* createTransformedFormFactor(const IFormFactor &formfactor, const IRotation &rot, kvector_t translation)
 ";