From 17a10be1396fad092fddeb32cbaef0067e66e35a Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Tue, 26 Jul 2016 09:30:21 +0200
Subject: [PATCH] updated '@file'

---
 Core/Aggregate/DecouplingApproximationStrategy.cpp            | 2 +-
 Core/Aggregate/DecouplingApproximationStrategy.h              | 2 +-
 Core/Aggregate/FTDecayFunctions.cpp                           | 2 +-
 Core/Aggregate/FTDecayFunctions.h                             | 2 +-
 Core/Aggregate/FTDistributions.cpp                            | 2 +-
 Core/Aggregate/FTDistributions.h                              | 2 +-
 Core/Aggregate/IInterferenceFunction.cpp                      | 2 +-
 Core/Aggregate/IInterferenceFunction.h                        | 2 +-
 Core/Aggregate/IInterferenceFunctionStrategy.cpp              | 2 +-
 Core/Aggregate/IInterferenceFunctionStrategy.h                | 2 +-
 Core/Aggregate/ILayout.h                                      | 2 +-
 Core/Aggregate/InterferenceFunction1DLattice.cpp              | 2 +-
 Core/Aggregate/InterferenceFunction1DLattice.h                | 2 +-
 Core/Aggregate/InterferenceFunction2DLattice.cpp              | 2 +-
 Core/Aggregate/InterferenceFunction2DLattice.h                | 2 +-
 Core/Aggregate/InterferenceFunction2DParaCrystal.cpp          | 2 +-
 Core/Aggregate/InterferenceFunction2DParaCrystal.h            | 2 +-
 Core/Aggregate/InterferenceFunctionNone.cpp                   | 2 +-
 Core/Aggregate/InterferenceFunctionNone.h                     | 2 +-
 Core/Aggregate/InterferenceFunctionRadialParaCrystal.cpp      | 2 +-
 Core/Aggregate/InterferenceFunctionRadialParaCrystal.h        | 2 +-
 Core/Aggregate/InterferenceFunctionStrategies.h               | 2 +-
 Core/Aggregate/InterferenceFunctions.h                        | 2 +-
 Core/Aggregate/ParticleLayout.cpp                             | 2 +-
 Core/Aggregate/ParticleLayout.h                               | 2 +-
 .../Aggregate/SizeSpacingCorrelationApproximationStrategy.cpp | 2 +-
 Core/Aggregate/SizeSpacingCorrelationApproximationStrategy.h  | 2 +-
 Core/Binning/Bin.cpp                                          | 2 +-
 Core/Binning/Bin.h                                            | 2 +-
 Core/Binning/ConstKBinAxis.cpp                                | 2 +-
 Core/Binning/ConstKBinAxis.h                                  | 2 +-
 Core/Binning/CustomBinAxis.cpp                                | 2 +-
 Core/Binning/CustomBinAxis.h                                  | 2 +-
 Core/Binning/FixedBinAxis.cpp                                 | 2 +-
 Core/Binning/FixedBinAxis.h                                   | 2 +-
 Core/Binning/IAxis.h                                          | 2 +-
 Core/Binning/VariableBinAxis.cpp                              | 2 +-
 Core/Binning/VariableBinAxis.h                                | 2 +-
 Core/HardParticle/FormFactorAnisoPyramid.cpp                  | 2 +-
 Core/HardParticle/FormFactorAnisoPyramid.h                    | 2 +-
 Core/HardParticle/FormFactorBox.cpp                           | 2 +-
 Core/HardParticle/FormFactorBox.h                             | 2 +-
 Core/HardParticle/FormFactorCone.cpp                          | 2 +-
 Core/HardParticle/FormFactorCone.h                            | 2 +-
 Core/HardParticle/FormFactorCone6.cpp                         | 2 +-
 Core/HardParticle/FormFactorCone6.h                           | 2 +-
 Core/HardParticle/FormFactorCuboctahedron.cpp                 | 2 +-
 Core/HardParticle/FormFactorCuboctahedron.h                   | 2 +-
 Core/HardParticle/FormFactorCylinder.cpp                      | 2 +-
 Core/HardParticle/FormFactorCylinder.h                        | 2 +-
 Core/HardParticle/FormFactorDodecahedron.cpp                  | 2 +-
 Core/HardParticle/FormFactorDodecahedron.h                    | 2 +-
 Core/HardParticle/FormFactorEllipsoidalCylinder.cpp           | 2 +-
 Core/HardParticle/FormFactorEllipsoidalCylinder.h             | 2 +-
 Core/HardParticle/FormFactorFullSphere.cpp                    | 2 +-
 Core/HardParticle/FormFactorFullSphere.h                      | 2 +-
 Core/HardParticle/FormFactorFullSpheroid.cpp                  | 2 +-
 Core/HardParticle/FormFactorFullSpheroid.h                    | 2 +-
 Core/HardParticle/FormFactorHemiEllipsoid.cpp                 | 2 +-
 Core/HardParticle/FormFactorHemiEllipsoid.h                   | 2 +-
 Core/HardParticle/FormFactorIcosahedron.cpp                   | 2 +-
 Core/HardParticle/FormFactorIcosahedron.h                     | 2 +-
 Core/HardParticle/FormFactorLongBoxGauss.cpp                  | 2 +-
 Core/HardParticle/FormFactorLongBoxGauss.h                    | 2 +-
 Core/HardParticle/FormFactorLongBoxLorentz.cpp                | 2 +-
 Core/HardParticle/FormFactorLongBoxLorentz.h                  | 2 +-
 Core/HardParticle/FormFactorLongRipple1Gauss.cpp              | 2 +-
 Core/HardParticle/FormFactorLongRipple1Gauss.h                | 2 +-
 Core/HardParticle/FormFactorLongRipple1Lorentz.cpp            | 2 +-
 Core/HardParticle/FormFactorLongRipple1Lorentz.h              | 2 +-
 Core/HardParticle/FormFactorLongRipple2Gauss.cpp              | 2 +-
 Core/HardParticle/FormFactorLongRipple2Gauss.h                | 2 +-
 Core/HardParticle/FormFactorLongRipple2Lorentz.cpp            | 2 +-
 Core/HardParticle/FormFactorLongRipple2Lorentz.h              | 2 +-
 Core/HardParticle/FormFactorPolyhedron.cpp                    | 2 +-
 Core/HardParticle/FormFactorPolyhedron.h                      | 2 +-
 Core/HardParticle/FormFactorPrism3.cpp                        | 2 +-
 Core/HardParticle/FormFactorPrism3.h                          | 2 +-
 Core/HardParticle/FormFactorPrism6.cpp                        | 2 +-
 Core/HardParticle/FormFactorPrism6.h                          | 2 +-
 Core/HardParticle/FormFactorPyramid.cpp                       | 2 +-
 Core/HardParticle/FormFactorPyramid.h                         | 2 +-
 Core/HardParticle/FormFactorRipple1.cpp                       | 2 +-
 Core/HardParticle/FormFactorRipple1.h                         | 2 +-
 Core/HardParticle/FormFactorRipple2.cpp                       | 2 +-
 Core/HardParticle/FormFactorRipple2.h                         | 2 +-
 Core/HardParticle/FormFactorTetrahedron.cpp                   | 2 +-
 Core/HardParticle/FormFactorTetrahedron.h                     | 2 +-
 Core/HardParticle/FormFactorTriangle.cpp                      | 2 +-
 Core/HardParticle/FormFactorTriangle.h                        | 2 +-
 Core/HardParticle/FormFactorTrivial.cpp                       | 2 +-
 Core/HardParticle/FormFactorTrivial.h                         | 2 +-
 Core/HardParticle/FormFactorTruncatedCube.cpp                 | 2 +-
 Core/HardParticle/FormFactorTruncatedCube.h                   | 2 +-
 Core/HardParticle/FormFactorTruncatedSphere.cpp               | 2 +-
 Core/HardParticle/FormFactorTruncatedSphere.h                 | 2 +-
 Core/HardParticle/FormFactorTruncatedSpheroid.cpp             | 2 +-
 Core/HardParticle/FormFactorTruncatedSpheroid.h               | 2 +-
 Core/HardParticle/HardParticles.h                             | 2 +-
 Core/Instrument/Convolve.cpp                                  | 2 +-
 Core/Instrument/Convolve.h                                    | 2 +-
 Core/Instrument/CumulativeValue.cpp                           | 2 +-
 Core/Instrument/CumulativeValue.h                             | 2 +-
 Core/Parametrization/AttLimits.cpp                            | 2 +-
 Core/Parametrization/AttLimits.h                              | 2 +-
 Core/Parametrization/SimulationOptions.cpp                    | 2 +-
 Core/Parametrization/SimulationOptions.h                      | 2 +-
 Core/Parametrization/ThreadInfo.h                             | 2 +-
 Core/Particle/Crystal.cpp                                     | 2 +-
 Core/Particle/Crystal.h                                       | 2 +-
 Core/Particle/FormFactorCrystal.cpp                           | 2 +-
 Core/Particle/FormFactorCrystal.h                             | 2 +-
 Core/Particle/FormFactorWeighted.cpp                          | 2 +-
 Core/Particle/FormFactorWeighted.h                            | 2 +-
 Core/Particle/FormFactors.h                                   | 2 +-
 Core/Particle/IClusteredParticles.h                           | 2 +-
 Core/Particle/IFormFactorBorn.cpp                             | 2 +-
 Core/Particle/IFormFactorBorn.h                               | 2 +-
 Core/Particle/IParticle.cpp                                   | 2 +-
 Core/Particle/IParticle.h                                     | 2 +-
 Core/Particle/MesoCrystal.cpp                                 | 2 +-
 Core/Particle/MesoCrystal.h                                   | 2 +-
 Core/Particle/Particle.cpp                                    | 2 +-
 Core/Particle/Particle.h                                      | 2 +-
 Core/Particle/ParticleComposition.cpp                         | 2 +-
 Core/Particle/ParticleComposition.h                           | 2 +-
 Core/Particle/ParticleCoreShell.cpp                           | 2 +-
 Core/Particle/ParticleCoreShell.h                             | 2 +-
 Core/Particle/ParticleDistribution.cpp                        | 2 +-
 Core/Particle/ParticleDistribution.h                          | 2 +-
 Core/Particle/TRange.h                                        | 2 +-
 Core/Sample/ISampleVisitor.cpp                                | 2 +-
 Core/Sample/ISampleVisitor.h                                  | 2 +-
 Core/SoftParticle/FormFactorGauss.cpp                         | 2 +-
 Core/SoftParticle/FormFactorGauss.h                           | 2 +-
 Core/SoftParticle/FormFactorLorentz.cpp                       | 2 +-
 Core/SoftParticle/FormFactorLorentz.h                         | 2 +-
 Core/SoftParticle/FormFactorSphereGaussianRadius.cpp          | 2 +-
 Core/SoftParticle/FormFactorSphereGaussianRadius.h            | 2 +-
 Core/SoftParticle/FormFactorSphereLogNormalRadius.cpp         | 2 +-
 Core/SoftParticle/FormFactorSphereLogNormalRadius.h           | 2 +-
 Core/SoftParticle/FormFactorSphereUniformRadius.cpp           | 2 +-
 Core/SoftParticle/FormFactorSphereUniformRadius.h             | 2 +-
 Core/SoftParticle/SoftParticles.h                             | 2 +-
 Core/StandardSamples/IFactory.h                               | 2 +-
 Core/Tools/FileSystem.cpp                                     | 2 +-
 Core/Tools/FileSystem.h                                       | 2 +-
 Core/Tools/Logger.cpp                                         | 2 +-
 Core/Tools/Logger.h                                           | 2 +-
 Core/Tools/Numeric.cpp                                        | 2 +-
 Core/Tools/Numeric.h                                          | 2 +-
 Core/Tools/NumpyUtils.cpp                                     | 2 +-
 Core/Tools/NumpyUtils.h                                       | 2 +-
 Core/Tools/Precomputed.cpp                                    | 2 +-
 Core/Tools/Precomputed.h                                      | 2 +-
 Core/Tools/Utils.cpp                                          | 2 +-
 Core/Tools/Utils.h                                            | 2 +-
 Core/Tools/w32pragma.h                                        | 2 +-
 Core/Vector/BasicVector3D.cpp                                 | 2 +-
 Core/Vector/BasicVector3D.h                                   | 2 +-
 Core/Vector/EigenCore.h                                       | 2 +-
 Core/Vector/FastVector.h                                      | 2 +-
 Core/Vector/Transform3D.cpp                                   | 2 +-
 Core/Vector/Transform3D.h                                     | 2 +-
 Core/Vector/Vectors3D.h                                       | 2 +-
 Core/Vector/WavevectorInfo.h                                  | 2 +-
 GUI/coregui/utils/IMessageService.h                           | 2 +-
 GUI/coregui/utils/WarningMessageService.cpp                   | 2 +-
 GUI/coregui/utils/WarningMessageService.h                     | 2 +-
 Tests/Functional/Core/CoreStandardTest.cpp                    | 2 +-
 Tests/Functional/Core/CoreTest.cpp                            | 2 +-
 Tests/Functional/Core/CoreTest.h                              | 2 +-
 Tests/Functional/Fit/IMinimizerTest.cpp                       | 2 +-
 Tests/Functional/Fit/IMinimizerTest.h                         | 2 +-
 Tests/Functional/Fit/MinimizerTests.cpp                       | 2 +-
 Tests/Functional/Fit/MinimizerTests.h                         | 2 +-
 Tests/Functional/Fit/RectDetectorFitTest.cpp                  | 2 +-
 Tests/Functional/Fit/RectDetectorFitTest.h                    | 2 +-
 Tests/Functional/Fit/StandardFitsFactory.cpp                  | 2 +-
 Tests/Functional/Fit/StandardFitsFactory.h                    | 2 +-
 Tests/Functional/GUI/GUITest.cpp                              | 2 +-
 Tests/Functional/GUI/GUITest.h                                | 2 +-
 Tests/Functional/PyCore/suite/PyCoreTest.cpp                  | 2 +-
 Tests/Functional/PyCore/suite/PyCoreTest.h                    | 2 +-
 Tests/Functional/TestMachinery/IFunctionalTest.cpp            | 2 +-
 Tests/Functional/TestMachinery/IFunctionalTest.h              | 2 +-
 Tests/Functional/TestMachinery/IRegistry.h                    | 2 +-
 Tests/Functional/TestMachinery/IStandardTest.cpp              | 2 +-
 Tests/Functional/TestMachinery/IStandardTest.h                | 2 +-
 Tests/Functional/TestMachinery/SimulationInfo.cpp             | 2 +-
 Tests/Functional/TestMachinery/SimulationInfo.h               | 2 +-
 .../Functional/TestMachinery/StandardSimulationsRegistry.cpp  | 2 +-
 Tests/Functional/TestMachinery/StandardSimulationsRegistry.h  | 2 +-
 Tests/Functional/TestMachinery/SubtestRegistry.cpp            | 2 +-
 Tests/Functional/TestMachinery/SubtestRegistry.h              | 2 +-
 dev-tools/edit/update-filename.py                             | 4 ++--
 dev-tools/edit/update-sourcecode-header.py                    | 2 +-
 197 files changed, 198 insertions(+), 198 deletions(-)

diff --git a/Core/Aggregate/DecouplingApproximationStrategy.cpp b/Core/Aggregate/DecouplingApproximationStrategy.cpp
index 71de56403e0..7c22a542465 100644
--- a/Core/Aggregate/DecouplingApproximationStrategy.cpp
+++ b/Core/Aggregate/DecouplingApproximationStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/DecouplingApproximationStrategy.cpp
+//! @file      Core/Aggregate/DecouplingApproximationStrategy.cpp
 //! @brief     Implements class DecouplingApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/DecouplingApproximationStrategy.h b/Core/Aggregate/DecouplingApproximationStrategy.h
index c25021e5f5f..7ceb961ec82 100644
--- a/Core/Aggregate/DecouplingApproximationStrategy.h
+++ b/Core/Aggregate/DecouplingApproximationStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/DecouplingApproximationStrategy.h
+//! @file      Core/Aggregate/DecouplingApproximationStrategy.h
 //! @brief     Declares class DecouplingApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/FTDecayFunctions.cpp b/Core/Aggregate/FTDecayFunctions.cpp
index bcaeb206334..44a5cd10b39 100644
--- a/Core/Aggregate/FTDecayFunctions.cpp
+++ b/Core/Aggregate/FTDecayFunctions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/FTDecayFunctions.cpp
+//! @file      Core/Aggregate/FTDecayFunctions.cpp
 //! @brief     Implements class FTDistribution2DCauchy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/FTDecayFunctions.h b/Core/Aggregate/FTDecayFunctions.h
index f965dc51b63..3a629d0c855 100644
--- a/Core/Aggregate/FTDecayFunctions.h
+++ b/Core/Aggregate/FTDecayFunctions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/FTDecayFunctions.h
+//! @file      Core/Aggregate/FTDecayFunctions.h
 //! @brief     Declares classes IFTDecayFunction1D, IFTDecayFunction2D,
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/FTDistributions.cpp b/Core/Aggregate/FTDistributions.cpp
index 198468748d9..44314293c39 100644
--- a/Core/Aggregate/FTDistributions.cpp
+++ b/Core/Aggregate/FTDistributions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/FTDistributions.cpp
+//! @file      Core/Aggregate/FTDistributions.cpp
 //! @brief     Implements class FTDistribution2DCauchy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/FTDistributions.h b/Core/Aggregate/FTDistributions.h
index 7887bd355d8..e45cff4a234 100644
--- a/Core/Aggregate/FTDistributions.h
+++ b/Core/Aggregate/FTDistributions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/FTDistributions.h
+//! @file      Core/Aggregate/FTDistributions.h
 //! @brief     Declares classes IFTDistribution1D, IFTDistribution2D,
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/IInterferenceFunction.cpp b/Core/Aggregate/IInterferenceFunction.cpp
index b0b631e1084..3b0e4f3ea2f 100644
--- a/Core/Aggregate/IInterferenceFunction.cpp
+++ b/Core/Aggregate/IInterferenceFunction.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/IInterferenceFunction.cpp
+//! @file      Core/Aggregate/IInterferenceFunction.cpp
 //! @brief     Implements interface class IInterferenceFunction.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/IInterferenceFunction.h b/Core/Aggregate/IInterferenceFunction.h
index 13cc4fe894c..af665878d6c 100644
--- a/Core/Aggregate/IInterferenceFunction.h
+++ b/Core/Aggregate/IInterferenceFunction.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/IInterferenceFunction.h
+//! @file      Core/Aggregate/IInterferenceFunction.h
 //! @brief     Declares interface class IInterferenceFunction.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/IInterferenceFunctionStrategy.cpp b/Core/Aggregate/IInterferenceFunctionStrategy.cpp
index 78268378d21..9bdd524ecbc 100644
--- a/Core/Aggregate/IInterferenceFunctionStrategy.cpp
+++ b/Core/Aggregate/IInterferenceFunctionStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/IInterferenceFunctionStrategy.cpp
+//! @file      Core/Aggregate/IInterferenceFunctionStrategy.cpp
 //! @brief     Implements default behaviour of IInterferenceFunctionStrategy
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/IInterferenceFunctionStrategy.h b/Core/Aggregate/IInterferenceFunctionStrategy.h
index fde207bc5e8..9798ed5f64c 100644
--- a/Core/Aggregate/IInterferenceFunctionStrategy.h
+++ b/Core/Aggregate/IInterferenceFunctionStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/IInterferenceFunctionStrategy.h
+//! @file      Core/Aggregate/IInterferenceFunctionStrategy.h
 //! @brief     Declares class IInterferenceFunctionStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/ILayout.h b/Core/Aggregate/ILayout.h
index 16984e806a5..403cc4d3487 100644
--- a/Core/Aggregate/ILayout.h
+++ b/Core/Aggregate/ILayout.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/ILayout.h
+//! @file      Core/Aggregate/ILayout.h
 //! @brief     Declares interface class ILayout.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/InterferenceFunction1DLattice.cpp b/Core/Aggregate/InterferenceFunction1DLattice.cpp
index 9c34ce26781..749f784e8af 100644
--- a/Core/Aggregate/InterferenceFunction1DLattice.cpp
+++ b/Core/Aggregate/InterferenceFunction1DLattice.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/InterferenceFunction1DLattice.cpp
+//! @file      Core/Aggregate/InterferenceFunction1DLattice.cpp
 //! @brief     Implements class InterferenceFunction1DLattice.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/InterferenceFunction1DLattice.h b/Core/Aggregate/InterferenceFunction1DLattice.h
index b3cc5d079cc..fa4478383d4 100644
--- a/Core/Aggregate/InterferenceFunction1DLattice.h
+++ b/Core/Aggregate/InterferenceFunction1DLattice.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/InterferenceFunction1DLattice.h
+//! @file      Core/Aggregate/InterferenceFunction1DLattice.h
 //! @brief     Declares class InterferenceFunction1DLattice.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/InterferenceFunction2DLattice.cpp b/Core/Aggregate/InterferenceFunction2DLattice.cpp
index ea008935599..dfef295390e 100644
--- a/Core/Aggregate/InterferenceFunction2DLattice.cpp
+++ b/Core/Aggregate/InterferenceFunction2DLattice.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/InterferenceFunction2DLattice.cpp
+//! @file      Core/Aggregate/InterferenceFunction2DLattice.cpp
 //! @brief     Implements class InterferenceFunction2DLattice.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/InterferenceFunction2DLattice.h b/Core/Aggregate/InterferenceFunction2DLattice.h
index ff1238be128..5d90f5cadcc 100644
--- a/Core/Aggregate/InterferenceFunction2DLattice.h
+++ b/Core/Aggregate/InterferenceFunction2DLattice.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/InterferenceFunction2DLattice.h
+//! @file      Core/Aggregate/InterferenceFunction2DLattice.h
 //! @brief     Declares class InterferenceFunction2DLattice.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp b/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp
index f745818188c..234c31d2b90 100644
--- a/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp
+++ b/Core/Aggregate/InterferenceFunction2DParaCrystal.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/InterferenceFunction2DParaCrystal.cpp
+//! @file      Core/Aggregate/InterferenceFunction2DParaCrystal.cpp
 //! @brief     Implements class InterferenceFunction2DParaCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/InterferenceFunction2DParaCrystal.h b/Core/Aggregate/InterferenceFunction2DParaCrystal.h
index 0805715e506..0600302a6eb 100644
--- a/Core/Aggregate/InterferenceFunction2DParaCrystal.h
+++ b/Core/Aggregate/InterferenceFunction2DParaCrystal.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/InterferenceFunction2DParaCrystal.h
+//! @file      Core/Aggregate/InterferenceFunction2DParaCrystal.h
 //! @brief     Declares class InterferenceFunction2DParaCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/InterferenceFunctionNone.cpp b/Core/Aggregate/InterferenceFunctionNone.cpp
index a5311c00cb6..63af0b2bdb6 100644
--- a/Core/Aggregate/InterferenceFunctionNone.cpp
+++ b/Core/Aggregate/InterferenceFunctionNone.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/InterferenceFunctionNone.cpp
+//! @file      Core/Aggregate/InterferenceFunctionNone.cpp
 //! @brief     Implements class InterferenceFunctionNone.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/InterferenceFunctionNone.h b/Core/Aggregate/InterferenceFunctionNone.h
index 275948ae58a..dfc1931738a 100644
--- a/Core/Aggregate/InterferenceFunctionNone.h
+++ b/Core/Aggregate/InterferenceFunctionNone.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/InterferenceFunctionNone.h
+//! @file      Core/Aggregate/InterferenceFunctionNone.h
 //! @brief     Declares class InterferenceFunctionNone.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/InterferenceFunctionRadialParaCrystal.cpp b/Core/Aggregate/InterferenceFunctionRadialParaCrystal.cpp
index 12d71111418..adbbceeb184 100644
--- a/Core/Aggregate/InterferenceFunctionRadialParaCrystal.cpp
+++ b/Core/Aggregate/InterferenceFunctionRadialParaCrystal.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/InterferenceFunctionRadialParaCrystal.cpp
+//! @file      Core/Aggregate/InterferenceFunctionRadialParaCrystal.cpp
 //! @brief     Implements class InterferenceFunctionRadialParaCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/InterferenceFunctionRadialParaCrystal.h b/Core/Aggregate/InterferenceFunctionRadialParaCrystal.h
index ef9ad55eedc..0a8eda6c739 100644
--- a/Core/Aggregate/InterferenceFunctionRadialParaCrystal.h
+++ b/Core/Aggregate/InterferenceFunctionRadialParaCrystal.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/InterferenceFunctionRadialParaCrystal.h
+//! @file      Core/Aggregate/InterferenceFunctionRadialParaCrystal.h
 //! @brief     Declares class InterferenceFunctionRadialParaCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/InterferenceFunctionStrategies.h b/Core/Aggregate/InterferenceFunctionStrategies.h
index b1a531263d0..9790898d33b 100644
--- a/Core/Aggregate/InterferenceFunctionStrategies.h
+++ b/Core/Aggregate/InterferenceFunctionStrategies.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/InterferenceFunctionStrategies.h
+//! @file      Core/Aggregate/InterferenceFunctionStrategies.h
 //! @brief     Includes several files named *Strategy.h
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/InterferenceFunctions.h b/Core/Aggregate/InterferenceFunctions.h
index 22cbd455b1c..b330054ed8e 100644
--- a/Core/Aggregate/InterferenceFunctions.h
+++ b/Core/Aggregate/InterferenceFunctions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/InterferenceFunctions.h
+//! @file      Core/Aggregate/InterferenceFunctions.h
 //! @brief     Includes all interference function definitions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/ParticleLayout.cpp b/Core/Aggregate/ParticleLayout.cpp
index aa9f7af1d66..1478045ea25 100644
--- a/Core/Aggregate/ParticleLayout.cpp
+++ b/Core/Aggregate/ParticleLayout.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/ParticleLayout.cpp
+//! @file      Core/Aggregate/ParticleLayout.cpp
 //! @brief     Implements class ParticleLayout.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/ParticleLayout.h b/Core/Aggregate/ParticleLayout.h
index 85d42bf2c54..a70f10fb130 100644
--- a/Core/Aggregate/ParticleLayout.h
+++ b/Core/Aggregate/ParticleLayout.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/ParticleLayout.h
+//! @file      Core/Aggregate/ParticleLayout.h
 //! @brief     Declares class ParticleLayout.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/SizeSpacingCorrelationApproximationStrategy.cpp b/Core/Aggregate/SizeSpacingCorrelationApproximationStrategy.cpp
index 60bfe7333c4..ce3fdd902d3 100644
--- a/Core/Aggregate/SizeSpacingCorrelationApproximationStrategy.cpp
+++ b/Core/Aggregate/SizeSpacingCorrelationApproximationStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/SizeSpacingCorrelationApproximationStrategy.cpp
+//! @file      Core/Aggregate/SizeSpacingCorrelationApproximationStrategy.cpp
 //! @brief     Implements class SizeSpacingCorrelationApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregate/SizeSpacingCorrelationApproximationStrategy.h b/Core/Aggregate/SizeSpacingCorrelationApproximationStrategy.h
index 7721b313cc6..f655ffa5b47 100644
--- a/Core/Aggregate/SizeSpacingCorrelationApproximationStrategy.h
+++ b/Core/Aggregate/SizeSpacingCorrelationApproximationStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Aggregates/SizeSpacingCorrelationApproximationStrategy.h
+//! @file      Core/Aggregate/SizeSpacingCorrelationApproximationStrategy.h
 //! @brief     Declares class SizeSpacingCorrelationApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Binning/Bin.cpp b/Core/Binning/Bin.cpp
index c975b3bc916..37dc46a7f39 100644
--- a/Core/Binning/Bin.cpp
+++ b/Core/Binning/Bin.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Bins/Bin.cpp
+//! @file      Core/Binning/Bin.cpp
 //! @brief     Implements structs Bin1D, Bin1DCVector
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Binning/Bin.h b/Core/Binning/Bin.h
index 38193c53dc0..32fd923cad2 100644
--- a/Core/Binning/Bin.h
+++ b/Core/Binning/Bin.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Bins/Bin.h
+//! @file      Core/Binning/Bin.h
 //! @brief     Declares structs Bin1D, Bin1DCVector
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Binning/ConstKBinAxis.cpp b/Core/Binning/ConstKBinAxis.cpp
index 2eef0070292..3051a05d525 100644
--- a/Core/Binning/ConstKBinAxis.cpp
+++ b/Core/Binning/ConstKBinAxis.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Bins/ConstKBinAxis.cpp
+//! @file      Core/Binning/ConstKBinAxis.cpp
 //! @brief     Implement class ConstKBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Binning/ConstKBinAxis.h b/Core/Binning/ConstKBinAxis.h
index c292c5363f1..2510cf192ba 100644
--- a/Core/Binning/ConstKBinAxis.h
+++ b/Core/Binning/ConstKBinAxis.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Bins/ConstKBinAxis.h
+//! @file      Core/Binning/ConstKBinAxis.h
 //! @brief     Declares class ConstKBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Binning/CustomBinAxis.cpp b/Core/Binning/CustomBinAxis.cpp
index 424fb1d0772..57de65e91d4 100644
--- a/Core/Binning/CustomBinAxis.cpp
+++ b/Core/Binning/CustomBinAxis.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Bins/CustomBinAxis.cpp
+//! @file      Core/Binning/CustomBinAxis.cpp
 //! @brief     Implement class CustomBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Binning/CustomBinAxis.h b/Core/Binning/CustomBinAxis.h
index 8d00cf3aa7b..8d27c363740 100644
--- a/Core/Binning/CustomBinAxis.h
+++ b/Core/Binning/CustomBinAxis.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Bins/CustomBinAxis.h
+//! @file      Core/Binning/CustomBinAxis.h
 //! @brief     Declares class CustomBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Binning/FixedBinAxis.cpp b/Core/Binning/FixedBinAxis.cpp
index 055fa9d7ac9..2e137fb6afd 100644
--- a/Core/Binning/FixedBinAxis.cpp
+++ b/Core/Binning/FixedBinAxis.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Bins/FixedBinAxis.cpp
+//! @file      Core/Binning/FixedBinAxis.cpp
 //! @brief     Implement class FixedBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Binning/FixedBinAxis.h b/Core/Binning/FixedBinAxis.h
index a5346187fb2..b030cad474a 100644
--- a/Core/Binning/FixedBinAxis.h
+++ b/Core/Binning/FixedBinAxis.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Bins/FixedBinAxis.h
+//! @file      Core/Binning/FixedBinAxis.h
 //! @brief     Declares class FixedBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Binning/IAxis.h b/Core/Binning/IAxis.h
index f33b72a0a26..8e89171a192 100644
--- a/Core/Binning/IAxis.h
+++ b/Core/Binning/IAxis.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Bins/IAxis.h
+//! @file      Core/Binning/IAxis.h
 //! @brief     Declares class IAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Binning/VariableBinAxis.cpp b/Core/Binning/VariableBinAxis.cpp
index c745d238576..de9c13c3c46 100644
--- a/Core/Binning/VariableBinAxis.cpp
+++ b/Core/Binning/VariableBinAxis.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Bins/VariableBinAxis.cpp
+//! @file      Core/Binning/VariableBinAxis.cpp
 //! @brief     Implements VariableBinAxis class.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Binning/VariableBinAxis.h b/Core/Binning/VariableBinAxis.h
index 89686398529..959e4cc74a2 100644
--- a/Core/Binning/VariableBinAxis.h
+++ b/Core/Binning/VariableBinAxis.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Bins/VariableBinAxis.h
+//! @file      Core/Binning/VariableBinAxis.h
 //! @brief     Declares class VariableBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorAnisoPyramid.cpp b/Core/HardParticle/FormFactorAnisoPyramid.cpp
index d962b10478d..d88beb28d1c 100644
--- a/Core/HardParticle/FormFactorAnisoPyramid.cpp
+++ b/Core/HardParticle/FormFactorAnisoPyramid.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorAnisoPyramid.cpp
+//! @file      Core/HardParticle/FormFactorAnisoPyramid.cpp
 //! @brief     Implements class FormFactorAnisoPyramid.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorAnisoPyramid.h b/Core/HardParticle/FormFactorAnisoPyramid.h
index fe82b5340ff..8772330f9ce 100644
--- a/Core/HardParticle/FormFactorAnisoPyramid.h
+++ b/Core/HardParticle/FormFactorAnisoPyramid.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorAnisoPyramid.h
+//! @file      Core/HardParticle/FormFactorAnisoPyramid.h
 //! @brief     Declares class FormFactorAnisoPyramid
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorBox.cpp b/Core/HardParticle/FormFactorBox.cpp
index 184dd01dfb9..cb9ea365f6d 100644
--- a/Core/HardParticle/FormFactorBox.cpp
+++ b/Core/HardParticle/FormFactorBox.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorBox.cpp
+//! @file      Core/HardParticle/FormFactorBox.cpp
 //! @brief     Implements class FormFactorBox.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorBox.h b/Core/HardParticle/FormFactorBox.h
index c1360561f98..d989753a72c 100644
--- a/Core/HardParticle/FormFactorBox.h
+++ b/Core/HardParticle/FormFactorBox.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorBox.h
+//! @file      Core/HardParticle/FormFactorBox.h
 //! @brief     Declares class FormFactorBox.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorCone.cpp b/Core/HardParticle/FormFactorCone.cpp
index 272c54b0bdc..f3d1644d45b 100644
--- a/Core/HardParticle/FormFactorCone.cpp
+++ b/Core/HardParticle/FormFactorCone.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorCone.cpp
+//! @file      Core/HardParticle/FormFactorCone.cpp
 //! @brief     Implements class FormFactorCone.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorCone.h b/Core/HardParticle/FormFactorCone.h
index c03d1cec09a..458821b627b 100644
--- a/Core/HardParticle/FormFactorCone.h
+++ b/Core/HardParticle/FormFactorCone.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorCone.h
+//! @file      Core/HardParticle/FormFactorCone.h
 //! @brief     Declares class FormFactorCone
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorCone6.cpp b/Core/HardParticle/FormFactorCone6.cpp
index ca5709eed1a..2b0a5a5f447 100644
--- a/Core/HardParticle/FormFactorCone6.cpp
+++ b/Core/HardParticle/FormFactorCone6.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorCone6.cpp
+//! @file      Core/HardParticle/FormFactorCone6.cpp
 //! @brief     Implements class FormFactorCone6.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorCone6.h b/Core/HardParticle/FormFactorCone6.h
index 5bcc65d6e59..ff03d11388b 100644
--- a/Core/HardParticle/FormFactorCone6.h
+++ b/Core/HardParticle/FormFactorCone6.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorCone6.h
+//! @file      Core/HardParticle/FormFactorCone6.h
 //! @brief     Declares class FormFactorCone6
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorCuboctahedron.cpp b/Core/HardParticle/FormFactorCuboctahedron.cpp
index 24c543f7b2a..41df4ba3607 100644
--- a/Core/HardParticle/FormFactorCuboctahedron.cpp
+++ b/Core/HardParticle/FormFactorCuboctahedron.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorCuboctahedron.cpp
+//! @file      Core/HardParticle/FormFactorCuboctahedron.cpp
 //! @brief     Implements class FormFactorCuboctahedron.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorCuboctahedron.h b/Core/HardParticle/FormFactorCuboctahedron.h
index ffecdea0d1a..58804e719b0 100644
--- a/Core/HardParticle/FormFactorCuboctahedron.h
+++ b/Core/HardParticle/FormFactorCuboctahedron.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorCuboctahedron.h
+//! @file      Core/HardParticle/FormFactorCuboctahedron.h
 //! @brief     Declares class FormFactorCuboctahedron
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorCylinder.cpp b/Core/HardParticle/FormFactorCylinder.cpp
index fe6a86b97ff..fb9ebfb0d14 100644
--- a/Core/HardParticle/FormFactorCylinder.cpp
+++ b/Core/HardParticle/FormFactorCylinder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorCylinder.cpp
+//! @file      Core/HardParticle/FormFactorCylinder.cpp
 //! @brief     Implements class FormFactorCylinder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorCylinder.h b/Core/HardParticle/FormFactorCylinder.h
index 55fb4bbe53b..4452095e2cc 100644
--- a/Core/HardParticle/FormFactorCylinder.h
+++ b/Core/HardParticle/FormFactorCylinder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorCylinder.h
+//! @file      Core/HardParticle/FormFactorCylinder.h
 //! @brief     Declares class FormFactorCylinder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorDodecahedron.cpp b/Core/HardParticle/FormFactorDodecahedron.cpp
index 4fcf359e65e..5e86abc1dd5 100644
--- a/Core/HardParticle/FormFactorDodecahedron.cpp
+++ b/Core/HardParticle/FormFactorDodecahedron.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorDodecahedron.cpp
+//! @file      Core/HardParticle/FormFactorDodecahedron.cpp
 //! @brief     Implements class FormFactorDodecahedron.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorDodecahedron.h b/Core/HardParticle/FormFactorDodecahedron.h
index e9942f709e9..6778fe80809 100644
--- a/Core/HardParticle/FormFactorDodecahedron.h
+++ b/Core/HardParticle/FormFactorDodecahedron.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorDodecahedron.h
+//! @file      Core/HardParticle/FormFactorDodecahedron.h
 //! @brief     Declares class FormFactorDodecahedron.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorEllipsoidalCylinder.cpp b/Core/HardParticle/FormFactorEllipsoidalCylinder.cpp
index 8029a7378c5..9c501804537 100644
--- a/Core/HardParticle/FormFactorEllipsoidalCylinder.cpp
+++ b/Core/HardParticle/FormFactorEllipsoidalCylinder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorEllipsoidalCylinder.cpp
+//! @file      Core/HardParticle/FormFactorEllipsoidalCylinder.cpp
 //! @brief     Implements class FormFactorEllipsoidalCylinder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorEllipsoidalCylinder.h b/Core/HardParticle/FormFactorEllipsoidalCylinder.h
index b81961a9133..b74778da435 100644
--- a/Core/HardParticle/FormFactorEllipsoidalCylinder.h
+++ b/Core/HardParticle/FormFactorEllipsoidalCylinder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorEllipsoidalCylinder.h
+//! @file      Core/HardParticle/FormFactorEllipsoidalCylinder.h
 //! @brief     Declares class FormFactorEllipsoidalCylinder
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorFullSphere.cpp b/Core/HardParticle/FormFactorFullSphere.cpp
index c7f7a7cd294..be906e127ab 100644
--- a/Core/HardParticle/FormFactorFullSphere.cpp
+++ b/Core/HardParticle/FormFactorFullSphere.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorFullSphere.cpp
+//! @file      Core/HardParticle/FormFactorFullSphere.cpp
 //! @brief     Implements class FormFactorFullSphere.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorFullSphere.h b/Core/HardParticle/FormFactorFullSphere.h
index 0a6175826ac..323c4a01c03 100644
--- a/Core/HardParticle/FormFactorFullSphere.h
+++ b/Core/HardParticle/FormFactorFullSphere.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorFullSphere.h
+//! @file      Core/HardParticle/FormFactorFullSphere.h
 //! @brief     Declares class FormFactorFullSphere.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorFullSpheroid.cpp b/Core/HardParticle/FormFactorFullSpheroid.cpp
index dca11c82169..54af63937c0 100644
--- a/Core/HardParticle/FormFactorFullSpheroid.cpp
+++ b/Core/HardParticle/FormFactorFullSpheroid.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorFullSpheroid.cpp
+//! @file      Core/HardParticle/FormFactorFullSpheroid.cpp
 //! @brief     Implements class FormFactorFullSpheroid.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorFullSpheroid.h b/Core/HardParticle/FormFactorFullSpheroid.h
index 14bfcd124c4..db2d88adb75 100644
--- a/Core/HardParticle/FormFactorFullSpheroid.h
+++ b/Core/HardParticle/FormFactorFullSpheroid.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorFullSpheroid.h
+//! @file      Core/HardParticle/FormFactorFullSpheroid.h
 //! @brief     Declares class FormFactorFullSpheroid.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorHemiEllipsoid.cpp b/Core/HardParticle/FormFactorHemiEllipsoid.cpp
index 03399aa5870..b485f12aac2 100644
--- a/Core/HardParticle/FormFactorHemiEllipsoid.cpp
+++ b/Core/HardParticle/FormFactorHemiEllipsoid.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorHemiEllipsoid.cpp
+//! @file      Core/HardParticle/FormFactorHemiEllipsoid.cpp
 //! @brief     Implements class FormFactorHemiEllipsoid.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorHemiEllipsoid.h b/Core/HardParticle/FormFactorHemiEllipsoid.h
index 5a85869a483..a4b6f6d7406 100644
--- a/Core/HardParticle/FormFactorHemiEllipsoid.h
+++ b/Core/HardParticle/FormFactorHemiEllipsoid.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorHemiEllipsoid.h
+//! @file      Core/HardParticle/FormFactorHemiEllipsoid.h
 //! @brief     Declares class FormFactorHemiEllipsoid.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorIcosahedron.cpp b/Core/HardParticle/FormFactorIcosahedron.cpp
index 6eda9d0e825..409c431c3c7 100644
--- a/Core/HardParticle/FormFactorIcosahedron.cpp
+++ b/Core/HardParticle/FormFactorIcosahedron.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorIcosahedron.cpp
+//! @file      Core/HardParticle/FormFactorIcosahedron.cpp
 //! @brief     Implements class FormFactorIcosahedron.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorIcosahedron.h b/Core/HardParticle/FormFactorIcosahedron.h
index 17e4cb229d3..193a2011fda 100644
--- a/Core/HardParticle/FormFactorIcosahedron.h
+++ b/Core/HardParticle/FormFactorIcosahedron.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorIcosahedron.h
+//! @file      Core/HardParticle/FormFactorIcosahedron.h
 //! @brief     Declares class FormFactorIcosahedron.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorLongBoxGauss.cpp b/Core/HardParticle/FormFactorLongBoxGauss.cpp
index ec3338be65f..03ad2fc8003 100644
--- a/Core/HardParticle/FormFactorLongBoxGauss.cpp
+++ b/Core/HardParticle/FormFactorLongBoxGauss.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorLongBoxGauss.cpp
+//! @file      Core/HardParticle/FormFactorLongBoxGauss.cpp
 //! @brief     Implements class FormFactorLongBoxGauss.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorLongBoxGauss.h b/Core/HardParticle/FormFactorLongBoxGauss.h
index 06e803e6099..99aaf29d919 100644
--- a/Core/HardParticle/FormFactorLongBoxGauss.h
+++ b/Core/HardParticle/FormFactorLongBoxGauss.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorLongBoxGauss.h
+//! @file      Core/HardParticle/FormFactorLongBoxGauss.h
 //! @brief     Declares class FormFactorLongBoxGauss.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorLongBoxLorentz.cpp b/Core/HardParticle/FormFactorLongBoxLorentz.cpp
index 24e9ab1136c..30b8e4aef6d 100644
--- a/Core/HardParticle/FormFactorLongBoxLorentz.cpp
+++ b/Core/HardParticle/FormFactorLongBoxLorentz.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorLongBoxLorentz.cpp
+//! @file      Core/HardParticle/FormFactorLongBoxLorentz.cpp
 //! @brief     Implements class FormFactorLongBoxLorentz.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorLongBoxLorentz.h b/Core/HardParticle/FormFactorLongBoxLorentz.h
index 83418176d91..c071131f733 100644
--- a/Core/HardParticle/FormFactorLongBoxLorentz.h
+++ b/Core/HardParticle/FormFactorLongBoxLorentz.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorLongBoxLorentz.h
+//! @file      Core/HardParticle/FormFactorLongBoxLorentz.h
 //! @brief     Declares class FormFactorLongBoxLorentz.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorLongRipple1Gauss.cpp b/Core/HardParticle/FormFactorLongRipple1Gauss.cpp
index fd6405acb08..e5583b0caf4 100644
--- a/Core/HardParticle/FormFactorLongRipple1Gauss.cpp
+++ b/Core/HardParticle/FormFactorLongRipple1Gauss.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorLongRipple1Gauss.cpp
+//! @file      Core/HardParticle/FormFactorLongRipple1Gauss.cpp
 //! @brief     Implements class FormFactorLongRipple1Gauss.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorLongRipple1Gauss.h b/Core/HardParticle/FormFactorLongRipple1Gauss.h
index 93e881c5b89..8b22c640239 100644
--- a/Core/HardParticle/FormFactorLongRipple1Gauss.h
+++ b/Core/HardParticle/FormFactorLongRipple1Gauss.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorLongRipple1Gauss.h
+//! @file      Core/HardParticle/FormFactorLongRipple1Gauss.h
 //! @brief     Declares class FormFactorLongRipple1Gauss.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorLongRipple1Lorentz.cpp b/Core/HardParticle/FormFactorLongRipple1Lorentz.cpp
index 384e5762cea..50f7b6bd4ed 100644
--- a/Core/HardParticle/FormFactorLongRipple1Lorentz.cpp
+++ b/Core/HardParticle/FormFactorLongRipple1Lorentz.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorLongRipple1Lorentz.cpp
+//! @file      Core/HardParticle/FormFactorLongRipple1Lorentz.cpp
 //! @brief     Implements class FormFactorLongRipple1Lorentz.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorLongRipple1Lorentz.h b/Core/HardParticle/FormFactorLongRipple1Lorentz.h
index 2b18ba41719..1cc563dd171 100644
--- a/Core/HardParticle/FormFactorLongRipple1Lorentz.h
+++ b/Core/HardParticle/FormFactorLongRipple1Lorentz.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorLongRipple1Lorentz.h
+//! @file      Core/HardParticle/FormFactorLongRipple1Lorentz.h
 //! @brief     Declares class FormFactorLongRipple1Lorentz.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorLongRipple2Gauss.cpp b/Core/HardParticle/FormFactorLongRipple2Gauss.cpp
index 6e6ef2657b6..987e12a4edc 100644
--- a/Core/HardParticle/FormFactorLongRipple2Gauss.cpp
+++ b/Core/HardParticle/FormFactorLongRipple2Gauss.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorLongRipple2Gauss.cpp
+//! @file      Core/HardParticle/FormFactorLongRipple2Gauss.cpp
 //! @brief     Implements class FormFactorLongRipple2Gauss.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorLongRipple2Gauss.h b/Core/HardParticle/FormFactorLongRipple2Gauss.h
index 65194b9bbc5..3377ccc85e9 100644
--- a/Core/HardParticle/FormFactorLongRipple2Gauss.h
+++ b/Core/HardParticle/FormFactorLongRipple2Gauss.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorLongRipple2Gauss.h
+//! @file      Core/HardParticle/FormFactorLongRipple2Gauss.h
 //! @brief     Declares class FormFactorLongRipple2Gauss.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorLongRipple2Lorentz.cpp b/Core/HardParticle/FormFactorLongRipple2Lorentz.cpp
index a9765409e32..b997ae0527c 100644
--- a/Core/HardParticle/FormFactorLongRipple2Lorentz.cpp
+++ b/Core/HardParticle/FormFactorLongRipple2Lorentz.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorLongRipple2Lorentz.cpp
+//! @file      Core/HardParticle/FormFactorLongRipple2Lorentz.cpp
 //! @brief     Implements class FormFactorRipple2.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorLongRipple2Lorentz.h b/Core/HardParticle/FormFactorLongRipple2Lorentz.h
index fb96d8f2657..523b17586fa 100644
--- a/Core/HardParticle/FormFactorLongRipple2Lorentz.h
+++ b/Core/HardParticle/FormFactorLongRipple2Lorentz.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorLongRipple2Lorentz.h
+//! @file      Core/HardParticle/FormFactorLongRipple2Lorentz.h
 //! @brief     Declares class FormFactorLongRipple2Lorentz.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorPolyhedron.cpp b/Core/HardParticle/FormFactorPolyhedron.cpp
index 1776eeb9265..480994b1b41 100644
--- a/Core/HardParticle/FormFactorPolyhedron.cpp
+++ b/Core/HardParticle/FormFactorPolyhedron.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorPolyhedron.cpp
+//! @file      Core/HardParticle/FormFactorPolyhedron.cpp
 //! @brief     Implements class FormFactorPolyhedron, FormFactorPrism, and auxiliary classes.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorPolyhedron.h b/Core/HardParticle/FormFactorPolyhedron.h
index 6be71220f1c..c4ae271833b 100644
--- a/Core/HardParticle/FormFactorPolyhedron.h
+++ b/Core/HardParticle/FormFactorPolyhedron.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorPolyhedron.h
+//! @file      Core/HardParticle/FormFactorPolyhedron.h
 //! @brief     Declares class FormFactorPolyhedron, FormFactorPrism, and auxiliary classes.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorPrism3.cpp b/Core/HardParticle/FormFactorPrism3.cpp
index f45a79c537a..cbc388dec98 100644
--- a/Core/HardParticle/FormFactorPrism3.cpp
+++ b/Core/HardParticle/FormFactorPrism3.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorPrism3.cpp
+//! @file      Core/HardParticle/FormFactorPrism3.cpp
 //! @brief     Implements class FormFactorPrism3.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorPrism3.h b/Core/HardParticle/FormFactorPrism3.h
index 2acd87266cf..14909b9a132 100644
--- a/Core/HardParticle/FormFactorPrism3.h
+++ b/Core/HardParticle/FormFactorPrism3.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorPrism3.h
+//! @file      Core/HardParticle/FormFactorPrism3.h
 //! @brief     Declares class FormFactorPrism3.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorPrism6.cpp b/Core/HardParticle/FormFactorPrism6.cpp
index 6c733ad45a9..a80d6cd664f 100644
--- a/Core/HardParticle/FormFactorPrism6.cpp
+++ b/Core/HardParticle/FormFactorPrism6.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorPrism6.cpp
+//! @file      Core/HardParticle/FormFactorPrism6.cpp
 //! @brief     Implements class FormFactorPrism6.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorPrism6.h b/Core/HardParticle/FormFactorPrism6.h
index 1925e0579c3..78879af144d 100644
--- a/Core/HardParticle/FormFactorPrism6.h
+++ b/Core/HardParticle/FormFactorPrism6.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorPrism6.h
+//! @file      Core/HardParticle/FormFactorPrism6.h
 //! @brief     Declares class FormFactorPrism6.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorPyramid.cpp b/Core/HardParticle/FormFactorPyramid.cpp
index a9ab21d1d52..d1c76a490eb 100644
--- a/Core/HardParticle/FormFactorPyramid.cpp
+++ b/Core/HardParticle/FormFactorPyramid.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorPyramid.cpp
+//! @file      Core/HardParticle/FormFactorPyramid.cpp
 //! @brief     Implements class FormFactorPyramid.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorPyramid.h b/Core/HardParticle/FormFactorPyramid.h
index 2cb9d53204e..5bf0c0dd444 100644
--- a/Core/HardParticle/FormFactorPyramid.h
+++ b/Core/HardParticle/FormFactorPyramid.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorPyramid.h
+//! @file      Core/HardParticle/FormFactorPyramid.h
 //! @brief     Declares class FormFactorPyramid
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorRipple1.cpp b/Core/HardParticle/FormFactorRipple1.cpp
index dddf5663a02..b5dfe226118 100644
--- a/Core/HardParticle/FormFactorRipple1.cpp
+++ b/Core/HardParticle/FormFactorRipple1.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorRipple1.cpp
+//! @file      Core/HardParticle/FormFactorRipple1.cpp
 //! @brief     Implements class FormFactorRipple1.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorRipple1.h b/Core/HardParticle/FormFactorRipple1.h
index 6f8ff13879c..61f6b3dda66 100644
--- a/Core/HardParticle/FormFactorRipple1.h
+++ b/Core/HardParticle/FormFactorRipple1.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorRipple1.h
+//! @file      Core/HardParticle/FormFactorRipple1.h
 //! @brief     Declares class FormFactorRipple1.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorRipple2.cpp b/Core/HardParticle/FormFactorRipple2.cpp
index 1f9cabd4b05..5b605fc3ead 100644
--- a/Core/HardParticle/FormFactorRipple2.cpp
+++ b/Core/HardParticle/FormFactorRipple2.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorRipple2.cpp
+//! @file      Core/HardParticle/FormFactorRipple2.cpp
 //! @brief     Implements class FormFactorRipple2.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorRipple2.h b/Core/HardParticle/FormFactorRipple2.h
index 324d2c6a0ac..8f4022ed43e 100644
--- a/Core/HardParticle/FormFactorRipple2.h
+++ b/Core/HardParticle/FormFactorRipple2.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorRipple2.h
+//! @file      Core/HardParticle/FormFactorRipple2.h
 //! @brief     Declares class FormFactorRipple2.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorTetrahedron.cpp b/Core/HardParticle/FormFactorTetrahedron.cpp
index 05995479c6f..1eed58dfc58 100644
--- a/Core/HardParticle/FormFactorTetrahedron.cpp
+++ b/Core/HardParticle/FormFactorTetrahedron.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorTetrahedron.cpp
+//! @file      Core/HardParticle/FormFactorTetrahedron.cpp
 //! @brief     Implements class FormFactorTetrahedron.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorTetrahedron.h b/Core/HardParticle/FormFactorTetrahedron.h
index 874f1ac0aae..983b04dab66 100644
--- a/Core/HardParticle/FormFactorTetrahedron.h
+++ b/Core/HardParticle/FormFactorTetrahedron.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorTetrahedron.h
+//! @file      Core/HardParticle/FormFactorTetrahedron.h
 //! @brief     Declares class FormFactorTetrahedron
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorTriangle.cpp b/Core/HardParticle/FormFactorTriangle.cpp
index 7f59940b1e9..357dd9c2448 100644
--- a/Core/HardParticle/FormFactorTriangle.cpp
+++ b/Core/HardParticle/FormFactorTriangle.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorTriangle.cpp
+//! @file      Core/HardParticle/FormFactorTriangle.cpp
 //! @brief     Implements class FormFactorTriangle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorTriangle.h b/Core/HardParticle/FormFactorTriangle.h
index 7305b88237f..2ae1c17e28c 100644
--- a/Core/HardParticle/FormFactorTriangle.h
+++ b/Core/HardParticle/FormFactorTriangle.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorTriangle.h
+//! @file      Core/HardParticle/FormFactorTriangle.h
 //! @brief     Declares class FormFactorTriangle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorTrivial.cpp b/Core/HardParticle/FormFactorTrivial.cpp
index f94a836be14..f96615aaf59 100644
--- a/Core/HardParticle/FormFactorTrivial.cpp
+++ b/Core/HardParticle/FormFactorTrivial.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorTrivial.cpp
+//! @file      Core/HardParticle/FormFactorTrivial.cpp
 //! @brief     Implements class FormFactorTrivial.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorTrivial.h b/Core/HardParticle/FormFactorTrivial.h
index 399c25a6723..558652d531f 100644
--- a/Core/HardParticle/FormFactorTrivial.h
+++ b/Core/HardParticle/FormFactorTrivial.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorTrivial.h
+//! @file      Core/HardParticle/FormFactorTrivial.h
 //! @brief     Declares class FormFactorTrivial.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorTruncatedCube.cpp b/Core/HardParticle/FormFactorTruncatedCube.cpp
index dd3f959993f..3d50ba87b24 100644
--- a/Core/HardParticle/FormFactorTruncatedCube.cpp
+++ b/Core/HardParticle/FormFactorTruncatedCube.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorTruncatedCube.cpp
+//! @file      Core/HardParticle/FormFactorTruncatedCube.cpp
 //! @brief     Implements class FormFactorTruncatedCube.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorTruncatedCube.h b/Core/HardParticle/FormFactorTruncatedCube.h
index 67a3040c770..75e5a885764 100644
--- a/Core/HardParticle/FormFactorTruncatedCube.h
+++ b/Core/HardParticle/FormFactorTruncatedCube.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorTruncatedCube.h
+//! @file      Core/HardParticle/FormFactorTruncatedCube.h
 //! @brief     Declares class FormFactorTruncatedCube.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorTruncatedSphere.cpp b/Core/HardParticle/FormFactorTruncatedSphere.cpp
index 2d3a45d71ca..b5a44e7a578 100644
--- a/Core/HardParticle/FormFactorTruncatedSphere.cpp
+++ b/Core/HardParticle/FormFactorTruncatedSphere.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorTruncatedSphere.cpp
+//! @file      Core/HardParticle/FormFactorTruncatedSphere.cpp
 //! @brief     Implements class FormFactorTruncatedSphere.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorTruncatedSphere.h b/Core/HardParticle/FormFactorTruncatedSphere.h
index d3f99d68c10..8ad8a1e211f 100644
--- a/Core/HardParticle/FormFactorTruncatedSphere.h
+++ b/Core/HardParticle/FormFactorTruncatedSphere.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorTruncatedSphere.h
+//! @file      Core/HardParticle/FormFactorTruncatedSphere.h
 //! @brief     Declares class FormFactorTruncatedSphere.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorTruncatedSpheroid.cpp b/Core/HardParticle/FormFactorTruncatedSpheroid.cpp
index d1e53839ae7..9fbd281be2e 100644
--- a/Core/HardParticle/FormFactorTruncatedSpheroid.cpp
+++ b/Core/HardParticle/FormFactorTruncatedSpheroid.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorTruncatedSpheroid.cpp
+//! @file      Core/HardParticle/FormFactorTruncatedSpheroid.cpp
 //! @brief     Implements class FormFactorTruncatedSpheroid.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/FormFactorTruncatedSpheroid.h b/Core/HardParticle/FormFactorTruncatedSpheroid.h
index ed93a811d5c..1538123e9c4 100644
--- a/Core/HardParticle/FormFactorTruncatedSpheroid.h
+++ b/Core/HardParticle/FormFactorTruncatedSpheroid.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/FormFactorTruncatedSpheroid.h
+//! @file      Core/HardParticle/FormFactorTruncatedSpheroid.h
 //! @brief     Declares class FormFactorTruncatedSpheroid.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/HardParticle/HardParticles.h b/Core/HardParticle/HardParticles.h
index 8389da16178..ae6baafda7d 100644
--- a/Core/HardParticle/HardParticles.h
+++ b/Core/HardParticle/HardParticles.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/HardParticles/HardParticles.h
+//! @file      Core/HardParticle/HardParticles.h
 //! @brief     Includes all particle-shape form-factor definitions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Instrument/Convolve.cpp b/Core/Instrument/Convolve.cpp
index 67be274e8f3..80a20131a3a 100644
--- a/Core/Instrument/Convolve.cpp
+++ b/Core/Instrument/Convolve.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Tools/Convolve.cpp
+//! @file      Core/Instrument/Convolve.cpp
 //! @brief     Implements class Convolve.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Instrument/Convolve.h b/Core/Instrument/Convolve.h
index df9fc914c46..800f14b50f2 100644
--- a/Core/Instrument/Convolve.h
+++ b/Core/Instrument/Convolve.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Tools/Convolve.h
+//! @file      Core/Instrument/Convolve.h
 //! @brief     Declares class MathFunctions::Convolve.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Instrument/CumulativeValue.cpp b/Core/Instrument/CumulativeValue.cpp
index e335bdcbd99..e3b916e36bd 100644
--- a/Core/Instrument/CumulativeValue.cpp
+++ b/Core/Instrument/CumulativeValue.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Tools/CumulativeValue.cpp
+//! @file      Core/Instrument/CumulativeValue.cpp
 //! @brief     Implements class CumulativeValue.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Instrument/CumulativeValue.h b/Core/Instrument/CumulativeValue.h
index 105d3491f80..bacb8e50a3c 100644
--- a/Core/Instrument/CumulativeValue.h
+++ b/Core/Instrument/CumulativeValue.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/CumulativeValue.h
+//! @file      Core/Instrument/CumulativeValue.h
 //! @brief     Declares class CumulativeValue.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Parametrization/AttLimits.cpp b/Core/Parametrization/AttLimits.cpp
index c18b64953e8..8f55655189a 100644
--- a/Core/Parametrization/AttLimits.cpp
+++ b/Core/Parametrization/AttLimits.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Tools/AttLimits.cpp
+//! @file      Core/Parametrization/AttLimits.cpp
 //! @brief     Implements class AttLimits.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Parametrization/AttLimits.h b/Core/Parametrization/AttLimits.h
index fecf903b6a0..addb4551f17 100644
--- a/Core/Parametrization/AttLimits.h
+++ b/Core/Parametrization/AttLimits.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Tools/AttLimits.h
+//! @file      Core/Parametrization/AttLimits.h
 //! @brief     Declares class AttLimits.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Parametrization/SimulationOptions.cpp b/Core/Parametrization/SimulationOptions.cpp
index adfd0f3443d..7fc6e3d65d7 100644
--- a/Core/Parametrization/SimulationOptions.cpp
+++ b/Core/Parametrization/SimulationOptions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/SimulationOptions.cpp
+//! @file      Core/Parametrization/SimulationOptions.cpp
 //! @brief     Implements class SimulationOptions
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Parametrization/SimulationOptions.h b/Core/Parametrization/SimulationOptions.h
index 73c4b5838aa..7fc83cafc05 100644
--- a/Core/Parametrization/SimulationOptions.h
+++ b/Core/Parametrization/SimulationOptions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/SimulationOptions.h
+//! @file      Core/Parametrization/SimulationOptions.h
 //! @brief     Declares class SimulationOptions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Parametrization/ThreadInfo.h b/Core/Parametrization/ThreadInfo.h
index 1848aaf0fe2..392873828bb 100644
--- a/Core/Parametrization/ThreadInfo.h
+++ b/Core/Parametrization/ThreadInfo.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/ThreadInfo.h
+//! @file      Core/Parametrization/ThreadInfo.h
 //! @brief     Declares struct ThreadInfo.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/Crystal.cpp b/Core/Particle/Crystal.cpp
index 3ff22ee7a30..ca1c3324cfa 100644
--- a/Core/Particle/Crystal.cpp
+++ b/Core/Particle/Crystal.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/Crystal.cpp
+//! @file      Core/Particle/Crystal.cpp
 //! @brief     Implements class Crystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/Crystal.h b/Core/Particle/Crystal.h
index f5b5f155275..13c3716b03c 100644
--- a/Core/Particle/Crystal.h
+++ b/Core/Particle/Crystal.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/Crystal.h
+//! @file      Core/Particle/Crystal.h
 //! @brief     Declares class Crystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/FormFactorCrystal.cpp b/Core/Particle/FormFactorCrystal.cpp
index f39e166d17a..7336e4d61b4 100644
--- a/Core/Particle/FormFactorCrystal.cpp
+++ b/Core/Particle/FormFactorCrystal.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/FormFactorCrystal.cpp
+//! @file      Core/Particle/FormFactorCrystal.cpp
 //! @brief     Implements class FormFactorCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/FormFactorCrystal.h b/Core/Particle/FormFactorCrystal.h
index 3d48eaff2da..7a4badba857 100644
--- a/Core/Particle/FormFactorCrystal.h
+++ b/Core/Particle/FormFactorCrystal.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/FormFactorCrystal.h
+//! @file      Core/Particle/FormFactorCrystal.h
 //! @brief     Declares class FormFactorCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/FormFactorWeighted.cpp b/Core/Particle/FormFactorWeighted.cpp
index 86f42bc23ba..d7ee6ba862f 100644
--- a/Core/Particle/FormFactorWeighted.cpp
+++ b/Core/Particle/FormFactorWeighted.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/FormFactorWeighted.cpp
+//! @file      Core/Particle/FormFactorWeighted.cpp
 //! @brief     Implements class FormFactorWeighted.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/FormFactorWeighted.h b/Core/Particle/FormFactorWeighted.h
index f9d42321f97..02b342ef706 100644
--- a/Core/Particle/FormFactorWeighted.h
+++ b/Core/Particle/FormFactorWeighted.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/FormFactorWeighted.h
+//! @file      Core/Particle/FormFactorWeighted.h
 //! @brief     Declares class FormFactorWeighted.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/FormFactors.h b/Core/Particle/FormFactors.h
index 62a6263e413..0649323c5db 100644
--- a/Core/Particle/FormFactors.h
+++ b/Core/Particle/FormFactors.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/FormFactors.h
+//! @file      Core/Particle/FormFactors.h
 //! @brief     Include all form-factor include files.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/IClusteredParticles.h b/Core/Particle/IClusteredParticles.h
index 6b1e094c134..daf26a58b17 100644
--- a/Core/Particle/IClusteredParticles.h
+++ b/Core/Particle/IClusteredParticles.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/IClusteredParticles.h
+//! @file      Core/Particle/IClusteredParticles.h
 //! @brief     Declares class IClusteredParticles.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/IFormFactorBorn.cpp b/Core/Particle/IFormFactorBorn.cpp
index c6e8912bb45..fe886c11f57 100644
--- a/Core/Particle/IFormFactorBorn.cpp
+++ b/Core/Particle/IFormFactorBorn.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/IFormFactorBorn.cpp
+//! @file      Core/Particle/IFormFactorBorn.cpp
 //! @brief     Implements interface class IFormFactorBorn.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/IFormFactorBorn.h b/Core/Particle/IFormFactorBorn.h
index 5f07e6c60d6..7d58c09e8e7 100644
--- a/Core/Particle/IFormFactorBorn.h
+++ b/Core/Particle/IFormFactorBorn.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/IFormFactorBorn.h
+//! @file      Core/Particle/IFormFactorBorn.h
 //! @brief     Declares pure virtual interface class IFormFactorBorn.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/IParticle.cpp b/Core/Particle/IParticle.cpp
index bac623fddb6..3b39b76e621 100644
--- a/Core/Particle/IParticle.cpp
+++ b/Core/Particle/IParticle.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/IParticle.cpp
+//! @file      Core/Particle/IParticle.cpp
 //! @brief     Implements generic member functions of IParticle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/IParticle.h b/Core/Particle/IParticle.h
index ee6d2c81d82..43e873cfb12 100644
--- a/Core/Particle/IParticle.h
+++ b/Core/Particle/IParticle.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/IParticle.h
+//! @file      Core/Particle/IParticle.h
 //! @brief     Declares interface IParticle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/MesoCrystal.cpp b/Core/Particle/MesoCrystal.cpp
index b30c1ebdf77..b18f73e0eaf 100644
--- a/Core/Particle/MesoCrystal.cpp
+++ b/Core/Particle/MesoCrystal.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/MesoCrystal.cpp
+//! @file      Core/Particle/MesoCrystal.cpp
 //! @brief     Implements class MesoCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/MesoCrystal.h b/Core/Particle/MesoCrystal.h
index a67ee038c86..bbd4e47b270 100644
--- a/Core/Particle/MesoCrystal.h
+++ b/Core/Particle/MesoCrystal.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/MesoCrystal.h
+//! @file      Core/Particle/MesoCrystal.h
 //! @brief     Declares class MesoCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/Particle.cpp b/Core/Particle/Particle.cpp
index 718bcd67a8c..b40d0195db7 100644
--- a/Core/Particle/Particle.cpp
+++ b/Core/Particle/Particle.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/Particle.cpp
+//! @file      Core/Particle/Particle.cpp
 //! @brief     Implements class Particle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/Particle.h b/Core/Particle/Particle.h
index c689a3868e3..4a8100bb152 100644
--- a/Core/Particle/Particle.h
+++ b/Core/Particle/Particle.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/Particle.h
+//! @file      Core/Particle/Particle.h
 //! @brief     Declares class Particle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/ParticleComposition.cpp b/Core/Particle/ParticleComposition.cpp
index 333be80eedf..33f153efe7b 100644
--- a/Core/Particle/ParticleComposition.cpp
+++ b/Core/Particle/ParticleComposition.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/ParticleComposition.cpp
+//! @file      Core/Particle/ParticleComposition.cpp
 //! @brief     Implements class ParticleComposition.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/ParticleComposition.h b/Core/Particle/ParticleComposition.h
index 26d901fc637..4a76823dff7 100644
--- a/Core/Particle/ParticleComposition.h
+++ b/Core/Particle/ParticleComposition.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/ParticleComposition.h
+//! @file      Core/Particle/ParticleComposition.h
 //! @brief     Declares class ParticleComposition.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/ParticleCoreShell.cpp b/Core/Particle/ParticleCoreShell.cpp
index 0e4cb99e599..d3c8ea66086 100644
--- a/Core/Particle/ParticleCoreShell.cpp
+++ b/Core/Particle/ParticleCoreShell.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/ParticleCoreShell.cpp
+//! @file      Core/Particle/ParticleCoreShell.cpp
 //! @brief     Implements class ParticleCoreShell.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/ParticleCoreShell.h b/Core/Particle/ParticleCoreShell.h
index cd60a93ad32..fafb7195ebb 100644
--- a/Core/Particle/ParticleCoreShell.h
+++ b/Core/Particle/ParticleCoreShell.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/ParticleCoreShell.h
+//! @file      Core/Particle/ParticleCoreShell.h
 //! @brief     Declares ParticleCoreShell.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/ParticleDistribution.cpp b/Core/Particle/ParticleDistribution.cpp
index 5bffa9fea71..f394ec98a97 100644
--- a/Core/Particle/ParticleDistribution.cpp
+++ b/Core/Particle/ParticleDistribution.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/ParticleDistribution.cpp
+//! @file      Core/Particle/ParticleDistribution.cpp
 //! @brief     Implements class ParticleDistribution.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/ParticleDistribution.h b/Core/Particle/ParticleDistribution.h
index a96a084aff9..18b8723fd90 100644
--- a/Core/Particle/ParticleDistribution.h
+++ b/Core/Particle/ParticleDistribution.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/ParticleDistribution.h
+//! @file      Core/Particle/ParticleDistribution.h
 //! @brief     Declares class ParticleDistribution.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Particle/TRange.h b/Core/Particle/TRange.h
index 084b1cdc507..b82ea453f4b 100644
--- a/Core/Particle/TRange.h
+++ b/Core/Particle/TRange.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Particles/TRange.h
+//! @file      Core/Particle/TRange.h
 //! @brief     Declares and implements template classes TRange and TSampledRange.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Sample/ISampleVisitor.cpp b/Core/Sample/ISampleVisitor.cpp
index 85541cea338..11039bf3585 100644
--- a/Core/Sample/ISampleVisitor.cpp
+++ b/Core/Sample/ISampleVisitor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Visitors/ISampleVisitor.cpp
+//! @file      Core/Sample/ISampleVisitor.cpp
 //! @brief     Implements class ISampleVisitor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Sample/ISampleVisitor.h b/Core/Sample/ISampleVisitor.h
index 13c21a53c85..8eed2d4f0fc 100644
--- a/Core/Sample/ISampleVisitor.h
+++ b/Core/Sample/ISampleVisitor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Visitors/ISampleVisitor.h
+//! @file      Core/Sample/ISampleVisitor.h
 //! @brief     Declares interface class ISampleVisitor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/SoftParticle/FormFactorGauss.cpp b/Core/SoftParticle/FormFactorGauss.cpp
index 588e73a941a..d2be30e540a 100644
--- a/Core/SoftParticle/FormFactorGauss.cpp
+++ b/Core/SoftParticle/FormFactorGauss.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/SoftParticles/FormFactorGauss.cpp
+//! @file      Core/SoftParticle/FormFactorGauss.cpp
 //! @brief     Implements class FormFactorGauss.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/SoftParticle/FormFactorGauss.h b/Core/SoftParticle/FormFactorGauss.h
index 8b35f610467..7557acf6c27 100644
--- a/Core/SoftParticle/FormFactorGauss.h
+++ b/Core/SoftParticle/FormFactorGauss.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/SoftParticles/FormFactorGauss.h
+//! @file      Core/SoftParticle/FormFactorGauss.h
 //! @brief     Declares class FormFactorGauss.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/SoftParticle/FormFactorLorentz.cpp b/Core/SoftParticle/FormFactorLorentz.cpp
index 1952738feac..35ce7d89228 100644
--- a/Core/SoftParticle/FormFactorLorentz.cpp
+++ b/Core/SoftParticle/FormFactorLorentz.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/SoftParticles/FormFactorLorentz.cpp
+//! @file      Core/SoftParticle/FormFactorLorentz.cpp
 //! @brief     Implements class FormFactorLorentz.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/SoftParticle/FormFactorLorentz.h b/Core/SoftParticle/FormFactorLorentz.h
index dc1d3898c36..e8038661f30 100644
--- a/Core/SoftParticle/FormFactorLorentz.h
+++ b/Core/SoftParticle/FormFactorLorentz.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/SoftParticles/FormFactorLorentz.h
+//! @file      Core/SoftParticle/FormFactorLorentz.h
 //! @brief     Declares class FormFactorLorentz.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp b/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp
index cacafdd9009..8428ccab1e6 100644
--- a/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp
+++ b/Core/SoftParticle/FormFactorSphereGaussianRadius.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/SoftParticles/FormFactorSphereGaussianRadius.cpp
+//! @file      Core/SoftParticle/FormFactorSphereGaussianRadius.cpp
 //! @brief     Implements class FormFactorSphereGaussianRadius.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/SoftParticle/FormFactorSphereGaussianRadius.h b/Core/SoftParticle/FormFactorSphereGaussianRadius.h
index 599501d8d96..0e1c09314b6 100644
--- a/Core/SoftParticle/FormFactorSphereGaussianRadius.h
+++ b/Core/SoftParticle/FormFactorSphereGaussianRadius.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/SoftParticles/FormFactorSphereGaussianRadius.h
+//! @file      Core/SoftParticle/FormFactorSphereGaussianRadius.h
 //! @brief     Declares and implements class FormFactorSphereGaussianRadius.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/SoftParticle/FormFactorSphereLogNormalRadius.cpp b/Core/SoftParticle/FormFactorSphereLogNormalRadius.cpp
index ad4452c1a8f..95853a8a79e 100644
--- a/Core/SoftParticle/FormFactorSphereLogNormalRadius.cpp
+++ b/Core/SoftParticle/FormFactorSphereLogNormalRadius.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/SoftParticles/FormFactorSphereLogNormalRadius.cpp
+//! @file      Core/SoftParticle/FormFactorSphereLogNormalRadius.cpp
 //! @brief     Implements class FormFactorSphereGaussianRadius.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/SoftParticle/FormFactorSphereLogNormalRadius.h b/Core/SoftParticle/FormFactorSphereLogNormalRadius.h
index 84934900f1d..8f5f0e53067 100644
--- a/Core/SoftParticle/FormFactorSphereLogNormalRadius.h
+++ b/Core/SoftParticle/FormFactorSphereLogNormalRadius.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/SoftParticles/FormFactorSphereLogNormalRadius.h
+//! @file      Core/SoftParticle/FormFactorSphereLogNormalRadius.h
 //! @brief     Declares and implements class FormFactorSphereLogNormalRadius.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/SoftParticle/FormFactorSphereUniformRadius.cpp b/Core/SoftParticle/FormFactorSphereUniformRadius.cpp
index a7f4b9651d0..bf4665f46ac 100644
--- a/Core/SoftParticle/FormFactorSphereUniformRadius.cpp
+++ b/Core/SoftParticle/FormFactorSphereUniformRadius.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/SoftParticles/FormFactorSphereUniformRadius.cpp
+//! @file      Core/SoftParticle/FormFactorSphereUniformRadius.cpp
 //! @brief     Implements class FormFactorSphereUniformRadius.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/SoftParticle/FormFactorSphereUniformRadius.h b/Core/SoftParticle/FormFactorSphereUniformRadius.h
index 1e1a5d3d481..6c95b7dba57 100644
--- a/Core/SoftParticle/FormFactorSphereUniformRadius.h
+++ b/Core/SoftParticle/FormFactorSphereUniformRadius.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/SoftParticles/FormFactorSphereUniformRadius.h
+//! @file      Core/SoftParticle/FormFactorSphereUniformRadius.h
 //! @brief     Declares class FormFactorSphereUniformRadius.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/SoftParticle/SoftParticles.h b/Core/SoftParticle/SoftParticles.h
index 4d5f50d627e..ddb74e9a86e 100644
--- a/Core/SoftParticle/SoftParticles.h
+++ b/Core/SoftParticle/SoftParticles.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/SoftParticles/SoftParticles.h
+//! @file      Core/SoftParticle/SoftParticles.h
 //! @brief     Includes all soft-particle form-factor definitions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/IFactory.h b/Core/StandardSamples/IFactory.h
index fa7c08abd00..5a2b18a8508 100644
--- a/Core/StandardSamples/IFactory.h
+++ b/Core/StandardSamples/IFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Tools/IFactory.h
+//! @file      Core/StandardSamples/IFactory.h
 //! @brief     Declares interface class IFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/FileSystem.cpp b/Core/Tools/FileSystem.cpp
index 1ad96df4fcf..acbe06a0a89 100644
--- a/Core/Tools/FileSystem.cpp
+++ b/Core/Tools/FileSystem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/FileSystem.cpp
+//! @file      Core/Tools/FileSystem.cpp
 //! @brief     Implements class FileSystem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/FileSystem.h b/Core/Tools/FileSystem.h
index c131bff9dcf..e52031e1203 100644
--- a/Core/Tools/FileSystem.h
+++ b/Core/Tools/FileSystem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/FileSystem.h
+//! @file      Core/Tools/FileSystem.h
 //! @brief     Declares class FileSystem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Logger.cpp b/Core/Tools/Logger.cpp
index 32e408bf28f..8fc4728ba34 100644
--- a/Core/Tools/Logger.cpp
+++ b/Core/Tools/Logger.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/Logger.cpp
+//! @file      Core/Tools/Logger.cpp
 //! @brief     Implement Logger class.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Logger.h b/Core/Tools/Logger.h
index 98e72ec207b..ee955f7a446 100644
--- a/Core/Tools/Logger.h
+++ b/Core/Tools/Logger.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/Logger.h
+//! @file      Core/Tools/Logger.h
 //! @brief     Declares MSG namespace and Logger class.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Numeric.cpp b/Core/Tools/Numeric.cpp
index f82aebe7ed8..d185bbeb638 100644
--- a/Core/Tools/Numeric.cpp
+++ b/Core/Tools/Numeric.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/Numeric.cpp
+//! @file      Core/Tools/Numeric.cpp
 //! @brief     Implements "almost equal" in namespace Numeric.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Numeric.h b/Core/Tools/Numeric.h
index 4638917a6ab..a40de1f7a73 100644
--- a/Core/Tools/Numeric.h
+++ b/Core/Tools/Numeric.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/Numeric.h
+//! @file      Core/Tools/Numeric.h
 //! @brief     Declares constants and "almost equal" in namespace Numeric.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/NumpyUtils.cpp b/Core/Tools/NumpyUtils.cpp
index 85b98663f9b..bffca7d69ce 100644
--- a/Core/Tools/NumpyUtils.cpp
+++ b/Core/Tools/NumpyUtils.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/NumpyUtils.cpp
+//! @file      Core/Tools/NumpyUtils.cpp
 //! @brief     Implements various functions to interact from numpy on Python side
 //!
 //! @homepage  http://bornagainproject.org
diff --git a/Core/Tools/NumpyUtils.h b/Core/Tools/NumpyUtils.h
index 28e5d54de0c..2c32c6a885d 100644
--- a/Core/Tools/NumpyUtils.h
+++ b/Core/Tools/NumpyUtils.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/NumpyUtils.h
+//! @file      Core/Tools/NumpyUtils.h
 //! @brief     Declares various functions to interact from numpy on Python side
 //!
 //! @homepage  http://bornagainproject.org
diff --git a/Core/Tools/Precomputed.cpp b/Core/Tools/Precomputed.cpp
index 2803e412f11..26681583874 100644
--- a/Core/Tools/Precomputed.cpp
+++ b/Core/Tools/Precomputed.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/Precomputed.cpp
+//! @file      Core/Tools/Precomputed.cpp
 //! @brief     Implements class Precomputed, providing precomputed constants
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Precomputed.h b/Core/Tools/Precomputed.h
index 5deaf56c2bf..94933119912 100644
--- a/Core/Tools/Precomputed.h
+++ b/Core/Tools/Precomputed.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/Precomputed.h
+//! @file      Core/Tools/Precomputed.h
 //! @brief     Declares classes Precomputed, providing precomputed constants
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Utils.cpp b/Core/Tools/Utils.cpp
index 0f1d8d4c32d..2da315e6c57 100644
--- a/Core/Tools/Utils.cpp
+++ b/Core/Tools/Utils.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/Utils.cpp
+//! @file      Core/Tools/Utils.cpp
 //! @brief     Implements various stuff in namespace Utils.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Utils.h b/Core/Tools/Utils.h
index 8e2e357b24e..99507391d04 100644
--- a/Core/Tools/Utils.h
+++ b/Core/Tools/Utils.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/Utils.h
+//! @file      Core/Tools/Utils.h
 //! @brief     Declares various stuff in namespace Utils.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/w32pragma.h b/Core/Tools/w32pragma.h
index 5ea672d00c7..d544e86162c 100644
--- a/Core/Tools/w32pragma.h
+++ b/Core/Tools/w32pragma.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/w32pragma.h
+//! @file      Core/Tools/w32pragma.h
 //! @brief     Pragmas and defines for MSVC
 //
 // ************************************************************************** //
diff --git a/Core/Vector/BasicVector3D.cpp b/Core/Vector/BasicVector3D.cpp
index 6c18593802f..027977d8c8b 100644
--- a/Core/Vector/BasicVector3D.cpp
+++ b/Core/Vector/BasicVector3D.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Vectors/BasicVector3D.cpp
+//! @file      Core/Vector/BasicVector3D.cpp
 //! @brief      Implements template class BasicVector3D.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Vector/BasicVector3D.h b/Core/Vector/BasicVector3D.h
index 732b066469d..6995e7306aa 100644
--- a/Core/Vector/BasicVector3D.h
+++ b/Core/Vector/BasicVector3D.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Vectors/BasicVector3D.h
+//! @file      Core/Vector/BasicVector3D.h
 //! @brief      Declares template class BasicVector3D.
 //!
 //! Forked from CLHEP/Geometry by E. Chernyaev <Evgueni.Tcherniaev@cern.ch>,
diff --git a/Core/Vector/EigenCore.h b/Core/Vector/EigenCore.h
index f5d80536e12..7d0826fef95 100644
--- a/Core/Vector/EigenCore.h
+++ b/Core/Vector/EigenCore.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Vectors/EigenCore.h
+//! @file      Core/Vector/EigenCore.h
 //! @brief     Include to deal with Eigen alignment centrally
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Vector/FastVector.h b/Core/Vector/FastVector.h
index 527cf3d0210..ce91257c222 100644
--- a/Core/Vector/FastVector.h
+++ b/Core/Vector/FastVector.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Vectors/FastVector.h
+//! @file      Core/Vector/FastVector.h
 //! @brief     Declares class KVectorContainer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Vector/Transform3D.cpp b/Core/Vector/Transform3D.cpp
index d01f0740144..de937bcd4a2 100644
--- a/Core/Vector/Transform3D.cpp
+++ b/Core/Vector/Transform3D.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Vectors/Transform3D.cpp
+//! @file      Core/Vector/Transform3D.cpp
 //! @brief      Implements template class Transform3D.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Vector/Transform3D.h b/Core/Vector/Transform3D.h
index f5c40582450..d27f89af2da 100644
--- a/Core/Vector/Transform3D.h
+++ b/Core/Vector/Transform3D.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Vectors/Transform3D.h
+//! @file      Core/Vector/Transform3D.h
 //! @brief      Declares class Transform3D.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Vector/Vectors3D.h b/Core/Vector/Vectors3D.h
index a48352c403a..600596c0fef 100644
--- a/Core/Vector/Vectors3D.h
+++ b/Core/Vector/Vectors3D.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Vectors/Vectors3D.h
+//! @file      Core/Vector/Vectors3D.h
 //! @brief     Declares basic vectors in R^3 and C^3.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Vector/WavevectorInfo.h b/Core/Vector/WavevectorInfo.h
index 61f912c1f49..bd4dbc0318d 100644
--- a/Core/Vector/WavevectorInfo.h
+++ b/Core/Vector/WavevectorInfo.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Vectors/WavevectorInfo.h
+//! @file      Core/Vector/WavevectorInfo.h
 //! @brief     Declares WavevectorInfo.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/IMessageService.h b/GUI/coregui/utils/IMessageService.h
index 8824366f00d..bb94a514318 100644
--- a/GUI/coregui/utils/IMessageService.h
+++ b/GUI/coregui/utils/IMessageService.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/coregui/utils/ILogger.h
+//! @file      GUI/coregui/utils/IMessageService.h
 //! @brief     Declares abstract ILogger interface
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/WarningMessageService.cpp b/GUI/coregui/utils/WarningMessageService.cpp
index 3778b14b40b..ea68cf0ff6f 100644
--- a/GUI/coregui/utils/WarningMessageService.cpp
+++ b/GUI/coregui/utils/WarningMessageService.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/coregui/utils/WarningLogger.cpp
+//! @file      GUI/coregui/utils/WarningMessageService.cpp
 //! @brief     Defines abstract ILogger interface
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/WarningMessageService.h b/GUI/coregui/utils/WarningMessageService.h
index 5c9ca27aabc..b10f3fb1dd0 100644
--- a/GUI/coregui/utils/WarningMessageService.h
+++ b/GUI/coregui/utils/WarningMessageService.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/coregui/utils/WarningLogger.h
+//! @file      GUI/coregui/utils/WarningMessageService.h
 //! @brief     Declares abstract ILogger interface
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/Core/CoreStandardTest.cpp b/Tests/Functional/Core/CoreStandardTest.cpp
index edf2aed4427..3904127db69 100644
--- a/Tests/Functional/Core/CoreStandardTest.cpp
+++ b/Tests/Functional/Core/CoreStandardTest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tests/Functional/Core/CoreSuite.cpp
+//! @file      Tests/Functional/Core/CoreStandardTest.cpp
 //! @brief     Implements program CoreSuite, to run core functional tests
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/Core/CoreTest.cpp b/Tests/Functional/Core/CoreTest.cpp
index 45fd3577c7e..b25f461e756 100644
--- a/Tests/Functional/Core/CoreTest.cpp
+++ b/Tests/Functional/Core/CoreTest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/TestMachinery/CoreTest.cpp
+//! @file      Tests/Functional/Core/CoreTest.cpp
 //! @brief     Implements class CoreTest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/Core/CoreTest.h b/Tests/Functional/Core/CoreTest.h
index 6f9a3a3092c..920a9de0c31 100644
--- a/Tests/Functional/Core/CoreTest.h
+++ b/Tests/Functional/Core/CoreTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/TestMachinery/CoreTest.h
+//! @file      Tests/Functional/Core/CoreTest.h
 //! @brief     Declares class CoreTest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/Fit/IMinimizerTest.cpp b/Tests/Functional/Fit/IMinimizerTest.cpp
index 34920679015..8caf5706df0 100644
--- a/Tests/Functional/Fit/IMinimizerTest.cpp
+++ b/Tests/Functional/Fit/IMinimizerTest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/StandardFits/IMinimizerTest.cpp
+//! @file      Tests/Functional/Fit/IMinimizerTest.cpp
 //! @brief     Implements class IMinimizerTest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/Fit/IMinimizerTest.h b/Tests/Functional/Fit/IMinimizerTest.h
index e069e11ec43..36fc5a9fd67 100644
--- a/Tests/Functional/Fit/IMinimizerTest.h
+++ b/Tests/Functional/Fit/IMinimizerTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/StandardFits/IMinimizerTest.h
+//! @file      Tests/Functional/Fit/IMinimizerTest.h
 //! @brief     Declares class IMinimizerTest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/Fit/MinimizerTests.cpp b/Tests/Functional/Fit/MinimizerTests.cpp
index 3ea4ed974be..2fb6e967370 100644
--- a/Tests/Functional/Fit/MinimizerTests.cpp
+++ b/Tests/Functional/Fit/MinimizerTests.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/StandardFits/MinimizerTests.cpp
+//! @file      Tests/Functional/Fit/MinimizerTests.cpp
 //! @brief     Implements classes MinimizerTests.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/Fit/MinimizerTests.h b/Tests/Functional/Fit/MinimizerTests.h
index 70c07e32d44..c899fc6b0ee 100644
--- a/Tests/Functional/Fit/MinimizerTests.h
+++ b/Tests/Functional/Fit/MinimizerTests.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/StandardFits/MinimizerTests.h
+//! @file      Tests/Functional/Fit/MinimizerTests.h
 //! @brief     Declares classes MinimizerTests.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/Fit/RectDetectorFitTest.cpp b/Tests/Functional/Fit/RectDetectorFitTest.cpp
index 38ae8c5156f..559f5611db8 100644
--- a/Tests/Functional/Fit/RectDetectorFitTest.cpp
+++ b/Tests/Functional/Fit/RectDetectorFitTest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/StandardFits/RectDetectorFitTest.cpp
+//! @file      Tests/Functional/Fit/RectDetectorFitTest.cpp
 //! @brief     Implements class RectDetectorFitTest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/Fit/RectDetectorFitTest.h b/Tests/Functional/Fit/RectDetectorFitTest.h
index 68eaf527a06..618ac8f6b2b 100644
--- a/Tests/Functional/Fit/RectDetectorFitTest.h
+++ b/Tests/Functional/Fit/RectDetectorFitTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/StandardFits/RectDetectorFitTest.h
+//! @file      Tests/Functional/Fit/RectDetectorFitTest.h
 //! @brief     Declares class RectDetectorFitTest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/Fit/StandardFitsFactory.cpp b/Tests/Functional/Fit/StandardFitsFactory.cpp
index 784b7abe759..920cde1a0c7 100644
--- a/Tests/Functional/Fit/StandardFitsFactory.cpp
+++ b/Tests/Functional/Fit/StandardFitsFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/StandardFits/StandardFitsFactory.cpp
+//! @file      Tests/Functional/Fit/StandardFitsFactory.cpp
 //! @brief     Implements class StandardFitsFactory
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/Fit/StandardFitsFactory.h b/Tests/Functional/Fit/StandardFitsFactory.h
index 7737c912b1c..cbedb563f07 100644
--- a/Tests/Functional/Fit/StandardFitsFactory.h
+++ b/Tests/Functional/Fit/StandardFitsFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Fit/StandardFits/StandardFitsFactory.h
+//! @file      Tests/Functional/Fit/StandardFitsFactory.h
 //! @brief     Declares class StandardFitsFactory
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/GUI/GUITest.cpp b/Tests/Functional/GUI/GUITest.cpp
index 3a562c53933..9b7fdc6b07d 100644
--- a/Tests/Functional/GUI/GUITest.cpp
+++ b/Tests/Functional/GUI/GUITest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/coregui/utils/GUITest.cpp
+//! @file      Tests/Functional/GUI/GUITest.cpp
 //! @brief     Implements class GUITest
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/GUI/GUITest.h b/Tests/Functional/GUI/GUITest.h
index 118c7aa9729..749fb288870 100644
--- a/Tests/Functional/GUI/GUITest.h
+++ b/Tests/Functional/GUI/GUITest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/coregui/utils/GUITest.h
+//! @file      Tests/Functional/GUI/GUITest.h
 //! @brief     Declares class GUITest
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/PyCore/suite/PyCoreTest.cpp b/Tests/Functional/PyCore/suite/PyCoreTest.cpp
index ba3cd3b09ac..81a7b5ba62a 100644
--- a/Tests/Functional/PyCore/suite/PyCoreTest.cpp
+++ b/Tests/Functional/PyCore/suite/PyCoreTest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/TestMachinery/PyCoreTest.cpp
+//! @file      Tests/Functional/PyCore/suite/PyCoreTest.cpp
 //! @brief     Implements class PyCoreTest
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/PyCore/suite/PyCoreTest.h b/Tests/Functional/PyCore/suite/PyCoreTest.h
index fbc658057e5..4b88b741ee2 100644
--- a/Tests/Functional/PyCore/suite/PyCoreTest.h
+++ b/Tests/Functional/PyCore/suite/PyCoreTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/TestMachinery/PyCoreTest.h
+//! @file      Tests/Functional/PyCore/suite/PyCoreTest.h
 //! @brief     Declares class PyCoreTest
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/TestMachinery/IFunctionalTest.cpp b/Tests/Functional/TestMachinery/IFunctionalTest.cpp
index e615378488a..8e4b24483ff 100644
--- a/Tests/Functional/TestMachinery/IFunctionalTest.cpp
+++ b/Tests/Functional/TestMachinery/IFunctionalTest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/TestMachinery/IFunctionalTest.cpp
+//! @file      Tests/Functional/TestMachinery/IFunctionalTest.cpp
 //! @brief     Implements class IFunctionalTest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/TestMachinery/IFunctionalTest.h b/Tests/Functional/TestMachinery/IFunctionalTest.h
index 20a5222e454..8e1ab0eb794 100644
--- a/Tests/Functional/TestMachinery/IFunctionalTest.h
+++ b/Tests/Functional/TestMachinery/IFunctionalTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/TestMachinery/IFunctionalTest.h
+//! @file      Tests/Functional/TestMachinery/IFunctionalTest.h
 //! @brief     Declares pure virtual base class IFunctionalTest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/TestMachinery/IRegistry.h b/Tests/Functional/TestMachinery/IRegistry.h
index b52c605264f..71e395e6e2a 100644
--- a/Tests/Functional/TestMachinery/IRegistry.h
+++ b/Tests/Functional/TestMachinery/IRegistry.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/TestMachinery/IRegistry.h
+//! @file      Tests/Functional/TestMachinery/IRegistry.h
 //! @brief     Declares templated registry for ICloneable objects
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/TestMachinery/IStandardTest.cpp b/Tests/Functional/TestMachinery/IStandardTest.cpp
index 3caa86c7b42..ea48f605c84 100644
--- a/Tests/Functional/TestMachinery/IStandardTest.cpp
+++ b/Tests/Functional/TestMachinery/IStandardTest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/TestMachinery/IStandardTest.cpp
+//! @file      Tests/Functional/TestMachinery/IStandardTest.cpp
 //! @brief     Implements class IStandardTest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/TestMachinery/IStandardTest.h b/Tests/Functional/TestMachinery/IStandardTest.h
index b2e6f18d4a6..58ebbeb6697 100644
--- a/Tests/Functional/TestMachinery/IStandardTest.h
+++ b/Tests/Functional/TestMachinery/IStandardTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/TestMachinery/IStandardTest.h
+//! @file      Tests/Functional/TestMachinery/IStandardTest.h
 //! @brief     Declares class IStandardTest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/TestMachinery/SimulationInfo.cpp b/Tests/Functional/TestMachinery/SimulationInfo.cpp
index ed2d5b6fb7d..7071da95b2f 100644
--- a/Tests/Functional/TestMachinery/SimulationInfo.cpp
+++ b/Tests/Functional/TestMachinery/SimulationInfo.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/TestMachinery/SimulationInfo.cpp
+//! @file      Tests/Functional/TestMachinery/SimulationInfo.cpp
 //! @brief     Implements class SimulationInfo.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/TestMachinery/SimulationInfo.h b/Tests/Functional/TestMachinery/SimulationInfo.h
index d8e199e76b7..44a409377ff 100644
--- a/Tests/Functional/TestMachinery/SimulationInfo.h
+++ b/Tests/Functional/TestMachinery/SimulationInfo.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/TestMachinery/SimulationInfo.h
+//! @file      Tests/Functional/TestMachinery/SimulationInfo.h
 //! @brief     Declares class SimulationInfo.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/TestMachinery/StandardSimulationsRegistry.cpp b/Tests/Functional/TestMachinery/StandardSimulationsRegistry.cpp
index 6f854540c74..765addd1d08 100644
--- a/Tests/Functional/TestMachinery/StandardSimulationsRegistry.cpp
+++ b/Tests/Functional/TestMachinery/StandardSimulationsRegistry.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/TestMachinery/StandardSimulationsRegistry.cpp
+//! @file      Tests/Functional/TestMachinery/StandardSimulationsRegistry.cpp
 //! @brief     Implements class StandardSimulationsRegistry.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/TestMachinery/StandardSimulationsRegistry.h b/Tests/Functional/TestMachinery/StandardSimulationsRegistry.h
index a4400e5d411..75cf23d9feb 100644
--- a/Tests/Functional/TestMachinery/StandardSimulationsRegistry.h
+++ b/Tests/Functional/TestMachinery/StandardSimulationsRegistry.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/TestMachinery/StandardSimulationsRegistry.h
+//! @file      Tests/Functional/TestMachinery/StandardSimulationsRegistry.h
 //! @brief     Declares class StandardSimulationsRegistry.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/TestMachinery/SubtestRegistry.cpp b/Tests/Functional/TestMachinery/SubtestRegistry.cpp
index b356aecfeb8..2740d33bddb 100644
--- a/Tests/Functional/TestMachinery/SubtestRegistry.cpp
+++ b/Tests/Functional/TestMachinery/SubtestRegistry.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/TestMachinery/SubtestRegistry.cpp
+//! @file      Tests/Functional/TestMachinery/SubtestRegistry.cpp
 //! @brief     Implements different registries for subtests of functional tests.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/TestMachinery/SubtestRegistry.h b/Tests/Functional/TestMachinery/SubtestRegistry.h
index aed0882962d..ebdac02d8a1 100644
--- a/Tests/Functional/TestMachinery/SubtestRegistry.h
+++ b/Tests/Functional/TestMachinery/SubtestRegistry.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/TestMachinery/SubtestRegistry.h
+//! @file      Tests/Functional/TestMachinery/SubtestRegistry.h
 //! @brief     Declares different registries for subtests of functional tests.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/dev-tools/edit/update-filename.py b/dev-tools/edit/update-filename.py
index 97c0adc5788..7f0318f74d6 100755
--- a/dev-tools/edit/update-filename.py
+++ b/dev-tools/edit/update-filename.py
@@ -17,12 +17,12 @@ def doit( fn ):
     ti = fd.read()
     fd.close
 
-    if not re.search(  r'(//! @file)', ti ):
+    if not re.search(  r'(//! @file      dev-tools/edit/update-filename.py
         print( "no '@file' in " + fn )
         nempty += 1
         return
 
-    tf = re.sub( r'(//! @file).*', r'\1      '+fn, ti, re.M )
+    tf = re.sub( r'(//! @file      dev-tools/edit/update-filename.py
 
     if ti==tf:
         return
diff --git a/dev-tools/edit/update-sourcecode-header.py b/dev-tools/edit/update-sourcecode-header.py
index dd5d5e85e42..9c248a2a78e 100644
--- a/dev-tools/edit/update-sourcecode-header.py
+++ b/dev-tools/edit/update-sourcecode-header.py
@@ -27,7 +27,7 @@ header_top = [
     u"//                                                                              "
     ]
 header_center = [
-    u"//! @file      Algorithms/inc/Beam.h                                            ",
+    u"//! @file      dev-tools/edit/update-sourcecode-header.py
     u"//! @brief     Defines class Beam                                               "
     ]
 header_bottom = [
-- 
GitLab