diff --git a/Core/Aggregate/DecouplingApproximationStrategy.cpp b/Core/Aggregate/DecouplingApproximationStrategy.cpp
index 71de56403e0db0d137ce0cdd50b279db25b4b682..7c22a542465241982dbece2a76eeae4c2aacf1dc 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 c25021e5f5fa7534fa8652b23bd76dc090e6bcad..7ceb961ec82716b067607140f1183def2f0f6c5d 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 bcaeb206334136bbba41f18fa6a57d5a764c621a..44a5cd10b398bf64dece8bbfb22edf147d6d5aa4 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 f965dc51b63e4a86f8375201675992d5fa2237ba..3a629d0c85586ea3e8987d3524555bef4736e767 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 198468748d9647a2bea66c0456d3fabba1fe55d9..44314293c39ac2c5035ffc277a3a734dac13ecb4 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 7887bd355d8fee5be822830b4c6e3c370ac2e30a..e45cff4a2342003069abfb27bde5f2ed434a15b5 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 b0b631e1084b0ecb51721bda7d1fa8759a31142e..3b0e4f3ea2f0d7eead5c1f0da8d5d9d8b5ccd413 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 13cc4fe894cb295bbd256fb6a4bc7ee18df93c8b..af665878d6caa7cccb8b867c71087b7c4db05260 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 78268378d211e93db688e3df0caf7f0a4e5f094b..9bdd524ecbcf79f71e250e52a9bbe411d4bfa0ee 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 fde207bc5e840e99fd5494a1bbf62346130ca796..9798ed5f64cd34c25112046e7d96af471127f5af 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 16984e806a577d2cc1d213482ada7257b8979168..403cc4d3487d61993d27135bc10fe8a24d9a7151 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 9c34ce26781c983daeb57c606ca8ec0ba624ea0e..749f784e8af6f8f25da2d6089f1c18cef8925a6e 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 b3cc5d079cc50663267088f753443896843c816e..fa4478383d467c1341a5e13d55be9324341294f1 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 ea0089355998a645ebcb445388e4fa3d95b7bdd0..dfef295390e5827d02dfbe0a2167cceab076e53a 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 ff1238be128592d56a09a3fe12ef1eda4d293200..5d90f5cadcc3b39ecb138b5ef5bd399a235562e3 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 f745818188cbd1a89a91d11af4d27036b35e17a8..234c31d2b901b2c892ebacfc492fd3bd18d3ad07 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 0805715e5069b6891d2a08536713071292f17ddd..0600302a6eb0c43c1039983390e4523a6f42ec9a 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 a5311c00cb6220b171ca37ab42a0d28892d8d76f..63af0b2bdb606da2a054ea97ffafa8830312905a 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 275948ae58ad242cedaa11a254c2ac515fcc9c1f..dfc1931738ab1144f3bc9bf84a718449c9cf95c7 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 12d711114185a7279245a5bebad4fb50f7a42b35..adbbceeb1844a5adab2e53163a280031bcdd626b 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 ef9ad55eedc9697f9b0c27ddfe13b16a330bca8d..0a8eda6c7391dceb2f21ec9afc9a7747d68cf6d1 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 b1a531263d0daf1f9f54f8e0adcf4bcdd1fa9bd3..9790898d33b6ca09f4518e8167b45ba857fe4a7e 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 22cbd455b1cbfa8cb5c0a8d4854f0d3dd7acf0a8..b330054ed8e001297c573c49fda5a9a864336dcb 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 aa9f7af1d661ab86e5db9d632f89d1d0228d6778..1478045ea25f3c4761cc00c98f2280829edfbae3 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 85d42bf2c54a5e53b5b981b701443abd9a73529e..a70f10fb13072841237ab67798237286a01c23a6 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 60bfe7333c42ef16b681ac796925dc5da89c1d67..ce3fdd902d337d125798a63b52360c265d096036 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 7721b313cc6e775860e7cb762fd3206cd7ab34dd..f655ffa5b47b7815ac793de6809bddd63dbf0f96 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 c975b3bc916ee8b3984284a5ddb6d93e68a06ffb..37dc46a7f39d36b718af70033bcb5c9a76765c69 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 38193c53dc05021f35f5cda3cb0da701a0304823..32fd923cad2eb3fb17264d270ff538af2d917514 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 2eef007029278bba177218a0f03d099432686ef9..3051a05d5251005af9bd6e8adde04116cec7dd9d 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 c292c5363f19c2f0ff070a924cef2313063540e2..2510cf192ba2ac82f03be9b888aa057ed73cd9d5 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 424fb1d0772e14e666f331782e38e1c4fc9f9196..57de65e91d40c0a329e50ae3450a15cd50e0826c 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 8d00cf3aa7bc65039e50d63e58c83f048717bf55..8d27c3637408183757c8b100b3076ba30f1933ae 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 055fa9d7ac9f382b2bc09e0ee74b0e785bf732b1..2e137fb6afd487ddef5d18707e740ce4874e23cb 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 a5346187fb2a85718440b492dd3dc5bbbd59df60..b030cad474abd1b41c09fd0531892f2d9fe317e9 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 f33b72a0a26d6eda5fc335a47c2ffbb56fae966d..8e89171a192fb6326b556a2620572f965ab55859 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 c745d2385767ea7bf71cc268d6337e42da991c7e..de9c13c3c46f71e3d8c4cc9e2f540c633d9391d8 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 8968639852939b8fecfb61fc6379f6aebc86ca4b..959e4cc74a2d3ba4feb31f57c5b0a00527a8a188 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 d962b10478d675afc021d601db2f49fc7f834a9d..d88beb28d1c3582f94d954bd15f6e2e5fc8824b7 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 fe82b5340ffbdca259a7e1037e7f0b6eddbca8b6..8772330f9ceb3b5a0d9751f0414255e2d4e7ddbb 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 184dd01dfb96cacf5c2b4029ee13126c4ccbd3df..cb9ea365f6de1eab8684fabacb5d0f5b96f4aa4d 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 c1360561f98361ec02ca8739a91baedc36d0a212..d989753a72c1d3cd6654a2709334ad06da45f7da 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 272c54b0bdcebbecaffab277fde53842bf70ec31..f3d1644d45bcb3c604d08d65aa552cd31c774879 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 c03d1cec09af25096186f654f17255c949380985..458821b627b86e6be2ede05e4fb49ca2ff77134a 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 ca5709eed1a88ec543844eb0c0814405fa32e178..2b0a5a5f44703c00631aa4b4031bdc3b10f32b49 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 5bcc65d6e59bf65fa1e24393f44f7b2bb93459c0..ff03d11388bf33a50823203048fd937f4ee4f284 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 24c543f7b2a52e6d0c8e3e91a9538f718680d177..41df4ba3607b159fd4c04577b2aa52ebad9fac37 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 ffecdea0d1a8a61040bd79f21b0dbdcc2b216f2b..58804e719b09b196eca5d3dc9246a2f18792fa02 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 fe6a86b97ff54ed8097d8f551a29537685232f4c..fb9ebfb0d14a97812360b1e95bc1a8e61c28b3a9 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 55fb4bbe53b993727d880f78f57d863765cda87c..4452095e2cc109ada161ec570e98e7832df51565 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 4fcf359e65e324e18933a0dcd6298a71bb256e73..5e86abc1dd5786e327dfb69d74a63372fbaf0a70 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 e9942f709e9f29d12f3670c849338b32d4be802c..6778fe80809ec3389b0b8461873042fe70ad29f6 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 8029a7378c58adff5013c0fe21588d4d6b8ac304..9c501804537f29bf90a2a49521bc0af2b8221a78 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 b81961a91330c90c39c58c2a425267623d1fe028..b74778da4357a145390c36d06ffb5bb0d6fbacfe 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 c7f7a7cd294723e998e0a5f510262ba50ae94cb6..be906e127ab9742210acd9e2f62e6de846f8ac80 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 0a6175826ac071d6e8cf58c7d7873b49a3ce84d3..323c4a01c031134d3b7cbf9801afe5e1dc8835a2 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 dca11c821696bf64de1902b3222adf5fffd3075a..54af63937c0f8001bbf87dce99b37ab938fc3126 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 14bfcd124c409a2de9de046d613c9da688914d4e..db2d88adb75127480356158b33901ff83b2d9025 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 03399aa5870afb144d077356dcf861eedc3998b1..b485f12aac258559b4f79f286c532311b26f1eb4 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 5a85869a483fd588b871a4f36bdbf26dfd3345b8..a4b6f6d740682e639534aa2792d26c592986d387 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 6eda9d0e825b97055cd2e09ef9b654f25d418948..409c431c3c7be486f15ef89d7d96c19b4213f326 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 17e4cb229d335357d7baf1f3984fe2de6fbd0b42..193a2011fdaea96d552934cb5fb5b492d076e5e0 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 ec3338be65f3e3acec86db3e775e74f279b9c0fc..03ad2fc8003c12b676d56272923c99fbdc68a1e5 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 06e803e60998532f9a4b7d2670431b11b9d95c44..99aaf29d919469bfac32e12702e9ae5ccb66294c 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 24e9ab1136c33e870504226d385b0710e5ab66a4..30b8e4aef6df08dda4ed7d7f0da7e4772fe3e2b5 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 83418176d9184f06ea237bded05d81839670da6b..c071131f7332764959cb08d67fb864c501c2911e 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 fd6405acb08844c465eee8adba61062da0aae721..e5583b0caf4834c30cc44eded4ed451ce393a263 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 93e881c5b89a87ed59982bcb6a6a1925c4efd468..8b22c6402394d503c42cb3a52a651b6a90a78a17 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 384e5762cea9279ca5c9d8c2c8d7f74b4c31fc26..50f7b6bd4ed94d42c179d12710f5605b094802c7 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 2b18ba417191662955c9dbe9c10364a9d7f1dd3c..1cc563dd17197b6dc53fa156a0400a4ca9a86a7e 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 6e6ef2657b61110a968e7072b849a71cfdcf4ef3..987e12a4edc12907c1a07064ceb67bd7b5df36a1 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 65194b9bbc532667e1f31f08a6ff00e70f4697ea..3377ccc85e9abcb2acb64107577fe5344236016b 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 a9765409e32dcc3e64c5215f2c983bb1f5c02b06..b997ae0527c2519217a9f45763fa4cfb51703c20 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 fb96d8f265766b5b7a49ae47f1f5c261388071b1..523b17586fadf0b7af66a762eba1f2506805b196 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 1776eeb92651b605cea6f2f44ae26c8669b921d3..480994b1b41782913f1bd7ede3e423b68f23ab99 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 6be71220f1c8a3e1dd3854c38bd8abf719a7e454..c4ae271833bd7cc4fdf8c6598a4c49889074b1df 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 f45a79c537af961deed30f91478445789e0136b8..cbc388dec9824fe27532e28651fca73c5453a8cc 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 2acd87266cf210201825d548db801c3ef297154b..14909b9a132daa4bffd93a76722b0315726d2def 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 6c733ad45a9276cd4b63b257cc2ba86db14e80bf..a80d6cd664f7354a00221e714e7b7db88f849869 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 1925e0579c3c29b8edc75338bd79f1c0286ac81c..78879af144db45d1a662bad6231a3c63cbc29a9b 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 a9ab21d1d52efc0c2b74430a09fdd75c141c2187..d1c76a490eb00f68f241b8abc7889a33b48c2f30 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 2cb9d53204e110598fe681229f0577da83554c75..5bf0c0dd444776e294146b271ad738401a9d8448 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 dddf5663a022229329fb0f8f953fc4040b0a5b2a..b5dfe2261188f4cfc13994212345850a85a79546 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 6f8ff13879ce91f432627cd16f8c2da8ee4c22be..61f6b3dda669ab3c88cdc88b0575543f15c6d14e 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 1f9cabd4b0502a93e92923dabb7b09fbe1916d31..5b605fc3eade219f371b93acc76734f87c53e8e8 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 324d2c6a0acffe21b59a31167a6cba28d289b25e..8f4022ed43e8b66194edb1d92352566882057176 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 05995479c6f089af5a7e6f90f89afa669de5ff8c..1eed58dfc58e0d4520bfc61e5a229773712441b4 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 874f1ac0aae95daa65ff9685effecbd848ca113a..983b04dab66973daeb1e430a4087c60544af020b 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 7f59940b1e91ee9d3b678fe182d78eb4390dd32d..357dd9c24484d50f3123117a67442aa2d067240c 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 7305b88237fff1b3cac6da53ab33f217fef1eaae..2ae1c17e28cabaf2d1e61017d305b4bbf1988b00 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 f94a836be14f33fd753a9c235ecd58c7d9af0397..f96615aaf5938fd6b83522a9ffd3df2827998229 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 399c25a6723a2206ef86a9add1944c8178e9cbca..558652d531f91cc80e0fc1936b71db9fa1546bb9 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 dd3f959993f27038e8fc8fdea4503befe2f1fe93..3d50ba87b244e93d3c571b59853b712601d5d528 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 67a3040c77013b09cdcee256a38046991eb20c89..75e5a885764311c3c05a4c30991f01a747ec0f8b 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 2d3a45d71cac9f4c8160389e5c73b30cb208dd69..b5a44e7a5780d4d82c248025b5ec392260cbd692 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 d3f99d68c10a27641d7aad23d3d2a316e4d5b6fc..8ad8a1e211ff5a9c5dca2aaa3895ac5a294da438 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 d1e53839ae7a73edd5f195a8dfa091dd7252ee88..9fbd281be2eea37b952d4adfbcf8d54b0dce308a 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 ed93a811d5cf66b062d921f2dbc97af3e7b70f02..1538123e9c4bbff422657690bd0743cc33293b55 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 8389da161780bb03c7d3162eb7a6938a1405c3d8..ae6baafda7daf03010f60404247d1c0e43b4bcfa 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 67be274e8f36c1b7b416e1d2252e674001bea5ba..80a20131a3ae70f513ad6b88b5786aba74b0449c 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 df9fc914c46e8e8ce4a0c1a5597f2191a7ed6214..800f14b50f2893bfd3ebc3d5b35f12d4e7dfe01a 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 e335bdcbd99dbb7fb343cb804b15ba1d13d0f877..e3b916e36bd0f63aaef74e35158748d2b9a9ed9b 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 105d3491f807d99207aca68a27a45bada06db91d..bacb8e50a3c868cd3773c11db68baafb01306b5e 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 c18b64953e8bd67aee373abf11d2cccb2e15cd74..8f55655189ad09556c5cf01274f4339993cbff10 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 fecf903b6a019bfd85bd6e4db6a0463051e61fa0..addb4551f17829bc19ffa636c26e336baada30f0 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 adfd0f3443d1026c05665c9d27fdcb72b9d00b9f..7fc6e3d65d78ec8cc4d7646c962242017c270227 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 73c4b5838aaa535ffe81199f5a5b347a0477fdcf..7fc83cafc05d658be8633086d9438168bf5def6e 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 1848aaf0fe2b95ae8b987879447bcaaafd8e0e55..392873828bbbb359225a6a021ab00b892344c4c8 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 3ff22ee7a309ed5c70af132b24aa41b5b3838f88..ca1c3324cfaf591024919961e02afac811a5f8aa 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 f5b5f155275f58d55140dda6bc52aab9823049da..13c3716b03caa56ee573cf35f8fe52ba2816d489 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 f39e166d17a2d4070c3a12b2c9d820d41df68e37..7336e4d61b4e6f6ce4e9aabd53953a2851f9bb0f 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 3d48eaff2daebeb1193fc4c419e40b97e0edcbda..7a4badba857f9242c97215e4338f021f8893648c 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 86f42bc23ba97c8d3784484e7c33989d10a2ee96..d7ee6ba862fc9f8776d9db3b4ed3e9f735fc68fe 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 f9d42321f97b19df4bd6846bcb93306deb0bf21d..02b342ef706eda5755a609c2e8078aa08ec68591 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 62a6263e41381188302d5180946202579e984b3d..0649323c5dbc95ee853b67d398253d1b02d4114e 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 6b1e094c134781dcd19ee9b120a899b58a9d7d46..daf26a58b1787f172675fb3af5736aec6d405197 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 c6e8912bb452e19d11b4c32dd6a2271575c6579f..fe886c11f57083f1451c17d3d2ff92402d46719a 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 5f07e6c60d61fc6274e68c30db053c51714c4db8..7d58c09e8e722465afa4c1446c15cc5fea10a851 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 bac623fddb61bf8c43800cb231267c7b2b3f1ba0..3b39b76e6215b0955cf3b802ea88a2dda84b90bd 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 ee6d2c81d82eff0aef5c07ac01e83521bf0bc03f..43e873cfb12664d39c0c65fad6d1a93567a8daee 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 b30c1ebdf77a27be207b8d09668da34b0338514d..b18f73e0eaf4c4a614ea881ae7fde4fdc257341c 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 a67ee038c86410a67eb3f03571995b2eef0c0ce0..bbd4e47b270c091d6bfa0e6b3f7c2fb7e7b1f6c0 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 718bcd67a8cccb8480b6313a25581a7fdf6af547..b40d0195db761297b587f7bea046b40340a155c0 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 c689a3868e3fabe96e79855d5f5a196fa626241a..4a8100bb152c82ccf6a2e3de3b64788fad998f72 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 333be80eedf6c6735978f096beac242d9ee613c8..33f153efe7baaf4e860328f2015b8bc13dec7db1 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 26d901fc637e55944eb8df87ede4c63bbcb43498..4a76823dff772bbdcb7b029bacf000962c3b46a9 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 0e4cb99e5996899488858648776143d67975c700..d3c8ea660864e90126cf7185f3c30b43b56d7405 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 cd60a93ad32dd0ddae107015b5a40a30fe34e5f1..fafb7195ebb685851ddbef037ebbaa8b049595e1 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 5bffa9fea7193b03a3aa0224560199db429376ff..f394ec98a97508eccead05074eb50b6e95ae84d9 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 a96a084aff9cf51beaadc810a98ad5226eeb5920..18b8723fd90ee7274c3d6914286bd766ff9c0dc3 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 084b1cdc5075b770148f78e61021eb2562a3c4d5..b82ea453f4b7fb8a6fa99e0850408984cf13e4bd 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 85541cea33864202f08fae30a68d42da1e823081..11039bf3585fac78c39fa513c086b30d771e2270 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 13c21a53c85d8f9a296e86ab0b4d1c4805523441..8eed2d4f0fc18497b0ec2f4255512973daa570fe 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 588e73a941aefe2ea0fe7bc3622cbb301b36f10b..d2be30e540a37a9781bd6666929706efa4032a6f 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 8b35f610467141d003c3f9f5c1ad7959c521b54f..7557acf6c27b2b9b7921eed6cd56baefc82eb75e 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 1952738feace6b387841edd02ed67d8799b1e30e..35ce7d89228989d1b8a4a6659bcc4e2d13cdb033 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 dc1d3898c369bd1507e7b1ae1a429ac936888936..e8038661f30019f00f75932bd59ccb9ca81efd60 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 cacafdd9009126a40775f4fefeccfb2d1b828e9f..8428ccab1e6683b83f975dbc272c88b6e0332cab 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 599501d8d966bdbd640812ed371a34e63782144f..0e1c09314b6025f86b19e0d98159b98779299583 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 ad4452c1a8ff526efa8b27150e57acad98e115b9..95853a8a79e18435d5345de6f6971cc88190ae83 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 84934900f1d7a42e01fa18a0c8d796dbebdb2183..8f5f0e5306764d284fba0d9f5855f588f37f573c 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 a7f4b9651d0bd74a9158cbff5eaaf19bcf7895ab..bf4665f46ac3aeeb46174a67e491166cc4bec5ef 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 1e1a5d3d481b412121449b77907b9b3cf363bfbf..6c95b7dba57f904d71e8f2a29a53c67ad4ebebb2 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 4d5f50d627e4964dd348afcb61528fce5df89782..ddb74e9a86e90c1a3a1ab1d7f2dfea3135d85fb8 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 fa7c08abd00021a1735b40ace80fdeda7551e627..5a2b18a85081ac11296393a880d991844bd39ff8 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 1ad96df4fcfea4c82898839a2186940179bc48ec..acbe06a0a8928d0a92a4df18023e2a4dc661f1ed 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 c131bff9dcfda8748752b81647926d14de57c765..e52031e1203c44818cb8ef9533c267475d4c9639 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 32e408bf28fd200cff6855604d6c7bceceb017af..8fc4728ba34c9a2dd47baa3bce0b59fb70099fd7 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 98e72ec207b29ff5037e5f7cf39f3633eea03fa2..ee955f7a4466febb968dc17a836dca14550c7c71 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 f82aebe7ed8fc0b5cf0400361d807e66e4a2d281..d185bbeb638eb808e4bc5e0b0e840bb02ed2780f 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 4638917a6ab759eea2d9c8f426ea38e7a2e0906b..a40de1f7a73b4b4aed69f4e492d025480ee5ec2a 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 85b98663f9b91f68e3e5cb3bd4434db9541f7c5c..bffca7d69ce058e2239609c377949b5c8568540e 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 28e5d54de0cdbdf94152dea58863396d535aa0ff..2c32c6a885d4f12c9eda8006cb74dc904fdeef76 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 2803e412f116c4fecfc3581580eadb09dbfc1c79..2668158387481ac47f58a1d6550aa109f059647f 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 5deaf56c2bfa13a677cc487cc7b90c835c89c1ab..9493311991280495c6e3dd32b027877970745bf9 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 0f1d8d4c32d551b5d6bc50d004e989fb5c4f0515..2da315e6c57f8e9fa4a8b91c664ce53b2a738571 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 8e2e357b24ec62257a0f84dba6f8ceb40eae48d1..99507391d0456730f5df6027a8ccdee3c9a3f1c6 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 5ea672d00c76229852b9c523fe5c1a0029fb75e7..d544e86162cc01abb98173c9fae91c0d24149ae8 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 6c18593802f6487ecba5f2586b93964bbf9e4991..027977d8c8b465e8bce5a40c3dd3ab37caf48b77 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 732b066469d286b2b1d6205594068b7621f83df1..6995e7306aa4942a5efe348d9574c6beecdf59ad 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 f5d80536e1258e2aa695f9eb2881ec3d35f65637..7d0826fef958b23a9eb3ebfc6badc2d6f6f870cb 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 527cf3d02101582ad0b9d636e1c6dc3483dab0cf..ce91257c222107d77dba747d60b1522029933045 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 d01f074014402bafb834e2924cda5038a61fb9ef..de937bcd4a2c63c59c29a7123e38aca25bd30109 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 f5c40582450895d05f72405b0c01859cafcd3c7c..d27f89af2da4e0a2055c1107cc3f75d21c24e12e 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 a48352c403a87e1326daa1ecb62c2f3439d7273b..600596c0fefe47c0f1d2e697412f1ce6981c633e 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 61f912c1f49e2555b2ac45f124476261d31f7aea..bd4dbc0318d063c05254ad270dd05e8a575c7585 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 8824366f00d164de9c161c382cb857929c1a0b26..bb94a514318eac937d33524157092130d0ff40a7 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 3778b14b40bf4595324f508c24b532a999a26e90..ea68cf0ff6f70fcfca887ca7f497a9a518e302b7 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 5c9ca27aabcd3019da4fab5d09f2196fae5b48b1..b10f3fb1dd00d25c6636fee92f69391673f6aa07 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 edf2aed4427a550867d3c53e40277b1055200f48..3904127db69d0b58fb8db731be9e197898a27be3 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 45fd3577c7e1f5310ab5202fe02b3b9eb4190f2e..b25f461e756169d5f334b1fcee167ae1857955cc 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 6f9a3a3092c3f84070d55a399fcb077f64221488..920a9de0c319748c432060f96ed1a1f21ab41ed1 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 3492067901544d239c3aff7ba936499342e54863..8caf5706df0786dc16cd1177cc8166c2f1fab81a 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 e069e11ec430ce1c0035df611ae8b8bfd75a29eb..36fc5a9fd67ea13c7a0343ad363a94dcc1a340c2 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 3ea4ed974be2f4ee06055be064ad00dc39479ee0..2fb6e9673708cc6a439622ef30bcc081e6214c7c 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 70c07e32d4452759907b19e40af626d3ef7d9e63..c899fc6b0ee88b216d621100501be18bfb5ce482 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 38ae8c5156fcaff274f7de281a598470de0b7466..559f5611db8949932a89d33965e45087f7eb62d7 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 68eaf527a06318f58e3ebf182808014b065b155e..618ac8f6b2b60a8cbea0809a13467821955927e3 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 784b7abe75974bd6b6c3420eee3aa2fde5677401..920cde1a0c7ca26eaa5f85cd5011db4e670ad185 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 7737c912b1cbde7ebc54ef05327f64deeafb8374..cbedb563f07b67cb183bb710224941aeb960e962 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 3a562c539337c0b289e924445e2b39bf157abe59..9b7fdc6b07d618720026d77278cafb41d4cf7d3b 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 118c7aa9729209f7614538074eec8d2fe01ef80b..749fb2888700c25336da9030512b31f75f1e1158 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 ba3cd3b09ac376ee4981961c9a8afbe27a2dbce7..81a7b5ba62a79f311ba7556408dc8545e6cbec8a 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 fbc658057e5ce84db621c1d5b463dcf40ecbcd41..4b88b741ee29adbb40b0807b66a5ba0dba75c583 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 e615378488a4ab51f1f667416d7151f77c39e811..8e4b24483ffbaaf54120f6927a09b705cc5d0606 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 20a5222e454d29d0d6ea409c9998b0516e460160..8e1ab0eb794f6f3805ed1c1c7869855649a20b1f 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 b52c605264f2d5c4c0cb78c88549de86b9509ac0..71e395e6e2a92909cc3ecd6fa244127557b745cc 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 3caa86c7b4218c38644a290a500801849e73ce22..ea48f605c84788bb3b1793d690b6c7b1e44f1af2 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 b2e6f18d4a669a7f502d03a840785444a7d35662..58ebbeb66977509311a7194a40a787927b68cae2 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 ed2d5b6fb7d2a5498aa1e9af5074b58098a0b92f..7071da95b2fd4cf81325e06ffa12a294cab50356 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 d8e199e76b7dfb5876d97c23921196466ca4a863..44a409377ffec299a221b6ab369f53addb0711c6 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 6f854540c74e779a0fc87372d5b0afbf0e0db02c..765addd1d08bdb4beea67092bbe0d13557a507d7 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 a4400e5d41103b79b43e8c8f627a5e5bca299df6..75cf23d9febde1e3fd63111f2b2fb96222f473c1 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 b356aecfeb8a5377b99abcf03927cbf271176238..2740d33bddb4cc5e3c091e1e1e376cda83e3fb59 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 aed0882962dd5edb7580d581b587054c69078c41..ebdac02d8a146254477b484c94217ca0b778c27e 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 97c0adc5788a57878a490b970aaad761b730934b..7f0318f74d6bfa76ee90febec17792eb461a52ef 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 dd5d5e85e42a9ff58eef1f45cd5fe3c141ee1039..9c248a2a78e0d3a7ed7063263742a334337ea1bd 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 = [