diff --git a/Core/Aggregate/FormFactorInfo.cpp b/Core/Aggregate/FormFactorInfo.cpp
index 24f18d0623c653f2e45894eeaa31ee23eab8414d..688c479aa4c8be6377df847a916449cf9f244f89 100644
--- a/Core/Aggregate/FormFactorInfo.cpp
+++ b/Core/Aggregate/FormFactorInfo.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Multilayer/FormFactorInfo.cpp
+//! @file      Core/Aggregate/FormFactorInfo.cpp
 //! @brief     Implements class FormFactorInfo.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/FormFactorInfo.h b/Core/Aggregate/FormFactorInfo.h
index 46cc1be6308bf98a890bfb674532f60c8ee4c45c..bb9f2893606e3338e9c535dac925ca4ff08f3a21 100644
--- a/Core/Aggregate/FormFactorInfo.h
+++ b/Core/Aggregate/FormFactorInfo.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Multilayer/FormFactorInfo.h
+//! @file      Core/Aggregate/FormFactorInfo.h
 //! @brief     Defines class FormFactorInfo.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FFDecorators/FormFactorDecoratorDebyeWaller.cpp b/Core/FFDecorators/FormFactorDecoratorDebyeWaller.cpp
index 55d66b11b286941c9fa4770f84adbe6e52bf89f9..397b7402c2785a029c64941f1e70b915461d8aec 100644
--- a/Core/FFDecorators/FormFactorDecoratorDebyeWaller.cpp
+++ b/Core/FFDecorators/FormFactorDecoratorDebyeWaller.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/FormFactorDecoratorDebyeWaller.cpp
+//! @file      Core/FFDecorators/FormFactorDecoratorDebyeWaller.cpp
 //! @brief     Implements class FormFactorDecoratorDebyeWaller.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FFDecorators/FormFactorDecoratorDebyeWaller.h b/Core/FFDecorators/FormFactorDecoratorDebyeWaller.h
index 9381d6cf9b575fe7f3bdf174482b287b5c417c84..843fcb93c20bf9ec48779987a947e3510c9b2ce9 100644
--- a/Core/FFDecorators/FormFactorDecoratorDebyeWaller.h
+++ b/Core/FFDecorators/FormFactorDecoratorDebyeWaller.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/FormFactorDecoratorDebyeWaller.h
+//! @file      Core/FFDecorators/FormFactorDecoratorDebyeWaller.h
 //! @brief     Defines and implements class FormFactorDecoratorDebyeWaller.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FFDecorators/FormFactorDecoratorFactor.cpp b/Core/FFDecorators/FormFactorDecoratorFactor.cpp
index 62e7ef595c3c60439cc15631d088d49721ceea7d..863c104dc94649377999bd3af7ce9539628d9b28 100644
--- a/Core/FFDecorators/FormFactorDecoratorFactor.cpp
+++ b/Core/FFDecorators/FormFactorDecoratorFactor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/FormFactorDecoratorFactor.cpp
+//! @file      Core/FFDecorators/FormFactorDecoratorFactor.cpp
 //! @brief     Implements class FormFactorDecoratorFactor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FFDecorators/FormFactorDecoratorFactor.h b/Core/FFDecorators/FormFactorDecoratorFactor.h
index 23015b4e08507a6644a95d6f5a2928ba31d2bc30..4f0b9d94a2dae289795e650c290c9a8e34622e96 100644
--- a/Core/FFDecorators/FormFactorDecoratorFactor.h
+++ b/Core/FFDecorators/FormFactorDecoratorFactor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/FormFactorDecoratorFactor.h
+//! @file      Core/FFDecorators/FormFactorDecoratorFactor.h
 //! @brief     Defines class FormFactorDecoratorFactor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FFDecorators/FormFactorDecoratorMaterial.cpp b/Core/FFDecorators/FormFactorDecoratorMaterial.cpp
index 61ee208c405cbcc63e2cab42ee7615fb973bfc19..33d0192588244bf27a1d9f1ebeff4c3b6cd2332e 100644
--- a/Core/FFDecorators/FormFactorDecoratorMaterial.cpp
+++ b/Core/FFDecorators/FormFactorDecoratorMaterial.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/FormFactorDecoratorMaterial.cpp
+//! @file      Core/FFDecorators/FormFactorDecoratorMaterial.cpp
 //! @brief     Implements class FormFactorDecoratorMaterial.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FFDecorators/FormFactorDecoratorMaterial.h b/Core/FFDecorators/FormFactorDecoratorMaterial.h
index 9453b0a5abad9964f5ae3e889d72d0c53adec2fc..d1fa23d4a77c25efa67bb5694419dc2a47410f20 100644
--- a/Core/FFDecorators/FormFactorDecoratorMaterial.h
+++ b/Core/FFDecorators/FormFactorDecoratorMaterial.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/FormFactorDecoratorMaterial.h
+//! @file      Core/FFDecorators/FormFactorDecoratorMaterial.h
 //! @brief     Defines class FormFactorDecoratorMaterial.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FFDecorators/FormFactorDecoratorMultiPositionFactor.cpp b/Core/FFDecorators/FormFactorDecoratorMultiPositionFactor.cpp
index 095810813884d5ac1396d77acacfb8ef3dd69f95..19941b6591a85e470f7e1af35d1d166d4ac3121a 100644
--- a/Core/FFDecorators/FormFactorDecoratorMultiPositionFactor.cpp
+++ b/Core/FFDecorators/FormFactorDecoratorMultiPositionFactor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/FormFactorDecoratorMultiPositionFactor.cpp
+//! @file      Core/FFDecorators/FormFactorDecoratorMultiPositionFactor.cpp
 //! @brief     Implements class FormFactorDecoratorMultiPositionFactor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FFDecorators/FormFactorDecoratorMultiPositionFactor.h b/Core/FFDecorators/FormFactorDecoratorMultiPositionFactor.h
index c1224221b4db50322cad6913a26608b8e63aa0b9..052231fb662fbc7e4c1ab03247aca1759702a6fc 100644
--- a/Core/FFDecorators/FormFactorDecoratorMultiPositionFactor.h
+++ b/Core/FFDecorators/FormFactorDecoratorMultiPositionFactor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/FormFactorDecoratorMultiPositionFactor.h
+//! @file      Core/FFDecorators/FormFactorDecoratorMultiPositionFactor.h
 //! @brief     Defines class FormFactorDecoratorMultiPositionFactor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FFDecorators/FormFactorDecoratorPositionFactor.cpp b/Core/FFDecorators/FormFactorDecoratorPositionFactor.cpp
index 6390391504f5bf5b4b204023653fb114c54e9abc..96bee0508e72c5e86cd92637f3fa68487f0e523d 100644
--- a/Core/FFDecorators/FormFactorDecoratorPositionFactor.cpp
+++ b/Core/FFDecorators/FormFactorDecoratorPositionFactor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/FormFactorDecoratorPositionFactor.cpp
+//! @file      Core/FFDecorators/FormFactorDecoratorPositionFactor.cpp
 //! @brief     Implements class FormFactorDecoratorPositionFactor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FFDecorators/FormFactorDecoratorPositionFactor.h b/Core/FFDecorators/FormFactorDecoratorPositionFactor.h
index f40d0c1e2cd516de1fe8f9740d3f896f99c5f781..87b9c928920ce0ed689977c777ce024911f12898 100644
--- a/Core/FFDecorators/FormFactorDecoratorPositionFactor.h
+++ b/Core/FFDecorators/FormFactorDecoratorPositionFactor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/FormFactorDecoratorPositionFactor.h
+//! @file      Core/FFDecorators/FormFactorDecoratorPositionFactor.h
 //! @brief     Defines class FormFactorDecoratorPositionFactor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FFDecorators/FormFactorDecoratorRotation.cpp b/Core/FFDecorators/FormFactorDecoratorRotation.cpp
index 12349a97515fcb6909ef5e3cbb850480ce2a42af..8292a8051bacd3ff46da902769e267123f2b9270 100644
--- a/Core/FFDecorators/FormFactorDecoratorRotation.cpp
+++ b/Core/FFDecorators/FormFactorDecoratorRotation.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/FormFactorDecoratorRotation.cpp
+//! @file      Core/FFDecorators/FormFactorDecoratorRotation.cpp
 //! @brief     Implements class FormFactorDecoratorRotation
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FFDecorators/FormFactorDecoratorRotation.h b/Core/FFDecorators/FormFactorDecoratorRotation.h
index c9a4b9c9d20bd05a16160a2b291bdff614991250..7d98b935e69c6c50bc7e780dbe6e8ac5274eda55 100644
--- a/Core/FFDecorators/FormFactorDecoratorRotation.h
+++ b/Core/FFDecorators/FormFactorDecoratorRotation.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/FormFactorDecoratorRotation.h
+//! @file      Core/FFDecorators/FormFactorDecoratorRotation.h
 //! @brief     Defines class FormFactorDecoratorRotation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FFDecorators/IFormFactorDecorator.h b/Core/FFDecorators/IFormFactorDecorator.h
index b92f87a853cfd220a76aa9b4522f990460b78444..8e394829abeca637fae17af3063d186c61a33e97 100644
--- a/Core/FFDecorators/IFormFactorDecorator.h
+++ b/Core/FFDecorators/IFormFactorDecorator.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/IFormFactorDecorator.h
+//! @file      Core/FFDecorators/IFormFactorDecorator.h
 //! @brief     Defines pure virtual interface class IFormFactorDecorator.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/DWBADiffuseReflection.cpp b/Core/Multilayer/DWBADiffuseReflection.cpp
index 057c7c4746115f7d29e11226cf56781530ba15ea..10c8595916d9d3a1a8f92e68b1970e6a9520cf29 100644
--- a/Core/Multilayer/DWBADiffuseReflection.cpp
+++ b/Core/Multilayer/DWBADiffuseReflection.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Simulation/DWBADiffuseReflection.cpp
+//! @file      Core/Multilayer/DWBADiffuseReflection.cpp
 //! @brief     Implements class DWBADiffuseReflection.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/DWBADiffuseReflection.h b/Core/Multilayer/DWBADiffuseReflection.h
index 3d3883472ad4b4cc233ddde6f4250a85db600494..5b3e872449ed4966cd597a6e29f98a4dc732c33c 100644
--- a/Core/Multilayer/DWBADiffuseReflection.h
+++ b/Core/Multilayer/DWBADiffuseReflection.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Simulation/DWBADiffuseReflection.h
+//! @file      Core/Multilayer/DWBADiffuseReflection.h
 //! @brief     Defines class DWBADiffuseReflection.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/DecouplingApproximationStrategy.cpp b/Core/Multilayer/DecouplingApproximationStrategy.cpp
index b3b34ad6b71b85521b54d99593f8921b8144b16b..9ce0e3b5303fc3b350a506f1b2b5f0df7e46a13b 100644
--- a/Core/Multilayer/DecouplingApproximationStrategy.cpp
+++ b/Core/Multilayer/DecouplingApproximationStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregate/DecouplingApproximationStrategy.cpp
+//! @file      Core/Multilayer/DecouplingApproximationStrategy.cpp
 //! @brief     Implements class DecouplingApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/DecouplingApproximationStrategy.h b/Core/Multilayer/DecouplingApproximationStrategy.h
index 6d5ecaeaaaed01f46ce4aa0a0bf0db69f6c24747..424ba380f612cc559f6295d720539b76aee0435a 100644
--- a/Core/Multilayer/DecouplingApproximationStrategy.h
+++ b/Core/Multilayer/DecouplingApproximationStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregate/DecouplingApproximationStrategy.h
+//! @file      Core/Multilayer/DecouplingApproximationStrategy.h
 //! @brief     Defines class DecouplingApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/FormFactorDWBA.cpp b/Core/Multilayer/FormFactorDWBA.cpp
index b51e7eefa0799de2e514448a53afd944f34b22c5..af573d1f12479ed82816cc070e4430f0dedcf509 100644
--- a/Core/Multilayer/FormFactorDWBA.cpp
+++ b/Core/Multilayer/FormFactorDWBA.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/FormFactorDWBA.cpp
+//! @file      Core/Multilayer/FormFactorDWBA.cpp
 //! @brief     Implements class FormFactorDWBA.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/FormFactorDWBA.h b/Core/Multilayer/FormFactorDWBA.h
index 870837958b8e0b1e88fb64020ffd6cc6dc8b91aa..eabfcdf3954264c39fa45d6c048cf0f9c691212b 100644
--- a/Core/Multilayer/FormFactorDWBA.h
+++ b/Core/Multilayer/FormFactorDWBA.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/FormFactorDWBA.h
+//! @file      Core/Multilayer/FormFactorDWBA.h
 //! @brief     Defines class FormFactorDWBA.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/FormFactorDWBAPol.cpp b/Core/Multilayer/FormFactorDWBAPol.cpp
index 0f6161ab4a69c0dc48b30c41cd1b9df1dc175f04..62cebeee8081bdb473c5c7a35830959dbd3e59f7 100644
--- a/Core/Multilayer/FormFactorDWBAPol.cpp
+++ b/Core/Multilayer/FormFactorDWBAPol.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/FormFactorDWBAPol.cpp
+//! @file      Core/Multilayer/FormFactorDWBAPol.cpp
 //! @brief     Defines class FormFactorDWBAPol.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/FormFactorDWBAPol.h b/Core/Multilayer/FormFactorDWBAPol.h
index f2082a7064ef71cd7e48035f4756d3bead44213e..f5d3b66df49983870c135be321999c0397a5fe2e 100644
--- a/Core/Multilayer/FormFactorDWBAPol.h
+++ b/Core/Multilayer/FormFactorDWBAPol.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/FormFactor/FormFactorDWBAPol.h
+//! @file      Core/Multilayer/FormFactorDWBAPol.h
 //! @brief     Defines class FormFactorDWBAPol.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/IInterferenceFunctionStrategy.cpp b/Core/Multilayer/IInterferenceFunctionStrategy.cpp
index f52482dbf8418c9d4456e159058d0897c81960d8..1bb19eb89a8fe753ad8dc168983126d7f06f21af 100644
--- a/Core/Multilayer/IInterferenceFunctionStrategy.cpp
+++ b/Core/Multilayer/IInterferenceFunctionStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregate/IInterferenceFunctionStrategy.cpp
+//! @file      Core/Multilayer/IInterferenceFunctionStrategy.cpp
 //! @brief     Implements default behaviour of IInterferenceFunctionStrategy
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/IInterferenceFunctionStrategy.h b/Core/Multilayer/IInterferenceFunctionStrategy.h
index 837ed526fde1baada005849e73ecb5f9d6813e07..1b7de4185d148eea2efc78ac2415f7ebdf6995d4 100644
--- a/Core/Multilayer/IInterferenceFunctionStrategy.h
+++ b/Core/Multilayer/IInterferenceFunctionStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregate/IInterferenceFunctionStrategy.h
+//! @file      Core/Multilayer/IInterferenceFunctionStrategy.h
 //! @brief     Defines class IInterferenceFunctionStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/ISpecularInfoMap.h b/Core/Multilayer/ISpecularInfoMap.h
index e18fa3e81ce6bbba732ee6e123038c2e7ace8070..a81f38d7472e59933e15b133f9b745fb9f3eaf8f 100644
--- a/Core/Multilayer/ISpecularInfoMap.h
+++ b/Core/Multilayer/ISpecularInfoMap.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Simulation/ISpecularInfoMap.h
+//! @file      Core/Multilayer/ISpecularInfoMap.h
 //! @brief     Defines and implements interface ISpecularInfoMap.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/InterferenceFunctionStrategies.h b/Core/Multilayer/InterferenceFunctionStrategies.h
index 9790898d33b6ca09f4518e8167b45ba857fe4a7e..ba05cd1abe486d8461fcffe99e1b623b353fb8e6 100644
--- a/Core/Multilayer/InterferenceFunctionStrategies.h
+++ b/Core/Multilayer/InterferenceFunctionStrategies.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregate/InterferenceFunctionStrategies.h
+//! @file      Core/Multilayer/InterferenceFunctionStrategies.h
 //! @brief     Includes several files named *Strategy.h
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/SizeSpacingCorrelationApproximationStrategy.cpp b/Core/Multilayer/SizeSpacingCorrelationApproximationStrategy.cpp
index 2b7f511c99f413c595e4e568d9fb2d5a82edf4b4..8725e293692dc6c6ac4eced9bf5b760adfd81e20 100644
--- a/Core/Multilayer/SizeSpacingCorrelationApproximationStrategy.cpp
+++ b/Core/Multilayer/SizeSpacingCorrelationApproximationStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregate/SizeSpacingCorrelationApproximationStrategy.cpp
+//! @file      Core/Multilayer/SizeSpacingCorrelationApproximationStrategy.cpp
 //! @brief     Implements class SizeSpacingCorrelationApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/SizeSpacingCorrelationApproximationStrategy.h b/Core/Multilayer/SizeSpacingCorrelationApproximationStrategy.h
index f411f4dff3ee8e3f1c982bbc020435dd99c14b92..ad9d20e541931513a33893fd9d121a3ed80e05b3 100644
--- a/Core/Multilayer/SizeSpacingCorrelationApproximationStrategy.h
+++ b/Core/Multilayer/SizeSpacingCorrelationApproximationStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregate/SizeSpacingCorrelationApproximationStrategy.h
+//! @file      Core/Multilayer/SizeSpacingCorrelationApproximationStrategy.h
 //! @brief     Defines class SizeSpacingCorrelationApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Parametrization/DistributionHandler.cpp b/Core/Parametrization/DistributionHandler.cpp
index 40c6f1a7990015c1fca0593028380d17bddaab05..1aa35d19bb933d2c9f83b5cc71410a0186d16ab4 100644
--- a/Core/Parametrization/DistributionHandler.cpp
+++ b/Core/Parametrization/DistributionHandler.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Simulation/DistributionHandler.cpp
+//! @file      Core/Parametrization/DistributionHandler.cpp
 //! @brief     Implements class DistributionHandler.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Parametrization/DistributionHandler.h b/Core/Parametrization/DistributionHandler.h
index f7eddffa6e2e96f0a866ea57c05a6b6f91e392fe..34e4adf8804af798fd4e8c56688e10269c5a70c5 100644
--- a/Core/Parametrization/DistributionHandler.h
+++ b/Core/Parametrization/DistributionHandler.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Simulation/DistributionHandler.h
+//! @file      Core/Parametrization/DistributionHandler.h
 //! @brief     Defines class DistributionHandler.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Sample/IFormFactor.cpp b/Core/Sample/IFormFactor.cpp
index 430b288d06df2f67ba004159cd43e5f8aa35ca87..b60b86b429b7e6a4d75ce5ec75a9623a8458708d 100644
--- a/Core/Sample/IFormFactor.cpp
+++ b/Core/Sample/IFormFactor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Multilayer/IFormFactor.cpp
+//! @file      Core/Sample/IFormFactor.cpp
 //! @brief     Implements interface class IFormFactor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Sample/IFormFactor.h b/Core/Sample/IFormFactor.h
index f1e0432723969d56793efc58449175af9a79508b..2480c96fb2d50a31b3b65111bf01a67a59f91d8b 100644
--- a/Core/Sample/IFormFactor.h
+++ b/Core/Sample/IFormFactor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Multilayer/IFormFactor.h
+//! @file      Core/Sample/IFormFactor.h
 //! @brief     Defines and implements pure virtual interface IFormFactor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -25,9 +25,14 @@ class ILayerRTCoefficients;
 class WavevectorInfo;
 
 //! Pure virtual base class for all form factors.
+//!
 //! The actual form factor is returned by the complex valued function IFormFactor::evaluate,
 //! which depends on the incoming and outgoing wave vectors ki and kf.
 //! If it only depends on the scattering vector q=ki-kf, then it is a IBornFormFactor.
+//!
+//! Other children besides IBornFormFactor are IFormFactorDecorator, FormFactorWeighted,
+//! FormFactorDWBAPol.
+
 //! @ingroup formfactors_internal
 
 class BA_CORE_API_ IFormFactor : public ISample
diff --git a/Core/Sample/IFormFactorBorn.cpp b/Core/Sample/IFormFactorBorn.cpp
index fe886c11f57083f1451c17d3d2ff92402d46719a..3eaa3ead941535bb26708b426acb015dd7dbb5c3 100644
--- a/Core/Sample/IFormFactorBorn.cpp
+++ b/Core/Sample/IFormFactorBorn.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particle/IFormFactorBorn.cpp
+//! @file      Core/Sample/IFormFactorBorn.cpp
 //! @brief     Implements interface class IFormFactorBorn.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Sample/IFormFactorBorn.h b/Core/Sample/IFormFactorBorn.h
index 2ebde46befb469c212c8ae27972d8589a31af62c..8ec2537cd57a482a44100802f2ee7cdbdd74628e 100644
--- a/Core/Sample/IFormFactorBorn.h
+++ b/Core/Sample/IFormFactorBorn.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particle/IFormFactorBorn.h
+//! @file      Core/Sample/IFormFactorBorn.h
 //! @brief     Defines pure virtual interface class IFormFactorBorn.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -20,7 +20,7 @@
 #include "Vectors3D.h"
 
 //! Pure virtual base class for Born form factors.
-//! In contrast to a generic form factor, a Born form factor does not depend
+//! In contrast to the generic IFormFactor, a Born form factor does not depend
 //! on the incoming and outgoing wave vectors ki and kf, except through their
 //! difference, the scattering vector q=ki-kf.
 //! @ingroup formfactors_internal
diff --git a/Core/Sample/Rotations.cpp b/Core/Sample/Rotations.cpp
index fe245537670b30a88588201d5a5043f789d742f4..7edbf4ecf62fe369f4be40cbbf3b9e48d1431322 100644
--- a/Core/Sample/Rotations.cpp
+++ b/Core/Sample/Rotations.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Rotation/Rotations.cpp
+//! @file      Core/Sample/Rotations.cpp
 //! @brief     Implements IRotation classes.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Sample/Rotations.h b/Core/Sample/Rotations.h
index 885d90651dc09a0f0b961a68e97d7f34910debe3..711e1d5d2a326ab9204bdc036ec040c3b5e78d39 100644
--- a/Core/Sample/Rotations.h
+++ b/Core/Sample/Rotations.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Rotation/Rotations.h
+//! @file      Core/Sample/Rotations.h
 //! @brief     Defines IRotation classes.
 //!
 //! @homepage  http://www.bornagainproject.org