From 09850a37b0e4753cb37565ebe1373d748dd87815 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Wed, 20 Jul 2016 16:40:41 +0200
Subject: [PATCH] mv Simulation/SimulationOptions.* -> Basics; correct '@file'
 entries from last moves.

---
 .../DecouplingApproximationStrategy.cpp          |  2 +-
 .../Aggregates/DecouplingApproximationStrategy.h |  2 +-
 Core/Aggregates/FTDecayFunctions.cpp             |  2 +-
 Core/Aggregates/FTDecayFunctions.h               |  2 +-
 Core/Aggregates/FTDistributions.cpp              |  2 +-
 Core/Aggregates/FTDistributions.h                |  2 +-
 Core/Aggregates/IInterferenceFunction.cpp        |  2 +-
 Core/Aggregates/IInterferenceFunction.h          |  2 +-
 .../Aggregates/IInterferenceFunctionStrategy.cpp |  2 +-
 Core/Aggregates/IInterferenceFunctionStrategy.h  |  2 +-
 Core/Aggregates/ILayout.h                        |  2 +-
 .../Aggregates/InterferenceFunction1DLattice.cpp |  2 +-
 Core/Aggregates/InterferenceFunction1DLattice.h  |  2 +-
 .../Aggregates/InterferenceFunction2DLattice.cpp |  2 +-
 Core/Aggregates/InterferenceFunction2DLattice.h  |  2 +-
 .../InterferenceFunction2DParaCrystal.cpp        |  2 +-
 .../InterferenceFunction2DParaCrystal.h          |  2 +-
 Core/Aggregates/InterferenceFunctionNone.cpp     |  2 +-
 Core/Aggregates/InterferenceFunctionNone.h       |  2 +-
 .../InterferenceFunctionRadialParaCrystal.cpp    |  2 +-
 .../InterferenceFunctionRadialParaCrystal.h      |  2 +-
 Core/Aggregates/InterferenceFunctionStrategies.h |  2 +-
 Core/Aggregates/InterferenceFunctions.h          |  2 +-
 Core/Aggregates/ParticleLayout.cpp               |  2 +-
 Core/Aggregates/ParticleLayout.h                 |  2 +-
 ...zeSpacingCorrelationApproximationStrategy.cpp |  2 +-
 ...SizeSpacingCorrelationApproximationStrategy.h |  2 +-
 .../{Simulation => Basics}/SimulationOptions.cpp |  2 +-
 Core/{Simulation => Basics}/SimulationOptions.h  |  2 +-
 Core/Bins/Bin.cpp                                |  2 +-
 Core/Bins/Bin.h                                  |  2 +-
 Core/Bins/ConstKBinAxis.cpp                      |  2 +-
 Core/Bins/ConstKBinAxis.h                        |  2 +-
 Core/Bins/CustomBinAxis.cpp                      |  2 +-
 Core/Bins/CustomBinAxis.h                        |  2 +-
 Core/Bins/FixedBinAxis.cpp                       |  2 +-
 Core/Bins/FixedBinAxis.h                         |  2 +-
 Core/Bins/IAxis.h                                |  2 +-
 Core/Bins/VariableBinAxis.cpp                    |  2 +-
 Core/Bins/VariableBinAxis.h                      |  2 +-
 Core/Mask/Ellipse.cpp                            |  2 +-
 Core/Mask/Ellipse.h                              |  2 +-
 Core/Mask/IShape2D.h                             |  2 +-
 Core/Mask/InfinitePlane.cpp                      |  2 +-
 Core/Mask/InfinitePlane.h                        |  2 +-
 Core/Mask/Line.cpp                               |  2 +-
 Core/Mask/Line.h                                 |  2 +-
 Core/Mask/Mask.cpp                               |  2 +-
 Core/Mask/Mask.h                                 |  2 +-
 Core/Mask/MaskCoordinateFunction.cpp             |  2 +-
 Core/Mask/MaskCoordinateFunction.h               |  2 +-
 Core/Mask/Polygon.cpp                            |  2 +-
 Core/Mask/Polygon.h                              |  2 +-
 Core/Mask/Rectangle.cpp                          |  2 +-
 Core/Mask/Rectangle.h                            |  2 +-
 Wrap/swig/libBornAgainCore.i                     |  2 +-
 Wrap/swig/libBornAgainFit.i                      |  2 +-
 auto/Wrap/doxygen_core.i                         | 16 ++++++++--------
 58 files changed, 65 insertions(+), 65 deletions(-)
 rename Core/{Simulation => Basics}/SimulationOptions.cpp (97%)
 rename Core/{Simulation => Basics}/SimulationOptions.h (97%)

diff --git a/Core/Aggregates/DecouplingApproximationStrategy.cpp b/Core/Aggregates/DecouplingApproximationStrategy.cpp
index 02a99948577..71de56403e0 100644
--- a/Core/Aggregates/DecouplingApproximationStrategy.cpp
+++ b/Core/Aggregates/DecouplingApproximationStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/DecouplingApproximationStrategy.cpp
+//! @file      Core/Aggregates/DecouplingApproximationStrategy.cpp
 //! @brief     Implements class DecouplingApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/DecouplingApproximationStrategy.h b/Core/Aggregates/DecouplingApproximationStrategy.h
index aed06058ba4..c25021e5f5f 100644
--- a/Core/Aggregates/DecouplingApproximationStrategy.h
+++ b/Core/Aggregates/DecouplingApproximationStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/DecouplingApproximationStrategy.h
+//! @file      Core/Aggregates/DecouplingApproximationStrategy.h
 //! @brief     Declares class DecouplingApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/FTDecayFunctions.cpp b/Core/Aggregates/FTDecayFunctions.cpp
index a02ba3f5719..f5e68522b59 100644
--- a/Core/Aggregates/FTDecayFunctions.cpp
+++ b/Core/Aggregates/FTDecayFunctions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/FTDecayFunctions.cpp
+//! @file      Core/Aggregates/FTDecayFunctions.cpp
 //! @brief     Implements class FTDistribution2DCauchy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/FTDecayFunctions.h b/Core/Aggregates/FTDecayFunctions.h
index ab46687530c..f965dc51b63 100644
--- a/Core/Aggregates/FTDecayFunctions.h
+++ b/Core/Aggregates/FTDecayFunctions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/FTDecayFunctions.h
+//! @file      Core/Aggregates/FTDecayFunctions.h
 //! @brief     Declares classes IFTDecayFunction1D, IFTDecayFunction2D,
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/FTDistributions.cpp b/Core/Aggregates/FTDistributions.cpp
index 522542e8788..2447066cdae 100644
--- a/Core/Aggregates/FTDistributions.cpp
+++ b/Core/Aggregates/FTDistributions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/FTDistributions.cpp
+//! @file      Core/Aggregates/FTDistributions.cpp
 //! @brief     Implements class FTDistribution2DCauchy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/FTDistributions.h b/Core/Aggregates/FTDistributions.h
index e7657fb0113..7887bd355d8 100644
--- a/Core/Aggregates/FTDistributions.h
+++ b/Core/Aggregates/FTDistributions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/FTDistributions.h
+//! @file      Core/Aggregates/FTDistributions.h
 //! @brief     Declares classes IFTDistribution1D, IFTDistribution2D,
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/IInterferenceFunction.cpp b/Core/Aggregates/IInterferenceFunction.cpp
index bfbe8400db7..b0b631e1084 100644
--- a/Core/Aggregates/IInterferenceFunction.cpp
+++ b/Core/Aggregates/IInterferenceFunction.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Samples/IInterferenceFunction.cpp
+//! @file      Core/Aggregates/IInterferenceFunction.cpp
 //! @brief     Implements interface class IInterferenceFunction.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/IInterferenceFunction.h b/Core/Aggregates/IInterferenceFunction.h
index ba36a67d937..13cc4fe894c 100644
--- a/Core/Aggregates/IInterferenceFunction.h
+++ b/Core/Aggregates/IInterferenceFunction.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/IInterferenceFunction.h
+//! @file      Core/Aggregates/IInterferenceFunction.h
 //! @brief     Declares interface class IInterferenceFunction.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/IInterferenceFunctionStrategy.cpp b/Core/Aggregates/IInterferenceFunctionStrategy.cpp
index 794a95eab74..5bd75cc92d0 100644
--- a/Core/Aggregates/IInterferenceFunctionStrategy.cpp
+++ b/Core/Aggregates/IInterferenceFunctionStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/IInterferenceFunctionStrategy.cpp
+//! @file      Core/Aggregates/IInterferenceFunctionStrategy.cpp
 //! @brief     Implements default behaviour of IInterferenceFunctionStrategy
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/IInterferenceFunctionStrategy.h b/Core/Aggregates/IInterferenceFunctionStrategy.h
index d576ef4b568..b310a9e9097 100644
--- a/Core/Aggregates/IInterferenceFunctionStrategy.h
+++ b/Core/Aggregates/IInterferenceFunctionStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/IInterferenceFunctionStrategy.h
+//! @file      Core/Aggregates/IInterferenceFunctionStrategy.h
 //! @brief     Declares class IInterferenceFunctionStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/ILayout.h b/Core/Aggregates/ILayout.h
index 9e1665e37a3..16984e806a5 100644
--- a/Core/Aggregates/ILayout.h
+++ b/Core/Aggregates/ILayout.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/ILayout.h
+//! @file      Core/Aggregates/ILayout.h
 //! @brief     Declares interface class ILayout.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/InterferenceFunction1DLattice.cpp b/Core/Aggregates/InterferenceFunction1DLattice.cpp
index 5a2efbad044..c18bd7990a5 100644
--- a/Core/Aggregates/InterferenceFunction1DLattice.cpp
+++ b/Core/Aggregates/InterferenceFunction1DLattice.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/InterferenceFunction1DLattice.cpp
+//! @file      Core/Aggregates/InterferenceFunction1DLattice.cpp
 //! @brief     Implements class InterferenceFunction1DLattice.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/InterferenceFunction1DLattice.h b/Core/Aggregates/InterferenceFunction1DLattice.h
index ab53c4118cc..b3cc5d079cc 100644
--- a/Core/Aggregates/InterferenceFunction1DLattice.h
+++ b/Core/Aggregates/InterferenceFunction1DLattice.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/InterferenceFunction1DLattice.h
+//! @file      Core/Aggregates/InterferenceFunction1DLattice.h
 //! @brief     Declares class InterferenceFunction1DLattice.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/InterferenceFunction2DLattice.cpp b/Core/Aggregates/InterferenceFunction2DLattice.cpp
index 74bccb5f2c4..bac88c62efb 100644
--- a/Core/Aggregates/InterferenceFunction2DLattice.cpp
+++ b/Core/Aggregates/InterferenceFunction2DLattice.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/InterferenceFunction2DLattice.cpp
+//! @file      Core/Aggregates/InterferenceFunction2DLattice.cpp
 //! @brief     Implements class InterferenceFunction2DLattice.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/InterferenceFunction2DLattice.h b/Core/Aggregates/InterferenceFunction2DLattice.h
index 0574593dc1c..ff1238be128 100644
--- a/Core/Aggregates/InterferenceFunction2DLattice.h
+++ b/Core/Aggregates/InterferenceFunction2DLattice.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/InterferenceFunction2DLattice.h
+//! @file      Core/Aggregates/InterferenceFunction2DLattice.h
 //! @brief     Declares class InterferenceFunction2DLattice.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/InterferenceFunction2DParaCrystal.cpp b/Core/Aggregates/InterferenceFunction2DParaCrystal.cpp
index e2e9788c5cb..cb6c44b0ccb 100644
--- a/Core/Aggregates/InterferenceFunction2DParaCrystal.cpp
+++ b/Core/Aggregates/InterferenceFunction2DParaCrystal.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/InterferenceFunction2DParaCrystal.cpp
+//! @file      Core/Aggregates/InterferenceFunction2DParaCrystal.cpp
 //! @brief     Implements class InterferenceFunction2DParaCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/InterferenceFunction2DParaCrystal.h b/Core/Aggregates/InterferenceFunction2DParaCrystal.h
index 316c3b4bfa5..058e9392639 100644
--- a/Core/Aggregates/InterferenceFunction2DParaCrystal.h
+++ b/Core/Aggregates/InterferenceFunction2DParaCrystal.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/InterferenceFunction2DParaCrystal.h
+//! @file      Core/Aggregates/InterferenceFunction2DParaCrystal.h
 //! @brief     Declares class InterferenceFunction2DParaCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/InterferenceFunctionNone.cpp b/Core/Aggregates/InterferenceFunctionNone.cpp
index 5af89d96f6d..a5311c00cb6 100644
--- a/Core/Aggregates/InterferenceFunctionNone.cpp
+++ b/Core/Aggregates/InterferenceFunctionNone.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/InterferenceFunctionNone.cpp
+//! @file      Core/Aggregates/InterferenceFunctionNone.cpp
 //! @brief     Implements class InterferenceFunctionNone.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/InterferenceFunctionNone.h b/Core/Aggregates/InterferenceFunctionNone.h
index 505ba984747..275948ae58a 100644
--- a/Core/Aggregates/InterferenceFunctionNone.h
+++ b/Core/Aggregates/InterferenceFunctionNone.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/InterferenceFunctionNone.h
+//! @file      Core/Aggregates/InterferenceFunctionNone.h
 //! @brief     Declares class InterferenceFunctionNone.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/InterferenceFunctionRadialParaCrystal.cpp b/Core/Aggregates/InterferenceFunctionRadialParaCrystal.cpp
index a635952d6cf..6e7e8552bc9 100644
--- a/Core/Aggregates/InterferenceFunctionRadialParaCrystal.cpp
+++ b/Core/Aggregates/InterferenceFunctionRadialParaCrystal.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/InterferenceFunctionRadialParaCrystal.cpp
+//! @file      Core/Aggregates/InterferenceFunctionRadialParaCrystal.cpp
 //! @brief     Implements class InterferenceFunctionRadialParaCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/InterferenceFunctionRadialParaCrystal.h b/Core/Aggregates/InterferenceFunctionRadialParaCrystal.h
index b387fc1087e..7f7859f073b 100644
--- a/Core/Aggregates/InterferenceFunctionRadialParaCrystal.h
+++ b/Core/Aggregates/InterferenceFunctionRadialParaCrystal.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/InterferenceFunctionRadialParaCrystal.h
+//! @file      Core/Aggregates/InterferenceFunctionRadialParaCrystal.h
 //! @brief     Declares class InterferenceFunctionRadialParaCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/InterferenceFunctionStrategies.h b/Core/Aggregates/InterferenceFunctionStrategies.h
index f7338501679..b1a531263d0 100644
--- a/Core/Aggregates/InterferenceFunctionStrategies.h
+++ b/Core/Aggregates/InterferenceFunctionStrategies.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/InterferenceFunctionStrategies.h
+//! @file      Core/Aggregates/InterferenceFunctionStrategies.h
 //! @brief     Includes several files named *Strategy.h
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/InterferenceFunctions.h b/Core/Aggregates/InterferenceFunctions.h
index 6646b9ddd25..22cbd455b1c 100644
--- a/Core/Aggregates/InterferenceFunctions.h
+++ b/Core/Aggregates/InterferenceFunctions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/InterferenceFunctions.h
+//! @file      Core/Aggregates/InterferenceFunctions.h
 //! @brief     Includes all interference function definitions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/ParticleLayout.cpp b/Core/Aggregates/ParticleLayout.cpp
index 0ffe671d9be..286898bc6d1 100644
--- a/Core/Aggregates/ParticleLayout.cpp
+++ b/Core/Aggregates/ParticleLayout.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/ParticleLayout.cpp
+//! @file      Core/Aggregates/ParticleLayout.cpp
 //! @brief     Implements class ParticleLayout.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/ParticleLayout.h b/Core/Aggregates/ParticleLayout.h
index 6b50e1a4bca..85d42bf2c54 100644
--- a/Core/Aggregates/ParticleLayout.h
+++ b/Core/Aggregates/ParticleLayout.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/ParticleLayout.h
+//! @file      Core/Aggregates/ParticleLayout.h
 //! @brief     Declares class ParticleLayout.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/SizeSpacingCorrelationApproximationStrategy.cpp b/Core/Aggregates/SizeSpacingCorrelationApproximationStrategy.cpp
index 87a061b724a..60bfe7333c4 100644
--- a/Core/Aggregates/SizeSpacingCorrelationApproximationStrategy.cpp
+++ b/Core/Aggregates/SizeSpacingCorrelationApproximationStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/SizeSpacingCorrelationApproximationStrategy.cpp
+//! @file      Core/Aggregates/SizeSpacingCorrelationApproximationStrategy.cpp
 //! @brief     Implements class SizeSpacingCorrelationApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Aggregates/SizeSpacingCorrelationApproximationStrategy.h b/Core/Aggregates/SizeSpacingCorrelationApproximationStrategy.h
index 3946d0a21e7..7721b313cc6 100644
--- a/Core/Aggregates/SizeSpacingCorrelationApproximationStrategy.h
+++ b/Core/Aggregates/SizeSpacingCorrelationApproximationStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Assembly/SizeSpacingCorrelationApproximationStrategy.h
+//! @file      Core/Aggregates/SizeSpacingCorrelationApproximationStrategy.h
 //! @brief     Declares class SizeSpacingCorrelationApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Simulation/SimulationOptions.cpp b/Core/Basics/SimulationOptions.cpp
similarity index 97%
rename from Core/Simulation/SimulationOptions.cpp
rename to Core/Basics/SimulationOptions.cpp
index 0171f467ec4..adfd0f3443d 100644
--- a/Core/Simulation/SimulationOptions.cpp
+++ b/Core/Basics/SimulationOptions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Simulation/SimulationOptions.cpp
+//! @file      Core/Basics/SimulationOptions.cpp
 //! @brief     Implements class SimulationOptions
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Simulation/SimulationOptions.h b/Core/Basics/SimulationOptions.h
similarity index 97%
rename from Core/Simulation/SimulationOptions.h
rename to Core/Basics/SimulationOptions.h
index f834d3fd6e7..73c4b5838aa 100644
--- a/Core/Simulation/SimulationOptions.h
+++ b/Core/Basics/SimulationOptions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Simulation/SimulationOptions.h
+//! @file      Core/Basics/SimulationOptions.h
 //! @brief     Declares class SimulationOptions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Bins/Bin.cpp b/Core/Bins/Bin.cpp
index 51d482a9e03..c975b3bc916 100644
--- a/Core/Bins/Bin.cpp
+++ b/Core/Bins/Bin.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Vectors/Bin.cpp
+//! @file      Core/Bins/Bin.cpp
 //! @brief     Implements structs Bin1D, Bin1DCVector
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Bins/Bin.h b/Core/Bins/Bin.h
index 3176884add7..18f7ab13024 100644
--- a/Core/Bins/Bin.h
+++ b/Core/Bins/Bin.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Vectors/Bin.h
+//! @file      Core/Bins/Bin.h
 //! @brief     Declares structs Bin1D, Bin1DCVector
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Bins/ConstKBinAxis.cpp b/Core/Bins/ConstKBinAxis.cpp
index abe84722518..2eef0070292 100644
--- a/Core/Bins/ConstKBinAxis.cpp
+++ b/Core/Bins/ConstKBinAxis.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/ConstKBinAxis.cpp
+//! @file      Core/Bins/ConstKBinAxis.cpp
 //! @brief     Implement class ConstKBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Bins/ConstKBinAxis.h b/Core/Bins/ConstKBinAxis.h
index d5ada5d57d4..c292c5363f1 100644
--- a/Core/Bins/ConstKBinAxis.h
+++ b/Core/Bins/ConstKBinAxis.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/ConstKBinAxis.h
+//! @file      Core/Bins/ConstKBinAxis.h
 //! @brief     Declares class ConstKBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Bins/CustomBinAxis.cpp b/Core/Bins/CustomBinAxis.cpp
index 3c64757f3d4..424fb1d0772 100644
--- a/Core/Bins/CustomBinAxis.cpp
+++ b/Core/Bins/CustomBinAxis.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/CustomBinAxis.cpp
+//! @file      Core/Bins/CustomBinAxis.cpp
 //! @brief     Implement class CustomBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Bins/CustomBinAxis.h b/Core/Bins/CustomBinAxis.h
index 6de2ffd11dd..8d00cf3aa7b 100644
--- a/Core/Bins/CustomBinAxis.h
+++ b/Core/Bins/CustomBinAxis.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/CustomBinAxis.h
+//! @file      Core/Bins/CustomBinAxis.h
 //! @brief     Declares class CustomBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Bins/FixedBinAxis.cpp b/Core/Bins/FixedBinAxis.cpp
index 9937250a44e..055fa9d7ac9 100644
--- a/Core/Bins/FixedBinAxis.cpp
+++ b/Core/Bins/FixedBinAxis.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/FixedBinAxis.cpp
+//! @file      Core/Bins/FixedBinAxis.cpp
 //! @brief     Implement class FixedBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Bins/FixedBinAxis.h b/Core/Bins/FixedBinAxis.h
index 014cbaee8c0..a5346187fb2 100644
--- a/Core/Bins/FixedBinAxis.h
+++ b/Core/Bins/FixedBinAxis.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/FixedBinAxis.h
+//! @file      Core/Bins/FixedBinAxis.h
 //! @brief     Declares class FixedBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Bins/IAxis.h b/Core/Bins/IAxis.h
index 461d094b5fb..f33b72a0a26 100644
--- a/Core/Bins/IAxis.h
+++ b/Core/Bins/IAxis.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/IAxis.h
+//! @file      Core/Bins/IAxis.h
 //! @brief     Declares class IAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Bins/VariableBinAxis.cpp b/Core/Bins/VariableBinAxis.cpp
index e6c9c16f46d..c745d238576 100644
--- a/Core/Bins/VariableBinAxis.cpp
+++ b/Core/Bins/VariableBinAxis.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/VariableBinAxis.cpp
+//! @file      Core/Bins/VariableBinAxis.cpp
 //! @brief     Implements VariableBinAxis class.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Bins/VariableBinAxis.h b/Core/Bins/VariableBinAxis.h
index 6972888e47c..89686398529 100644
--- a/Core/Bins/VariableBinAxis.h
+++ b/Core/Bins/VariableBinAxis.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/VariableBinAxis.h
+//! @file      Core/Bins/VariableBinAxis.h
 //! @brief     Declares class VariableBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Mask/Ellipse.cpp b/Core/Mask/Ellipse.cpp
index da67dac10a1..a1f327a8239 100644
--- a/Core/Mask/Ellipse.cpp
+++ b/Core/Mask/Ellipse.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/Ellipse.cpp
+//! @file      Core/Mask/Ellipse.cpp
 //! @brief     Implements class Ellipse.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Mask/Ellipse.h b/Core/Mask/Ellipse.h
index cdc7475996b..deb6097ce43 100644
--- a/Core/Mask/Ellipse.h
+++ b/Core/Mask/Ellipse.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/Ellipse.h
+//! @file      Core/Mask/Ellipse.h
 //! @brief     Declares class Rectangle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Mask/IShape2D.h b/Core/Mask/IShape2D.h
index 3d339a7b458..a247d71ceaa 100644
--- a/Core/Mask/IShape2D.h
+++ b/Core/Mask/IShape2D.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/IShape2D.h
+//! @file      Core/Mask/IShape2D.h
 //! @brief     Declares basic class for all 2D shapes.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Mask/InfinitePlane.cpp b/Core/Mask/InfinitePlane.cpp
index 353b0a9a839..b41d0e3b539 100644
--- a/Core/Mask/InfinitePlane.cpp
+++ b/Core/Mask/InfinitePlane.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/InfinitePlane.cpp
+//! @file      Core/Mask/InfinitePlane.cpp
 //! @brief     Implements class InfinitePlane.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Mask/InfinitePlane.h b/Core/Mask/InfinitePlane.h
index 61c2bd28085..023e1da5bb4 100644
--- a/Core/Mask/InfinitePlane.h
+++ b/Core/Mask/InfinitePlane.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/InfinitePlane.h
+//! @file      Core/Mask/InfinitePlane.h
 //! @brief     Declares class InfinitePlane.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Mask/Line.cpp b/Core/Mask/Line.cpp
index 4020fab74d1..cd50aba2012 100644
--- a/Core/Mask/Line.cpp
+++ b/Core/Mask/Line.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/Line.cpp
+//! @file      Core/Mask/Line.cpp
 //! @brief     Implements class Line.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Mask/Line.h b/Core/Mask/Line.h
index dab5616c4c6..c3a0a08e340 100644
--- a/Core/Mask/Line.h
+++ b/Core/Mask/Line.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/Line.h
+//! @file      Core/Mask/Line.h
 //! @brief     Declares class Line.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Mask/Mask.cpp b/Core/Mask/Mask.cpp
index 30b1adab821..8dbe7d31d4b 100644
--- a/Core/Mask/Mask.cpp
+++ b/Core/Mask/Mask.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/Mask.cpp
+//! @file      Core/Mask/Mask.cpp
 //! @brief     Implements classes Mask, MaskIndexModulus, MaskCoordinates.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Mask/Mask.h b/Core/Mask/Mask.h
index c76eee38ec6..a822f6229cd 100644
--- a/Core/Mask/Mask.h
+++ b/Core/Mask/Mask.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/Mask.h
+//! @file      Core/Mask/Mask.h
 //! @brief     Declares classes Mask, MaskIndexModulus, MaskCoordinates.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Mask/MaskCoordinateFunction.cpp b/Core/Mask/MaskCoordinateFunction.cpp
index bcc7bf7009a..8ef8dd01f2c 100644
--- a/Core/Mask/MaskCoordinateFunction.cpp
+++ b/Core/Mask/MaskCoordinateFunction.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/MaskCoordinateFunction.cpp
+//! @file      Core/Mask/MaskCoordinateFunction.cpp
 //! @brief     Implements classes MaskCoordinateFunction, MaskCoordinate..Function
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Mask/MaskCoordinateFunction.h b/Core/Mask/MaskCoordinateFunction.h
index 4f25bac480f..9d74f77dea4 100644
--- a/Core/Mask/MaskCoordinateFunction.h
+++ b/Core/Mask/MaskCoordinateFunction.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/MaskCoordinateFunction.h
+//! @file      Core/Mask/MaskCoordinateFunction.h
 //! @brief     Declares classes MaskCoordinateFunction,
 //!              MaskCoordinateRectangleFunction, MaskCoordinateEllipseFunction
 //!
diff --git a/Core/Mask/Polygon.cpp b/Core/Mask/Polygon.cpp
index d9ed4566179..ddfa8f9a48b 100644
--- a/Core/Mask/Polygon.cpp
+++ b/Core/Mask/Polygon.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/Polygon.cpp
+//! @file      Core/Mask/Polygon.cpp
 //! @brief     Implements class Polygon.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Mask/Polygon.h b/Core/Mask/Polygon.h
index 3d18b4bf6c6..4b15ef5c650 100644
--- a/Core/Mask/Polygon.h
+++ b/Core/Mask/Polygon.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/Polygon.h
+//! @file      Core/Mask/Polygon.h
 //! @brief     Declares class Polygon.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Mask/Rectangle.cpp b/Core/Mask/Rectangle.cpp
index b08e3680d0d..6699af5614a 100644
--- a/Core/Mask/Rectangle.cpp
+++ b/Core/Mask/Rectangle.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/Rectangle.cpp
+//! @file      Core/Mask/Rectangle.cpp
 //! @brief     Implements class Rectangle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Mask/Rectangle.h b/Core/Mask/Rectangle.h
index 8f60400bbfc..091502ac895 100644
--- a/Core/Mask/Rectangle.h
+++ b/Core/Mask/Rectangle.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/Rectangle.h
+//! @file      Core/Mask/Rectangle.h
 //! @brief     Declares class Rectangle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Wrap/swig/libBornAgainCore.i b/Wrap/swig/libBornAgainCore.i
index 98d72975435..1f4ef496aa1 100644
--- a/Wrap/swig/libBornAgainCore.i
+++ b/Wrap/swig/libBornAgainCore.i
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      PythonAPI/libBornAgainCore.i
+//! @file      Wrap/swig/libBornAgainCore.i
 //! @brief     SWIG interface file for libBornAgainCore
 //!
 //! @homepage  http://apps.jcns.fz-juelich.de/BornAgain
diff --git a/Wrap/swig/libBornAgainFit.i b/Wrap/swig/libBornAgainFit.i
index d304920d2ec..87f4cfe2c92 100644
--- a/Wrap/swig/libBornAgainFit.i
+++ b/Wrap/swig/libBornAgainFit.i
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      PythonAPI/libBornAgainFit.i
+//! @file      Wrap/swig/libBornAgainFit.i
 //! @brief     SWIG interface file for libBornAgainFit
 //!
 //! @homepage  http://apps.jcns.fz-juelich.de/BornAgain
diff --git a/auto/Wrap/doxygen_core.i b/auto/Wrap/doxygen_core.i
index d0267b63605..24c55b4765a 100644
--- a/auto/Wrap/doxygen_core.i
+++ b/auto/Wrap/doxygen_core.i
@@ -13132,10 +13132,10 @@ C++ includes: WavevectorInfo.h
 // File: classMathFunctions_1_1Convolve_1_1Workspace.xml
 
 
-// File: namespace_0D279.xml
+// File: namespace_0D281.xml
 
 
-// File: namespace_0D340.xml
+// File: namespace_0D342.xml
 
 
 // File: namespace_0D407.xml
@@ -13744,6 +13744,12 @@ Returns exp(I*z), where I is the imaginary unit.
 // File: SafePointerVector_8h.xml
 
 
+// File: SimulationOptions_8cpp.xml
+
+
+// File: SimulationOptions_8h.xml
+
+
 // File: ThreadInfo_8h.xml
 
 
@@ -14714,12 +14720,6 @@ Returns concatenated rotation (first right, then left).
 // File: Simulation_8h.xml
 
 
-// File: SimulationOptions_8cpp.xml
-
-
-// File: SimulationOptions_8h.xml
-
-
 // File: SpecularSimulation_8cpp.xml
 
 
-- 
GitLab