From 00842cbd0827692f611e460d3b6abf9bce4f426e Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sun, 12 Jun 2016 18:29:57 +0200
Subject: [PATCH] New script update-filename.py, used to update the Doxygen
 parameter @file => down to 20 warnings

---
 Core/Algorithms/Beam.cpp                      |  2 +-
 Core/Algorithms/Beam.h                        |  2 +-
 Core/Algorithms/ChiSquaredModule.cpp          |  2 +-
 Core/Algorithms/ChiSquaredModule.h            |  2 +-
 .../ConvolutionDetectorResolution.cpp         |  2 +-
 .../ConvolutionDetectorResolution.h           |  2 +-
 Core/Algorithms/DWBADiffuseReflection.cpp     |  2 +-
 Core/Algorithms/DWBADiffuseReflection.h       |  2 +-
 Core/Algorithms/DWBASimulation.cpp            |  2 +-
 Core/Algorithms/DWBASimulation.h              |  2 +-
 .../DecoratedLayerDWBASimulation.cpp          |  2 +-
 .../Algorithms/DecoratedLayerDWBASimulation.h |  2 +-
 .../DecouplingApproximationStrategy.cpp       |  2 +-
 .../DecouplingApproximationStrategy.h         |  2 +-
 Core/Algorithms/DetectorMask.cpp              |  2 +-
 Core/Algorithms/DetectorMask.h                |  2 +-
 Core/Algorithms/DistributionHandler.cpp       |  2 +-
 Core/Algorithms/DistributionHandler.h         |  2 +-
 Core/Algorithms/Distributions.cpp             |  2 +-
 Core/Algorithms/Distributions.h               |  2 +-
 Core/Algorithms/FTDecayFunctions.cpp          |  2 +-
 Core/Algorithms/FTDecayFunctions.h            |  2 +-
 Core/Algorithms/FTDistributions.cpp           |  2 +-
 Core/Algorithms/FTDistributions.h             |  2 +-
 Core/Algorithms/FitElement.cpp                |  2 +-
 Core/Algorithms/FitElement.h                  |  2 +-
 Core/Algorithms/GISASSimulation.cpp           |  2 +-
 Core/Algorithms/GISASSimulation.h             |  2 +-
 Core/Algorithms/IChiSquaredModule.cpp         |  2 +-
 Core/Algorithms/IChiSquaredModule.h           |  2 +-
 Core/Algorithms/IDetector2D.cpp               |  2 +-
 Core/Algorithms/IDetector2D.h                 |  2 +-
 Core/Algorithms/IDetectorResolution.cpp       |  2 +-
 Core/Algorithms/IDetectorResolution.h         |  2 +-
 Core/Algorithms/IIntensityFunction.h          |  2 +-
 Core/Algorithms/IIntensityNormalizer.cpp      |  2 +-
 Core/Algorithms/IIntensityNormalizer.h        |  2 +-
 .../IInterferenceFunctionStrategy.cpp         |  2 +-
 .../IInterferenceFunctionStrategy.h           |  2 +-
 Core/Algorithms/ILayerRTCoefficients.h        |  2 +-
 Core/Algorithms/IPixelMap.h                   |  2 +-
 Core/Algorithms/IResolutionFunction2D.h       |  2 +-
 Core/Algorithms/ISampleBuilder.h              |  2 +-
 Core/Algorithms/ISimulation.h                 |  2 +-
 Core/Algorithms/ISpecularInfoMap.h            |  2 +-
 Core/Algorithms/ISquaredFunction.h            |  2 +-
 Core/Algorithms/Instrument.cpp                |  2 +-
 Core/Algorithms/Instrument.h                  |  2 +-
 .../InterferenceFunctionStrategies.h          |  2 +-
 Core/Algorithms/IsGISAXSDetector.cpp          |  2 +-
 Core/Algorithms/IsGISAXSDetector.h            |  2 +-
 Core/Algorithms/LayerDWBASimulation.cpp       |  2 +-
 Core/Algorithms/LayerDWBASimulation.h         |  2 +-
 Core/Algorithms/LayerSpecularInfo.cpp         |  2 +-
 Core/Algorithms/LayerSpecularInfo.h           |  2 +-
 Core/Algorithms/LayerStrategyBuilder.cpp      |  2 +-
 Core/Algorithms/LayerStrategyBuilder.h        |  2 +-
 Core/Algorithms/Mask.cpp                      |  2 +-
 Core/Algorithms/Mask.h                        |  2 +-
 Core/Algorithms/MaskCoordinateFunction.cpp    |  2 +-
 Core/Algorithms/MaskCoordinateFunction.h      |  2 +-
 Core/Algorithms/MatrixRTCoefficients.cpp      |  2 +-
 Core/Algorithms/MatrixRTCoefficients.h        |  2 +-
 Core/Algorithms/MatrixSpecularInfoMap.cpp     |  2 +-
 Core/Algorithms/MatrixSpecularInfoMap.h       |  2 +-
 Core/Algorithms/MultiLayerDWBASimulation.cpp  |  2 +-
 Core/Algorithms/MultiLayerDWBASimulation.h    |  2 +-
 .../MultiLayerRoughnessDWBASimulation.cpp     |  2 +-
 .../MultiLayerRoughnessDWBASimulation.h       |  2 +-
 Core/Algorithms/OMPISimulation.cpp            |  2 +-
 Core/Algorithms/OMPISimulation.h              |  2 +-
 Core/Algorithms/OffSpecSimulation.cpp         |  2 +-
 Core/Algorithms/OffSpecSimulation.h           |  2 +-
 Core/Algorithms/ParameterSample.h             |  2 +-
 Core/Algorithms/ProgressHandler.cpp           |  2 +-
 Core/Algorithms/ProgressHandler.h             |  2 +-
 Core/Algorithms/ProgressHandlerDWBA.cpp       |  2 +-
 Core/Algorithms/ProgressHandlerDWBA.h         |  2 +-
 Core/Algorithms/RectangularDetector.cpp       |  2 +-
 Core/Algorithms/RectangularDetector.h         |  2 +-
 .../ResolutionFunction2DGaussian.cpp          |  2 +-
 .../Algorithms/ResolutionFunction2DGaussian.h |  2 +-
 Core/Algorithms/ScalarRTCoefficients.h        |  2 +-
 Core/Algorithms/ScalarSpecularInfoMap.cpp     |  2 +-
 Core/Algorithms/ScalarSpecularInfoMap.h       |  2 +-
 Core/Algorithms/Simulation.cpp                |  2 +-
 Core/Algorithms/Simulation.h                  |  2 +-
 Core/Algorithms/SimulationElement.cpp         |  2 +-
 Core/Algorithms/SimulationElement.h           |  2 +-
 Core/Algorithms/SimulationOptions.cpp         |  2 +-
 Core/Algorithms/SimulationOptions.h           |  2 +-
 ...pacingCorrelationApproximationStrategy.cpp |  2 +-
 ...eSpacingCorrelationApproximationStrategy.h |  2 +-
 Core/Algorithms/SpecularMagnetic.cpp          |  2 +-
 Core/Algorithms/SpecularMagnetic.h            |  2 +-
 Core/Algorithms/SpecularMatrix.cpp            |  2 +-
 Core/Algorithms/SpecularMatrix.h              |  2 +-
 Core/Algorithms/SpecularSimulation.cpp        |  2 +-
 Core/Algorithms/SpecularSimulation.h          |  2 +-
 Core/Algorithms/SphericalDetector.cpp         |  2 +-
 Core/Algorithms/SphericalDetector.h           |  2 +-
 Core/Algorithms/ThreadInfo.h                  |  2 +-
 Core/FormFactors/FormFactorAnisoPyramid.cpp   |  2 +-
 Core/FormFactors/FormFactorAnisoPyramid.h     |  2 +-
 Core/FormFactors/FormFactorBox.cpp            |  2 +-
 Core/FormFactors/FormFactorBox.h              |  2 +-
 Core/FormFactors/FormFactorCone.cpp           |  2 +-
 Core/FormFactors/FormFactorCone.h             |  2 +-
 Core/FormFactors/FormFactorCone6.cpp          |  2 +-
 Core/FormFactors/FormFactorCone6.h            |  2 +-
 Core/FormFactors/FormFactorCrystal.cpp        |  2 +-
 Core/FormFactors/FormFactorCrystal.h          |  2 +-
 Core/FormFactors/FormFactorCuboctahedron.cpp  |  2 +-
 Core/FormFactors/FormFactorCuboctahedron.h    |  2 +-
 Core/FormFactors/FormFactorCylinder.cpp       |  2 +-
 Core/FormFactors/FormFactorCylinder.h         |  2 +-
 Core/FormFactors/FormFactorDWBA.cpp           |  2 +-
 Core/FormFactors/FormFactorDWBA.h             |  2 +-
 Core/FormFactors/FormFactorDWBAPol.cpp        |  2 +-
 Core/FormFactors/FormFactorDWBAPol.h          |  2 +-
 .../FormFactorDecoratorDebyeWaller.cpp        |  2 +-
 .../FormFactorDecoratorDebyeWaller.h          |  2 +-
 Core/FormFactors/FormFactorDecoratorFactor.h  |  2 +-
 .../FormFactorDecoratorMaterial.cpp           |  2 +-
 .../FormFactors/FormFactorDecoratorMaterial.h |  2 +-
 ...FormFactorDecoratorMultiPositionFactor.cpp |  2 +-
 .../FormFactorDecoratorMultiPositionFactor.h  |  2 +-
 .../FormFactorDecoratorPositionFactor.h       |  2 +-
 .../FormFactorDecoratorRotation.cpp           |  2 +-
 .../FormFactors/FormFactorDecoratorRotation.h |  2 +-
 Core/FormFactors/FormFactorDodecahedron.cpp   |  2 +-
 Core/FormFactors/FormFactorDodecahedron.h     |  2 +-
 .../FormFactorEllipsoidalCylinder.cpp         |  2 +-
 .../FormFactorEllipsoidalCylinder.h           |  2 +-
 Core/FormFactors/FormFactorFullSphere.cpp     |  2 +-
 Core/FormFactors/FormFactorFullSphere.h       |  2 +-
 Core/FormFactors/FormFactorFullSpheroid.cpp   |  2 +-
 Core/FormFactors/FormFactorFullSpheroid.h     |  2 +-
 Core/FormFactors/FormFactorGauss.cpp          |  2 +-
 Core/FormFactors/FormFactorGauss.h            |  2 +-
 Core/FormFactors/FormFactorHemiEllipsoid.cpp  |  2 +-
 Core/FormFactors/FormFactorHemiEllipsoid.h    |  2 +-
 Core/FormFactors/FormFactorIcosahedron.cpp    |  2 +-
 Core/FormFactors/FormFactorIcosahedron.h      |  2 +-
 Core/FormFactors/FormFactorLongBoxGauss.cpp   |  2 +-
 Core/FormFactors/FormFactorLongBoxGauss.h     |  2 +-
 Core/FormFactors/FormFactorLongBoxLorentz.cpp |  2 +-
 Core/FormFactors/FormFactorLongBoxLorentz.h   |  2 +-
 .../FormFactorLongRipple1Gauss.cpp            |  2 +-
 Core/FormFactors/FormFactorLongRipple1Gauss.h |  2 +-
 .../FormFactorLongRipple1Lorentz.cpp          |  2 +-
 .../FormFactorLongRipple1Lorentz.h            |  2 +-
 .../FormFactorLongRipple2Gauss.cpp            |  2 +-
 Core/FormFactors/FormFactorLongRipple2Gauss.h |  2 +-
 .../FormFactorLongRipple2Lorentz.cpp          |  2 +-
 .../FormFactorLongRipple2Lorentz.h            |  2 +-
 Core/FormFactors/FormFactorLorentz.cpp        |  2 +-
 Core/FormFactors/FormFactorLorentz.h          |  2 +-
 Core/FormFactors/FormFactorPolyhedron.cpp     |  2 +-
 Core/FormFactors/FormFactorPolyhedron.h       |  2 +-
 Core/FormFactors/FormFactorPrism3.cpp         |  2 +-
 Core/FormFactors/FormFactorPrism3.h           |  2 +-
 Core/FormFactors/FormFactorPrism6.cpp         |  2 +-
 Core/FormFactors/FormFactorPrism6.h           |  2 +-
 Core/FormFactors/FormFactorPyramid.cpp        |  2 +-
 Core/FormFactors/FormFactorPyramid.h          |  2 +-
 Core/FormFactors/FormFactorRipple1.cpp        |  2 +-
 Core/FormFactors/FormFactorRipple1.h          |  2 +-
 Core/FormFactors/FormFactorRipple2.cpp        |  2 +-
 Core/FormFactors/FormFactorRipple2.h          |  2 +-
 .../FormFactorSphereGaussianRadius.cpp        |  2 +-
 .../FormFactorSphereGaussianRadius.h          |  2 +-
 .../FormFactorSphereLogNormalRadius.cpp       |  2 +-
 .../FormFactorSphereLogNormalRadius.h         |  2 +-
 .../FormFactorSphereUniformRadius.cpp         |  2 +-
 .../FormFactorSphereUniformRadius.h           |  2 +-
 Core/FormFactors/FormFactorTetrahedron.cpp    |  2 +-
 Core/FormFactors/FormFactorTetrahedron.h      |  2 +-
 Core/FormFactors/FormFactorTools.cpp          |  2 +-
 Core/FormFactors/FormFactorTools.h            |  2 +-
 Core/FormFactors/FormFactorTriangle.cpp       |  2 +-
 Core/FormFactors/FormFactorTriangle.h         |  2 +-
 Core/FormFactors/FormFactorTrivial.cpp        |  2 +-
 Core/FormFactors/FormFactorTrivial.h          |  2 +-
 Core/FormFactors/FormFactorTruncatedCube.cpp  |  2 +-
 Core/FormFactors/FormFactorTruncatedCube.h    |  2 +-
 .../FormFactors/FormFactorTruncatedSphere.cpp |  2 +-
 Core/FormFactors/FormFactorTruncatedSphere.h  |  2 +-
 .../FormFactorTruncatedSpheroid.cpp           |  2 +-
 .../FormFactors/FormFactorTruncatedSpheroid.h |  2 +-
 Core/FormFactors/FormFactorWeighted.cpp       |  2 +-
 Core/FormFactors/FormFactorWeighted.h         |  2 +-
 Core/FormFactors/FormFactors.h                |  2 +-
 Core/FormFactors/IFormFactor.h                |  2 +-
 Core/FormFactors/IFormFactorBorn.cpp          |  2 +-
 Core/FormFactors/IFormFactorBorn.h            |  2 +-
 Core/FormFactors/IFormFactorDecorator.h       |  2 +-
 Core/FormFactors/ParticleShapes.h             |  2 +-
 Core/FormFactors/WavevectorInfo.h             |  2 +-
 Core/Geometry/BasicVector3D.cpp               |  2 +-
 Core/Geometry/BasicVector3D.h                 |  2 +-
 Core/Geometry/Ellipse.cpp                     |  2 +-
 Core/Geometry/Ellipse.h                       |  2 +-
 Core/Geometry/IShape2D.h                      |  2 +-
 Core/Geometry/InfinitePlane.cpp               |  2 +-
 Core/Geometry/InfinitePlane.h                 |  2 +-
 Core/Geometry/Line.cpp                        |  2 +-
 Core/Geometry/Line.h                          |  2 +-
 Core/Geometry/Polygon.cpp                     |  2 +-
 Core/Geometry/Polygon.h                       |  2 +-
 Core/Geometry/Rectangle.cpp                   |  2 +-
 Core/Geometry/Rectangle.h                     |  2 +-
 Core/Geometry/Transform3D.cpp                 |  2 +-
 Core/Geometry/Transform3D.h                   |  2 +-
 Core/Geometry/Vectors3D.h                     |  2 +-
 Core/InputOutput/IntensityDataIOFactory.cpp   |  2 +-
 Core/InputOutput/IntensityDataIOFactory.h     |  2 +-
 Core/InputOutput/OutputDataIOHelper.cpp       |  2 +-
 Core/InputOutput/OutputDataIOHelper.h         |  2 +-
 Core/InputOutput/OutputDataReadFactory.cpp    |  2 +-
 Core/InputOutput/OutputDataReadFactory.h      |  2 +-
 Core/InputOutput/OutputDataReadStrategy.cpp   |  2 +-
 Core/InputOutput/OutputDataReadStrategy.h     |  2 +-
 Core/InputOutput/OutputDataReader.cpp         |  2 +-
 Core/InputOutput/OutputDataReader.h           |  2 +-
 Core/InputOutput/OutputDataWriteFactory.cpp   |  2 +-
 Core/InputOutput/OutputDataWriteFactory.h     |  2 +-
 Core/InputOutput/OutputDataWriteStrategy.cpp  |  2 +-
 Core/InputOutput/OutputDataWriteStrategy.h    |  2 +-
 Core/InputOutput/OutputDataWriter.cpp         |  2 +-
 Core/InputOutput/OutputDataWriter.h           |  2 +-
 Core/InputOutput/TiffHandler.cpp              |  2 +-
 Core/InputOutput/TiffHandler.h                |  2 +-
 Core/InputOutput/boost_streams.h              |  2 +-
 Core/Samples/BAVersion.h                      |  2 +-
 Core/Samples/Crystal.cpp                      |  2 +-
 Core/Samples/Crystal.h                        |  2 +-
 Core/Samples/HomogeneousMagneticMaterial.cpp  |  2 +-
 Core/Samples/HomogeneousMagneticMaterial.h    |  2 +-
 Core/Samples/HomogeneousMaterial.h            |  2 +-
 Core/Samples/IClusteredParticles.h            |  2 +-
 Core/Samples/ICompositeSample.cpp             |  2 +-
 Core/Samples/ICompositeSample.h               |  2 +-
 Core/Samples/IInterferenceFunction.h          |  2 +-
 Core/Samples/ILayout.h                        |  2 +-
 Core/Samples/IMaterial.cpp                    |  2 +-
 Core/Samples/IMaterial.h                      |  2 +-
 Core/Samples/IParticle.cpp                    |  2 +-
 Core/Samples/IParticle.h                      |  2 +-
 Core/Samples/IRoughness.h                     |  2 +-
 Core/Samples/ISample.cpp                      |  2 +-
 Core/Samples/ISample.h                        |  2 +-
 Core/Samples/ISampleIteratorStrategy.cpp      |  2 +-
 Core/Samples/ISampleIteratorStrategy.h        |  2 +-
 Core/Samples/ISampleVisitor.cpp               |  2 +-
 Core/Samples/ISampleVisitor.h                 |  2 +-
 Core/Samples/ISelectionRule.h                 |  2 +-
 .../Samples/InterferenceFunction1DLattice.cpp |  2 +-
 Core/Samples/InterferenceFunction1DLattice.h  |  2 +-
 .../Samples/InterferenceFunction2DLattice.cpp |  2 +-
 Core/Samples/InterferenceFunction2DLattice.h  |  2 +-
 .../InterferenceFunction2DParaCrystal.cpp     |  2 +-
 .../InterferenceFunction2DParaCrystal.h       |  2 +-
 Core/Samples/InterferenceFunctionNone.cpp     |  2 +-
 Core/Samples/InterferenceFunctionNone.h       |  2 +-
 .../InterferenceFunctionRadialParaCrystal.cpp |  2 +-
 .../InterferenceFunctionRadialParaCrystal.h   |  2 +-
 Core/Samples/InterferenceFunctions.h          |  2 +-
 Core/Samples/Lattice.cpp                      |  2 +-
 Core/Samples/Lattice.h                        |  2 +-
 Core/Samples/Lattice1DParameters.h            |  2 +-
 Core/Samples/Lattice2DParameters.h            |  2 +-
 Core/Samples/Layer.cpp                        |  2 +-
 Core/Samples/Layer.h                          |  2 +-
 Core/Samples/LayerInterface.cpp               |  2 +-
 Core/Samples/LayerInterface.h                 |  2 +-
 Core/Samples/LayerRoughness.cpp               |  2 +-
 Core/Samples/LayerRoughness.h                 |  2 +-
 Core/Samples/Materials.cpp                    |  2 +-
 Core/Samples/Materials.h                      |  2 +-
 Core/Samples/MesoCrystal.cpp                  |  2 +-
 Core/Samples/MesoCrystal.h                    |  2 +-
 Core/Samples/MultiLayer.cpp                   |  2 +-
 Core/Samples/MultiLayer.h                     |  2 +-
 Core/Samples/Particle.cpp                     |  2 +-
 Core/Samples/Particle.h                       |  2 +-
 Core/Samples/ParticleComposition.cpp          |  2 +-
 Core/Samples/ParticleComposition.h            |  2 +-
 Core/Samples/ParticleCoreShell.cpp            |  2 +-
 Core/Samples/ParticleCoreShell.h              |  2 +-
 Core/Samples/ParticleDistribution.cpp         |  2 +-
 Core/Samples/ParticleDistribution.h           |  2 +-
 Core/Samples/ParticleLayout.cpp               |  2 +-
 Core/Samples/ParticleLayout.h                 |  2 +-
 Core/Samples/Rotations.cpp                    |  2 +-
 Core/Samples/Rotations.h                      |  2 +-
 Core/Samples/SampleTreeIterator.cpp           |  2 +-
 Core/Samples/SampleTreeIterator.h             |  2 +-
 Core/Samples/Samples.h                        |  2 +-
 .../StandardSamples/BoxCompositionBuilder.cpp |  2 +-
 Core/StandardSamples/BoxCompositionBuilder.h  |  2 +-
 .../CoreShellParticleBuilder.cpp              |  2 +-
 .../CoreShellParticleBuilder.h                |  2 +-
 .../CustomMorphologyBuilder.cpp               |  2 +-
 .../StandardSamples/CustomMorphologyBuilder.h |  2 +-
 .../CylindersAndPrismsBuilder.cpp             |  2 +-
 .../CylindersAndPrismsBuilder.h               |  2 +-
 Core/StandardSamples/CylindersBuilder.cpp     |  2 +-
 Core/StandardSamples/CylindersBuilder.h       |  2 +-
 Core/StandardSamples/LatticeBuilder.cpp       |  2 +-
 Core/StandardSamples/LatticeBuilder.h         |  2 +-
 .../LayersWithAbsorptionBuilder.cpp           |  2 +-
 .../LayersWithAbsorptionBuilder.h             |  2 +-
 .../MagneticParticlesBuilder.cpp              |  2 +-
 .../MagneticParticlesBuilder.h                |  2 +-
 Core/StandardSamples/MesoCrystalBuilder.cpp   |  2 +-
 Core/StandardSamples/MesoCrystalBuilder.h     |  2 +-
 .../MultiLayerWithRoughnessBuilder.cpp        |  2 +-
 .../MultiLayerWithRoughnessBuilder.h          |  2 +-
 .../StandardSamples/MultipleLayoutBuilder.cpp |  2 +-
 Core/StandardSamples/MultipleLayoutBuilder.h  |  2 +-
 Core/StandardSamples/ParaCrystalBuilder.cpp   |  2 +-
 Core/StandardSamples/ParaCrystalBuilder.h     |  2 +-
 .../ParticleCompositionBuilder.cpp            |  2 +-
 .../ParticleCompositionBuilder.h              |  2 +-
 .../ParticleDistributionsBuilder.cpp          |  2 +-
 .../ParticleDistributionsBuilder.h            |  2 +-
 .../ParticleInTheAirBuilder.cpp               |  2 +-
 .../StandardSamples/ParticleInTheAirBuilder.h |  2 +-
 Core/StandardSamples/RipplesBuilder.cpp       |  2 +-
 Core/StandardSamples/RipplesBuilder.h         |  2 +-
 .../RotatedPyramidsBuilder.cpp                |  2 +-
 Core/StandardSamples/RotatedPyramidsBuilder.h |  2 +-
 Core/StandardSamples/SampleBuilderFactory.cpp |  2 +-
 Core/StandardSamples/SampleBuilderFactory.h   |  2 +-
 Core/StandardSamples/SimulationFactory.cpp    |  2 +-
 Core/StandardSamples/SimulationFactory.h      |  2 +-
 .../SizeDistributionModelsBuilder.cpp         |  2 +-
 .../SizeDistributionModelsBuilder.h           |  2 +-
 Core/StandardSamples/StandardSimulations.cpp  |  2 +-
 Core/StandardSamples/StandardSimulations.h    |  2 +-
 .../TransformationsBuilder.cpp                |  2 +-
 Core/StandardSamples/TransformationsBuilder.h |  2 +-
 Core/StandardSamples/TwoDimLatticeBuilder.cpp |  2 +-
 Core/StandardSamples/TwoDimLatticeBuilder.h   |  2 +-
 Core/TestMachinery/CoreFutest.cpp             |  2 +-
 Core/TestMachinery/CoreFutest.h               |  2 +-
 Core/TestMachinery/FutestInfo.cpp             |  2 +-
 Core/TestMachinery/FutestInfo.h               |  2 +-
 Core/TestMachinery/FutestRegistry.cpp         |  2 +-
 Core/TestMachinery/FutestRegistry.h           |  2 +-
 Core/TestMachinery/FutestSuite.cpp            |  2 +-
 Core/TestMachinery/FutestSuite.h              |  2 +-
 Core/TestMachinery/IFutest.cpp                |  2 +-
 Core/TestMachinery/IFutest.h                  |  2 +-
 Core/TestMachinery/IRegistry.h                |  2 +-
 Core/TestMachinery/PyScriptFutest.cpp         |  2 +-
 Core/TestMachinery/PyScriptFutest.h           |  2 +-
 Core/TestMachinery/SubtestRegistry.cpp        |  2 +-
 Core/TestMachinery/SubtestRegistry.h          |  2 +-
 Core/Tools/AttLimits.cpp                      |  2 +-
 Core/Tools/AttLimits.h                        |  2 +-
 Core/Tools/Bin.h                              |  2 +-
 Core/Tools/BornAgainNamespace.h               |  2 +-
 Core/Tools/Complex.h                          |  2 +-
 Core/Tools/ConstKBinAxis.cpp                  |  2 +-
 Core/Tools/ConstKBinAxis.h                    |  2 +-
 Core/Tools/Convolve.cpp                       |  2 +-
 Core/Tools/Convolve.h                         |  2 +-
 Core/Tools/CumulativeValue.h                  |  2 +-
 Core/Tools/CustomBinAxis.cpp                  |  2 +-
 Core/Tools/CustomBinAxis.h                    |  2 +-
 Core/Tools/EigenCore.h                        |  2 +-
 Core/Tools/Exceptions.cpp                     |  2 +-
 Core/Tools/Exceptions.h                       |  2 +-
 Core/Tools/FastVector.h                       |  2 +-
 Core/Tools/FileSystem.cpp                     |  2 +-
 Core/Tools/FileSystem.h                       |  2 +-
 Core/Tools/FixedBinAxis.cpp                   |  2 +-
 Core/Tools/FixedBinAxis.h                     |  2 +-
 Core/Tools/Histogram1D.cpp                    |  2 +-
 Core/Tools/Histogram1D.h                      |  2 +-
 Core/Tools/Histogram2D.cpp                    |  2 +-
 Core/Tools/Histogram2D.h                      |  2 +-
 Core/Tools/IAxis.h                            |  2 +-
 Core/Tools/ICloneable.h                       |  2 +-
 Core/Tools/IFactory.h                         |  2 +-
 Core/Tools/IHistogram.cpp                     |  2 +-
 Core/Tools/IHistogram.h                       |  2 +-
 Core/Tools/INamed.h                           |  2 +-
 Core/Tools/IObserver.cpp                      |  2 +-
 Core/Tools/IObserver.h                        |  2 +-
 Core/Tools/IParameterized.cpp                 |  2 +-
 Core/Tools/IParameterized.h                   |  2 +-
 Core/Tools/IShareable.h                       |  2 +-
 Core/Tools/ISingleton.h                       |  2 +-
 Core/Tools/IntegratorComplex.h                |  2 +-
 Core/Tools/IntegratorMCMiser.h                |  2 +-
 Core/Tools/IntegratorReal.h                   |  2 +-
 Core/Tools/IntensityDataFunctions.cpp         |  2 +-
 Core/Tools/IntensityDataFunctions.h           |  2 +-
 Core/Tools/LLData.cpp                         |  2 +-
 Core/Tools/LLData.h                           |  2 +-
 Core/Tools/Macros.h                           |  2 +-
 Core/Tools/MathFunctions.cpp                  |  2 +-
 Core/Tools/MathFunctions.h                    |  2 +-
 Core/Tools/MessageService.cpp                 |  2 +-
 Core/Tools/MessageService.h                   |  2 +-
 Core/Tools/Numeric.cpp                        |  2 +-
 Core/Tools/Numeric.h                          |  2 +-
 Core/Tools/NumpyUtils.cpp                     |  2 +-
 Core/Tools/NumpyUtils.h                       |  2 +-
 Core/Tools/OutputData.cpp                     |  2 +-
 Core/Tools/OutputData.h                       |  2 +-
 Core/Tools/OutputDataFunctions.cpp            |  2 +-
 Core/Tools/OutputDataFunctions.h              |  2 +-
 Core/Tools/OutputDataIterator.h               |  2 +-
 Core/Tools/ParameterDistribution.cpp          |  2 +-
 Core/Tools/ParameterDistribution.h            |  2 +-
 Core/Tools/ParameterPool.cpp                  |  2 +-
 Core/Tools/ParameterPool.h                    |  2 +-
 Core/Tools/Precomputed.cpp                    |  2 +-
 Core/Tools/Precomputed.h                      |  2 +-
 Core/Tools/PyGenTools.cpp                     |  2 +-
 Core/Tools/PyGenTools.h                       |  2 +-
 Core/Tools/PyGenVisitor.cpp                   |  2 +-
 Core/Tools/PyGenVisitor.h                     |  2 +-
 Core/Tools/RealParameterWrapper.cpp           |  2 +-
 Core/Tools/RealParameterWrapper.h             |  2 +-
 Core/Tools/SafePointerVector.h                |  2 +-
 Core/Tools/SampleLabelHandler.cpp             |  2 +-
 Core/Tools/SampleLabelHandler.h               |  2 +-
 Core/Tools/SampleMaterialVisitor.cpp          |  2 +-
 Core/Tools/SampleMaterialVisitor.h            |  2 +-
 Core/Tools/SamplePrintVisitor.cpp             |  2 +-
 Core/Tools/SamplePrintVisitor.h               |  2 +-
 Core/Tools/TRange.h                           |  2 +-
 Core/Tools/Units.h                            |  2 +-
 Core/Tools/Utils.cpp                          |  2 +-
 Core/Tools/Utils.h                            |  2 +-
 Core/Tools/VDouble.h                          |  2 +-
 Core/Tools/VariableBinAxis.cpp                |  2 +-
 Core/Tools/VariableBinAxis.h                  |  2 +-
 Core/Tools/WinDllMacros.h                     |  2 +-
 Core/Tools/fp_exception_glibc_extension.h     |  2 +-
 Core/Tools/w32pragma.h                        |  2 +-
 Fit/FitKernel/FitKernel.cpp                   |  2 +-
 Fit/FitKernel/FitKernel.h                     |  2 +-
 Fit/FitKernel/FitObject.cpp                   |  2 +-
 Fit/FitKernel/FitObject.h                     |  2 +-
 Fit/FitKernel/FitOptions.h                    |  2 +-
 Fit/FitKernel/FitParameter.cpp                |  2 +-
 Fit/FitKernel/FitParameter.h                  |  2 +-
 Fit/FitKernel/FitParameterLinked.cpp          |  2 +-
 Fit/FitKernel/FitParameterLinked.h            |  2 +-
 Fit/FitKernel/FitStrategyAdjustMinimizer.cpp  |  2 +-
 Fit/FitKernel/FitStrategyAdjustMinimizer.h    |  2 +-
 Fit/FitKernel/FitStrategyAdjustParameters.cpp |  2 +-
 Fit/FitKernel/FitStrategyAdjustParameters.h   |  2 +-
 Fit/FitKernel/FitSuite.cpp                    |  2 +-
 Fit/FitKernel/FitSuite.h                      |  2 +-
 Fit/FitKernel/FitSuiteFunctions.cpp           |  2 +-
 Fit/FitKernel/FitSuiteFunctions.h             |  2 +-
 Fit/FitKernel/FitSuiteObjects.cpp             |  2 +-
 Fit/FitKernel/FitSuiteObjects.h               |  2 +-
 Fit/FitKernel/FitSuiteParameters.cpp          |  2 +-
 Fit/FitKernel/FitSuiteParameters.h            |  2 +-
 Fit/FitKernel/FitSuitePrintObserver.cpp       |  2 +-
 Fit/FitKernel/FitSuitePrintObserver.h         |  2 +-
 Fit/FitKernel/FitSuiteStrategies.cpp          |  2 +-
 Fit/FitKernel/FitSuiteStrategies.h            |  2 +-
 Fit/FitKernel/IFitObserver.cpp                |  2 +-
 Fit/FitKernel/IFitObserver.h                  |  2 +-
 Fit/FitKernel/IFitStrategy.cpp                |  2 +-
 Fit/FitKernel/IFitStrategy.h                  |  2 +-
 Fit/FitKernel/IMinimizer.h                    |  2 +-
 Fit/FitKernel/MinimizerFactory.cpp            |  2 +-
 Fit/FitKernel/MinimizerFactory.h              |  2 +-
 Fit/FitKernel/MinimizerOptions.cpp            |  2 +-
 Fit/FitKernel/MinimizerOptions.h              |  2 +-
 Fit/FitKernel/MinimizerScan.cpp               |  2 +-
 Fit/FitKernel/MinimizerScan.h                 |  2 +-
 Fit/FitKernel/MinimizerTest.cpp               |  2 +-
 Fit/FitKernel/MinimizerTest.h                 |  2 +-
 Fit/FitKernel/ROOTGeneticMinimizer.cpp        |  2 +-
 Fit/FitKernel/ROOTGeneticMinimizer.h          |  2 +-
 Fit/FitKernel/ROOTLMAMinimizer.cpp            |  2 +-
 Fit/FitKernel/ROOTLMAMinimizer.h              |  2 +-
 Fit/FitKernel/ROOTMinimizer.cpp               |  2 +-
 Fit/FitKernel/ROOTMinimizer.h                 |  2 +-
 Fit/FitKernel/ROOTMinimizerFunction.h         |  2 +-
 Fit/FitKernel/ROOTMinimizerHelper.cpp         |  2 +-
 Fit/FitKernel/ROOTMinimizerHelper.h           |  2 +-
 Fit/FitKernel/ROOTMinuit2Minimizer.cpp        |  2 +-
 Fit/FitKernel/ROOTMinuit2Minimizer.h          |  2 +-
 Fit/FitKernel/ROOTMultiMinMinimizer.cpp       |  2 +-
 Fit/FitKernel/ROOTMultiMinMinimizer.h         |  2 +-
 Fit/FitKernel/ROOTSimAnMinimizer.cpp          |  2 +-
 Fit/FitKernel/ROOTSimAnMinimizer.h            |  2 +-
 Fit/StandardFits/IMinimizerFutest.cpp         |  2 +-
 Fit/StandardFits/IMinimizerFutest.h           |  2 +-
 Fit/StandardFits/MinimizerFutests.cpp         |  2 +-
 Fit/StandardFits/MinimizerFutests.h           |  2 +-
 Fit/StandardFits/RectDetectorFitTest.cpp      |  2 +-
 Fit/StandardFits/RectDetectorFitTest.h        |  2 +-
 GUI/coregui/Models/AngleProperty.cpp          |  2 +-
 GUI/coregui/Models/AngleProperty.h            |  2 +-
 GUI/coregui/Models/ApplicationModels.cpp      |  2 +-
 GUI/coregui/Models/ApplicationModels.h        |  2 +-
 GUI/coregui/Models/AxesItems.cpp              |  2 +-
 GUI/coregui/Models/AxesItems.h                |  2 +-
 GUI/coregui/Models/BeamAngleItems.cpp         |  2 +-
 GUI/coregui/Models/BeamAngleItems.h           |  2 +-
 GUI/coregui/Models/BeamDistributionItem.cpp   |  2 +-
 GUI/coregui/Models/BeamDistributionItem.h     |  2 +-
 GUI/coregui/Models/BeamItem.cpp               |  2 +-
 GUI/coregui/Models/BeamItem.h                 |  2 +-
 GUI/coregui/Models/BeamWavelengthItem.cpp     |  2 +-
 GUI/coregui/Models/BeamWavelengthItem.h       |  2 +-
 GUI/coregui/Models/ColorProperty.h            |  2 +-
 GUI/coregui/Models/ComboProperty.cpp          |  2 +-
 GUI/coregui/Models/ComboProperty.h            |  2 +-
 GUI/coregui/Models/DetectorItems.cpp          |  2 +-
 GUI/coregui/Models/DetectorItems.h            |  2 +-
 GUI/coregui/Models/DistributionItem.cpp       |  2 +-
 GUI/coregui/Models/DistributionItem.h         |  2 +-
 GUI/coregui/Models/DocumentModel.cpp          |  2 +-
 GUI/coregui/Models/DocumentModel.h            |  2 +-
 GUI/coregui/Models/DomainFittingBuilder.cpp   |  2 +-
 GUI/coregui/Models/DomainFittingBuilder.h     |  2 +-
 GUI/coregui/Models/DomainObjectBuilder.cpp    |  2 +-
 GUI/coregui/Models/DomainObjectBuilder.h      |  2 +-
 .../Models/DomainSimulationBuilder.cpp        |  2 +-
 GUI/coregui/Models/DomainSimulationBuilder.h  |  2 +-
 GUI/coregui/Models/FTDecayFunctionItems.cpp   |  2 +-
 GUI/coregui/Models/FTDecayFunctionItems.h     |  2 +-
 GUI/coregui/Models/FTDistributionItems.cpp    |  2 +-
 GUI/coregui/Models/FTDistributionItems.h      |  2 +-
 GUI/coregui/Models/FilterPropertyProxy.cpp    |  2 +-
 GUI/coregui/Models/FilterPropertyProxy.h      |  2 +-
 GUI/coregui/Models/FitModelHelper.cpp         |  2 +-
 GUI/coregui/Models/FitModelHelper.h           |  2 +-
 GUI/coregui/Models/FitParameterAbsModel.cpp   |  2 +-
 GUI/coregui/Models/FitParameterAbsModel.h     |  2 +-
 GUI/coregui/Models/FitParameterItems.cpp      |  2 +-
 GUI/coregui/Models/FitParameterItems.h        |  2 +-
 GUI/coregui/Models/FitSuiteItem.cpp           |  2 +-
 GUI/coregui/Models/FitSuiteItem.h             |  2 +-
 GUI/coregui/Models/FormFactorItems.cpp        |  2 +-
 GUI/coregui/Models/FormFactorItems.h          |  2 +-
 GUI/coregui/Models/GUIExamplesFactory.cpp     |  2 +-
 GUI/coregui/Models/GUIExamplesFactory.h       |  2 +-
 GUI/coregui/Models/GUIObjectBuilder.cpp       |  2 +-
 GUI/coregui/Models/GUIObjectBuilder.h         |  2 +-
 GUI/coregui/Models/GroupItem.cpp              |  2 +-
 GUI/coregui/Models/GroupItem.h                |  2 +-
 GUI/coregui/Models/GroupProperty.cpp          |  2 +-
 GUI/coregui/Models/GroupProperty.h            |  2 +-
 GUI/coregui/Models/GroupPropertyRegistry.cpp  |  2 +-
 GUI/coregui/Models/GroupPropertyRegistry.h    |  2 +-
 GUI/coregui/Models/IconProvider.cpp           |  2 +-
 GUI/coregui/Models/IconProvider.h             |  2 +-
 GUI/coregui/Models/InstrumentItem.cpp         |  2 +-
 GUI/coregui/Models/InstrumentItem.h           |  2 +-
 GUI/coregui/Models/InstrumentModel.cpp        |  2 +-
 GUI/coregui/Models/InstrumentModel.h          |  2 +-
 GUI/coregui/Models/IntensityDataItem.cpp      |  2 +-
 GUI/coregui/Models/IntensityDataItem.h        |  2 +-
 .../Models/InterferenceFunctionItems.cpp      |  2 +-
 .../Models/InterferenceFunctionItems.h        |  2 +-
 GUI/coregui/Models/ItemFactory.cpp            |  2 +-
 GUI/coregui/Models/ItemFactory.h              |  2 +-
 GUI/coregui/Models/JobItem.cpp                |  2 +-
 GUI/coregui/Models/JobItem.h                  |  2 +-
 GUI/coregui/Models/JobModel.cpp               |  2 +-
 GUI/coregui/Models/JobModel.h                 |  2 +-
 GUI/coregui/Models/JobQueueData.cpp           |  2 +-
 GUI/coregui/Models/JobQueueData.h             |  2 +-
 GUI/coregui/Models/JobResultsPresenter.cpp    |  2 +-
 GUI/coregui/Models/JobResultsPresenter.h      |  2 +-
 GUI/coregui/Models/JobRunner.cpp              |  2 +-
 GUI/coregui/Models/JobRunner.h                |  2 +-
 GUI/coregui/Models/LatticeTypeItems.cpp       |  2 +-
 GUI/coregui/Models/LatticeTypeItems.h         |  2 +-
 GUI/coregui/Models/LayerItem.cpp              |  2 +-
 GUI/coregui/Models/LayerItem.h                |  2 +-
 GUI/coregui/Models/LayerRoughnessItems.cpp    |  2 +-
 GUI/coregui/Models/LayerRoughnessItems.h      |  2 +-
 GUI/coregui/Models/MagneticFieldItem.cpp      |  2 +-
 GUI/coregui/Models/MagneticFieldItem.h        |  2 +-
 GUI/coregui/Models/MaskItems.cpp              |  2 +-
 GUI/coregui/Models/MaskItems.h                |  2 +-
 GUI/coregui/Models/MaskModel.cpp              |  2 +-
 GUI/coregui/Models/MaskModel.h                |  2 +-
 GUI/coregui/Models/MaterialItem.cpp           |  2 +-
 GUI/coregui/Models/MaterialItem.h             |  2 +-
 GUI/coregui/Models/MaterialModel.cpp          |  2 +-
 GUI/coregui/Models/MaterialModel.h            |  2 +-
 GUI/coregui/Models/ModelMapper.cpp            |  2 +-
 GUI/coregui/Models/ModelMapper.h              |  2 +-
 GUI/coregui/Models/ModelPath.cpp              |  2 +-
 GUI/coregui/Models/ModelPath.h                |  2 +-
 GUI/coregui/Models/MultiLayerItem.cpp         |  2 +-
 GUI/coregui/Models/MultiLayerItem.h           |  2 +-
 GUI/coregui/Models/ObsoleteFitModel.cpp       |  2 +-
 GUI/coregui/Models/ObsoleteFitModel.h         |  2 +-
 .../Models/ObsoleteFitParameterItems.cpp      |  2 +-
 .../Models/ObsoleteFitParameterItems.h        |  2 +-
 .../Models/ObsoleteFitParameterModel.cpp      |  2 +-
 .../Models/ObsoleteFitParameterModel.h        |  2 +-
 .../Models/ObsoleteFitSelectorModel.cpp       |  2 +-
 GUI/coregui/Models/ObsoleteFitSelectorModel.h |  2 +-
 GUI/coregui/Models/ParameterModelBuilder.cpp  |  2 +-
 GUI/coregui/Models/ParameterModelBuilder.h    |  2 +-
 GUI/coregui/Models/ParameterTranslators.cpp   |  2 +-
 GUI/coregui/Models/ParameterTranslators.h     |  2 +-
 GUI/coregui/Models/ParameterTreeItems.cpp     |  2 +-
 GUI/coregui/Models/ParameterTreeItems.h       |  2 +-
 GUI/coregui/Models/ParameterTuningModel.cpp   |  2 +-
 GUI/coregui/Models/ParameterTuningModel.h     |  2 +-
 .../Models/ParticleCompositionItem.cpp        |  2 +-
 GUI/coregui/Models/ParticleCompositionItem.h  |  2 +-
 GUI/coregui/Models/ParticleCoreShellItem.cpp  |  2 +-
 GUI/coregui/Models/ParticleCoreShellItem.h    |  2 +-
 .../Models/ParticleDistributionItem.cpp       |  2 +-
 GUI/coregui/Models/ParticleDistributionItem.h |  2 +-
 GUI/coregui/Models/ParticleItem.cpp           |  2 +-
 GUI/coregui/Models/ParticleItem.h             |  2 +-
 GUI/coregui/Models/ParticleLayoutItem.cpp     |  2 +-
 GUI/coregui/Models/ParticleLayoutItem.h       |  2 +-
 GUI/coregui/Models/PropertyAttribute.cpp      |  2 +-
 GUI/coregui/Models/PropertyAttribute.h        |  2 +-
 GUI/coregui/Models/PropertyItem.cpp           |  2 +-
 GUI/coregui/Models/PropertyItem.h             |  2 +-
 GUI/coregui/Models/RealDataItem.cpp           |  2 +-
 GUI/coregui/Models/RealDataItem.h             |  2 +-
 GUI/coregui/Models/RealDataModel.cpp          |  2 +-
 GUI/coregui/Models/RealDataModel.h            |  2 +-
 .../Models/RectangularDetectorItem.cpp        |  2 +-
 GUI/coregui/Models/RectangularDetectorItem.h  |  2 +-
 GUI/coregui/Models/RefractiveIndexItem.cpp    |  2 +-
 GUI/coregui/Models/RefractiveIndexItem.h      |  2 +-
 .../Models/ResolutionFunctionItems.cpp        |  2 +-
 GUI/coregui/Models/ResolutionFunctionItems.h  |  2 +-
 GUI/coregui/Models/RotationItems.cpp          |  2 +-
 GUI/coregui/Models/RotationItems.h            |  2 +-
 GUI/coregui/Models/SampleModel.cpp            |  2 +-
 GUI/coregui/Models/SampleModel.h              |  2 +-
 GUI/coregui/Models/SampleValidator.cpp        |  2 +-
 GUI/coregui/Models/SampleValidator.h          |  2 +-
 GUI/coregui/Models/ScientificDoubleProperty.h |  2 +-
 GUI/coregui/Models/SessionGraphicsItem.cpp    |  2 +-
 GUI/coregui/Models/SessionGraphicsItem.h      |  2 +-
 GUI/coregui/Models/SessionItem.cpp            |  2 +-
 GUI/coregui/Models/SessionItem.h              |  2 +-
 GUI/coregui/Models/SessionModel.cpp           |  2 +-
 GUI/coregui/Models/SessionModel.h             |  2 +-
 GUI/coregui/Models/SessionModelAssistant.cpp  |  2 +-
 GUI/coregui/Models/SessionModelAssistant.h    |  2 +-
 GUI/coregui/Models/SessionModelDelegate.cpp   |  2 +-
 GUI/coregui/Models/SessionModelDelegate.h     |  2 +-
 GUI/coregui/Models/SessionXML.cpp             |  2 +-
 GUI/coregui/Models/SessionXML.h               |  2 +-
 GUI/coregui/Models/SimulationOptionsItem.cpp  |  2 +-
 GUI/coregui/Models/SimulationOptionsItem.h    |  2 +-
 GUI/coregui/Models/SphericalDetectorItem.cpp  |  2 +-
 GUI/coregui/Models/SphericalDetectorItem.h    |  2 +-
 GUI/coregui/Models/TestItem.cpp               |  2 +-
 GUI/coregui/Models/TestItem.h                 |  2 +-
 GUI/coregui/Models/TransformFromDomain.cpp    |  2 +-
 GUI/coregui/Models/TransformFromDomain.h      |  2 +-
 GUI/coregui/Models/TransformToDomain.cpp      |  2 +-
 GUI/coregui/Models/TransformToDomain.h        |  2 +-
 GUI/coregui/Models/TransformationItem.cpp     |  2 +-
 GUI/coregui/Models/TransformationItem.h       |  2 +-
 GUI/coregui/Models/VectorItem.cpp             |  2 +-
 GUI/coregui/Models/VectorItem.h               |  2 +-
 GUI/coregui/Models/item_constants.h           |  2 +-
 .../Views/AccordionWidget/AccordionWidget.cpp |  2 +-
 .../Views/AccordionWidget/AccordionWidget.h   |  2 +-
 .../Views/AccordionWidget/ClickableFrame.cpp  |  2 +-
 .../Views/AccordionWidget/ClickableFrame.h    |  2 +-
 .../Views/AccordionWidget/ContentPane.cpp     |  2 +-
 .../Views/AccordionWidget/ContentPane.h       |  2 +-
 .../CommonWidgets/ItemSelectorWidget.cpp      |  2 +-
 .../Views/CommonWidgets/ItemSelectorWidget.h  |  2 +-
 .../Views/CommonWidgets/ItemStackPresenter.h  |  2 +-
 .../Views/CommonWidgets/ItemStackWidget.cpp   |  2 +-
 .../Views/CommonWidgets/ItemStackWidget.h     |  2 +-
 .../Views/FitWidgets/FitActivityPanel.cpp     |  2 +-
 .../Views/FitWidgets/FitActivityPanel.h       |  2 +-
 .../Views/FitWidgets/FitParameterWidget.cpp   |  2 +-
 .../Views/FitWidgets/FitParameterWidget.h     |  2 +-
 .../Views/FitWidgets/FitResultsWidget.cpp     |  2 +-
 .../Views/FitWidgets/FitResultsWidget.h       |  2 +-
 .../Views/FitWidgets/FitSuiteWidget.cpp       |  2 +-
 GUI/coregui/Views/FitWidgets/FitSuiteWidget.h |  2 +-
 .../Views/FitWidgets/FittingWorker.cpp        |  2 +-
 GUI/coregui/Views/FitWidgets/FittingWorker.h  |  2 +-
 .../Views/FitWidgets/GUIFitObserver.cpp       |  2 +-
 GUI/coregui/Views/FitWidgets/GUIFitObserver.h |  2 +-
 .../FitWidgets/MinimizerSettingsWidget.cpp    |  2 +-
 .../FitWidgets/MinimizerSettingsWidget.h      |  2 +-
 .../FitWidgets/ObsoleteFitParameterWidget.cpp |  2 +-
 .../FitWidgets/ObsoleteFitParameterWidget.h   |  2 +-
 .../FitWidgets/ObsoleteFitProgressWidget.cpp  |  2 +-
 .../FitWidgets/ObsoleteFitProgressWidget.h    |  2 +-
 .../FitWidgets/ObsoleteFitSettingsWidget.cpp  |  2 +-
 .../FitWidgets/ObsoleteFitSettingsWidget.h    |  2 +-
 .../Views/FitWidgets/ObsoleteFitTools.cpp     |  2 +-
 .../Views/FitWidgets/ObsoleteFitTools.h       |  2 +-
 .../FitWidgets/ObsoleteImportDataWidget.cpp   |  2 +-
 .../FitWidgets/ObsoleteImportDataWidget.h     |  2 +-
 .../ObsoleteMinimizerSettingsWidget.cpp       |  2 +-
 .../ObsoleteMinimizerSettingsWidget.h         |  2 +-
 .../FitWidgets/ObsoleteRealDataWindow.cpp     |  2 +-
 .../Views/FitWidgets/ObsoleteRealDataWindow.h |  2 +-
 .../Views/FitWidgets/ObsoleteRunFitWidget.cpp |  2 +-
 .../Views/FitWidgets/ObsoleteRunFitWidget.h   |  2 +-
 .../Views/FitWidgets/RunFitControlWidget.cpp  |  2 +-
 .../Views/FitWidgets/RunFitControlWidget.h    |  2 +-
 .../Views/FitWidgets/RunFitManager.cpp        |  2 +-
 GUI/coregui/Views/FitWidgets/RunFitManager.h  |  2 +-
 .../Views/FitWidgets/TestFitWidgets.cpp       |  2 +-
 GUI/coregui/Views/FitWidgets/TestFitWidgets.h |  2 +-
 GUI/coregui/Views/ImportDataView.cpp          |  2 +-
 GUI/coregui/Views/ImportDataView.h            |  2 +-
 .../ImportDataWidgets/ImportDataAssistant.cpp |  2 +-
 .../ImportDataWidgets/ImportDataAssistant.h   |  2 +-
 .../ImportDataWidgets/ImportDataToolBar.cpp   |  2 +-
 .../ImportDataWidgets/ImportDataToolBar.h     |  2 +-
 .../RealDataEditorWidget.cpp                  |  2 +-
 .../ImportDataWidgets/RealDataEditorWidget.h  |  2 +-
 .../RealDataSelectorWidget.cpp                |  2 +-
 .../RealDataSelectorWidget.h                  |  2 +-
 .../Views/InfoWidgets/DistributionDialog.cpp  |  2 +-
 .../Views/InfoWidgets/DistributionDialog.h    |  2 +-
 .../Views/InfoWidgets/DistributionEditor.cpp  |  2 +-
 .../Views/InfoWidgets/DistributionEditor.h    |  2 +-
 .../Views/InfoWidgets/DistributionWidget.cpp  |  2 +-
 .../Views/InfoWidgets/DistributionWidget.h    |  2 +-
 .../Views/InfoWidgets/GroupInfoBox.cpp        |  2 +-
 GUI/coregui/Views/InfoWidgets/GroupInfoBox.h  |  2 +-
 GUI/coregui/Views/InfoWidgets/InfoToolBar.cpp |  2 +-
 GUI/coregui/Views/InfoWidgets/InfoToolBar.h   |  2 +-
 GUI/coregui/Views/InfoWidgets/InfoWidget.cpp  |  2 +-
 GUI/coregui/Views/InfoWidgets/InfoWidget.h    |  2 +-
 .../InfoWidgets/OverlayLabelController.cpp    |  2 +-
 .../InfoWidgets/OverlayLabelController.h      |  2 +-
 .../Views/InfoWidgets/OverlayLabelWidget.cpp  |  2 +-
 .../Views/InfoWidgets/OverlayLabelWidget.h    |  2 +-
 .../InfoWidgets/ProjectLoadWarningDialog.cpp  |  2 +-
 .../InfoWidgets/ProjectLoadWarningDialog.h    |  2 +-
 .../Views/InfoWidgets/PySampleWidget.cpp      |  2 +-
 .../Views/InfoWidgets/PySampleWidget.h        |  2 +-
 .../InfoWidgets/PythonSyntaxHighlighter.cpp   |  2 +-
 .../InfoWidgets/PythonSyntaxHighlighter.h     |  2 +-
 .../Views/InfoWidgets/WarningSignWidget.cpp   |  2 +-
 .../Views/InfoWidgets/WarningSignWidget.h     |  2 +-
 GUI/coregui/Views/InstrumentView.cpp          |  2 +-
 GUI/coregui/Views/InstrumentView.h            |  2 +-
 .../InstrumentWidgets/BeamEditorWidget.cpp    |  2 +-
 .../InstrumentWidgets/BeamEditorWidget.h      |  2 +-
 .../Views/InstrumentWidgets/ComboWidget.cpp   |  2 +-
 .../Views/InstrumentWidgets/ComboWidget.h     |  2 +-
 .../InstrumentWidgets/ComponentInfoBox.cpp    |  2 +-
 .../InstrumentWidgets/ComponentInfoBox.h      |  2 +-
 .../DetectorEditorWidget.cpp                  |  2 +-
 .../InstrumentWidgets/DetectorEditorWidget.h  |  2 +-
 .../DetectorMaskDelegate.cpp                  |  2 +-
 .../InstrumentWidgets/DetectorMaskDelegate.h  |  2 +-
 .../ExtendedDetectorDialog.cpp                |  2 +-
 .../ExtendedDetectorDialog.h                  |  2 +-
 .../InstrumentComponentsWidget.cpp            |  2 +-
 .../InstrumentComponentsWidget.h              |  2 +-
 .../InstrumentEditorWidget.cpp                |  2 +-
 .../InstrumentEditorWidget.h                  |  2 +-
 .../InstrumentSelectorWidget.cpp              |  2 +-
 .../InstrumentSelectorWidget.h                |  2 +-
 .../RectangularDetectorWidget.cpp             |  2 +-
 .../RectangularDetectorWidget.h               |  2 +-
 .../SphericalDetectorWidget.cpp               |  2 +-
 .../SphericalDetectorWidget.h                 |  2 +-
 .../Views/InstrumentWidgets/columnresizer.cpp |  2 +-
 .../Views/InstrumentWidgets/columnresizer.h   |  2 +-
 .../IntensityDataWidgets/ColorMapPlot.cpp     |  2 +-
 .../Views/IntensityDataWidgets/ColorMapPlot.h |  2 +-
 .../HorizontalSlicePlot.cpp                   |  2 +-
 .../HorizontalSlicePlot.h                     |  2 +-
 .../IntensityDataPlotWidget.cpp               |  2 +-
 .../IntensityDataPlotWidget.h                 |  2 +-
 .../IntensityDataPropertyWidget.cpp           |  2 +-
 .../IntensityDataPropertyWidget.h             |  2 +-
 .../IntensityDataWidget.cpp                   |  2 +-
 .../IntensityDataWidget.h                     |  2 +-
 .../SavePlotAssistant.cpp                     |  2 +-
 .../IntensityDataWidgets/SavePlotAssistant.h  |  2 +-
 .../VerticalSlicePlot.cpp                     |  2 +-
 .../IntensityDataWidgets/VerticalSlicePlot.h  |  2 +-
 GUI/coregui/Views/JobView.cpp                 |  2 +-
 GUI/coregui/Views/JobView.h                   |  2 +-
 .../Views/JobWidgets/JobActivityStatusBar.cpp |  2 +-
 .../Views/JobWidgets/JobActivityStatusBar.h   |  2 +-
 .../Views/JobWidgets/JobListViewDelegate.cpp  |  2 +-
 .../Views/JobWidgets/JobListViewDelegate.h    |  2 +-
 .../Views/JobWidgets/JobListWidget.cpp        |  2 +-
 GUI/coregui/Views/JobWidgets/JobListWidget.h  |  2 +-
 .../Views/JobWidgets/JobMessagePanel.cpp      |  2 +-
 .../Views/JobWidgets/JobMessagePanel.h        |  2 +-
 .../Views/JobWidgets/JobOutputDataToolBar.cpp |  2 +-
 .../Views/JobWidgets/JobOutputDataToolBar.h   |  2 +-
 .../Views/JobWidgets/JobOutputDataWidget.cpp  |  2 +-
 .../Views/JobWidgets/JobOutputDataWidget.h    |  2 +-
 .../Views/JobWidgets/JobProgressAssistant.cpp |  2 +-
 .../Views/JobWidgets/JobProgressAssistant.h   |  2 +-
 .../Views/JobWidgets/JobPropertiesWidget.cpp  |  2 +-
 .../Views/JobWidgets/JobPropertiesWidget.h    |  2 +-
 .../Views/JobWidgets/JobRealTimeToolBar.cpp   |  2 +-
 .../Views/JobWidgets/JobRealTimeToolBar.h     |  2 +-
 .../Views/JobWidgets/JobRealTimeWidget.cpp    |  2 +-
 .../Views/JobWidgets/JobRealTimeWidget.h      |  2 +-
 .../Views/JobWidgets/JobSelectorActions.cpp   |  2 +-
 .../Views/JobWidgets/JobSelectorActions.h     |  2 +-
 .../Views/JobWidgets/JobSelectorWidget.cpp    |  2 +-
 .../Views/JobWidgets/JobSelectorWidget.h      |  2 +-
 .../Views/JobWidgets/JobViewActivities.cpp    |  2 +-
 .../Views/JobWidgets/JobViewActivities.h      |  2 +-
 GUI/coregui/Views/JobWidgets/JobViewDocks.cpp |  2 +-
 GUI/coregui/Views/JobWidgets/JobViewDocks.h   |  2 +-
 GUI/coregui/Views/JobWidgets/JobViewFlags.h   |  2 +-
 .../JobWidgets/ParameterTuningDelegate.cpp    |  2 +-
 .../JobWidgets/ParameterTuningDelegate.h      |  2 +-
 .../JobWidgets/ParameterTuningWidget.cpp      |  2 +-
 .../Views/JobWidgets/ParameterTuningWidget.h  |  2 +-
 .../Views/JobWidgets/SliderSettingsWidget.cpp |  2 +-
 .../Views/JobWidgets/SliderSettingsWidget.h   |  2 +-
 .../MaskWidgets/ColorMapSceneAdaptor.cpp      |  2 +-
 .../Views/MaskWidgets/ColorMapSceneAdaptor.h  |  2 +-
 GUI/coregui/Views/MaskWidgets/EllipseView.cpp |  2 +-
 GUI/coregui/Views/MaskWidgets/EllipseView.h   |  2 +-
 GUI/coregui/Views/MaskWidgets/IMaskView.cpp   |  2 +-
 GUI/coregui/Views/MaskWidgets/IMaskView.h     |  2 +-
 GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h |  2 +-
 .../Views/MaskWidgets/IntensityDataView.cpp   |  2 +-
 .../Views/MaskWidgets/IntensityDataView.h     |  2 +-
 GUI/coregui/Views/MaskWidgets/LineViews.cpp   |  2 +-
 GUI/coregui/Views/MaskWidgets/LineViews.h     |  2 +-
 GUI/coregui/Views/MaskWidgets/MaskAllView.cpp |  2 +-
 GUI/coregui/Views/MaskWidgets/MaskAllView.h   |  2 +-
 .../Views/MaskWidgets/MaskContainerView.cpp   |  2 +-
 .../Views/MaskWidgets/MaskContainerView.h     |  2 +-
 .../Views/MaskWidgets/MaskDrawingContext.cpp  |  2 +-
 .../Views/MaskWidgets/MaskDrawingContext.h    |  2 +-
 GUI/coregui/Views/MaskWidgets/MaskEditor.cpp  |  2 +-
 GUI/coregui/Views/MaskWidgets/MaskEditor.h    |  2 +-
 .../Views/MaskWidgets/MaskEditorActions.cpp   |  2 +-
 .../Views/MaskWidgets/MaskEditorActions.h     |  2 +-
 .../Views/MaskWidgets/MaskEditorCanvas.cpp    |  2 +-
 .../Views/MaskWidgets/MaskEditorCanvas.h      |  2 +-
 .../Views/MaskWidgets/MaskEditorFlags.h       |  2 +-
 .../Views/MaskWidgets/MaskEditorHelper.cpp    |  2 +-
 .../Views/MaskWidgets/MaskEditorHelper.h      |  2 +-
 .../MaskWidgets/MaskEditorPropertyPanel.cpp   |  2 +-
 .../MaskWidgets/MaskEditorPropertyPanel.h     |  2 +-
 .../Views/MaskWidgets/MaskEditorToolBar.cpp   |  2 +-
 .../Views/MaskWidgets/MaskEditorToolBar.h     |  2 +-
 .../Views/MaskWidgets/MaskGraphicsProxy.cpp   |  2 +-
 .../Views/MaskWidgets/MaskGraphicsProxy.h     |  2 +-
 .../Views/MaskWidgets/MaskGraphicsScene.cpp   |  2 +-
 .../Views/MaskWidgets/MaskGraphicsScene.h     |  2 +-
 .../Views/MaskWidgets/MaskGraphicsView.cpp    |  2 +-
 .../Views/MaskWidgets/MaskGraphicsView.h      |  2 +-
 .../MaskWidgets/MaskResultsPresenter.cpp      |  2 +-
 .../Views/MaskWidgets/MaskResultsPresenter.h  |  2 +-
 .../Views/MaskWidgets/MaskViewFactory.cpp     |  2 +-
 .../Views/MaskWidgets/MaskViewFactory.h       |  2 +-
 .../Views/MaskWidgets/PolygonPointView.cpp    |  2 +-
 .../Views/MaskWidgets/PolygonPointView.h      |  2 +-
 GUI/coregui/Views/MaskWidgets/PolygonView.cpp |  2 +-
 GUI/coregui/Views/MaskWidgets/PolygonView.h   |  2 +-
 .../Views/MaskWidgets/RectangleView.cpp       |  2 +-
 GUI/coregui/Views/MaskWidgets/RectangleView.h |  2 +-
 .../Views/MaskWidgets/SizeHandleElement.cpp   |  2 +-
 .../Views/MaskWidgets/SizeHandleElement.h     |  2 +-
 .../Views/MaterialEditor/MaterialEditor.cpp   |  2 +-
 .../Views/MaterialEditor/MaterialEditor.h     |  2 +-
 .../MaterialEditor/MaterialEditorDialog.cpp   |  2 +-
 .../MaterialEditor/MaterialEditorDialog.h     |  2 +-
 .../MaterialEditor/MaterialEditorToolBar.cpp  |  2 +-
 .../MaterialEditor/MaterialEditorToolBar.h    |  2 +-
 .../Views/MaterialEditor/MaterialProperty.cpp |  2 +-
 .../Views/MaterialEditor/MaterialProperty.h   |  2 +-
 .../Views/MaterialEditor/MaterialSvc.cpp      |  2 +-
 .../Views/MaterialEditor/MaterialSvc.h        |  2 +-
 .../Views/MaterialEditor/MaterialUtils.cpp    |  2 +-
 .../Views/MaterialEditor/MaterialUtils.h      |  2 +-
 GUI/coregui/Views/ObsoleteFitView.cpp         |  2 +-
 GUI/coregui/Views/ObsoleteFitView.h           |  2 +-
 .../PropertyEditor/ComponentBoxEditor.cpp     |  2 +-
 .../Views/PropertyEditor/ComponentBoxEditor.h |  2 +-
 .../Views/PropertyEditor/ComponentEditor.cpp  |  2 +-
 .../Views/PropertyEditor/ComponentEditor.h    |  2 +-
 .../PropertyEditor/ComponentEditorFlags.h     |  2 +-
 .../PropertyEditor/ComponentEditorPrivate.cpp |  2 +-
 .../PropertyEditor/ComponentEditorPrivate.h   |  2 +-
 .../PropertyEditor/PropertyBrowserUtils.cpp   |  2 +-
 .../PropertyEditor/PropertyBrowserUtils.h     |  2 +-
 .../PropertyEditor/PropertyVariantFactory.cpp |  2 +-
 .../PropertyEditor/PropertyVariantFactory.h   |  2 +-
 .../PropertyEditor/PropertyVariantManager.cpp |  2 +-
 .../PropertyEditor/PropertyVariantManager.h   |  2 +-
 .../Views/SampleDesigner/ConnectableView.cpp  |  2 +-
 .../Views/SampleDesigner/ConnectableView.h    |  2 +-
 .../Views/SampleDesigner/DesignerHelper.cpp   |  2 +-
 .../Views/SampleDesigner/DesignerHelper.h     |  2 +-
 .../Views/SampleDesigner/DesignerMimeData.cpp |  2 +-
 .../Views/SampleDesigner/DesignerMimeData.h   |  2 +-
 .../Views/SampleDesigner/DesignerScene.cpp    |  2 +-
 .../Views/SampleDesigner/DesignerScene.h      |  2 +-
 .../Views/SampleDesigner/DesignerView.cpp     |  2 +-
 .../Views/SampleDesigner/DesignerView.h       |  2 +-
 .../Views/SampleDesigner/ILayerView.cpp       |  2 +-
 GUI/coregui/Views/SampleDesigner/ILayerView.h |  2 +-
 GUI/coregui/Views/SampleDesigner/IView.cpp    |  2 +-
 GUI/coregui/Views/SampleDesigner/IView.h      |  2 +-
 .../InterferenceFunctionViews.cpp             |  2 +-
 .../InterferenceFunctionViews.h               |  2 +-
 .../Views/SampleDesigner/ItemTreeView.cpp     |  2 +-
 .../Views/SampleDesigner/ItemTreeView.h       |  2 +-
 .../Views/SampleDesigner/LayerView.cpp        |  2 +-
 GUI/coregui/Views/SampleDesigner/LayerView.h  |  2 +-
 .../Views/SampleDesigner/MultiLayerView.cpp   |  2 +-
 .../Views/SampleDesigner/MultiLayerView.h     |  2 +-
 .../Views/SampleDesigner/NodeEditor.cpp       |  2 +-
 GUI/coregui/Views/SampleDesigner/NodeEditor.h |  2 +-
 .../SampleDesigner/NodeEditorConnection.cpp   |  2 +-
 .../SampleDesigner/NodeEditorConnection.h     |  2 +-
 .../Views/SampleDesigner/NodeEditorPort.cpp   |  2 +-
 .../Views/SampleDesigner/NodeEditorPort.h     |  2 +-
 .../ParticleCompositionView.cpp               |  2 +-
 .../SampleDesigner/ParticleCompositionView.h  |  2 +-
 .../SampleDesigner/ParticleCoreShellView.cpp  |  2 +-
 .../SampleDesigner/ParticleCoreShellView.h    |  2 +-
 .../ParticleDistributionView.cpp              |  2 +-
 .../SampleDesigner/ParticleDistributionView.h |  2 +-
 .../SampleDesigner/ParticleLayoutView.cpp     |  2 +-
 .../Views/SampleDesigner/ParticleLayoutView.h |  2 +-
 .../Views/SampleDesigner/ParticleView.cpp     |  2 +-
 .../Views/SampleDesigner/ParticleView.h       |  2 +-
 .../Views/SampleDesigner/SampleDesigner.cpp   |  2 +-
 .../Views/SampleDesigner/SampleDesigner.h     |  2 +-
 .../SampleDesigner/SamplePropertyWidget.cpp   |  2 +-
 .../SampleDesigner/SamplePropertyWidget.h     |  2 +-
 .../Views/SampleDesigner/SampleToolBar.cpp    |  2 +-
 .../Views/SampleDesigner/SampleToolBar.h      |  2 +-
 .../SampleDesigner/SampleViewAligner.cpp      |  2 +-
 .../Views/SampleDesigner/SampleViewAligner.h  |  2 +-
 .../SampleDesigner/SampleViewFactory.cpp      |  2 +-
 .../Views/SampleDesigner/SampleViewFactory.h  |  2 +-
 .../Views/SampleDesigner/SampleWidgetBox.cpp  |  2 +-
 .../Views/SampleDesigner/SampleWidgetBox.h    |  2 +-
 .../SampleDesigner/TransformationView.cpp     |  2 +-
 .../Views/SampleDesigner/TransformationView.h |  2 +-
 GUI/coregui/Views/SampleView.cpp              |  2 +-
 GUI/coregui/Views/SampleView.h                |  2 +-
 GUI/coregui/Views/SampleViewComponents.cpp    |  2 +-
 GUI/coregui/Views/SampleViewComponents.h      |  2 +-
 GUI/coregui/Views/SessionModelView.cpp        |  2 +-
 GUI/coregui/Views/SessionModelView.h          |  2 +-
 GUI/coregui/Views/SimulationView.cpp          |  2 +-
 GUI/coregui/Views/SimulationView.h            |  2 +-
 .../SimulationWidgets/PythonScriptWidget.cpp  |  2 +-
 .../SimulationWidgets/PythonScriptWidget.h    |  2 +-
 .../SimulationDataSelectorWidget.cpp          |  2 +-
 .../SimulationDataSelectorWidget.h            |  2 +-
 .../SimulationOptionsWidget.cpp               |  2 +-
 .../SimulationOptionsWidget.h                 |  2 +-
 .../SimulationSetupWidget.cpp                 |  2 +-
 .../SimulationWidgets/SimulationSetupWidget.h |  2 +-
 GUI/coregui/Views/TestComponentView.cpp       |  2 +-
 GUI/coregui/Views/TestComponentView.h         |  2 +-
 GUI/coregui/Views/TestView.cpp                |  2 +-
 GUI/coregui/Views/TestView.h                  |  2 +-
 GUI/coregui/Views/WelcomeView.cpp             |  2 +-
 GUI/coregui/Views/WelcomeView.h               |  2 +-
 GUI/coregui/mainwindow/AppSvc.cpp             |  2 +-
 GUI/coregui/mainwindow/AppSvc.h               |  2 +-
 GUI/coregui/mainwindow/SplashScreen.cpp       |  2 +-
 GUI/coregui/mainwindow/SplashScreen.h         |  2 +-
 GUI/coregui/mainwindow/StyledToolBar.cpp      |  2 +-
 GUI/coregui/mainwindow/StyledToolBar.h        |  2 +-
 GUI/coregui/mainwindow/UpdateNotifier.cpp     |  2 +-
 GUI/coregui/mainwindow/UpdateNotifier.h       |  2 +-
 .../mainwindow/aboutapplicationdialog.cpp     |  2 +-
 .../mainwindow/aboutapplicationdialog.h       |  2 +-
 GUI/coregui/mainwindow/actionmanager.cpp      |  2 +-
 GUI/coregui/mainwindow/actionmanager.h        |  2 +-
 GUI/coregui/mainwindow/mainwindow.cpp         |  2 +-
 GUI/coregui/mainwindow/mainwindow.h           |  2 +-
 GUI/coregui/mainwindow/mainwindow_constants.h |  2 +-
 GUI/coregui/mainwindow/newprojectdialog.cpp   |  2 +-
 GUI/coregui/mainwindow/newprojectdialog.h     |  2 +-
 GUI/coregui/mainwindow/projectdocument.cpp    |  2 +-
 GUI/coregui/mainwindow/projectdocument.h      |  2 +-
 GUI/coregui/mainwindow/projectmanager.cpp     |  2 +-
 GUI/coregui/mainwindow/projectmanager.h       |  2 +-
 GUI/coregui/mainwindow/tooltipdatabase.cpp    |  2 +-
 GUI/coregui/mainwindow/tooltipdatabase.h      |  2 +-
 GUI/coregui/utils/CustomEventFilters.cpp      |  2 +-
 GUI/coregui/utils/CustomEventFilters.h        |  2 +-
 GUI/coregui/utils/FancyLabel.cpp              |  2 +-
 GUI/coregui/utils/FancyLabel.h                |  2 +-
 GUI/coregui/utils/GUIFutest.cpp               |  2 +-
 GUI/coregui/utils/GUIFutest.h                 |  2 +-
 GUI/coregui/utils/GUIHelpers.cpp              |  2 +-
 GUI/coregui/utils/GUIHelpers.h                |  2 +-
 GUI/coregui/utils/GUIMessage.cpp              |  2 +-
 GUI/coregui/utils/GUIMessage.h                |  2 +-
 GUI/coregui/utils/IMessageService.h           |  2 +-
 GUI/coregui/utils/ItemIDFactory.cpp           |  2 +-
 GUI/coregui/utils/ItemIDFactory.h             |  2 +-
 GUI/coregui/utils/MessageContainer.cpp        |  2 +-
 GUI/coregui/utils/MessageContainer.h          |  2 +-
 GUI/coregui/utils/WarningMessageService.cpp   |  2 +-
 GUI/coregui/utils/WarningMessageService.h     |  2 +-
 GUI/coregui/utils/hostosinfo.h                |  2 +-
 GUI/coregui/utils/stringutils.cpp             |  2 +-
 GUI/coregui/utils/stringutils.h               |  2 +-
 GUI/main/appoptions.cpp                       |  2 +-
 GUI/main/appoptions.h                         |  2 +-
 GUI/main/main.cpp                             |  2 +-
 Tests/Functional/TestCore/CoreSuite.cpp       |  2 +-
 Tests/Functional/TestFit/FitSuite.cpp         |  2 +-
 Tests/Functional/TestGUI/GUISuite.cpp         |  2 +-
 Tests/Functional/TestPyDump/PyDump.cpp        |  2 +-
 Tests/UnitTests/Core/3/SpecialFunctionsTest.h |  2 +-
 Tests/UnitTests/Core/4/ThreadInfoTest.h       |  2 +-
 .../UnitTests/Core/P/FormFactorSymmetryTest.h |  2 +-
 .../Core/Q/FormFactorSpecializationTest.h     |  2 +-
 Tests/UnitTests/Core/S/FormFactorBasicTest.h  |  2 +-
 Tests/UnitTests/GUI/verify_throw_macro.h      |  2 +-
 Tests/UnitTests/utilities/qLoopedTest.h       |  2 +-
 dev-tools/code-tools/update-filename.py       | 29 +++++++++++++++++++
 1043 files changed, 1071 insertions(+), 1042 deletions(-)
 create mode 100755 dev-tools/code-tools/update-filename.py

diff --git a/Core/Algorithms/Beam.cpp b/Core/Algorithms/Beam.cpp
index 02e5871f54d..3f9b836c501 100644
--- a/Core/Algorithms/Beam.cpp
+++ b/Core/Algorithms/Beam.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/Beam.cpp
+//! @file      Core/Algorithms/Beam.cpp
 //! @brief     Implements class Beam.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/Beam.h b/Core/Algorithms/Beam.h
index 3da978e6f78..44588fb88ff 100644
--- a/Core/Algorithms/Beam.h
+++ b/Core/Algorithms/Beam.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/Beam.h
+//! @file      Core/Algorithms/Beam.h
 //! @brief     Declares class Beam.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ChiSquaredModule.cpp b/Core/Algorithms/ChiSquaredModule.cpp
index baa29226d2c..3e512d750b7 100644
--- a/Core/Algorithms/ChiSquaredModule.cpp
+++ b/Core/Algorithms/ChiSquaredModule.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ChiSquaredModule.cpp
+//! @file      Core/Algorithms/ChiSquaredModule.cpp
 //! @brief     Implements class ChiSquaredModule.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ChiSquaredModule.h b/Core/Algorithms/ChiSquaredModule.h
index d394c998abb..e33d0e8ec42 100644
--- a/Core/Algorithms/ChiSquaredModule.h
+++ b/Core/Algorithms/ChiSquaredModule.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ChiSquaredModule.h
+//! @file      Core/Algorithms/ChiSquaredModule.h
 //! @brief     Declares class ChiSquaredModule.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ConvolutionDetectorResolution.cpp b/Core/Algorithms/ConvolutionDetectorResolution.cpp
index 02ada0d415a..180f1fea191 100644
--- a/Core/Algorithms/ConvolutionDetectorResolution.cpp
+++ b/Core/Algorithms/ConvolutionDetectorResolution.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ConvolutionDetectorResolution.cpp
+//! @file      Core/Algorithms/ConvolutionDetectorResolution.cpp
 //! @brief     Implements class ConvolutionDetectorResolution.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ConvolutionDetectorResolution.h b/Core/Algorithms/ConvolutionDetectorResolution.h
index 927b91280ca..d896c4b71af 100644
--- a/Core/Algorithms/ConvolutionDetectorResolution.h
+++ b/Core/Algorithms/ConvolutionDetectorResolution.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ConvolutionDetectorResolution.h
+//! @file      Core/Algorithms/ConvolutionDetectorResolution.h
 //! @brief     Declares class ConvolutionDetectorResolution.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/DWBADiffuseReflection.cpp b/Core/Algorithms/DWBADiffuseReflection.cpp
index abea39159ad..c4e3aa66b58 100644
--- a/Core/Algorithms/DWBADiffuseReflection.cpp
+++ b/Core/Algorithms/DWBADiffuseReflection.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/DWBADiffuseReflection.cpp
+//! @file      Core/Algorithms/DWBADiffuseReflection.cpp
 //! @brief     Implements class DWBADiffuseReflection.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/DWBADiffuseReflection.h b/Core/Algorithms/DWBADiffuseReflection.h
index 814d5be8d95..91e7a872088 100644
--- a/Core/Algorithms/DWBADiffuseReflection.h
+++ b/Core/Algorithms/DWBADiffuseReflection.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/DWBADiffuseReflection.h
+//! @file      Core/Algorithms/DWBADiffuseReflection.h
 //! @brief     Declares class DWBADiffuseReflection.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/DWBASimulation.cpp b/Core/Algorithms/DWBASimulation.cpp
index 83ac68f06f8..0d0d134cbf7 100644
--- a/Core/Algorithms/DWBASimulation.cpp
+++ b/Core/Algorithms/DWBASimulation.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/DWBASimulation.cpp
+//! @file      Core/Algorithms/DWBASimulation.cpp
 //! @brief     Implements class DWBASimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/DWBASimulation.h b/Core/Algorithms/DWBASimulation.h
index 5c1b53721b1..ee0b2888aba 100644
--- a/Core/Algorithms/DWBASimulation.h
+++ b/Core/Algorithms/DWBASimulation.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/DWBASimulation.h
+//! @file      Core/Algorithms/DWBASimulation.h
 //! @brief     Declares class DWBASimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/DecoratedLayerDWBASimulation.cpp b/Core/Algorithms/DecoratedLayerDWBASimulation.cpp
index 8e64d0a9f9b..9d6348d1fe8 100644
--- a/Core/Algorithms/DecoratedLayerDWBASimulation.cpp
+++ b/Core/Algorithms/DecoratedLayerDWBASimulation.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/DecoratedLayerDWBASimulation.cpp
+//! @file      Core/Algorithms/DecoratedLayerDWBASimulation.cpp
 //! @brief     Implements class DecoratedLayerDWBASimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/DecoratedLayerDWBASimulation.h b/Core/Algorithms/DecoratedLayerDWBASimulation.h
index ae3b914aebd..58fd75c8f57 100644
--- a/Core/Algorithms/DecoratedLayerDWBASimulation.h
+++ b/Core/Algorithms/DecoratedLayerDWBASimulation.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/DecoratedLayerDWBASimulation.h
+//! @file      Core/Algorithms/DecoratedLayerDWBASimulation.h
 //! @brief     Declares class DecoratedLayerDWBASimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/DecouplingApproximationStrategy.cpp b/Core/Algorithms/DecouplingApproximationStrategy.cpp
index 184a8347ce9..b7fed8179bd 100644
--- a/Core/Algorithms/DecouplingApproximationStrategy.cpp
+++ b/Core/Algorithms/DecouplingApproximationStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/DecouplingApproximationStrategy.cpp
+//! @file      Core/Algorithms/DecouplingApproximationStrategy.cpp
 //! @brief     Implements class DecouplingApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/DecouplingApproximationStrategy.h b/Core/Algorithms/DecouplingApproximationStrategy.h
index 4b4f8ffbbf0..d19bfba1483 100644
--- a/Core/Algorithms/DecouplingApproximationStrategy.h
+++ b/Core/Algorithms/DecouplingApproximationStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/DecouplingApproximationStrategy.h
+//! @file      Core/Algorithms/DecouplingApproximationStrategy.h
 //! @brief     Declares class DecouplingApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/DetectorMask.cpp b/Core/Algorithms/DetectorMask.cpp
index 2fa09a6b644..4668169a605 100644
--- a/Core/Algorithms/DetectorMask.cpp
+++ b/Core/Algorithms/DetectorMask.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/DetectorMask.cpp
+//! @file      Core/Algorithms/DetectorMask.cpp
 //! @brief     Implements class DetectorMask.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/DetectorMask.h b/Core/Algorithms/DetectorMask.h
index 06a48dd10dd..dad3e1e24d9 100644
--- a/Core/Algorithms/DetectorMask.h
+++ b/Core/Algorithms/DetectorMask.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/DetectorMask.h
+//! @file      Core/Algorithms/DetectorMask.h
 //! @brief     Declares class DetectorMask.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/DistributionHandler.cpp b/Core/Algorithms/DistributionHandler.cpp
index 6c1134eb562..135f1741690 100644
--- a/Core/Algorithms/DistributionHandler.cpp
+++ b/Core/Algorithms/DistributionHandler.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/DistributionHandler.cpp
+//! @file      Core/Algorithms/DistributionHandler.cpp
 //! @brief     Implements class DistributionHandler.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/DistributionHandler.h b/Core/Algorithms/DistributionHandler.h
index eb48223b8a5..0a4be551a78 100644
--- a/Core/Algorithms/DistributionHandler.h
+++ b/Core/Algorithms/DistributionHandler.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/DistributionHandler.h
+//! @file      Core/Algorithms/DistributionHandler.h
 //! @brief     Declares class DistributionHandler.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/Distributions.cpp b/Core/Algorithms/Distributions.cpp
index b33a87de705..a1509b5fe9e 100644
--- a/Core/Algorithms/Distributions.cpp
+++ b/Core/Algorithms/Distributions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/Distributions.cpp
+//! @file      Core/Algorithms/Distributions.cpp
 //! @brief     Implements classes representing distributions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/Distributions.h b/Core/Algorithms/Distributions.h
index afce834f6b8..06065264958 100644
--- a/Core/Algorithms/Distributions.h
+++ b/Core/Algorithms/Distributions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/Distributions.h
+//! @file      Core/Algorithms/Distributions.h
 //! @brief     Declares classes representing distributions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/FTDecayFunctions.cpp b/Core/Algorithms/FTDecayFunctions.cpp
index 3cfca21f02d..6d6dabd1873 100644
--- a/Core/Algorithms/FTDecayFunctions.cpp
+++ b/Core/Algorithms/FTDecayFunctions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/FTDistributions.cpp
+//! @file      Core/Algorithms/FTDecayFunctions.cpp
 //! @brief     Implements class FTDistribution2DCauchy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/FTDecayFunctions.h b/Core/Algorithms/FTDecayFunctions.h
index efe495cfd10..6b157cabb20 100644
--- a/Core/Algorithms/FTDecayFunctions.h
+++ b/Core/Algorithms/FTDecayFunctions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/FTDecayFunctions.h
+//! @file      Core/Algorithms/FTDecayFunctions.h
 //! @brief     Declares classes IFTDecayFunction1D, IFTDecayFunction2D,
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/FTDistributions.cpp b/Core/Algorithms/FTDistributions.cpp
index 1ae5a6bedeb..4ca45210fa0 100644
--- a/Core/Algorithms/FTDistributions.cpp
+++ b/Core/Algorithms/FTDistributions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/FTDistributions.cpp
+//! @file      Core/Algorithms/FTDistributions.cpp
 //! @brief     Implements class FTDistribution2DCauchy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/FTDistributions.h b/Core/Algorithms/FTDistributions.h
index 90e1f1839ad..d878615495e 100644
--- a/Core/Algorithms/FTDistributions.h
+++ b/Core/Algorithms/FTDistributions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/FTDistributions.h
+//! @file      Core/Algorithms/FTDistributions.h
 //! @brief     Declares classes IFTDistribution1D, IFTDistribution2D,
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/FitElement.cpp b/Core/Algorithms/FitElement.cpp
index 655ff25facc..868d7f0fee4 100644
--- a/Core/Algorithms/FitElement.cpp
+++ b/Core/Algorithms/FitElement.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitElement.cpp
+//! @file      Core/Algorithms/FitElement.cpp
 //! @brief     Implements class FitElement.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/FitElement.h b/Core/Algorithms/FitElement.h
index b95609c39bf..39b47f11853 100644
--- a/Core/Algorithms/FitElement.h
+++ b/Core/Algorithms/FitElement.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitElement.h
+//! @file      Core/Algorithms/FitElement.h
 //! @brief     Declares class FitElement.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/GISASSimulation.cpp b/Core/Algorithms/GISASSimulation.cpp
index 90f16c3ffe3..bbd972a6747 100644
--- a/Core/Algorithms/GISASSimulation.cpp
+++ b/Core/Algorithms/GISASSimulation.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/Simulation.cpp
+//! @file      Core/Algorithms/GISASSimulation.cpp
 //! @brief     Implements class Simulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/GISASSimulation.h b/Core/Algorithms/GISASSimulation.h
index 278365554ca..27b75817139 100644
--- a/Core/Algorithms/GISASSimulation.h
+++ b/Core/Algorithms/GISASSimulation.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/GISASSimulation.h
+//! @file      Core/Algorithms/GISASSimulation.h
 //! @brief     Declares class GISASSimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/IChiSquaredModule.cpp b/Core/Algorithms/IChiSquaredModule.cpp
index 381675ade5c..9c72e694034 100644
--- a/Core/Algorithms/IChiSquaredModule.cpp
+++ b/Core/Algorithms/IChiSquaredModule.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/IChiSquaredModule.cpp
+//! @file      Core/Algorithms/IChiSquaredModule.cpp
 //! @brief     Implements class IChiSquaredModule.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/IChiSquaredModule.h b/Core/Algorithms/IChiSquaredModule.h
index 61463cd4aa2..e9942665678 100644
--- a/Core/Algorithms/IChiSquaredModule.h
+++ b/Core/Algorithms/IChiSquaredModule.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/IChiSquaredModule.h
+//! @file      Core/Algorithms/IChiSquaredModule.h
 //! @brief     Declares class IChiSquaredModule.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/IDetector2D.cpp b/Core/Algorithms/IDetector2D.cpp
index a18c6d0bfc6..8d3c16419aa 100644
--- a/Core/Algorithms/IDetector2D.cpp
+++ b/Core/Algorithms/IDetector2D.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/IDetector2D.cpp
+//! @file      Core/Algorithms/IDetector2D.cpp
 //! @brief     Implements shared functionality of interface IDetector2D.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/IDetector2D.h b/Core/Algorithms/IDetector2D.h
index bc70dc329fd..ea474aa0c4f 100644
--- a/Core/Algorithms/IDetector2D.h
+++ b/Core/Algorithms/IDetector2D.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/IDetector2D.h
+//! @file      Core/Algorithms/IDetector2D.h
 //! @brief     Declares interface IDetector2D.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/IDetectorResolution.cpp b/Core/Algorithms/IDetectorResolution.cpp
index fbec0d01c47..b5e9b98fce2 100644
--- a/Core/Algorithms/IDetectorResolution.cpp
+++ b/Core/Algorithms/IDetectorResolution.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/IDetectorResolution.cpp
+//! @file      Core/Algorithms/IDetectorResolution.cpp
 //! @brief     Implements default behaviour of IDetectorResolution interface.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/IDetectorResolution.h b/Core/Algorithms/IDetectorResolution.h
index a4ef6082692..14b32a068cb 100644
--- a/Core/Algorithms/IDetectorResolution.h
+++ b/Core/Algorithms/IDetectorResolution.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/IDetectorResolution.h
+//! @file      Core/Algorithms/IDetectorResolution.h
 //! @brief     Declares class IDetectorResolution.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/IIntensityFunction.h b/Core/Algorithms/IIntensityFunction.h
index 7020aa49b0e..6c668249073 100644
--- a/Core/Algorithms/IIntensityFunction.h
+++ b/Core/Algorithms/IIntensityFunction.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/IIntensityFunction.h
+//! @file      Core/Algorithms/IIntensityFunction.h
 //! @brief     Declares and implements the interface class IIntensityFunction
 //!            and its child classes IntensityFunctionLog, IntensityFunctionSqrt
 //!
diff --git a/Core/Algorithms/IIntensityNormalizer.cpp b/Core/Algorithms/IIntensityNormalizer.cpp
index 9a1463f6848..6a73c6892c1 100644
--- a/Core/Algorithms/IIntensityNormalizer.cpp
+++ b/Core/Algorithms/IIntensityNormalizer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/IIntensityNormalizer.cpp
+//! @file      Core/Algorithms/IIntensityNormalizer.cpp
 //! @brief     Implements class IntensityNormalizer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/IIntensityNormalizer.h b/Core/Algorithms/IIntensityNormalizer.h
index daefa488cbb..b442be9efc3 100644
--- a/Core/Algorithms/IIntensityNormalizer.h
+++ b/Core/Algorithms/IIntensityNormalizer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/IOutputDataNormalizer.h
+//! @file      Core/Algorithms/IIntensityNormalizer.h
 //! @brief     Declares classes IOutputDataNormalizer,
 //!              OutputDataNormalizer, OutputDataSimpleNormalizer.
 //!
diff --git a/Core/Algorithms/IInterferenceFunctionStrategy.cpp b/Core/Algorithms/IInterferenceFunctionStrategy.cpp
index b1e9da6b080..1e7b619db53 100644
--- a/Core/Algorithms/IInterferenceFunctionStrategy.cpp
+++ b/Core/Algorithms/IInterferenceFunctionStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/IInterferenceFunctionStrategy.cpp
+//! @file      Core/Algorithms/IInterferenceFunctionStrategy.cpp
 //! @brief     Implements default behaviour of IInterferenceFunctionStrategy
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/IInterferenceFunctionStrategy.h b/Core/Algorithms/IInterferenceFunctionStrategy.h
index 1844f776656..dddd75ed8fe 100644
--- a/Core/Algorithms/IInterferenceFunctionStrategy.h
+++ b/Core/Algorithms/IInterferenceFunctionStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/IInterferenceFunctionStrategy.h
+//! @file      Core/Algorithms/IInterferenceFunctionStrategy.h
 //! @brief     Declares class IInterferenceFunctionStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ILayerRTCoefficients.h b/Core/Algorithms/ILayerRTCoefficients.h
index db2047eaa80..4729c6ddf27 100644
--- a/Core/Algorithms/ILayerRTCoefficients.h
+++ b/Core/Algorithms/ILayerRTCoefficients.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ILayerRTCoefficients.h
+//! @file      Core/Algorithms/ILayerRTCoefficients.h
 //! @brief     Declares class ILayerRTCoefficients.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/IPixelMap.h b/Core/Algorithms/IPixelMap.h
index a1f7da16e3f..eea13584e3a 100644
--- a/Core/Algorithms/IPixelMap.h
+++ b/Core/Algorithms/IPixelMap.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/IPixelMap.h
+//! @file      Core/Algorithms/IPixelMap.h
 //! @brief     Declares interface IPixelMap.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/IResolutionFunction2D.h b/Core/Algorithms/IResolutionFunction2D.h
index 5b66c4b43ad..5f3c7c5747c 100644
--- a/Core/Algorithms/IResolutionFunction2D.h
+++ b/Core/Algorithms/IResolutionFunction2D.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/IResolutionFunction2D.h
+//! @file      Core/Algorithms/IResolutionFunction2D.h
 //! @brief     Declares interface class IResolutionFunction2D.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ISampleBuilder.h b/Core/Algorithms/ISampleBuilder.h
index 3c51ee5b944..7e2b27dea50 100644
--- a/Core/Algorithms/ISampleBuilder.h
+++ b/Core/Algorithms/ISampleBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ISampleBuilder.h
+//! @file      Core/Algorithms/ISampleBuilder.h
 //! @brief     Declares pure virtual base class ISampleBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ISimulation.h b/Core/Algorithms/ISimulation.h
index 24bed698639..cef0ae3c29c 100644
--- a/Core/Algorithms/ISimulation.h
+++ b/Core/Algorithms/ISimulation.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ISimulation.h
+//! @file      Core/Algorithms/ISimulation.h
 //! @brief     Declares interface class ISimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ISpecularInfoMap.h b/Core/Algorithms/ISpecularInfoMap.h
index d02b966a695..bc2023b8413 100644
--- a/Core/Algorithms/ISpecularInfoMap.h
+++ b/Core/Algorithms/ISpecularInfoMap.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ISpecularInfoMap.h
+//! @file      Core/Algorithms/ISpecularInfoMap.h
 //! @brief     Declares interface ISpecularInfoMap.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ISquaredFunction.h b/Core/Algorithms/ISquaredFunction.h
index 56fa75dbb54..d7d971c8a5d 100644
--- a/Core/Algorithms/ISquaredFunction.h
+++ b/Core/Algorithms/ISquaredFunction.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ISquaredFunction.h
+//! @file      Core/Algorithms/ISquaredFunction.h
 //! @brief     Declares classes ISquaredFunction, SquaredFunctionDefault, ...
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/Instrument.cpp b/Core/Algorithms/Instrument.cpp
index cb790e82405..61b2f49cbf0 100644
--- a/Core/Algorithms/Instrument.cpp
+++ b/Core/Algorithms/Instrument.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/Instrument.cpp
+//! @file      Core/Algorithms/Instrument.cpp
 //! @brief     Implements class Instrument.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/Instrument.h b/Core/Algorithms/Instrument.h
index 2944c7545d0..479e7b44d6a 100644
--- a/Core/Algorithms/Instrument.h
+++ b/Core/Algorithms/Instrument.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/Instrument.h
+//! @file      Core/Algorithms/Instrument.h
 //! @brief     Declares class Instrument.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/InterferenceFunctionStrategies.h b/Core/Algorithms/InterferenceFunctionStrategies.h
index 1e1273677b8..a5d05c1fcf7 100644
--- a/Core/Algorithms/InterferenceFunctionStrategies.h
+++ b/Core/Algorithms/InterferenceFunctionStrategies.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/InterferenceFunctionStrategies.h
+//! @file      Core/Algorithms/InterferenceFunctionStrategies.h
 //! @brief     Includes several files named *Strategy.h
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/IsGISAXSDetector.cpp b/Core/Algorithms/IsGISAXSDetector.cpp
index 7b98d4c71ca..6a7527b9af9 100644
--- a/Core/Algorithms/IsGISAXSDetector.cpp
+++ b/Core/Algorithms/IsGISAXSDetector.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/IsGISAXSDetector.cpp
+//! @file      Core/Algorithms/IsGISAXSDetector.cpp
 //! @brief     Implements class IsGISAXSDetector.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/IsGISAXSDetector.h b/Core/Algorithms/IsGISAXSDetector.h
index bd10975457a..28dff7d8656 100644
--- a/Core/Algorithms/IsGISAXSDetector.h
+++ b/Core/Algorithms/IsGISAXSDetector.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/IsGISAXSDetector.h
+//! @file      Core/Algorithms/IsGISAXSDetector.h
 //! @brief     Declares class IsGISAXSDetector.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/LayerDWBASimulation.cpp b/Core/Algorithms/LayerDWBASimulation.cpp
index 03a9986c5ac..3b47868f23d 100644
--- a/Core/Algorithms/LayerDWBASimulation.cpp
+++ b/Core/Algorithms/LayerDWBASimulation.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/LayerDWBASimulation.cpp
+//! @file      Core/Algorithms/LayerDWBASimulation.cpp
 //! @brief     Implements class LayerDWBASimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/LayerDWBASimulation.h b/Core/Algorithms/LayerDWBASimulation.h
index 3c7d39e206e..e868640e756 100644
--- a/Core/Algorithms/LayerDWBASimulation.h
+++ b/Core/Algorithms/LayerDWBASimulation.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/LayerDWBASimulation.h
+//! @file      Core/Algorithms/LayerDWBASimulation.h
 //! @brief     Declares class LayerDWBASimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/LayerSpecularInfo.cpp b/Core/Algorithms/LayerSpecularInfo.cpp
index 35708bffce8..9fb1ed8302d 100644
--- a/Core/Algorithms/LayerSpecularInfo.cpp
+++ b/Core/Algorithms/LayerSpecularInfo.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/LayerSpecularInfo.cpp
+//! @file      Core/Algorithms/LayerSpecularInfo.cpp
 //! @brief     Implements class LayerSpecularInfo.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/LayerSpecularInfo.h b/Core/Algorithms/LayerSpecularInfo.h
index 4e5ae0f4981..3f6d50bbe48 100644
--- a/Core/Algorithms/LayerSpecularInfo.h
+++ b/Core/Algorithms/LayerSpecularInfo.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/LayerSpecularInfo.h
+//! @file      Core/Algorithms/LayerSpecularInfo.h
 //! @brief     Declares class LayerSpecularInfo.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/LayerStrategyBuilder.cpp b/Core/Algorithms/LayerStrategyBuilder.cpp
index 7ec35071dea..0b61e4714f3 100644
--- a/Core/Algorithms/LayerStrategyBuilder.cpp
+++ b/Core/Algorithms/LayerStrategyBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/LayerStrategyBuilder.cpp
+//! @file      Core/Algorithms/LayerStrategyBuilder.cpp
 //! @brief     Implements classes LayerStrategyBuilder and
 //!              FormFactorInfo
 //!
diff --git a/Core/Algorithms/LayerStrategyBuilder.h b/Core/Algorithms/LayerStrategyBuilder.h
index e077c03f63b..d53efaa7057 100644
--- a/Core/Algorithms/LayerStrategyBuilder.h
+++ b/Core/Algorithms/LayerStrategyBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/LayerStrategyBuilder.h
+//! @file      Core/Algorithms/LayerStrategyBuilder.h
 //! @brief     Declares classes LayerStrategyBuilder, FormFactorInfo.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/Mask.cpp b/Core/Algorithms/Mask.cpp
index d51a9925849..ff60e5bc088 100644
--- a/Core/Algorithms/Mask.cpp
+++ b/Core/Algorithms/Mask.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/Mask.cpp
+//! @file      Core/Algorithms/Mask.cpp
 //! @brief     Implements classes Mask, MaskIndexModulus, MaskCoordinates.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/Mask.h b/Core/Algorithms/Mask.h
index 6132e6a4806..a0c79e0112e 100644
--- a/Core/Algorithms/Mask.h
+++ b/Core/Algorithms/Mask.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/Mask.h
+//! @file      Core/Algorithms/Mask.h
 //! @brief     Declares classes Mask, MaskIndexModulus, MaskCoordinates.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/MaskCoordinateFunction.cpp b/Core/Algorithms/MaskCoordinateFunction.cpp
index a40f419793b..1ef84b889f3 100644
--- a/Core/Algorithms/MaskCoordinateFunction.cpp
+++ b/Core/Algorithms/MaskCoordinateFunction.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/MaskCoordinateFunction.cpp
+//! @file      Core/Algorithms/MaskCoordinateFunction.cpp
 //! @brief     Implements classes MaskCoordinateFunction, MaskCoordinate..Function
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/MaskCoordinateFunction.h b/Core/Algorithms/MaskCoordinateFunction.h
index 9b763eacea2..3ef8c2223e5 100644
--- a/Core/Algorithms/MaskCoordinateFunction.h
+++ b/Core/Algorithms/MaskCoordinateFunction.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/MaskCoordinateFunction.h
+//! @file      Core/Algorithms/MaskCoordinateFunction.h
 //! @brief     Declares classes MaskCoordinateFunction,
 //!              MaskCoordinateRectangleFunction, MaskCoordinateEllipseFunction
 //!
diff --git a/Core/Algorithms/MatrixRTCoefficients.cpp b/Core/Algorithms/MatrixRTCoefficients.cpp
index 7647eb8e16c..afbca699e1e 100644
--- a/Core/Algorithms/MatrixRTCoefficients.cpp
+++ b/Core/Algorithms/MatrixRTCoefficients.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/MatrixRTCoefficients.cpp
+//! @file      Core/Algorithms/MatrixRTCoefficients.cpp
 //! @brief     Implements class MatrixRTCoefficients.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/MatrixRTCoefficients.h b/Core/Algorithms/MatrixRTCoefficients.h
index 8ca3fc692e3..140176806fc 100644
--- a/Core/Algorithms/MatrixRTCoefficients.h
+++ b/Core/Algorithms/MatrixRTCoefficients.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/MatrixRTCoefficients.h
+//! @file      Core/Algorithms/MatrixRTCoefficients.h
 //! @brief     Declares class MatrixRTCoefficients.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/MatrixSpecularInfoMap.cpp b/Core/Algorithms/MatrixSpecularInfoMap.cpp
index f894adebe24..c3923bb5881 100644
--- a/Core/Algorithms/MatrixSpecularInfoMap.cpp
+++ b/Core/Algorithms/MatrixSpecularInfoMap.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ScalarSpecularInfoMap.cpp
+//! @file      Core/Algorithms/MatrixSpecularInfoMap.cpp
 //! @brief     Implements class ScalarSpecularInfoMap.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/MatrixSpecularInfoMap.h b/Core/Algorithms/MatrixSpecularInfoMap.h
index a400a21bf13..7c5e1a7b5db 100644
--- a/Core/Algorithms/MatrixSpecularInfoMap.h
+++ b/Core/Algorithms/MatrixSpecularInfoMap.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/MatrixSpecularInfoMap.h
+//! @file      Core/Algorithms/MatrixSpecularInfoMap.h
 //! @brief     Declares class MatrixSpecularInfoMap.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/MultiLayerDWBASimulation.cpp b/Core/Algorithms/MultiLayerDWBASimulation.cpp
index c559a87d16a..26fdfb51dbe 100644
--- a/Core/Algorithms/MultiLayerDWBASimulation.cpp
+++ b/Core/Algorithms/MultiLayerDWBASimulation.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/MultiLayerDWBASimulation.cpp
+//! @file      Core/Algorithms/MultiLayerDWBASimulation.cpp
 //! @brief     Implements class MultiLayerDWBASimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/MultiLayerDWBASimulation.h b/Core/Algorithms/MultiLayerDWBASimulation.h
index 61b61955c40..2650910609a 100644
--- a/Core/Algorithms/MultiLayerDWBASimulation.h
+++ b/Core/Algorithms/MultiLayerDWBASimulation.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/MultiLayerDWBASimulation.h
+//! @file      Core/Algorithms/MultiLayerDWBASimulation.h
 //! @brief     Declares class MultiLayerDWBASimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/MultiLayerRoughnessDWBASimulation.cpp b/Core/Algorithms/MultiLayerRoughnessDWBASimulation.cpp
index 78db26ce8bd..6296ac7e788 100644
--- a/Core/Algorithms/MultiLayerRoughnessDWBASimulation.cpp
+++ b/Core/Algorithms/MultiLayerRoughnessDWBASimulation.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/MultiLayerRoughnessDWBASimulation.cpp
+//! @file      Core/Algorithms/MultiLayerRoughnessDWBASimulation.cpp
 //! @brief     Implements class MultiLayerRoughnessDWBASimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/MultiLayerRoughnessDWBASimulation.h b/Core/Algorithms/MultiLayerRoughnessDWBASimulation.h
index 15938cb4bdf..efd4f592155 100644
--- a/Core/Algorithms/MultiLayerRoughnessDWBASimulation.h
+++ b/Core/Algorithms/MultiLayerRoughnessDWBASimulation.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/MultiLayerRoughnessDWBASimulation.h
+//! @file      Core/Algorithms/MultiLayerRoughnessDWBASimulation.h
 //! @brief     Declares class MultiLayerRoughnessDWBASimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/OMPISimulation.cpp b/Core/Algorithms/OMPISimulation.cpp
index 987c455f8f7..7bb13cc7cb6 100644
--- a/Core/Algorithms/OMPISimulation.cpp
+++ b/Core/Algorithms/OMPISimulation.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/OMPISimulation.cpp
+//! @file      Core/Algorithms/OMPISimulation.cpp
 //! @brief     Implements class OMPISimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/OMPISimulation.h b/Core/Algorithms/OMPISimulation.h
index fac3e47d76d..7c9a134ad53 100644
--- a/Core/Algorithms/OMPISimulation.h
+++ b/Core/Algorithms/OMPISimulation.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/OMPISimulation.h
+//! @file      Core/Algorithms/OMPISimulation.h
 //! @brief     Declares class OMPISimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/OffSpecSimulation.cpp b/Core/Algorithms/OffSpecSimulation.cpp
index e84d050a23e..1fed9e8877f 100644
--- a/Core/Algorithms/OffSpecSimulation.cpp
+++ b/Core/Algorithms/OffSpecSimulation.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/OffSpecSimulation.cpp
+//! @file      Core/Algorithms/OffSpecSimulation.cpp
 //! @brief     Implements class OffSpecSimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/OffSpecSimulation.h b/Core/Algorithms/OffSpecSimulation.h
index f43db61bb30..ff706304a23 100644
--- a/Core/Algorithms/OffSpecSimulation.h
+++ b/Core/Algorithms/OffSpecSimulation.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/OffSpecSimulation.h
+//! @file      Core/Algorithms/OffSpecSimulation.h
 //! @brief     Declares class OffSpecSimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ParameterSample.h b/Core/Algorithms/ParameterSample.h
index af59e998842..181f8dd3770 100644
--- a/Core/Algorithms/ParameterSample.h
+++ b/Core/Algorithms/ParameterSample.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ParameterSample.h
+//! @file      Core/Algorithms/ParameterSample.h
 //! @brief     Declares class ParameterSample.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ProgressHandler.cpp b/Core/Algorithms/ProgressHandler.cpp
index 246da90cdde..6bc88996c8e 100644
--- a/Core/Algorithms/ProgressHandler.cpp
+++ b/Core/Algorithms/ProgressHandler.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ProgressHandler.cpp
+//! @file      Core/Algorithms/ProgressHandler.cpp
 //! @brief     Implements class ProgressHandler.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ProgressHandler.h b/Core/Algorithms/ProgressHandler.h
index a3b31a452ac..f5e6f49533b 100644
--- a/Core/Algorithms/ProgressHandler.h
+++ b/Core/Algorithms/ProgressHandler.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ProgressHandler.h
+//! @file      Core/Algorithms/ProgressHandler.h
 //! @brief     Declares class ProgressHandler.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ProgressHandlerDWBA.cpp b/Core/Algorithms/ProgressHandlerDWBA.cpp
index 895c46ff47e..e0d4d3aac7f 100644
--- a/Core/Algorithms/ProgressHandlerDWBA.cpp
+++ b/Core/Algorithms/ProgressHandlerDWBA.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ProgressHandlerDWBA.cpp
+//! @file      Core/Algorithms/ProgressHandlerDWBA.cpp
 //! @brief     Implements class ProgressHandlerDWBA.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ProgressHandlerDWBA.h b/Core/Algorithms/ProgressHandlerDWBA.h
index ce68be67186..9b129afdbcf 100644
--- a/Core/Algorithms/ProgressHandlerDWBA.h
+++ b/Core/Algorithms/ProgressHandlerDWBA.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ProgressHandlerDWBA.h
+//! @file      Core/Algorithms/ProgressHandlerDWBA.h
 //! @brief     Declares class ProgressHandlerDWBA.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/RectangularDetector.cpp b/Core/Algorithms/RectangularDetector.cpp
index 020a592b2a5..53ad0963a35 100644
--- a/Core/Algorithms/RectangularDetector.cpp
+++ b/Core/Algorithms/RectangularDetector.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/RectangularDetector.cpp
+//! @file      Core/Algorithms/RectangularDetector.cpp
 //! @brief     Implements class RectangularDetector.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/RectangularDetector.h b/Core/Algorithms/RectangularDetector.h
index 94cbd6b30ad..5110356c3f2 100644
--- a/Core/Algorithms/RectangularDetector.h
+++ b/Core/Algorithms/RectangularDetector.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/RectangularDetector.h
+//! @file      Core/Algorithms/RectangularDetector.h
 //! @brief     Declares class RectangularDetector.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ResolutionFunction2DGaussian.cpp b/Core/Algorithms/ResolutionFunction2DGaussian.cpp
index c97245f2696..428b2a1bed0 100644
--- a/Core/Algorithms/ResolutionFunction2DGaussian.cpp
+++ b/Core/Algorithms/ResolutionFunction2DGaussian.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ResolutionFunction2DGaussian.cpp
+//! @file      Core/Algorithms/ResolutionFunction2DGaussian.cpp
 //! @brief     Implements class ResolutionFunction2DGaussian.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ResolutionFunction2DGaussian.h b/Core/Algorithms/ResolutionFunction2DGaussian.h
index 02e87cc1f29..de87c49712b 100644
--- a/Core/Algorithms/ResolutionFunction2DGaussian.h
+++ b/Core/Algorithms/ResolutionFunction2DGaussian.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ResolutionFunction2DGaussian.h
+//! @file      Core/Algorithms/ResolutionFunction2DGaussian.h
 //! @brief     Declares class ResolutionFunction2DGaussian.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ScalarRTCoefficients.h b/Core/Algorithms/ScalarRTCoefficients.h
index 150b3a3f70f..92f322b1538 100644
--- a/Core/Algorithms/ScalarRTCoefficients.h
+++ b/Core/Algorithms/ScalarRTCoefficients.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ScalarRTCoefficients.h
+//! @file      Core/Algorithms/ScalarRTCoefficients.h
 //! @brief     Declares class ScalarRTCoefficients.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ScalarSpecularInfoMap.cpp b/Core/Algorithms/ScalarSpecularInfoMap.cpp
index 2f96704706e..87a2cadcb0f 100644
--- a/Core/Algorithms/ScalarSpecularInfoMap.cpp
+++ b/Core/Algorithms/ScalarSpecularInfoMap.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ScalarSpecularInfoMap.cpp
+//! @file      Core/Algorithms/ScalarSpecularInfoMap.cpp
 //! @brief     Implements class ScalarSpecularInfoMap.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ScalarSpecularInfoMap.h b/Core/Algorithms/ScalarSpecularInfoMap.h
index 3879cbfa157..deb364aafde 100644
--- a/Core/Algorithms/ScalarSpecularInfoMap.h
+++ b/Core/Algorithms/ScalarSpecularInfoMap.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ScalarSpecularInfoMap.h
+//! @file      Core/Algorithms/ScalarSpecularInfoMap.h
 //! @brief     Declares class ScalarSpecularInfoMap.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/Simulation.cpp b/Core/Algorithms/Simulation.cpp
index 43626f48f55..2eb6a703496 100644
--- a/Core/Algorithms/Simulation.cpp
+++ b/Core/Algorithms/Simulation.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/Simulation.cpp
+//! @file      Core/Algorithms/Simulation.cpp
 //! @brief     Implements class Simulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/Simulation.h b/Core/Algorithms/Simulation.h
index 0d609948b28..c080156f844 100644
--- a/Core/Algorithms/Simulation.h
+++ b/Core/Algorithms/Simulation.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/Simulation.h
+//! @file      Core/Algorithms/Simulation.h
 //! @brief     Declares class Simulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/SimulationElement.cpp b/Core/Algorithms/SimulationElement.cpp
index fa283f53961..0f57bf298a5 100644
--- a/Core/Algorithms/SimulationElement.cpp
+++ b/Core/Algorithms/SimulationElement.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/SimulationElement.cpp
+//! @file      Core/Algorithms/SimulationElement.cpp
 //! @brief     Implements class SimulationElement.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/SimulationElement.h b/Core/Algorithms/SimulationElement.h
index cbaa1e758cf..7a6b6cd1c28 100644
--- a/Core/Algorithms/SimulationElement.h
+++ b/Core/Algorithms/SimulationElement.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/SimulationElement.h
+//! @file      Core/Algorithms/SimulationElement.h
 //! @brief     Declares class SimulationElement.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/SimulationOptions.cpp b/Core/Algorithms/SimulationOptions.cpp
index 5b3f949e910..2f2546c3bf5 100644
--- a/Core/Algorithms/SimulationOptions.cpp
+++ b/Core/Algorithms/SimulationOptions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/inc/SimulationOptions.cpp
+//! @file      Core/Algorithms/SimulationOptions.cpp
 //! @brief     Implements class SimulationOptions
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/SimulationOptions.h b/Core/Algorithms/SimulationOptions.h
index 82ecdec2f65..2d35cc91a95 100644
--- a/Core/Algorithms/SimulationOptions.h
+++ b/Core/Algorithms/SimulationOptions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/SimulationOptions.h
+//! @file      Core/Algorithms/SimulationOptions.h
 //! @brief     Declares class SimulationOptions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/SizeSpacingCorrelationApproximationStrategy.cpp b/Core/Algorithms/SizeSpacingCorrelationApproximationStrategy.cpp
index e8d7a1a09d8..6aaaff3a409 100644
--- a/Core/Algorithms/SizeSpacingCorrelationApproximationStrategy.cpp
+++ b/Core/Algorithms/SizeSpacingCorrelationApproximationStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/SizeSpacingCorrelationApproximationStrategy.cpp
+//! @file      Core/Algorithms/SizeSpacingCorrelationApproximationStrategy.cpp
 //! @brief     Implements class SizeSpacingCorrelationApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/SizeSpacingCorrelationApproximationStrategy.h b/Core/Algorithms/SizeSpacingCorrelationApproximationStrategy.h
index f92fc177fbe..291f2613e1e 100644
--- a/Core/Algorithms/SizeSpacingCorrelationApproximationStrategy.h
+++ b/Core/Algorithms/SizeSpacingCorrelationApproximationStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/SizeSpacingCorrelationApproximationStrategy.h
+//! @file      Core/Algorithms/SizeSpacingCorrelationApproximationStrategy.h
 //! @brief     Declares class SizeSpacingCorrelationApproximationStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/SpecularMagnetic.cpp b/Core/Algorithms/SpecularMagnetic.cpp
index aed1fe0d283..f71a7f80c66 100644
--- a/Core/Algorithms/SpecularMagnetic.cpp
+++ b/Core/Algorithms/SpecularMagnetic.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      SpecularMagnetic.cpp
+//! @file      Core/Algorithms/SpecularMagnetic.cpp
 //! @brief     Implements class SpecularMagnetic.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/SpecularMagnetic.h b/Core/Algorithms/SpecularMagnetic.h
index a298e7b5361..8666d6562de 100644
--- a/Core/Algorithms/SpecularMagnetic.h
+++ b/Core/Algorithms/SpecularMagnetic.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/SpecularMagnetic.h
+//! @file      Core/Algorithms/SpecularMagnetic.h
 //! @brief     Declares class SpecularMagnetic.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/SpecularMatrix.cpp b/Core/Algorithms/SpecularMatrix.cpp
index bbfe4ac0a93..d158bb208a9 100644
--- a/Core/Algorithms/SpecularMatrix.cpp
+++ b/Core/Algorithms/SpecularMatrix.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/SpecularMatrix.cpp
+//! @file      Core/Algorithms/SpecularMatrix.cpp
 //! @brief     Implements class SpecularMatrix.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/SpecularMatrix.h b/Core/Algorithms/SpecularMatrix.h
index 2e93ee3e7a0..24ddab6a4fa 100644
--- a/Core/Algorithms/SpecularMatrix.h
+++ b/Core/Algorithms/SpecularMatrix.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/SpecularMatrix.h
+//! @file      Core/Algorithms/SpecularMatrix.h
 //! @brief     Declares class SpecularMatrix.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/SpecularSimulation.cpp b/Core/Algorithms/SpecularSimulation.cpp
index a1e7a8f51ff..65628eb8eeb 100644
--- a/Core/Algorithms/SpecularSimulation.cpp
+++ b/Core/Algorithms/SpecularSimulation.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/OffSpecSimulation.cpp
+//! @file      Core/Algorithms/SpecularSimulation.cpp
 //! @brief     Implements class OffSpecSimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/SpecularSimulation.h b/Core/Algorithms/SpecularSimulation.h
index 17cf393cd6c..158447a11a1 100644
--- a/Core/Algorithms/SpecularSimulation.h
+++ b/Core/Algorithms/SpecularSimulation.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/SpecularSimulation.h
+//! @file      Core/Algorithms/SpecularSimulation.h
 //! @brief     Declares class SpecularSimulation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/SphericalDetector.cpp b/Core/Algorithms/SphericalDetector.cpp
index da0a931d854..966d0ba2f87 100644
--- a/Core/Algorithms/SphericalDetector.cpp
+++ b/Core/Algorithms/SphericalDetector.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/SphericalDetector.cpp
+//! @file      Core/Algorithms/SphericalDetector.cpp
 //! @brief     Implements class SphericalDetector.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/SphericalDetector.h b/Core/Algorithms/SphericalDetector.h
index 6b31b230cc1..8bce6ddefc1 100644
--- a/Core/Algorithms/SphericalDetector.h
+++ b/Core/Algorithms/SphericalDetector.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/SphericalDetector.h
+//! @file      Core/Algorithms/SphericalDetector.h
 //! @brief     Declares class SphericalDetector.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Algorithms/ThreadInfo.h b/Core/Algorithms/ThreadInfo.h
index 1e301fba49f..288b3297902 100644
--- a/Core/Algorithms/ThreadInfo.h
+++ b/Core/Algorithms/ThreadInfo.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/ThreadInfo.h
+//! @file      Core/Algorithms/ThreadInfo.h
 //! @brief     Declares struct ThreadInfo.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorAnisoPyramid.cpp b/Core/FormFactors/FormFactorAnisoPyramid.cpp
index 71486a338bf..e3990e80544 100644
--- a/Core/FormFactors/FormFactorAnisoPyramid.cpp
+++ b/Core/FormFactors/FormFactorAnisoPyramid.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorAnisoPyramid.cpp
+//! @file      Core/FormFactors/FormFactorAnisoPyramid.cpp
 //! @brief     Implements class FormFactorAnisoPyramid.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorAnisoPyramid.h b/Core/FormFactors/FormFactorAnisoPyramid.h
index 640108f70a1..c045f1b8117 100644
--- a/Core/FormFactors/FormFactorAnisoPyramid.h
+++ b/Core/FormFactors/FormFactorAnisoPyramid.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorAnisoPyramid.h
+//! @file      Core/FormFactors/FormFactorAnisoPyramid.h
 //! @brief     Declares class FormFactorAnisoPyramid
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorBox.cpp b/Core/FormFactors/FormFactorBox.cpp
index c8f74036541..ff31d7ae9a6 100644
--- a/Core/FormFactors/FormFactorBox.cpp
+++ b/Core/FormFactors/FormFactorBox.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorBox.cpp
+//! @file      Core/FormFactors/FormFactorBox.cpp
 //! @brief     Implements class FormFactorBox.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorBox.h b/Core/FormFactors/FormFactorBox.h
index 40b4ddad4ba..7ff7a639223 100644
--- a/Core/FormFactors/FormFactorBox.h
+++ b/Core/FormFactors/FormFactorBox.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorBox.h
+//! @file      Core/FormFactors/FormFactorBox.h
 //! @brief     Declares class FormFactorBox.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorCone.cpp b/Core/FormFactors/FormFactorCone.cpp
index 05c27057815..0aca23496fb 100644
--- a/Core/FormFactors/FormFactorCone.cpp
+++ b/Core/FormFactors/FormFactorCone.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorCone.cpp
+//! @file      Core/FormFactors/FormFactorCone.cpp
 //! @brief     Implements class FormFactorCone.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorCone.h b/Core/FormFactors/FormFactorCone.h
index a17f0737eb5..d9d2a55c78a 100644
--- a/Core/FormFactors/FormFactorCone.h
+++ b/Core/FormFactors/FormFactorCone.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorCone.h
+//! @file      Core/FormFactors/FormFactorCone.h
 //! @brief     Declares class FormFactorCone
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorCone6.cpp b/Core/FormFactors/FormFactorCone6.cpp
index d963232b565..056d14161cf 100644
--- a/Core/FormFactors/FormFactorCone6.cpp
+++ b/Core/FormFactors/FormFactorCone6.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorCone6.cpp
+//! @file      Core/FormFactors/FormFactorCone6.cpp
 //! @brief     Implements class FormFactorCone6.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorCone6.h b/Core/FormFactors/FormFactorCone6.h
index f8331323193..eb8ffc6392d 100644
--- a/Core/FormFactors/FormFactorCone6.h
+++ b/Core/FormFactors/FormFactorCone6.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorCone6.h
+//! @file      Core/FormFactors/FormFactorCone6.h
 //! @brief     Declares class FormFactorCone6
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorCrystal.cpp b/Core/FormFactors/FormFactorCrystal.cpp
index ef725b02bf5..d17d273e6cd 100644
--- a/Core/FormFactors/FormFactorCrystal.cpp
+++ b/Core/FormFactors/FormFactorCrystal.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorCrystal.cpp
+//! @file      Core/FormFactors/FormFactorCrystal.cpp
 //! @brief     Implements class FormFactorCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorCrystal.h b/Core/FormFactors/FormFactorCrystal.h
index bb1c8f67460..fa590532174 100644
--- a/Core/FormFactors/FormFactorCrystal.h
+++ b/Core/FormFactors/FormFactorCrystal.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorCrystal.h
+//! @file      Core/FormFactors/FormFactorCrystal.h
 //! @brief     Declares class FormFactorCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorCuboctahedron.cpp b/Core/FormFactors/FormFactorCuboctahedron.cpp
index c56449eaaa0..e056a77689e 100644
--- a/Core/FormFactors/FormFactorCuboctahedron.cpp
+++ b/Core/FormFactors/FormFactorCuboctahedron.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorCuboctahedron.cpp
+//! @file      Core/FormFactors/FormFactorCuboctahedron.cpp
 //! @brief     Implements class FormFactorCuboctahedron.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorCuboctahedron.h b/Core/FormFactors/FormFactorCuboctahedron.h
index 042d747fe6d..6fa0d43abfe 100644
--- a/Core/FormFactors/FormFactorCuboctahedron.h
+++ b/Core/FormFactors/FormFactorCuboctahedron.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorCuboctahedron.h
+//! @file      Core/FormFactors/FormFactorCuboctahedron.h
 //! @brief     Declares class FormFactorCuboctahedron
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorCylinder.cpp b/Core/FormFactors/FormFactorCylinder.cpp
index 84e9bbabdf7..936ecc6c3ee 100644
--- a/Core/FormFactors/FormFactorCylinder.cpp
+++ b/Core/FormFactors/FormFactorCylinder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorCylinder.cpp
+//! @file      Core/FormFactors/FormFactorCylinder.cpp
 //! @brief     Implements class FormFactorCylinder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorCylinder.h b/Core/FormFactors/FormFactorCylinder.h
index 89a069be616..c4d11b57bdb 100644
--- a/Core/FormFactors/FormFactorCylinder.h
+++ b/Core/FormFactors/FormFactorCylinder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorCylinder.h
+//! @file      Core/FormFactors/FormFactorCylinder.h
 //! @brief     Declares class FormFactorCylinder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorDWBA.cpp b/Core/FormFactors/FormFactorDWBA.cpp
index d879fe7301e..c0b389bf64b 100644
--- a/Core/FormFactors/FormFactorDWBA.cpp
+++ b/Core/FormFactors/FormFactorDWBA.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorDWBA.cpp
+//! @file      Core/FormFactors/FormFactorDWBA.cpp
 //! @brief     Implements class FormFactorDWBA.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorDWBA.h b/Core/FormFactors/FormFactorDWBA.h
index 546b12e482a..458394b5798 100644
--- a/Core/FormFactors/FormFactorDWBA.h
+++ b/Core/FormFactors/FormFactorDWBA.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorDWBA.h
+//! @file      Core/FormFactors/FormFactorDWBA.h
 //! @brief     Declares class FormFactorDWBA.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorDWBAPol.cpp b/Core/FormFactors/FormFactorDWBAPol.cpp
index 8f88463ddac..ac79ec42769 100644
--- a/Core/FormFactors/FormFactorDWBAPol.cpp
+++ b/Core/FormFactors/FormFactorDWBAPol.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorDWBAPol.cpp
+//! @file      Core/FormFactors/FormFactorDWBAPol.cpp
 //! @brief     Defines class FormFactorDWBAPol.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorDWBAPol.h b/Core/FormFactors/FormFactorDWBAPol.h
index 6824a124a83..8f9799acca0 100644
--- a/Core/FormFactors/FormFactorDWBAPol.h
+++ b/Core/FormFactors/FormFactorDWBAPol.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorDWBAPol.h
+//! @file      Core/FormFactors/FormFactorDWBAPol.h
 //! @brief     Declares class FormFactorDWBAPol.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorDecoratorDebyeWaller.cpp b/Core/FormFactors/FormFactorDecoratorDebyeWaller.cpp
index cbb609088c4..dd47d5c8e14 100644
--- a/Core/FormFactors/FormFactorDecoratorDebyeWaller.cpp
+++ b/Core/FormFactors/FormFactorDecoratorDebyeWaller.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorDecoratorDebyeWaller.cpp
+//! @file      Core/FormFactors/FormFactorDecoratorDebyeWaller.cpp
 //! @brief     Implements class FormFactorDecoratorDebyeWaller.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorDecoratorDebyeWaller.h b/Core/FormFactors/FormFactorDecoratorDebyeWaller.h
index affa22d61de..8af6b669cd5 100644
--- a/Core/FormFactors/FormFactorDecoratorDebyeWaller.h
+++ b/Core/FormFactors/FormFactorDecoratorDebyeWaller.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorDecoratorDebyeWaller.h
+//! @file      Core/FormFactors/FormFactorDecoratorDebyeWaller.h
 //! @brief     Declares and implements class FormFactorDecoratorDebyeWaller.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorDecoratorFactor.h b/Core/FormFactors/FormFactorDecoratorFactor.h
index 4e6447760b4..41dbdd3b810 100644
--- a/Core/FormFactors/FormFactorDecoratorFactor.h
+++ b/Core/FormFactors/FormFactorDecoratorFactor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorDecoratorFactor.h
+//! @file      Core/FormFactors/FormFactorDecoratorFactor.h
 //! @brief     Declares class FormFactorDecoratorFactor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorDecoratorMaterial.cpp b/Core/FormFactors/FormFactorDecoratorMaterial.cpp
index 1c81e9540a5..37840fbc89a 100644
--- a/Core/FormFactors/FormFactorDecoratorMaterial.cpp
+++ b/Core/FormFactors/FormFactorDecoratorMaterial.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorDecoratorMaterial.cpp
+//! @file      Core/FormFactors/FormFactorDecoratorMaterial.cpp
 //! @brief     Implements class FormFactorDecoratorMaterial.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorDecoratorMaterial.h b/Core/FormFactors/FormFactorDecoratorMaterial.h
index ab89094bca0..c552dc7db07 100644
--- a/Core/FormFactors/FormFactorDecoratorMaterial.h
+++ b/Core/FormFactors/FormFactorDecoratorMaterial.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorDecoratorMaterial.h
+//! @file      Core/FormFactors/FormFactorDecoratorMaterial.h
 //! @brief     Declares class FormFactorDecoratorMaterial.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorDecoratorMultiPositionFactor.cpp b/Core/FormFactors/FormFactorDecoratorMultiPositionFactor.cpp
index e41165c3e11..a33c00d469d 100644
--- a/Core/FormFactors/FormFactorDecoratorMultiPositionFactor.cpp
+++ b/Core/FormFactors/FormFactorDecoratorMultiPositionFactor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorDecoratorMultiPositionFactor.cpp
+//! @file      Core/FormFactors/FormFactorDecoratorMultiPositionFactor.cpp
 //! @brief     Implements class FormFactorDecoratorMultiPositionFactor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorDecoratorMultiPositionFactor.h b/Core/FormFactors/FormFactorDecoratorMultiPositionFactor.h
index af223d5fb17..e96362de053 100644
--- a/Core/FormFactors/FormFactorDecoratorMultiPositionFactor.h
+++ b/Core/FormFactors/FormFactorDecoratorMultiPositionFactor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorDecoratorMultiPositionFactor.h
+//! @file      Core/FormFactors/FormFactorDecoratorMultiPositionFactor.h
 //! @brief     Declares class FormFactorDecoratorMultiPositionFactor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorDecoratorPositionFactor.h b/Core/FormFactors/FormFactorDecoratorPositionFactor.h
index dda041e0b8c..2d11e857805 100644
--- a/Core/FormFactors/FormFactorDecoratorPositionFactor.h
+++ b/Core/FormFactors/FormFactorDecoratorPositionFactor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorDecoratorPositionFactor.h
+//! @file      Core/FormFactors/FormFactorDecoratorPositionFactor.h
 //! @brief     Declares class FormFactorDecoratorPositionFactor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorDecoratorRotation.cpp b/Core/FormFactors/FormFactorDecoratorRotation.cpp
index d529d274448..a613731ce40 100644
--- a/Core/FormFactors/FormFactorDecoratorRotation.cpp
+++ b/Core/FormFactors/FormFactorDecoratorRotation.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorDecoratorRotation.cpp
+//! @file      Core/FormFactors/FormFactorDecoratorRotation.cpp
 //! @brief     Implements class FormFactorDecoratorRotation
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorDecoratorRotation.h b/Core/FormFactors/FormFactorDecoratorRotation.h
index c5f0cc45220..38fd7121722 100644
--- a/Core/FormFactors/FormFactorDecoratorRotation.h
+++ b/Core/FormFactors/FormFactorDecoratorRotation.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorDecoratorRotation.h
+//! @file      Core/FormFactors/FormFactorDecoratorRotation.h
 //! @brief     Declares class FormFactorDecoratorRotation.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorDodecahedron.cpp b/Core/FormFactors/FormFactorDodecahedron.cpp
index b6d928feb98..b3e5a699e40 100644
--- a/Core/FormFactors/FormFactorDodecahedron.cpp
+++ b/Core/FormFactors/FormFactorDodecahedron.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorzdodecahedron.cpp
+//! @file      Core/FormFactors/FormFactorDodecahedron.cpp
 //! @brief     Implements class FormFactorDodecahedron.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorDodecahedron.h b/Core/FormFactors/FormFactorDodecahedron.h
index da1584e7ca8..ac8265b77bb 100644
--- a/Core/FormFactors/FormFactorDodecahedron.h
+++ b/Core/FormFactors/FormFactorDodecahedron.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorDodecahedron.h
+//! @file      Core/FormFactors/FormFactorDodecahedron.h
 //! @brief     Declares class FormFactorDodecahedron.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorEllipsoidalCylinder.cpp b/Core/FormFactors/FormFactorEllipsoidalCylinder.cpp
index 4639ec04bc2..2c35e14f9c2 100644
--- a/Core/FormFactors/FormFactorEllipsoidalCylinder.cpp
+++ b/Core/FormFactors/FormFactorEllipsoidalCylinder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorEllipsoidalCylinder.cpp
+//! @file      Core/FormFactors/FormFactorEllipsoidalCylinder.cpp
 //! @brief     Implements class FormFactorEllipsoidalCylinder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorEllipsoidalCylinder.h b/Core/FormFactors/FormFactorEllipsoidalCylinder.h
index bcd9815b8cd..6d8eebcc230 100644
--- a/Core/FormFactors/FormFactorEllipsoidalCylinder.h
+++ b/Core/FormFactors/FormFactorEllipsoidalCylinder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorEllipsoidalCylinder.h
+//! @file      Core/FormFactors/FormFactorEllipsoidalCylinder.h
 //! @brief     Declares class FormFactorEllipsoidalCylinder
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorFullSphere.cpp b/Core/FormFactors/FormFactorFullSphere.cpp
index 166b1c5fe9c..6b22398af4d 100644
--- a/Core/FormFactors/FormFactorFullSphere.cpp
+++ b/Core/FormFactors/FormFactorFullSphere.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorFullSphere.cpp
+//! @file      Core/FormFactors/FormFactorFullSphere.cpp
 //! @brief     Implements class FormFactorFullSphere.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorFullSphere.h b/Core/FormFactors/FormFactorFullSphere.h
index 95c6fe21ad9..dc91fcd9767 100644
--- a/Core/FormFactors/FormFactorFullSphere.h
+++ b/Core/FormFactors/FormFactorFullSphere.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorFullSphere.h
+//! @file      Core/FormFactors/FormFactorFullSphere.h
 //! @brief     Declares class FormFactorFullSphere.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorFullSpheroid.cpp b/Core/FormFactors/FormFactorFullSpheroid.cpp
index 8bd35029267..3b888763ac7 100644
--- a/Core/FormFactors/FormFactorFullSpheroid.cpp
+++ b/Core/FormFactors/FormFactorFullSpheroid.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorFullSpheroid.cpp
+//! @file      Core/FormFactors/FormFactorFullSpheroid.cpp
 //! @brief     Implements class FormFactorFullSpheroid.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorFullSpheroid.h b/Core/FormFactors/FormFactorFullSpheroid.h
index 09812cb3a85..8661e0faeba 100644
--- a/Core/FormFactors/FormFactorFullSpheroid.h
+++ b/Core/FormFactors/FormFactorFullSpheroid.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorFullSpheroid.h
+//! @file      Core/FormFactors/FormFactorFullSpheroid.h
 //! @brief     Declares class FormFactorFullSpheroid.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorGauss.cpp b/Core/FormFactors/FormFactorGauss.cpp
index 34b58ef338a..a14642e7bcf 100644
--- a/Core/FormFactors/FormFactorGauss.cpp
+++ b/Core/FormFactors/FormFactorGauss.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorGauss.cpp
+//! @file      Core/FormFactors/FormFactorGauss.cpp
 //! @brief     Implements class FormFactorGauss.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorGauss.h b/Core/FormFactors/FormFactorGauss.h
index 9bf6b82eb60..fc40f601529 100644
--- a/Core/FormFactors/FormFactorGauss.h
+++ b/Core/FormFactors/FormFactorGauss.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorGauss.h
+//! @file      Core/FormFactors/FormFactorGauss.h
 //! @brief     Declares class FormFactorGauss.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorHemiEllipsoid.cpp b/Core/FormFactors/FormFactorHemiEllipsoid.cpp
index cca2c5cb95a..bc8d3d0174e 100644
--- a/Core/FormFactors/FormFactorHemiEllipsoid.cpp
+++ b/Core/FormFactors/FormFactorHemiEllipsoid.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorHemiEllipsoid.cpp
+//! @file      Core/FormFactors/FormFactorHemiEllipsoid.cpp
 //! @brief     Implements class FormFactorHemiEllipsoid.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorHemiEllipsoid.h b/Core/FormFactors/FormFactorHemiEllipsoid.h
index 0773aee0647..9d18e4de194 100644
--- a/Core/FormFactors/FormFactorHemiEllipsoid.h
+++ b/Core/FormFactors/FormFactorHemiEllipsoid.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorHemiEllipsoid.h
+//! @file      Core/FormFactors/FormFactorHemiEllipsoid.h
 //! @brief     Declares class FormFactorHemiEllipsoid.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorIcosahedron.cpp b/Core/FormFactors/FormFactorIcosahedron.cpp
index 93f21cfee8f..a14d9d9fd55 100644
--- a/Core/FormFactors/FormFactorIcosahedron.cpp
+++ b/Core/FormFactors/FormFactorIcosahedron.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorzicosahedron.cpp
+//! @file      Core/FormFactors/FormFactorIcosahedron.cpp
 //! @brief     Implements class FormFactorIcosahedron.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorIcosahedron.h b/Core/FormFactors/FormFactorIcosahedron.h
index 77e6e750f2d..d3afb7eddc5 100644
--- a/Core/FormFactors/FormFactorIcosahedron.h
+++ b/Core/FormFactors/FormFactorIcosahedron.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorIcosahedron.h
+//! @file      Core/FormFactors/FormFactorIcosahedron.h
 //! @brief     Declares class FormFactorIcosahedron.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorLongBoxGauss.cpp b/Core/FormFactors/FormFactorLongBoxGauss.cpp
index d7c7dca8f3a..5aaba42ecc8 100644
--- a/Core/FormFactors/FormFactorLongBoxGauss.cpp
+++ b/Core/FormFactors/FormFactorLongBoxGauss.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorLongBoxGauss.cpp
+//! @file      Core/FormFactors/FormFactorLongBoxGauss.cpp
 //! @brief     Implements class FormFactorLongBoxGauss.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorLongBoxGauss.h b/Core/FormFactors/FormFactorLongBoxGauss.h
index 69c5ff251a0..3dc3ae389bf 100644
--- a/Core/FormFactors/FormFactorLongBoxGauss.h
+++ b/Core/FormFactors/FormFactorLongBoxGauss.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorLongBoxGauss.h
+//! @file      Core/FormFactors/FormFactorLongBoxGauss.h
 //! @brief     Declares class FormFactorLongBoxGauss.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorLongBoxLorentz.cpp b/Core/FormFactors/FormFactorLongBoxLorentz.cpp
index f17e7c7f743..6da64b1ca64 100644
--- a/Core/FormFactors/FormFactorLongBoxLorentz.cpp
+++ b/Core/FormFactors/FormFactorLongBoxLorentz.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorLongBoxLorentz.cpp
+//! @file      Core/FormFactors/FormFactorLongBoxLorentz.cpp
 //! @brief     Implements class FormFactorLongBoxLorentz.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorLongBoxLorentz.h b/Core/FormFactors/FormFactorLongBoxLorentz.h
index ced6c9dc1b2..5e36994f3d9 100644
--- a/Core/FormFactors/FormFactorLongBoxLorentz.h
+++ b/Core/FormFactors/FormFactorLongBoxLorentz.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorLongBoxLorentz.h
+//! @file      Core/FormFactors/FormFactorLongBoxLorentz.h
 //! @brief     Declares class FormFactorLongBoxLorentz.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorLongRipple1Gauss.cpp b/Core/FormFactors/FormFactorLongRipple1Gauss.cpp
index d22ba8c8cd4..0834bc2cf98 100644
--- a/Core/FormFactors/FormFactorLongRipple1Gauss.cpp
+++ b/Core/FormFactors/FormFactorLongRipple1Gauss.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorLongRipple1Gauss.cpp
+//! @file      Core/FormFactors/FormFactorLongRipple1Gauss.cpp
 //! @brief     Implements class FormFactorLongRipple1Gauss.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorLongRipple1Gauss.h b/Core/FormFactors/FormFactorLongRipple1Gauss.h
index 8c83ebd2ff2..3486a0efb28 100644
--- a/Core/FormFactors/FormFactorLongRipple1Gauss.h
+++ b/Core/FormFactors/FormFactorLongRipple1Gauss.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorLongRipple1Gauss.h
+//! @file      Core/FormFactors/FormFactorLongRipple1Gauss.h
 //! @brief     Declares class FormFactorLongRipple1Gauss.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorLongRipple1Lorentz.cpp b/Core/FormFactors/FormFactorLongRipple1Lorentz.cpp
index 29e93ba584d..0dd80cff8af 100644
--- a/Core/FormFactors/FormFactorLongRipple1Lorentz.cpp
+++ b/Core/FormFactors/FormFactorLongRipple1Lorentz.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorLongRipple1Lorentz.cpp
+//! @file      Core/FormFactors/FormFactorLongRipple1Lorentz.cpp
 //! @brief     Implements class FormFactorLongRipple1Lorentz.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorLongRipple1Lorentz.h b/Core/FormFactors/FormFactorLongRipple1Lorentz.h
index 81049a12fbd..7f3da370a85 100644
--- a/Core/FormFactors/FormFactorLongRipple1Lorentz.h
+++ b/Core/FormFactors/FormFactorLongRipple1Lorentz.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorLongRipple1Lorentz.h
+//! @file      Core/FormFactors/FormFactorLongRipple1Lorentz.h
 //! @brief     Declares class FormFactorLongRipple1Lorentz.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorLongRipple2Gauss.cpp b/Core/FormFactors/FormFactorLongRipple2Gauss.cpp
index b4b9e176465..449825c302c 100644
--- a/Core/FormFactors/FormFactorLongRipple2Gauss.cpp
+++ b/Core/FormFactors/FormFactorLongRipple2Gauss.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorLongRipple2Gauss.cpp
+//! @file      Core/FormFactors/FormFactorLongRipple2Gauss.cpp
 //! @brief     Implements class FormFactorLongRipple2Gauss.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorLongRipple2Gauss.h b/Core/FormFactors/FormFactorLongRipple2Gauss.h
index fb67bc735c1..3470c803e8f 100644
--- a/Core/FormFactors/FormFactorLongRipple2Gauss.h
+++ b/Core/FormFactors/FormFactorLongRipple2Gauss.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorLongRipple2Gauss.h
+//! @file      Core/FormFactors/FormFactorLongRipple2Gauss.h
 //! @brief     Declares class FormFactorLongRipple2Gauss.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorLongRipple2Lorentz.cpp b/Core/FormFactors/FormFactorLongRipple2Lorentz.cpp
index 13274c1f818..4f0cfe6177a 100644
--- a/Core/FormFactors/FormFactorLongRipple2Lorentz.cpp
+++ b/Core/FormFactors/FormFactorLongRipple2Lorentz.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorRipple2.cpp
+//! @file      Core/FormFactors/FormFactorLongRipple2Lorentz.cpp
 //! @brief     Implements class FormFactorRipple2.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorLongRipple2Lorentz.h b/Core/FormFactors/FormFactorLongRipple2Lorentz.h
index bc04d74da6e..d1eec9625ea 100644
--- a/Core/FormFactors/FormFactorLongRipple2Lorentz.h
+++ b/Core/FormFactors/FormFactorLongRipple2Lorentz.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorLongRipple2Lorentz.h
+//! @file      Core/FormFactors/FormFactorLongRipple2Lorentz.h
 //! @brief     Declares class FormFactorLongRipple2Lorentz.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorLorentz.cpp b/Core/FormFactors/FormFactorLorentz.cpp
index 8c419fdfb3e..66b29e15a34 100644
--- a/Core/FormFactors/FormFactorLorentz.cpp
+++ b/Core/FormFactors/FormFactorLorentz.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorLorentz.cpp
+//! @file      Core/FormFactors/FormFactorLorentz.cpp
 //! @brief     Implements class FormFactorLorentz.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorLorentz.h b/Core/FormFactors/FormFactorLorentz.h
index 4a092af076a..aa8929ff8c0 100644
--- a/Core/FormFactors/FormFactorLorentz.h
+++ b/Core/FormFactors/FormFactorLorentz.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorLorentz.h
+//! @file      Core/FormFactors/FormFactorLorentz.h
 //! @brief     Declares class FormFactorLorentz.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorPolyhedron.cpp b/Core/FormFactors/FormFactorPolyhedron.cpp
index 38691796a6c..dcdb89e6ab6 100644
--- a/Core/FormFactors/FormFactorPolyhedron.cpp
+++ b/Core/FormFactors/FormFactorPolyhedron.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorPolyhedron.cpp
+//! @file      Core/FormFactors/FormFactorPolyhedron.cpp
 //! @brief     Implements class FormFactorPolyhedron, FormFactorPrism, and auxiliary classes.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorPolyhedron.h b/Core/FormFactors/FormFactorPolyhedron.h
index 7ce67ef9da4..ad8a0f1127a 100644
--- a/Core/FormFactors/FormFactorPolyhedron.h
+++ b/Core/FormFactors/FormFactorPolyhedron.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorPolyhedron.h
+//! @file      Core/FormFactors/FormFactorPolyhedron.h
 //! @brief     Declares class FormFactorPolyhedron, FormFactorPrism, and auxiliary classes.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorPrism3.cpp b/Core/FormFactors/FormFactorPrism3.cpp
index 4ea519521a5..d2dc306dca5 100644
--- a/Core/FormFactors/FormFactorPrism3.cpp
+++ b/Core/FormFactors/FormFactorPrism3.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorPrism3.cpp
+//! @file      Core/FormFactors/FormFactorPrism3.cpp
 //! @brief     Implements class FormFactorPrism3.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorPrism3.h b/Core/FormFactors/FormFactorPrism3.h
index b4f331cf5f6..e9444783160 100644
--- a/Core/FormFactors/FormFactorPrism3.h
+++ b/Core/FormFactors/FormFactorPrism3.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorPrism3.h
+//! @file      Core/FormFactors/FormFactorPrism3.h
 //! @brief     Declares class FormFactorPrism3.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorPrism6.cpp b/Core/FormFactors/FormFactorPrism6.cpp
index 8741ed7cd25..efc93ae3fb8 100644
--- a/Core/FormFactors/FormFactorPrism6.cpp
+++ b/Core/FormFactors/FormFactorPrism6.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorPrism6.cpp
+//! @file      Core/FormFactors/FormFactorPrism6.cpp
 //! @brief     Implements class FormFactorPrism6.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorPrism6.h b/Core/FormFactors/FormFactorPrism6.h
index 6743c59446f..df2ceb94490 100644
--- a/Core/FormFactors/FormFactorPrism6.h
+++ b/Core/FormFactors/FormFactorPrism6.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorPrism6.h
+//! @file      Core/FormFactors/FormFactorPrism6.h
 //! @brief     Declares class FormFactorPrism6.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorPyramid.cpp b/Core/FormFactors/FormFactorPyramid.cpp
index 845f6d36934..86e0135a357 100644
--- a/Core/FormFactors/FormFactorPyramid.cpp
+++ b/Core/FormFactors/FormFactorPyramid.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorPyramid.cpp
+//! @file      Core/FormFactors/FormFactorPyramid.cpp
 //! @brief     Implements class FormFactorPyramid.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorPyramid.h b/Core/FormFactors/FormFactorPyramid.h
index e191396ddd2..0ca39909f6a 100644
--- a/Core/FormFactors/FormFactorPyramid.h
+++ b/Core/FormFactors/FormFactorPyramid.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorPyramid.h
+//! @file      Core/FormFactors/FormFactorPyramid.h
 //! @brief     Declares class FormFactorPyramid
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorRipple1.cpp b/Core/FormFactors/FormFactorRipple1.cpp
index 66409045101..d15a905574b 100644
--- a/Core/FormFactors/FormFactorRipple1.cpp
+++ b/Core/FormFactors/FormFactorRipple1.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorRipple1.cpp
+//! @file      Core/FormFactors/FormFactorRipple1.cpp
 //! @brief     Implements class FormFactorRipple1.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorRipple1.h b/Core/FormFactors/FormFactorRipple1.h
index cb51d6ad83a..a216e7cd173 100644
--- a/Core/FormFactors/FormFactorRipple1.h
+++ b/Core/FormFactors/FormFactorRipple1.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorRipple1.h
+//! @file      Core/FormFactors/FormFactorRipple1.h
 //! @brief     Declares class FormFactorRipple1.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorRipple2.cpp b/Core/FormFactors/FormFactorRipple2.cpp
index f24424d4d7f..82e67c55df6 100644
--- a/Core/FormFactors/FormFactorRipple2.cpp
+++ b/Core/FormFactors/FormFactorRipple2.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorRipple2.cpp
+//! @file      Core/FormFactors/FormFactorRipple2.cpp
 //! @brief     Implements class FormFactorRipple2.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorRipple2.h b/Core/FormFactors/FormFactorRipple2.h
index 46dd331fead..3b111c0fd7d 100644
--- a/Core/FormFactors/FormFactorRipple2.h
+++ b/Core/FormFactors/FormFactorRipple2.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorRipple2.h
+//! @file      Core/FormFactors/FormFactorRipple2.h
 //! @brief     Declares class FormFactorRipple2.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorSphereGaussianRadius.cpp b/Core/FormFactors/FormFactorSphereGaussianRadius.cpp
index abf3ad242e4..4e815929efa 100644
--- a/Core/FormFactors/FormFactorSphereGaussianRadius.cpp
+++ b/Core/FormFactors/FormFactorSphereGaussianRadius.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorSphereGaussianRadius.cpp
+//! @file      Core/FormFactors/FormFactorSphereGaussianRadius.cpp
 //! @brief     Implements class FormFactorSphereGaussianRadius.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorSphereGaussianRadius.h b/Core/FormFactors/FormFactorSphereGaussianRadius.h
index 2163104800a..d0f08b60c75 100644
--- a/Core/FormFactors/FormFactorSphereGaussianRadius.h
+++ b/Core/FormFactors/FormFactorSphereGaussianRadius.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorSphereGaussianRadius.h
+//! @file      Core/FormFactors/FormFactorSphereGaussianRadius.h
 //! @brief     Declares and implements class FormFactorSphereGaussianRadius.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorSphereLogNormalRadius.cpp b/Core/FormFactors/FormFactorSphereLogNormalRadius.cpp
index 3fc47b65267..40027c88c89 100644
--- a/Core/FormFactors/FormFactorSphereLogNormalRadius.cpp
+++ b/Core/FormFactors/FormFactorSphereLogNormalRadius.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorSphereGaussianRadius.cpp
+//! @file      Core/FormFactors/FormFactorSphereLogNormalRadius.cpp
 //! @brief     Implements class FormFactorSphereGaussianRadius.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorSphereLogNormalRadius.h b/Core/FormFactors/FormFactorSphereLogNormalRadius.h
index 01f9c47bb97..050059df356 100644
--- a/Core/FormFactors/FormFactorSphereLogNormalRadius.h
+++ b/Core/FormFactors/FormFactorSphereLogNormalRadius.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorSphereLogNormalRadius.h
+//! @file      Core/FormFactors/FormFactorSphereLogNormalRadius.h
 //! @brief     Declares and implements class FormFactorSphereLogNormalRadius.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorSphereUniformRadius.cpp b/Core/FormFactors/FormFactorSphereUniformRadius.cpp
index 7ed655d2d69..afdb8e3a5db 100644
--- a/Core/FormFactors/FormFactorSphereUniformRadius.cpp
+++ b/Core/FormFactors/FormFactorSphereUniformRadius.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorSphereUniformRadius.cpp
+//! @file      Core/FormFactors/FormFactorSphereUniformRadius.cpp
 //! @brief     Implements class FormFactorSphereUniformRadius.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorSphereUniformRadius.h b/Core/FormFactors/FormFactorSphereUniformRadius.h
index fd7cf7f090b..1018352ac49 100644
--- a/Core/FormFactors/FormFactorSphereUniformRadius.h
+++ b/Core/FormFactors/FormFactorSphereUniformRadius.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorSphereUniformRadius.h
+//! @file      Core/FormFactors/FormFactorSphereUniformRadius.h
 //! @brief     Declares class FormFactorSphereUniformRadius.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorTetrahedron.cpp b/Core/FormFactors/FormFactorTetrahedron.cpp
index 672ce42c634..fc71a678b5e 100644
--- a/Core/FormFactors/FormFactorTetrahedron.cpp
+++ b/Core/FormFactors/FormFactorTetrahedron.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorTetrahedron.cpp
+//! @file      Core/FormFactors/FormFactorTetrahedron.cpp
 //! @brief     Implements class FormFactorTetrahedron.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorTetrahedron.h b/Core/FormFactors/FormFactorTetrahedron.h
index 4c00da0777f..a18f8dd1492 100644
--- a/Core/FormFactors/FormFactorTetrahedron.h
+++ b/Core/FormFactors/FormFactorTetrahedron.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorTetrahedron.h
+//! @file      Core/FormFactors/FormFactorTetrahedron.h
 //! @brief     Declares class FormFactorTetrahedron
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorTools.cpp b/Core/FormFactors/FormFactorTools.cpp
index b1fab575869..9a1b4257600 100644
--- a/Core/FormFactors/FormFactorTools.cpp
+++ b/Core/FormFactors/FormFactorTools.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorTools.cpp
+//! @file      Core/FormFactors/FormFactorTools.cpp
 //! @brief     Implements global functions that facilitate IFormFactor handling.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorTools.h b/Core/FormFactors/FormFactorTools.h
index 40666ec3cf4..0c6d956ca1b 100644
--- a/Core/FormFactors/FormFactorTools.h
+++ b/Core/FormFactors/FormFactorTools.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorTools.h
+//! @file      Core/FormFactors/FormFactorTools.h
 //! @brief     Declares global functions that facilitate IFormFactor handling.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorTriangle.cpp b/Core/FormFactors/FormFactorTriangle.cpp
index e38786f63b7..a772994eda7 100644
--- a/Core/FormFactors/FormFactorTriangle.cpp
+++ b/Core/FormFactors/FormFactorTriangle.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorTriangle.cpp
+//! @file      Core/FormFactors/FormFactorTriangle.cpp
 //! @brief     Implements class FormFactorTriangle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorTriangle.h b/Core/FormFactors/FormFactorTriangle.h
index 542038154d2..0d6f11b9a0c 100644
--- a/Core/FormFactors/FormFactorTriangle.h
+++ b/Core/FormFactors/FormFactorTriangle.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorTriangle.h
+//! @file      Core/FormFactors/FormFactorTriangle.h
 //! @brief     Declares class FormFactorTriangle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorTrivial.cpp b/Core/FormFactors/FormFactorTrivial.cpp
index b407e794a26..94d5f8bad26 100644
--- a/Core/FormFactors/FormFactorTrivial.cpp
+++ b/Core/FormFactors/FormFactorTrivial.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorTrivial.cpp
+//! @file      Core/FormFactors/FormFactorTrivial.cpp
 //! @brief     Implements class FormFactorTrivial.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorTrivial.h b/Core/FormFactors/FormFactorTrivial.h
index cca2d9bba92..0d934294454 100644
--- a/Core/FormFactors/FormFactorTrivial.h
+++ b/Core/FormFactors/FormFactorTrivial.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorTrivial.h
+//! @file      Core/FormFactors/FormFactorTrivial.h
 //! @brief     Declares class FormFactorTrivial.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorTruncatedCube.cpp b/Core/FormFactors/FormFactorTruncatedCube.cpp
index 6ef9f66d500..85892190777 100644
--- a/Core/FormFactors/FormFactorTruncatedCube.cpp
+++ b/Core/FormFactors/FormFactorTruncatedCube.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorztruncatedCube.cpp
+//! @file      Core/FormFactors/FormFactorTruncatedCube.cpp
 //! @brief     Implements class FormFactorTruncatedCube.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorTruncatedCube.h b/Core/FormFactors/FormFactorTruncatedCube.h
index f43c9a8fbc8..bfea21da469 100644
--- a/Core/FormFactors/FormFactorTruncatedCube.h
+++ b/Core/FormFactors/FormFactorTruncatedCube.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorTruncatedCube.h
+//! @file      Core/FormFactors/FormFactorTruncatedCube.h
 //! @brief     Declares class FormFactorTruncatedCube.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorTruncatedSphere.cpp b/Core/FormFactors/FormFactorTruncatedSphere.cpp
index cb98db9f198..687e44c7d81 100644
--- a/Core/FormFactors/FormFactorTruncatedSphere.cpp
+++ b/Core/FormFactors/FormFactorTruncatedSphere.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorTruncatedSphere.cpp
+//! @file      Core/FormFactors/FormFactorTruncatedSphere.cpp
 //! @brief     Implements class FormFactorTruncatedSphere.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorTruncatedSphere.h b/Core/FormFactors/FormFactorTruncatedSphere.h
index 7b59dab5ea7..9c163c22885 100644
--- a/Core/FormFactors/FormFactorTruncatedSphere.h
+++ b/Core/FormFactors/FormFactorTruncatedSphere.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorTruncatedSphere.h
+//! @file      Core/FormFactors/FormFactorTruncatedSphere.h
 //! @brief     Declares class FormFactorTruncatedSphere.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorTruncatedSpheroid.cpp b/Core/FormFactors/FormFactorTruncatedSpheroid.cpp
index 8ffa4733eba..be109762bad 100644
--- a/Core/FormFactors/FormFactorTruncatedSpheroid.cpp
+++ b/Core/FormFactors/FormFactorTruncatedSpheroid.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorTruncatedSpheroid.cpp
+//! @file      Core/FormFactors/FormFactorTruncatedSpheroid.cpp
 //! @brief     Implements class FormFactorTruncatedSpheroid.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorTruncatedSpheroid.h b/Core/FormFactors/FormFactorTruncatedSpheroid.h
index 8e38656ea25..80cf63ba3b9 100644
--- a/Core/FormFactors/FormFactorTruncatedSpheroid.h
+++ b/Core/FormFactors/FormFactorTruncatedSpheroid.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorTruncatedSpheroid.h
+//! @file      Core/FormFactors/FormFactorTruncatedSpheroid.h
 //! @brief     Declares class FormFactorTruncatedSpheroid.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorWeighted.cpp b/Core/FormFactors/FormFactorWeighted.cpp
index 587c4244361..b79294f79f6 100644
--- a/Core/FormFactors/FormFactorWeighted.cpp
+++ b/Core/FormFactors/FormFactorWeighted.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorWeighted.cpp
+//! @file      Core/FormFactors/FormFactorWeighted.cpp
 //! @brief     Implements class FormFactorWeighted.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactorWeighted.h b/Core/FormFactors/FormFactorWeighted.h
index 3b179864142..0a43f9b1da4 100644
--- a/Core/FormFactors/FormFactorWeighted.h
+++ b/Core/FormFactors/FormFactorWeighted.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactorWeighted.h
+//! @file      Core/FormFactors/FormFactorWeighted.h
 //! @brief     Declares class FormFactorWeighted.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/FormFactors.h b/Core/FormFactors/FormFactors.h
index 29d4125e330..a95671a107f 100644
--- a/Core/FormFactors/FormFactors.h
+++ b/Core/FormFactors/FormFactors.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/FormFactors.h
+//! @file      Core/FormFactors/FormFactors.h
 //! @brief     Include all form-factor include files.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/IFormFactor.h b/Core/FormFactors/IFormFactor.h
index c52dd365e58..f9cf98bc271 100644
--- a/Core/FormFactors/IFormFactor.h
+++ b/Core/FormFactors/IFormFactor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/IFormFactor.h
+//! @file      Core/FormFactors/IFormFactor.h
 //! @brief     Declares and implements pure virtual interface IFormFactor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/IFormFactorBorn.cpp b/Core/FormFactors/IFormFactorBorn.cpp
index dbfe4001ac1..5ec1f510589 100644
--- a/Core/FormFactors/IFormFactorBorn.cpp
+++ b/Core/FormFactors/IFormFactorBorn.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/IFormFactorBorn.cpp
+//! @file      Core/FormFactors/IFormFactorBorn.cpp
 //! @brief     Implements interface class IFormFactorBorn.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/IFormFactorBorn.h b/Core/FormFactors/IFormFactorBorn.h
index 5d97f5296d9..b7809f6ee6f 100644
--- a/Core/FormFactors/IFormFactorBorn.h
+++ b/Core/FormFactors/IFormFactorBorn.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/IFormFactorBorn.h
+//! @file      Core/FormFactors/IFormFactorBorn.h
 //! @brief     Declares pure virtual interface class IFormFactorBorn.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/IFormFactorDecorator.h b/Core/FormFactors/IFormFactorDecorator.h
index 52ceabd69cf..40d222fa79d 100644
--- a/Core/FormFactors/IFormFactorDecorator.h
+++ b/Core/FormFactors/IFormFactorDecorator.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/IFormFactorDecorator.h
+//! @file      Core/FormFactors/IFormFactorDecorator.h
 //! @brief     Declares pure virtual interface class IFormFactorDecorator.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/ParticleShapes.h b/Core/FormFactors/ParticleShapes.h
index 29f66a28d6d..a4560f0e05d 100644
--- a/Core/FormFactors/ParticleShapes.h
+++ b/Core/FormFactors/ParticleShapes.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/ParticleShapes.h
+//! @file      Core/FormFactors/ParticleShapes.h
 //! @brief     Include all particle-shape form-factor include files.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/FormFactors/WavevectorInfo.h b/Core/FormFactors/WavevectorInfo.h
index bce73c0f203..3754354a062 100644
--- a/Core/FormFactors/WavevectorInfo.h
+++ b/Core/FormFactors/WavevectorInfo.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactors/WavevectorInfo.h
+//! @file      Core/FormFactors/WavevectorInfo.h
 //! @brief     Declares WavevectorInfo.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Geometry/BasicVector3D.cpp b/Core/Geometry/BasicVector3D.cpp
index 1c8cb70524f..e7df777847f 100644
--- a/Core/Geometry/BasicVector3D.cpp
+++ b/Core/Geometry/BasicVector3D.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file       Geometry/BasicVector3D.cpp
+//! @file      Core/Geometry/BasicVector3D.cpp
 //! @brief      Implements template class BasicVector3D.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Geometry/BasicVector3D.h b/Core/Geometry/BasicVector3D.h
index 2961aa430cd..7e364a49a33 100644
--- a/Core/Geometry/BasicVector3D.h
+++ b/Core/Geometry/BasicVector3D.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file       Geometry/BasicVector3D.h
+//! @file      Core/Geometry/BasicVector3D.h
 //! @brief      Declares template class BasicVector3D.
 //!
 //! Forked from CLHEP/Geometry by E. Chernyaev <Evgueni.Tcherniaev@cern.ch>,
diff --git a/Core/Geometry/Ellipse.cpp b/Core/Geometry/Ellipse.cpp
index 032e7859d6f..7057159dc0d 100644
--- a/Core/Geometry/Ellipse.cpp
+++ b/Core/Geometry/Ellipse.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Geometry/Ellipse.cpp
+//! @file      Core/Geometry/Ellipse.cpp
 //! @brief     Implements class Ellipse.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Geometry/Ellipse.h b/Core/Geometry/Ellipse.h
index ec0ccf8515a..e8a33364ee9 100644
--- a/Core/Geometry/Ellipse.h
+++ b/Core/Geometry/Ellipse.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Geometry/Rectangle.h
+//! @file      Core/Geometry/Ellipse.h
 //! @brief     Declares class Rectangle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Geometry/IShape2D.h b/Core/Geometry/IShape2D.h
index 744ed8eb270..7c7b7051f0a 100644
--- a/Core/Geometry/IShape2D.h
+++ b/Core/Geometry/IShape2D.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Geometry/IShape2D.h
+//! @file      Core/Geometry/IShape2D.h
 //! @brief     Declares basic class for all 2D shapes.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Geometry/InfinitePlane.cpp b/Core/Geometry/InfinitePlane.cpp
index cb8f4a6fc4f..04f2c767b54 100644
--- a/Core/Geometry/InfinitePlane.cpp
+++ b/Core/Geometry/InfinitePlane.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Geometry/InfinitePlane.cpp
+//! @file      Core/Geometry/InfinitePlane.cpp
 //! @brief     Implements class InfinitePlane.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Geometry/InfinitePlane.h b/Core/Geometry/InfinitePlane.h
index 9d157867c12..1b090548376 100644
--- a/Core/Geometry/InfinitePlane.h
+++ b/Core/Geometry/InfinitePlane.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Geometry/InfinitePlane.h
+//! @file      Core/Geometry/InfinitePlane.h
 //! @brief     Declares class InfinitePlane.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Geometry/Line.cpp b/Core/Geometry/Line.cpp
index b5effb40fd2..7a1913884aa 100644
--- a/Core/Geometry/Line.cpp
+++ b/Core/Geometry/Line.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Geometry/Line.cpp
+//! @file      Core/Geometry/Line.cpp
 //! @brief     Implements class Line.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Geometry/Line.h b/Core/Geometry/Line.h
index b0969c82ef4..9d2e19e8fae 100644
--- a/Core/Geometry/Line.h
+++ b/Core/Geometry/Line.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Geometry/Line.h
+//! @file      Core/Geometry/Line.h
 //! @brief     Declares class Line.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Geometry/Polygon.cpp b/Core/Geometry/Polygon.cpp
index 9365d1e9cd1..8480fd9bafe 100644
--- a/Core/Geometry/Polygon.cpp
+++ b/Core/Geometry/Polygon.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Geometry/Polygon.cpp
+//! @file      Core/Geometry/Polygon.cpp
 //! @brief     Implements class Polygon.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Geometry/Polygon.h b/Core/Geometry/Polygon.h
index c7859be7f20..55629c02e3e 100644
--- a/Core/Geometry/Polygon.h
+++ b/Core/Geometry/Polygon.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Geometry/Polygon.h
+//! @file      Core/Geometry/Polygon.h
 //! @brief     Declares class Polygon.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Geometry/Rectangle.cpp b/Core/Geometry/Rectangle.cpp
index c9b8def54e9..172328b330d 100644
--- a/Core/Geometry/Rectangle.cpp
+++ b/Core/Geometry/Rectangle.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Geometry/Rectangle.cpp
+//! @file      Core/Geometry/Rectangle.cpp
 //! @brief     Implements class Rectangle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Geometry/Rectangle.h b/Core/Geometry/Rectangle.h
index 80f9affdb90..bfa0dca426e 100644
--- a/Core/Geometry/Rectangle.h
+++ b/Core/Geometry/Rectangle.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Geometry/Rectangle.h
+//! @file      Core/Geometry/Rectangle.h
 //! @brief     Declares class Rectangle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Geometry/Transform3D.cpp b/Core/Geometry/Transform3D.cpp
index 4174ea229d0..230607d2c7c 100644
--- a/Core/Geometry/Transform3D.cpp
+++ b/Core/Geometry/Transform3D.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file       Geometry/Transform3D.cpp
+//! @file      Core/Geometry/Transform3D.cpp
 //! @brief      Implements template class Transform3D.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Geometry/Transform3D.h b/Core/Geometry/Transform3D.h
index 0ff00e15886..262c1d556f9 100644
--- a/Core/Geometry/Transform3D.h
+++ b/Core/Geometry/Transform3D.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file       Geometry/Transform3D.h
+//! @file      Core/Geometry/Transform3D.h
 //! @brief      Declares class Transform3D.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Geometry/Vectors3D.h b/Core/Geometry/Vectors3D.h
index e2bc70ba198..6f7f5a32880 100644
--- a/Core/Geometry/Vectors3D.h
+++ b/Core/Geometry/Vectors3D.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Geometry/Vectors3D.h
+//! @file      Core/Geometry/Vectors3D.h
 //! @brief     Declares basic vectors in R^3 and C^3.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/IntensityDataIOFactory.cpp b/Core/InputOutput/IntensityDataIOFactory.cpp
index e08bc330daf..83bc15d1cb6 100644
--- a/Core/InputOutput/IntensityDataIOFactory.cpp
+++ b/Core/InputOutput/IntensityDataIOFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/OutputDataIOFactory.cpp
+//! @file      Core/InputOutput/IntensityDataIOFactory.cpp
 //! @brief     Implements class OutputDataIOFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/IntensityDataIOFactory.h b/Core/InputOutput/IntensityDataIOFactory.h
index 0e196aee681..b52c0fa3b09 100644
--- a/Core/InputOutput/IntensityDataIOFactory.h
+++ b/Core/InputOutput/IntensityDataIOFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/IntensityDataIOFactory.h
+//! @file      Core/InputOutput/IntensityDataIOFactory.h
 //! @brief     Declares class IntensityDataIOFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/OutputDataIOHelper.cpp b/Core/InputOutput/OutputDataIOHelper.cpp
index 2124e2b987d..a8874f88fd0 100644
--- a/Core/InputOutput/OutputDataIOHelper.cpp
+++ b/Core/InputOutput/OutputDataIOHelper.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/OutputDataIOHelper.cpp
+//! @file      Core/InputOutput/OutputDataIOHelper.cpp
 //! @brief     Implements class OutputDataIOHelper.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/OutputDataIOHelper.h b/Core/InputOutput/OutputDataIOHelper.h
index 47dc112fd49..fd6a2568272 100644
--- a/Core/InputOutput/OutputDataIOHelper.h
+++ b/Core/InputOutput/OutputDataIOHelper.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/OutputDataIOFactory.h
+//! @file      Core/InputOutput/OutputDataIOHelper.h
 //! @brief     Declares class OutputDataIOFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/OutputDataReadFactory.cpp b/Core/InputOutput/OutputDataReadFactory.cpp
index ec6c0180199..79978daeb05 100644
--- a/Core/InputOutput/OutputDataReadFactory.cpp
+++ b/Core/InputOutput/OutputDataReadFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/OutputDataReadFactory.cpp
+//! @file      Core/InputOutput/OutputDataReadFactory.cpp
 //! @brief     Implements class OutputDataReadFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/OutputDataReadFactory.h b/Core/InputOutput/OutputDataReadFactory.h
index a8fe0a933d7..c4279eba54d 100644
--- a/Core/InputOutput/OutputDataReadFactory.h
+++ b/Core/InputOutput/OutputDataReadFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/OutputDataReadFactory.h
+//! @file      Core/InputOutput/OutputDataReadFactory.h
 //! @brief     Declares class OutputDataReadFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/OutputDataReadStrategy.cpp b/Core/InputOutput/OutputDataReadStrategy.cpp
index c7922e02e9f..87a5c0e9696 100644
--- a/Core/InputOutput/OutputDataReadStrategy.cpp
+++ b/Core/InputOutput/OutputDataReadStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/OutputDataReadStrategy.cpp
+//! @file      Core/InputOutput/OutputDataReadStrategy.cpp
 //! @brief     Implements class OutputDataReadStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/OutputDataReadStrategy.h b/Core/InputOutput/OutputDataReadStrategy.h
index 28c9398bcdb..822245a0d3d 100644
--- a/Core/InputOutput/OutputDataReadStrategy.h
+++ b/Core/InputOutput/OutputDataReadStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/OutputDataReadStrategy.h
+//! @file      Core/InputOutput/OutputDataReadStrategy.h
 //! @brief     Declares IOutputDataReadStrategy and related classes.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/OutputDataReader.cpp b/Core/InputOutput/OutputDataReader.cpp
index e30d678e3da..f603c389274 100644
--- a/Core/InputOutput/OutputDataReader.cpp
+++ b/Core/InputOutput/OutputDataReader.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/OutputDataReader.cpp
+//! @file      Core/InputOutput/OutputDataReader.cpp
 //! @brief     Implements class OutputDataReader.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/OutputDataReader.h b/Core/InputOutput/OutputDataReader.h
index 7846597c5bc..d92702ab731 100644
--- a/Core/InputOutput/OutputDataReader.h
+++ b/Core/InputOutput/OutputDataReader.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/OutputDataReader.h
+//! @file      Core/InputOutput/OutputDataReader.h
 //! @brief     Declares class OutputDataReader.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/OutputDataWriteFactory.cpp b/Core/InputOutput/OutputDataWriteFactory.cpp
index 99cbe782208..b3cdb1baff5 100644
--- a/Core/InputOutput/OutputDataWriteFactory.cpp
+++ b/Core/InputOutput/OutputDataWriteFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/OutputDataWriteFactory.cpp
+//! @file      Core/InputOutput/OutputDataWriteFactory.cpp
 //! @brief     Implements class OutputDataWriteFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/OutputDataWriteFactory.h b/Core/InputOutput/OutputDataWriteFactory.h
index 19cfcd99f75..ae25f124bfa 100644
--- a/Core/InputOutput/OutputDataWriteFactory.h
+++ b/Core/InputOutput/OutputDataWriteFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/OutputDataWriteFactory.h
+//! @file      Core/InputOutput/OutputDataWriteFactory.h
 //! @brief     Declares class OutputDataWriteFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/OutputDataWriteStrategy.cpp b/Core/InputOutput/OutputDataWriteStrategy.cpp
index df8b630a1eb..5275b9f748a 100644
--- a/Core/InputOutput/OutputDataWriteStrategy.cpp
+++ b/Core/InputOutput/OutputDataWriteStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/OutputDataWriteStrategy.cpp
+//! @file      Core/InputOutput/OutputDataWriteStrategy.cpp
 //! @brief     Implements class OutputDataWriteStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/OutputDataWriteStrategy.h b/Core/InputOutput/OutputDataWriteStrategy.h
index 621bba62f54..b6260c723c2 100644
--- a/Core/InputOutput/OutputDataWriteStrategy.h
+++ b/Core/InputOutput/OutputDataWriteStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/OutputDataWriteStrategy.h
+//! @file      Core/InputOutput/OutputDataWriteStrategy.h
 //! @brief     Declares classes IOutputDataWriteStrategy and OutputDataWriteStreamIMA.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/OutputDataWriter.cpp b/Core/InputOutput/OutputDataWriter.cpp
index 8dec3eb421f..5f8603523c6 100644
--- a/Core/InputOutput/OutputDataWriter.cpp
+++ b/Core/InputOutput/OutputDataWriter.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/OutputDataWriter.cpp
+//! @file      Core/InputOutput/OutputDataWriter.cpp
 //! @brief     Implements class OutputDataWriter.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/OutputDataWriter.h b/Core/InputOutput/OutputDataWriter.h
index 3ea74aed158..48096f40de6 100644
--- a/Core/InputOutput/OutputDataWriter.h
+++ b/Core/InputOutput/OutputDataWriter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/OutputDataWriter.h
+//! @file      Core/InputOutput/OutputDataWriter.h
 //! @brief     Declares class OutputDataWriter.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/TiffHandler.cpp b/Core/InputOutput/TiffHandler.cpp
index d5c4d9bb00a..96ddfa7bcc7 100644
--- a/Core/InputOutput/TiffHandler.cpp
+++ b/Core/InputOutput/TiffHandler.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/TiffReadStrategy.cpp
+//! @file      Core/InputOutput/TiffHandler.cpp
 //! @brief     Implements class TiffReadStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/TiffHandler.h b/Core/InputOutput/TiffHandler.h
index c6e9c783139..f37ffa1fffe 100644
--- a/Core/InputOutput/TiffHandler.h
+++ b/Core/InputOutput/TiffHandler.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/TiffHandler.h
+//! @file      Core/InputOutput/TiffHandler.h
 //! @brief     Declares class TiffHandler.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/InputOutput/boost_streams.h b/Core/InputOutput/boost_streams.h
index a39d0489b90..9194c2d2b9c 100644
--- a/Core/InputOutput/boost_streams.h
+++ b/Core/InputOutput/boost_streams.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      InputOutput/boost_streams.h
+//! @file      Core/InputOutput/boost_streams.h
 //! @brief     Contains boost streams related headers
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/BAVersion.h b/Core/Samples/BAVersion.h
index 48331309e60..1152e001d85 100644
--- a/Core/Samples/BAVersion.h
+++ b/Core/Samples/BAVersion.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/BAVersion.h
+//! @file      Core/Samples/BAVersion.h
 //! @brief     Declares functions for access to the package version number.
 //!
 //! @homepage  http://bornagainproject.org
diff --git a/Core/Samples/Crystal.cpp b/Core/Samples/Crystal.cpp
index dd09bb71ac6..05d40d52f89 100644
--- a/Core/Samples/Crystal.cpp
+++ b/Core/Samples/Crystal.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/Crystal.cpp
+//! @file      Core/Samples/Crystal.cpp
 //! @brief     Implements class Crystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/Crystal.h b/Core/Samples/Crystal.h
index bd09c9f5a84..85a16940aab 100644
--- a/Core/Samples/Crystal.h
+++ b/Core/Samples/Crystal.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/Crystal.h
+//! @file      Core/Samples/Crystal.h
 //! @brief     Declares class Crystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/HomogeneousMagneticMaterial.cpp b/Core/Samples/HomogeneousMagneticMaterial.cpp
index d3b512b3c7d..d12a8491f84 100644
--- a/Core/Samples/HomogeneousMagneticMaterial.cpp
+++ b/Core/Samples/HomogeneousMagneticMaterial.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      HomogeneousMagneticMaterial.cpp
+//! @file      Core/Samples/HomogeneousMagneticMaterial.cpp
 //! @brief     Implements class HomogeneousMagneticMaterial.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/HomogeneousMagneticMaterial.h b/Core/Samples/HomogeneousMagneticMaterial.h
index 7ace42d01f9..4569c72245f 100644
--- a/Core/Samples/HomogeneousMagneticMaterial.h
+++ b/Core/Samples/HomogeneousMagneticMaterial.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      HomogeneousMagneticMaterial.h
+//! @file      Core/Samples/HomogeneousMagneticMaterial.h
 //! @brief     Declares class HomogeneousMagneticMaterial
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/HomogeneousMaterial.h b/Core/Samples/HomogeneousMaterial.h
index 2249916a0d5..0efef658205 100644
--- a/Core/Samples/HomogeneousMaterial.h
+++ b/Core/Samples/HomogeneousMaterial.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/HomogeneousMaterial.h
+//! @file      Core/Samples/HomogeneousMaterial.h
 //! @brief     Declares and implements class HomogeneousMaterial.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/IClusteredParticles.h b/Core/Samples/IClusteredParticles.h
index 36cbb08748f..44f6ea0c17a 100644
--- a/Core/Samples/IClusteredParticles.h
+++ b/Core/Samples/IClusteredParticles.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/IClusteredParticles.h
+//! @file      Core/Samples/IClusteredParticles.h
 //! @brief     Declares class IClusteredParticles.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ICompositeSample.cpp b/Core/Samples/ICompositeSample.cpp
index 52d9a64ea3a..139ac8f8398 100644
--- a/Core/Samples/ICompositeSample.cpp
+++ b/Core/Samples/ICompositeSample.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ICompositeSample.cpp
+//! @file      Core/Samples/ICompositeSample.cpp
 //! @brief     Implements class ICompositeSample.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ICompositeSample.h b/Core/Samples/ICompositeSample.h
index 345ccb19115..87f14feb6b4 100644
--- a/Core/Samples/ICompositeSample.h
+++ b/Core/Samples/ICompositeSample.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ICompositeSample.h
+//! @file      Core/Samples/ICompositeSample.h
 //! @brief     Declares interface class ICompositeSample.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/IInterferenceFunction.h b/Core/Samples/IInterferenceFunction.h
index b7f75e1a2c4..a43dc39a107 100644
--- a/Core/Samples/IInterferenceFunction.h
+++ b/Core/Samples/IInterferenceFunction.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/IInterferenceFunction.h
+//! @file      Core/Samples/IInterferenceFunction.h
 //! @brief     Declares interface class IInterferenceFunction.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ILayout.h b/Core/Samples/ILayout.h
index 2b63ba249ec..214b5cc2cca 100644
--- a/Core/Samples/ILayout.h
+++ b/Core/Samples/ILayout.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ILayout.h
+//! @file      Core/Samples/ILayout.h
 //! @brief     Declares interface class ILayout.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/IMaterial.cpp b/Core/Samples/IMaterial.cpp
index 98ba6b4791e..1acfe087cd3 100644
--- a/Core/Samples/IMaterial.cpp
+++ b/Core/Samples/IMaterial.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/IMaterial.cpp
+//! @file      Core/Samples/IMaterial.cpp
 //! @brief     Implements class IMaterial.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/IMaterial.h b/Core/Samples/IMaterial.h
index d8fbe62fdae..ca688380c76 100644
--- a/Core/Samples/IMaterial.h
+++ b/Core/Samples/IMaterial.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/IMaterial.h
+//! @file      Core/Samples/IMaterial.h
 //! @brief     Declares interface class IMaterial.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/IParticle.cpp b/Core/Samples/IParticle.cpp
index d8f21cb3c03..303d942f46d 100644
--- a/Core/Samples/IParticle.cpp
+++ b/Core/Samples/IParticle.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/IParticle.cpp
+//! @file      Core/Samples/IParticle.cpp
 //! @brief     Implements generic member functions of IParticle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/IParticle.h b/Core/Samples/IParticle.h
index 1d6a6946759..4e343869546 100644
--- a/Core/Samples/IParticle.h
+++ b/Core/Samples/IParticle.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/IParticle.h
+//! @file      Core/Samples/IParticle.h
 //! @brief     Declares interface IParticle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/IRoughness.h b/Core/Samples/IRoughness.h
index f945b5d4ec6..a4912bcb4fd 100644
--- a/Core/Samples/IRoughness.h
+++ b/Core/Samples/IRoughness.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/IRoughness.h
+//! @file      Core/Samples/IRoughness.h
 //! @brief     Declares interface class IRoughness.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ISample.cpp b/Core/Samples/ISample.cpp
index d3605a91758..11d64ec14e2 100644
--- a/Core/Samples/ISample.cpp
+++ b/Core/Samples/ISample.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ISample.cpp
+//! @file      Core/Samples/ISample.cpp
 //! @brief     Implements class ISample.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ISample.h b/Core/Samples/ISample.h
index 7ef65331990..f3a2c91c00c 100644
--- a/Core/Samples/ISample.h
+++ b/Core/Samples/ISample.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ISample.h
+//! @file      Core/Samples/ISample.h
 //! @brief     Declares interface class ISample.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ISampleIteratorStrategy.cpp b/Core/Samples/ISampleIteratorStrategy.cpp
index adee20f3810..beebf6706ab 100644
--- a/Core/Samples/ISampleIteratorStrategy.cpp
+++ b/Core/Samples/ISampleIteratorStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ISampleIteratorStrategy.cpp
+//! @file      Core/Samples/ISampleIteratorStrategy.cpp
 //! @brief     Implements strategies for the class SampleTreeIterator.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ISampleIteratorStrategy.h b/Core/Samples/ISampleIteratorStrategy.h
index 7e7961a8882..2ec10fdaddb 100644
--- a/Core/Samples/ISampleIteratorStrategy.h
+++ b/Core/Samples/ISampleIteratorStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ISampleIteratorStrategy.h
+//! @file      Core/Samples/ISampleIteratorStrategy.h
 //! @brief     Declares strategies for the class SampleTreeIterator.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ISampleVisitor.cpp b/Core/Samples/ISampleVisitor.cpp
index 005fd7ba3f0..68b4a9f5f38 100644
--- a/Core/Samples/ISampleVisitor.cpp
+++ b/Core/Samples/ISampleVisitor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ISampleVisitor.cpp
+//! @file      Core/Samples/ISampleVisitor.cpp
 //! @brief     Implements class ISampleVisitor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ISampleVisitor.h b/Core/Samples/ISampleVisitor.h
index cc9e099d2c2..c24225d7f3c 100644
--- a/Core/Samples/ISampleVisitor.h
+++ b/Core/Samples/ISampleVisitor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ISampleVisitor.h
+//! @file      Core/Samples/ISampleVisitor.h
 //! @brief     Declares interface class ISampleVisitor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ISelectionRule.h b/Core/Samples/ISelectionRule.h
index 47d973fb4c4..87f74169fdb 100644
--- a/Core/Samples/ISelectionRule.h
+++ b/Core/Samples/ISelectionRule.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ISelectionRule.h
+//! @file      Core/Samples/ISelectionRule.h
 //! @brief     Declares classes ISelectionRule, SimpleSelectionRule
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/InterferenceFunction1DLattice.cpp b/Core/Samples/InterferenceFunction1DLattice.cpp
index cb4736f363f..0715fda875a 100644
--- a/Core/Samples/InterferenceFunction1DLattice.cpp
+++ b/Core/Samples/InterferenceFunction1DLattice.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/InterferenceFunction1DLattice.cpp
+//! @file      Core/Samples/InterferenceFunction1DLattice.cpp
 //! @brief     Implements class InterferenceFunction1DLattice.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/InterferenceFunction1DLattice.h b/Core/Samples/InterferenceFunction1DLattice.h
index ffdfcfc5021..a069c226c89 100644
--- a/Core/Samples/InterferenceFunction1DLattice.h
+++ b/Core/Samples/InterferenceFunction1DLattice.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/InterferenceFunction1DLattice.h
+//! @file      Core/Samples/InterferenceFunction1DLattice.h
 //! @brief     Declares class InterferenceFunction1DLattice.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/InterferenceFunction2DLattice.cpp b/Core/Samples/InterferenceFunction2DLattice.cpp
index 619c7386a1e..528ab07a0ac 100644
--- a/Core/Samples/InterferenceFunction2DLattice.cpp
+++ b/Core/Samples/InterferenceFunction2DLattice.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/InterferenceFunction2DLattice.cpp
+//! @file      Core/Samples/InterferenceFunction2DLattice.cpp
 //! @brief     Implements class InterferenceFunction2DLattice.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/InterferenceFunction2DLattice.h b/Core/Samples/InterferenceFunction2DLattice.h
index 3ecff317ea1..a1a806bd5c8 100644
--- a/Core/Samples/InterferenceFunction2DLattice.h
+++ b/Core/Samples/InterferenceFunction2DLattice.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/InterferenceFunction2DLattice.h
+//! @file      Core/Samples/InterferenceFunction2DLattice.h
 //! @brief     Declares class InterferenceFunction2DLattice.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/InterferenceFunction2DParaCrystal.cpp b/Core/Samples/InterferenceFunction2DParaCrystal.cpp
index 47a6760879a..fec829d5347 100644
--- a/Core/Samples/InterferenceFunction2DParaCrystal.cpp
+++ b/Core/Samples/InterferenceFunction2DParaCrystal.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/InterferenceFunction2DParaCrystal.cpp
+//! @file      Core/Samples/InterferenceFunction2DParaCrystal.cpp
 //! @brief     Implements class InterferenceFunction2DParaCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/InterferenceFunction2DParaCrystal.h b/Core/Samples/InterferenceFunction2DParaCrystal.h
index b5cb7dfa917..a246deaf30e 100644
--- a/Core/Samples/InterferenceFunction2DParaCrystal.h
+++ b/Core/Samples/InterferenceFunction2DParaCrystal.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/InterferenceFunction2DParaCrystal.h
+//! @file      Core/Samples/InterferenceFunction2DParaCrystal.h
 //! @brief     Declares class InterferenceFunction2DParaCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/InterferenceFunctionNone.cpp b/Core/Samples/InterferenceFunctionNone.cpp
index 6102feda245..9e37d03e23d 100644
--- a/Core/Samples/InterferenceFunctionNone.cpp
+++ b/Core/Samples/InterferenceFunctionNone.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/inc/InterferenceFunctionNone.cpp
+//! @file      Core/Samples/InterferenceFunctionNone.cpp
 //! @brief     Implements class InterferenceFunctionNone.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/InterferenceFunctionNone.h b/Core/Samples/InterferenceFunctionNone.h
index 142aa52b980..3d4f22beef4 100644
--- a/Core/Samples/InterferenceFunctionNone.h
+++ b/Core/Samples/InterferenceFunctionNone.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/InterferenceFunctionNone.h
+//! @file      Core/Samples/InterferenceFunctionNone.h
 //! @brief     Declares class InterferenceFunctionNone.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/InterferenceFunctionRadialParaCrystal.cpp b/Core/Samples/InterferenceFunctionRadialParaCrystal.cpp
index 35cb3a0a535..c8e92f49d01 100644
--- a/Core/Samples/InterferenceFunctionRadialParaCrystal.cpp
+++ b/Core/Samples/InterferenceFunctionRadialParaCrystal.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/InterferenceFunctionRadialParaCrystal.cpp
+//! @file      Core/Samples/InterferenceFunctionRadialParaCrystal.cpp
 //! @brief     Implements class InterferenceFunctionRadialParaCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/InterferenceFunctionRadialParaCrystal.h b/Core/Samples/InterferenceFunctionRadialParaCrystal.h
index 95ecb681352..c6ef31bdcc2 100644
--- a/Core/Samples/InterferenceFunctionRadialParaCrystal.h
+++ b/Core/Samples/InterferenceFunctionRadialParaCrystal.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/InterferenceFunctionRadialParaCrystal.h
+//! @file      Core/Samples/InterferenceFunctionRadialParaCrystal.h
 //! @brief     Declares class InterferenceFunctionRadialParaCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/InterferenceFunctions.h b/Core/Samples/InterferenceFunctions.h
index 0ae529aec2c..a494e029d9c 100644
--- a/Core/Samples/InterferenceFunctions.h
+++ b/Core/Samples/InterferenceFunctions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/InterferenceFunctions.h
+//! @file      Core/Samples/InterferenceFunctions.h
 //! @brief     Include all interference function definitions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/Lattice.cpp b/Core/Samples/Lattice.cpp
index e8194a519b1..24a2317fd8f 100644
--- a/Core/Samples/Lattice.cpp
+++ b/Core/Samples/Lattice.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/Lattice.cpp
+//! @file      Core/Samples/Lattice.cpp
 //! @brief     Implements class Lattice.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/Lattice.h b/Core/Samples/Lattice.h
index 67053adf8c3..1e31c89edc1 100644
--- a/Core/Samples/Lattice.h
+++ b/Core/Samples/Lattice.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/Lattice.h
+//! @file      Core/Samples/Lattice.h
 //! @brief     Declares class Lattice.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/Lattice1DParameters.h b/Core/Samples/Lattice1DParameters.h
index 5e55350dccd..157068a063b 100644
--- a/Core/Samples/Lattice1DParameters.h
+++ b/Core/Samples/Lattice1DParameters.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/Lattice1DParameters.h
+//! @file      Core/Samples/Lattice1DParameters.h
 //! @brief     Declares class Lattice1DParameters.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/Lattice2DParameters.h b/Core/Samples/Lattice2DParameters.h
index b684b383b7b..2c625d640ad 100644
--- a/Core/Samples/Lattice2DParameters.h
+++ b/Core/Samples/Lattice2DParameters.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/Lattice2DParameters.h
+//! @file      Core/Samples/Lattice2DParameters.h
 //! @brief     Declares class Lattice2DParameters.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/Layer.cpp b/Core/Samples/Layer.cpp
index d6ca2cc7f8f..54cf8d0819f 100644
--- a/Core/Samples/Layer.cpp
+++ b/Core/Samples/Layer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/Layer.cpp
+//! @file      Core/Samples/Layer.cpp
 //! @brief     Implements class Layer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/Layer.h b/Core/Samples/Layer.h
index d9b4590ae42..ff4437305ce 100644
--- a/Core/Samples/Layer.h
+++ b/Core/Samples/Layer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/Layer.h
+//! @file      Core/Samples/Layer.h
 //! @brief     Declares class Layer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/LayerInterface.cpp b/Core/Samples/LayerInterface.cpp
index e610f719e9a..de7005cc2a9 100644
--- a/Core/Samples/LayerInterface.cpp
+++ b/Core/Samples/LayerInterface.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/LayerInterface.cpp
+//! @file      Core/Samples/LayerInterface.cpp
 //! @brief     Implements class LayerInterface.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/LayerInterface.h b/Core/Samples/LayerInterface.h
index 5317a92d0c8..8e87acdb799 100644
--- a/Core/Samples/LayerInterface.h
+++ b/Core/Samples/LayerInterface.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/LayerInterface.h
+//! @file      Core/Samples/LayerInterface.h
 //! @brief     Declares class LayerInterface.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/LayerRoughness.cpp b/Core/Samples/LayerRoughness.cpp
index 7da38ce83fc..8dcad2eb1fc 100644
--- a/Core/Samples/LayerRoughness.cpp
+++ b/Core/Samples/LayerRoughness.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/LayerRoughness.cpp
+//! @file      Core/Samples/LayerRoughness.cpp
 //! @brief     Implements class LayerRoughness.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/LayerRoughness.h b/Core/Samples/LayerRoughness.h
index 34e863b0723..a56c5a31f7b 100644
--- a/Core/Samples/LayerRoughness.h
+++ b/Core/Samples/LayerRoughness.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/LayerRoughness.h
+//! @file      Core/Samples/LayerRoughness.h
 //! @brief     Declares class LayerRoughness.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/Materials.cpp b/Core/Samples/Materials.cpp
index f16915d082f..cce7f644d19 100644
--- a/Core/Samples/Materials.cpp
+++ b/Core/Samples/Materials.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/inc/Materials.cpp
+//! @file      Core/Samples/Materials.cpp
 //! @brief     Implement utils for handling materials in namespace Materials
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/Materials.h b/Core/Samples/Materials.h
index 39748d1cca8..8b9dfd3ea32 100644
--- a/Core/Samples/Materials.h
+++ b/Core/Samples/Materials.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/Materials.h
+//! @file      Core/Samples/Materials.h
 //! @brief     Declares namespace Materials
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/MesoCrystal.cpp b/Core/Samples/MesoCrystal.cpp
index a3dc4531dcb..98950542743 100644
--- a/Core/Samples/MesoCrystal.cpp
+++ b/Core/Samples/MesoCrystal.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/MesoCrystal.cpp
+//! @file      Core/Samples/MesoCrystal.cpp
 //! @brief     Implements class MesoCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/MesoCrystal.h b/Core/Samples/MesoCrystal.h
index bc0083d1563..f59421621e3 100644
--- a/Core/Samples/MesoCrystal.h
+++ b/Core/Samples/MesoCrystal.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/MesoCrystal.h
+//! @file      Core/Samples/MesoCrystal.h
 //! @brief     Declares class MesoCrystal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/MultiLayer.cpp b/Core/Samples/MultiLayer.cpp
index 13c62fb37b6..254a62ee647 100644
--- a/Core/Samples/MultiLayer.cpp
+++ b/Core/Samples/MultiLayer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/MultiLayer.cpp
+//! @file      Core/Samples/MultiLayer.cpp
 //! @brief     Implements class MultiLayer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/MultiLayer.h b/Core/Samples/MultiLayer.h
index af6f1b113e1..e2ed1958525 100644
--- a/Core/Samples/MultiLayer.h
+++ b/Core/Samples/MultiLayer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/MultiLayer.h
+//! @file      Core/Samples/MultiLayer.h
 //! @brief     Declares class MultiLayer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/Particle.cpp b/Core/Samples/Particle.cpp
index 02ed20be47f..ebf25ae2e77 100644
--- a/Core/Samples/Particle.cpp
+++ b/Core/Samples/Particle.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/Particle.cpp
+//! @file      Core/Samples/Particle.cpp
 //! @brief     Implements class Particle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/Particle.h b/Core/Samples/Particle.h
index f1acae82f0c..ac3623b05b7 100644
--- a/Core/Samples/Particle.h
+++ b/Core/Samples/Particle.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/Particle.h
+//! @file      Core/Samples/Particle.h
 //! @brief     Declares class Particle.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ParticleComposition.cpp b/Core/Samples/ParticleComposition.cpp
index d427978cebf..b0eafc06dd5 100644
--- a/Core/Samples/ParticleComposition.cpp
+++ b/Core/Samples/ParticleComposition.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ParticleComposition.cpp
+//! @file      Core/Samples/ParticleComposition.cpp
 //! @brief     Implements class ParticleComposition.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ParticleComposition.h b/Core/Samples/ParticleComposition.h
index 857baa31531..49591dacfbe 100644
--- a/Core/Samples/ParticleComposition.h
+++ b/Core/Samples/ParticleComposition.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ParticleComposition.h
+//! @file      Core/Samples/ParticleComposition.h
 //! @brief     Declares class ParticleComposition.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ParticleCoreShell.cpp b/Core/Samples/ParticleCoreShell.cpp
index b5ef6f5f2ca..468c78fd99e 100644
--- a/Core/Samples/ParticleCoreShell.cpp
+++ b/Core/Samples/ParticleCoreShell.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ParticleCoreShell.cpp
+//! @file      Core/Samples/ParticleCoreShell.cpp
 //! @brief     Implements class ParticleCoreShell.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ParticleCoreShell.h b/Core/Samples/ParticleCoreShell.h
index 1f9ca4707ba..4f1e62225e3 100644
--- a/Core/Samples/ParticleCoreShell.h
+++ b/Core/Samples/ParticleCoreShell.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ParticleCoreShell.h
+//! @file      Core/Samples/ParticleCoreShell.h
 //! @brief     Declares class ParticleCoreShell.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ParticleDistribution.cpp b/Core/Samples/ParticleDistribution.cpp
index af8b696292e..9832ae347f7 100644
--- a/Core/Samples/ParticleDistribution.cpp
+++ b/Core/Samples/ParticleDistribution.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ParticleDistribution.cpp
+//! @file      Core/Samples/ParticleDistribution.cpp
 //! @brief     Implements class ParticleDistribution.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ParticleDistribution.h b/Core/Samples/ParticleDistribution.h
index f69290d0bf3..7e527972055 100644
--- a/Core/Samples/ParticleDistribution.h
+++ b/Core/Samples/ParticleDistribution.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ParticleDistribution.h
+//! @file      Core/Samples/ParticleDistribution.h
 //! @brief     Declares class ParticleDistribution.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ParticleLayout.cpp b/Core/Samples/ParticleLayout.cpp
index 8579b5909b3..8f3f106b575 100644
--- a/Core/Samples/ParticleLayout.cpp
+++ b/Core/Samples/ParticleLayout.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ParticleLayout.cpp
+//! @file      Core/Samples/ParticleLayout.cpp
 //! @brief     Implements class ParticleLayout.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/ParticleLayout.h b/Core/Samples/ParticleLayout.h
index 2fc343f1c1e..d75786e05d3 100644
--- a/Core/Samples/ParticleLayout.h
+++ b/Core/Samples/ParticleLayout.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/ParticleLayout.h
+//! @file      Core/Samples/ParticleLayout.h
 //! @brief     Declares class ParticleLayout.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/Rotations.cpp b/Core/Samples/Rotations.cpp
index 7a460d86468..a770a7055d4 100644
--- a/Core/Samples/Rotations.cpp
+++ b/Core/Samples/Rotations.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/Rotations.cpp
+//! @file      Core/Samples/Rotations.cpp
 //! @brief     Implements IRotation classes.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/Rotations.h b/Core/Samples/Rotations.h
index 9ed82df8273..763733434d0 100644
--- a/Core/Samples/Rotations.h
+++ b/Core/Samples/Rotations.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/Rotations.h
+//! @file      Core/Samples/Rotations.h
 //! @brief     Declares IRotation classes.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/SampleTreeIterator.cpp b/Core/Samples/SampleTreeIterator.cpp
index d4b96b7e0e7..89f812b2e5c 100644
--- a/Core/Samples/SampleTreeIterator.cpp
+++ b/Core/Samples/SampleTreeIterator.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/SampleTreeIterator.cpp
+//! @file      Core/Samples/SampleTreeIterator.cpp
 //! @brief     Implements class SampleTreeIterator.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/SampleTreeIterator.h b/Core/Samples/SampleTreeIterator.h
index 13bad7458dc..f149a8f2dda 100644
--- a/Core/Samples/SampleTreeIterator.h
+++ b/Core/Samples/SampleTreeIterator.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/SampleTreeIterator.h
+//! @file      Core/Samples/SampleTreeIterator.h
 //! @brief     Declares and classes IteratorState, IteratorMemento and SampleTreeIterator.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Samples/Samples.h b/Core/Samples/Samples.h
index fa303326761..456bea000fe 100644
--- a/Core/Samples/Samples.h
+++ b/Core/Samples/Samples.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Samples/Samples.h
+//! @file      Core/Samples/Samples.h
 //! @brief     Include various .h files.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/BoxCompositionBuilder.cpp b/Core/StandardSamples/BoxCompositionBuilder.cpp
index 12dc1755e52..86c2d3682d8 100644
--- a/Core/StandardSamples/BoxCompositionBuilder.cpp
+++ b/Core/StandardSamples/BoxCompositionBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/BoxCompositionBuilder.cpp
+//! @file      Core/StandardSamples/BoxCompositionBuilder.cpp
 //! @brief     Implements class BoxCompositionBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/BoxCompositionBuilder.h b/Core/StandardSamples/BoxCompositionBuilder.h
index 1cc9024e91b..b62d9e075b8 100644
--- a/Core/StandardSamples/BoxCompositionBuilder.h
+++ b/Core/StandardSamples/BoxCompositionBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/BoxCompositionBuilder.h
+//! @file      Core/StandardSamples/BoxCompositionBuilder.h
 //! @brief     Declares classes of BoxCompositionBuilder family.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/CoreShellParticleBuilder.cpp b/Core/StandardSamples/CoreShellParticleBuilder.cpp
index 14a7dee0e21..5de5bc2db92 100644
--- a/Core/StandardSamples/CoreShellParticleBuilder.cpp
+++ b/Core/StandardSamples/CoreShellParticleBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/CoreShellParticleBuilder.cpp
+//! @file      Core/StandardSamples/CoreShellParticleBuilder.cpp
 //! @brief     Implements class CoreShellParticleBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/CoreShellParticleBuilder.h b/Core/StandardSamples/CoreShellParticleBuilder.h
index f0695b7f2a0..0551c71a88d 100644
--- a/Core/StandardSamples/CoreShellParticleBuilder.h
+++ b/Core/StandardSamples/CoreShellParticleBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/CoreShellParticleBuilder.h
+//! @file      Core/StandardSamples/CoreShellParticleBuilder.h
 //! @brief     Declares class CoreShellParticleBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/CustomMorphologyBuilder.cpp b/Core/StandardSamples/CustomMorphologyBuilder.cpp
index 2ae724fc6d5..fa00764e821 100644
--- a/Core/StandardSamples/CustomMorphologyBuilder.cpp
+++ b/Core/StandardSamples/CustomMorphologyBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/CustomMorphologyBuilder.cpp
+//! @file      Core/StandardSamples/CustomMorphologyBuilder.cpp
 //! @brief     Implements class CustomMorphologyBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/CustomMorphologyBuilder.h b/Core/StandardSamples/CustomMorphologyBuilder.h
index 86d7a1c9957..3ed1d1a446d 100644
--- a/Core/StandardSamples/CustomMorphologyBuilder.h
+++ b/Core/StandardSamples/CustomMorphologyBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/CustomMorphologyBuilder.h
+//! @file      Core/StandardSamples/CustomMorphologyBuilder.h
 //! @brief     Declares class CustomMorphologyBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/CylindersAndPrismsBuilder.cpp b/Core/StandardSamples/CylindersAndPrismsBuilder.cpp
index b5f522d5d8a..6f07e6fb5d2 100644
--- a/Core/StandardSamples/CylindersAndPrismsBuilder.cpp
+++ b/Core/StandardSamples/CylindersAndPrismsBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/CylindersAndPrismsBuilder.cpp
+//! @file      Core/StandardSamples/CylindersAndPrismsBuilder.cpp
 //! @brief     Implements class CylindersAndPrismsBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/CylindersAndPrismsBuilder.h b/Core/StandardSamples/CylindersAndPrismsBuilder.h
index d57055f4308..571c971e85f 100644
--- a/Core/StandardSamples/CylindersAndPrismsBuilder.h
+++ b/Core/StandardSamples/CylindersAndPrismsBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/CylindersAndPrismsBuilder.h
+//! @file      Core/StandardSamples/CylindersAndPrismsBuilder.h
 //! @brief     Declares class CylindersAndPrismsBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/CylindersBuilder.cpp b/Core/StandardSamples/CylindersBuilder.cpp
index 28920d10d67..0965d5bc489 100644
--- a/Core/StandardSamples/CylindersBuilder.cpp
+++ b/Core/StandardSamples/CylindersBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/CylindersBuilder.cpp
+//! @file      Core/StandardSamples/CylindersBuilder.cpp
 //! @brief     Implements classes of CylindersBuilder family.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/CylindersBuilder.h b/Core/StandardSamples/CylindersBuilder.h
index 2e269212d59..8f990fe463d 100644
--- a/Core/StandardSamples/CylindersBuilder.h
+++ b/Core/StandardSamples/CylindersBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/CylindersBuilder.h
+//! @file      Core/StandardSamples/CylindersBuilder.h
 //! @brief     Declares classes of CylindersBuilder family.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/LatticeBuilder.cpp b/Core/StandardSamples/LatticeBuilder.cpp
index 51f7f740817..5a20b06e2ee 100644
--- a/Core/StandardSamples/LatticeBuilder.cpp
+++ b/Core/StandardSamples/LatticeBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/LatticeBuilder.cpp
+//! @file      Core/StandardSamples/LatticeBuilder.cpp
 //! @brief     Implements class LatticeBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/LatticeBuilder.h b/Core/StandardSamples/LatticeBuilder.h
index 3efc0433b4f..ab543e66435 100644
--- a/Core/StandardSamples/LatticeBuilder.h
+++ b/Core/StandardSamples/LatticeBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/LatticeBuilder.h
+//! @file      Core/StandardSamples/LatticeBuilder.h
 //! @brief     Declares classes of LatticeBuilder family.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/LayersWithAbsorptionBuilder.cpp b/Core/StandardSamples/LayersWithAbsorptionBuilder.cpp
index 6589b69484a..fb86341dd35 100644
--- a/Core/StandardSamples/LayersWithAbsorptionBuilder.cpp
+++ b/Core/StandardSamples/LayersWithAbsorptionBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/LayersWithAbsorptionBuilder.cpp
+//! @file      Core/StandardSamples/LayersWithAbsorptionBuilder.cpp
 //! @brief     Implements class LayersWithAbsorptionBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/LayersWithAbsorptionBuilder.h b/Core/StandardSamples/LayersWithAbsorptionBuilder.h
index 7f6bffbe019..5ebdd06fa91 100644
--- a/Core/StandardSamples/LayersWithAbsorptionBuilder.h
+++ b/Core/StandardSamples/LayersWithAbsorptionBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/LayersWithAbsorptionBuilder.h
+//! @file      Core/StandardSamples/LayersWithAbsorptionBuilder.h
 //! @brief     Declares class LayersWithAbsorptionBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/MagneticParticlesBuilder.cpp b/Core/StandardSamples/MagneticParticlesBuilder.cpp
index 615d90b2261..5616150072c 100644
--- a/Core/StandardSamples/MagneticParticlesBuilder.cpp
+++ b/Core/StandardSamples/MagneticParticlesBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/PolarizedParticlesBuilder.cpp
+//! @file      Core/StandardSamples/MagneticParticlesBuilder.cpp
 //! @brief     Implements classes to build magnetic samples
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/MagneticParticlesBuilder.h b/Core/StandardSamples/MagneticParticlesBuilder.h
index 68df964f276..d2b7012562c 100644
--- a/Core/StandardSamples/MagneticParticlesBuilder.h
+++ b/Core/StandardSamples/MagneticParticlesBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/PolarizedParticlesBuilder.h
+//! @file      Core/StandardSamples/MagneticParticlesBuilder.h
 //! @brief     Declares class to build magnetic samples
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/MesoCrystalBuilder.cpp b/Core/StandardSamples/MesoCrystalBuilder.cpp
index b506383acc5..a386dd32c23 100644
--- a/Core/StandardSamples/MesoCrystalBuilder.cpp
+++ b/Core/StandardSamples/MesoCrystalBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/MesoCrystalBuilder.cpp
+//! @file      Core/StandardSamples/MesoCrystalBuilder.cpp
 //! @brief     Implements class MesoCrystalBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/MesoCrystalBuilder.h b/Core/StandardSamples/MesoCrystalBuilder.h
index ed8a9c09dc5..b97366909ee 100644
--- a/Core/StandardSamples/MesoCrystalBuilder.h
+++ b/Core/StandardSamples/MesoCrystalBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/MesoCrystalBuilder.h
+//! @file      Core/StandardSamples/MesoCrystalBuilder.h
 //! @brief     Declares class MesoCrystalBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp b/Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
index e33178b1b02..ff4ef42e4af 100644
--- a/Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
+++ b/Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/MultiLayerWithRoughnessBuilder.cpp
+//! @file      Core/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
 //! @brief     Implement class MultiLayerWithRoughnessBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/MultiLayerWithRoughnessBuilder.h b/Core/StandardSamples/MultiLayerWithRoughnessBuilder.h
index 7cf7ab88c6d..bf7e767e938 100644
--- a/Core/StandardSamples/MultiLayerWithRoughnessBuilder.h
+++ b/Core/StandardSamples/MultiLayerWithRoughnessBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/MultiLayerWithRoughnessBuilder.h
+//! @file      Core/StandardSamples/MultiLayerWithRoughnessBuilder.h
 //! @brief     Declares class MultiLayerWithRoughnessBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/MultipleLayoutBuilder.cpp b/Core/StandardSamples/MultipleLayoutBuilder.cpp
index 9e14fca06a6..a7bf030fd43 100644
--- a/Core/StandardSamples/MultipleLayoutBuilder.cpp
+++ b/Core/StandardSamples/MultipleLayoutBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/MultipleLayoutBuilder.cpp
+//! @file      Core/StandardSamples/MultipleLayoutBuilder.cpp
 //! @brief     Implements class MultipleLayoutBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/MultipleLayoutBuilder.h b/Core/StandardSamples/MultipleLayoutBuilder.h
index acf4948f25b..9b1c9de427b 100644
--- a/Core/StandardSamples/MultipleLayoutBuilder.h
+++ b/Core/StandardSamples/MultipleLayoutBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/MultipleLayoutBuilder.h
+//! @file      Core/StandardSamples/MultipleLayoutBuilder.h
 //! @brief     Declares class MultipleLayoutBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/ParaCrystalBuilder.cpp b/Core/StandardSamples/ParaCrystalBuilder.cpp
index 800d8151400..068f54645f1 100644
--- a/Core/StandardSamples/ParaCrystalBuilder.cpp
+++ b/Core/StandardSamples/ParaCrystalBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/ParaCrystalBuilder.cpp
+//! @file      Core/StandardSamples/ParaCrystalBuilder.cpp
 //! @brief     Implements class ParaCrystalBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/ParaCrystalBuilder.h b/Core/StandardSamples/ParaCrystalBuilder.h
index 8bae31723b9..839e338b0b8 100644
--- a/Core/StandardSamples/ParaCrystalBuilder.h
+++ b/Core/StandardSamples/ParaCrystalBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/ParaCrystalBuilder.h
+//! @file      Core/StandardSamples/ParaCrystalBuilder.h
 //! @brief     Declares classes of ParaCrystalBuilder family.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/ParticleCompositionBuilder.cpp b/Core/StandardSamples/ParticleCompositionBuilder.cpp
index 432d5937282..9d10c56bb52 100644
--- a/Core/StandardSamples/ParticleCompositionBuilder.cpp
+++ b/Core/StandardSamples/ParticleCompositionBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/ParticleCompositionBuilder.cpp
+//! @file      Core/StandardSamples/ParticleCompositionBuilder.cpp
 //! @brief     Implements class ParticleCompositionBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/ParticleCompositionBuilder.h b/Core/StandardSamples/ParticleCompositionBuilder.h
index 92de783bb41..ee325b7417a 100644
--- a/Core/StandardSamples/ParticleCompositionBuilder.h
+++ b/Core/StandardSamples/ParticleCompositionBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/ParticleCompositionBuilder.h
+//! @file      Core/StandardSamples/ParticleCompositionBuilder.h
 //! @brief     Declares class ParticleCompositionBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/ParticleDistributionsBuilder.cpp b/Core/StandardSamples/ParticleDistributionsBuilder.cpp
index 4a162af414e..39e7391c549 100644
--- a/Core/StandardSamples/ParticleDistributionsBuilder.cpp
+++ b/Core/StandardSamples/ParticleDistributionsBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/ParticleDistributionsBuilder.cpp
+//! @file      Core/StandardSamples/ParticleDistributionsBuilder.cpp
 //! @brief     Implements classes of with different types of particle distributions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/ParticleDistributionsBuilder.h b/Core/StandardSamples/ParticleDistributionsBuilder.h
index 796c58b6f2f..098a98fedb9 100644
--- a/Core/StandardSamples/ParticleDistributionsBuilder.h
+++ b/Core/StandardSamples/ParticleDistributionsBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/ParticleDistributionsBuilder.h
+//! @file      Core/StandardSamples/ParticleDistributionsBuilder.h
 //! @brief     Declares classes of with different types of particle distributions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/ParticleInTheAirBuilder.cpp b/Core/StandardSamples/ParticleInTheAirBuilder.cpp
index b39c8313fad..ffcf4f8e6d2 100644
--- a/Core/StandardSamples/ParticleInTheAirBuilder.cpp
+++ b/Core/StandardSamples/ParticleInTheAirBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/ParticleInTheAirBuilder.cpp
+//! @file      Core/StandardSamples/ParticleInTheAirBuilder.cpp
 //! @brief     Implements class ParticleInTheAirBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/ParticleInTheAirBuilder.h b/Core/StandardSamples/ParticleInTheAirBuilder.h
index 74ea9297c4f..72dd8e31c81 100644
--- a/Core/StandardSamples/ParticleInTheAirBuilder.h
+++ b/Core/StandardSamples/ParticleInTheAirBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/ParticleInTheAirBuilder.h
+//! @file      Core/StandardSamples/ParticleInTheAirBuilder.h
 //! @brief     Declares class ParticleInTheAirBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/RipplesBuilder.cpp b/Core/StandardSamples/RipplesBuilder.cpp
index 72c18cd0a8c..7656819bb7d 100644
--- a/Core/StandardSamples/RipplesBuilder.cpp
+++ b/Core/StandardSamples/RipplesBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/RipplesBuilder.cpp
+//! @file      Core/StandardSamples/RipplesBuilder.cpp
 //! @brief     Implement classes to build various ripples.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/RipplesBuilder.h b/Core/StandardSamples/RipplesBuilder.h
index 5cc3a155a4c..40a550dc1c0 100644
--- a/Core/StandardSamples/RipplesBuilder.h
+++ b/Core/StandardSamples/RipplesBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/RipplesBuilder.h
+//! @file      Core/StandardSamples/RipplesBuilder.h
 //! @brief     Declares classes to build various ripples.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/RotatedPyramidsBuilder.cpp b/Core/StandardSamples/RotatedPyramidsBuilder.cpp
index 0bced69e3d2..ebf6eee2fbf 100644
--- a/Core/StandardSamples/RotatedPyramidsBuilder.cpp
+++ b/Core/StandardSamples/RotatedPyramidsBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/RotatedPyramidsBuilder.cpp
+//! @file      Core/StandardSamples/RotatedPyramidsBuilder.cpp
 //! @brief     Implements classe RotatedPyramidsBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/RotatedPyramidsBuilder.h b/Core/StandardSamples/RotatedPyramidsBuilder.h
index f554b86d654..e2bde52cb07 100644
--- a/Core/StandardSamples/RotatedPyramidsBuilder.h
+++ b/Core/StandardSamples/RotatedPyramidsBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/RotatedPyramidsBuilder.h
+//! @file      Core/StandardSamples/RotatedPyramidsBuilder.h
 //! @brief     Declares class RotatedPyramidsBuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/SampleBuilderFactory.cpp b/Core/StandardSamples/SampleBuilderFactory.cpp
index 2361104ff46..73a53fe3a63 100644
--- a/Core/StandardSamples/SampleBuilderFactory.cpp
+++ b/Core/StandardSamples/SampleBuilderFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/SampleBuilderFactory.cpp
+//! @file      Core/StandardSamples/SampleBuilderFactory.cpp
 //! @brief     Implement class SampleBuilderFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/SampleBuilderFactory.h b/Core/StandardSamples/SampleBuilderFactory.h
index 0ec9310e195..1c0b589972a 100644
--- a/Core/StandardSamples/SampleBuilderFactory.h
+++ b/Core/StandardSamples/SampleBuilderFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/SampleBuilderFactory.h
+//! @file      Core/StandardSamples/SampleBuilderFactory.h
 //! @brief     Declares class SampleBuilderFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/SimulationFactory.cpp b/Core/StandardSamples/SimulationFactory.cpp
index 176c210f192..2296ee81da3 100644
--- a/Core/StandardSamples/SimulationFactory.cpp
+++ b/Core/StandardSamples/SimulationFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/SimulationFactory.cpp
+//! @file      Core/StandardSamples/SimulationFactory.cpp
 //! @brief     Implement class SimulationFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/SimulationFactory.h b/Core/StandardSamples/SimulationFactory.h
index 908f99bcadb..e032aa5ebc6 100644
--- a/Core/StandardSamples/SimulationFactory.h
+++ b/Core/StandardSamples/SimulationFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/SimulationFactory.h
+//! @file      Core/StandardSamples/SimulationFactory.h
 //! @brief     Declares class SimulationFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/SizeDistributionModelsBuilder.cpp b/Core/StandardSamples/SizeDistributionModelsBuilder.cpp
index 1ff79c728d7..36c51006c32 100644
--- a/Core/StandardSamples/SizeDistributionModelsBuilder.cpp
+++ b/Core/StandardSamples/SizeDistributionModelsBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/ParticlesInSSCABuilder.cpp
+//! @file      Core/StandardSamples/SizeDistributionModelsBuilder.cpp
 //! @brief     Implements class ParticlesInSSCABuilder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/SizeDistributionModelsBuilder.h b/Core/StandardSamples/SizeDistributionModelsBuilder.h
index 13c12a84f05..2686d077575 100644
--- a/Core/StandardSamples/SizeDistributionModelsBuilder.h
+++ b/Core/StandardSamples/SizeDistributionModelsBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/SizeDistributionModelsBuilder.h
+//! @file      Core/StandardSamples/SizeDistributionModelsBuilder.h
 //! @brief     Declares various sample builder classes to test DA, LMA, SSCA approximations
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/StandardSimulations.cpp b/Core/StandardSamples/StandardSimulations.cpp
index 19a963111c8..6bc44739c87 100644
--- a/Core/StandardSamples/StandardSimulations.cpp
+++ b/Core/StandardSamples/StandardSimulations.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/StandardSimulations.cpp
+//! @file      Core/StandardSamples/StandardSimulations.cpp
 //! @brief     Implements functions for standard simulations.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/StandardSimulations.h b/Core/StandardSamples/StandardSimulations.h
index 76833b14a32..d79a67baac7 100644
--- a/Core/StandardSamples/StandardSimulations.h
+++ b/Core/StandardSamples/StandardSimulations.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/StandardSimulations.h
+//! @file      Core/StandardSamples/StandardSimulations.h
 //! @brief     Declares namespace and functions for standard simulations.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/TransformationsBuilder.cpp b/Core/StandardSamples/TransformationsBuilder.cpp
index 2693d9628fe..4ca79d0750d 100644
--- a/Core/StandardSamples/TransformationsBuilder.cpp
+++ b/Core/StandardSamples/TransformationsBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/TransformationsBuilder.cpp
+//! @file      Core/StandardSamples/TransformationsBuilder.cpp
 //! @brief     Implements classes to build samples with different transformations.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/TransformationsBuilder.h b/Core/StandardSamples/TransformationsBuilder.h
index f195b1e1cf8..06463aa9d81 100644
--- a/Core/StandardSamples/TransformationsBuilder.h
+++ b/Core/StandardSamples/TransformationsBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/TransformationsBuilder.h
+//! @file      Core/StandardSamples/TransformationsBuilder.h
 //! @brief     Declares classes to build samples with different transformations.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/TwoDimLatticeBuilder.cpp b/Core/StandardSamples/TwoDimLatticeBuilder.cpp
index d48801d2a60..5293e5e72e8 100644
--- a/Core/StandardSamples/TwoDimLatticeBuilder.cpp
+++ b/Core/StandardSamples/TwoDimLatticeBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/IsGISAXS06Builder.cpp
+//! @file      Core/StandardSamples/TwoDimLatticeBuilder.cpp
 //! @brief     Implements class IsGISAXS06Builder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/StandardSamples/TwoDimLatticeBuilder.h b/Core/StandardSamples/TwoDimLatticeBuilder.h
index 257d79bd30d..d0149610ae5 100644
--- a/Core/StandardSamples/TwoDimLatticeBuilder.h
+++ b/Core/StandardSamples/TwoDimLatticeBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/IsGISAXS06Builder.h
+//! @file      Core/StandardSamples/TwoDimLatticeBuilder.h
 //! @brief     Declares class IsGISAXS06Builder.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/TestMachinery/CoreFutest.cpp b/Core/TestMachinery/CoreFutest.cpp
index ebcee806ed9..594dfbcf409 100644
--- a/Core/TestMachinery/CoreFutest.cpp
+++ b/Core/TestMachinery/CoreFutest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/CoreFutest.cpp
+//! @file      Core/TestMachinery/CoreFutest.cpp
 //! @brief     Implements class CoreFutest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/TestMachinery/CoreFutest.h b/Core/TestMachinery/CoreFutest.h
index f1ade2c21a7..61db5382fce 100644
--- a/Core/TestMachinery/CoreFutest.h
+++ b/Core/TestMachinery/CoreFutest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/CoreFutest.h
+//! @file      Core/TestMachinery/CoreFutest.h
 //! @brief     Declares class CoreFutest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/TestMachinery/FutestInfo.cpp b/Core/TestMachinery/FutestInfo.cpp
index 1830f1d1864..9847a7c0a0a 100644
--- a/Core/TestMachinery/FutestInfo.cpp
+++ b/Core/TestMachinery/FutestInfo.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/FutestInfo.cpp
+//! @file      Core/TestMachinery/FutestInfo.cpp
 //! @brief     Implements class FutestInfo.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/TestMachinery/FutestInfo.h b/Core/TestMachinery/FutestInfo.h
index 850d7669c7a..735afc00ce6 100644
--- a/Core/TestMachinery/FutestInfo.h
+++ b/Core/TestMachinery/FutestInfo.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/FutestInfo.h
+//! @file      Core/TestMachinery/FutestInfo.h
 //! @brief     Declares class FutestInfo.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/TestMachinery/FutestRegistry.cpp b/Core/TestMachinery/FutestRegistry.cpp
index 37318f78d33..9ea327ef481 100644
--- a/Core/TestMachinery/FutestRegistry.cpp
+++ b/Core/TestMachinery/FutestRegistry.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/FutestRegistry.cpp
+//! @file      Core/TestMachinery/FutestRegistry.cpp
 //! @brief     Implements class FutestRegistry.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/TestMachinery/FutestRegistry.h b/Core/TestMachinery/FutestRegistry.h
index 3f69b7d9868..df3e01f6aa7 100644
--- a/Core/TestMachinery/FutestRegistry.h
+++ b/Core/TestMachinery/FutestRegistry.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/FutestRegistry.h
+//! @file      Core/TestMachinery/FutestRegistry.h
 //! @brief     Declares class FutestRegistry.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/TestMachinery/FutestSuite.cpp b/Core/TestMachinery/FutestSuite.cpp
index de5c255ff75..7a44cca729f 100644
--- a/Core/TestMachinery/FutestSuite.cpp
+++ b/Core/TestMachinery/FutestSuite.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/FutestSuite.cpp
+//! @file      Core/TestMachinery/FutestSuite.cpp
 //! @brief     Implements class FutestSuite.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/TestMachinery/FutestSuite.h b/Core/TestMachinery/FutestSuite.h
index 74d2ff9dfd1..141772ec14e 100644
--- a/Core/TestMachinery/FutestSuite.h
+++ b/Core/TestMachinery/FutestSuite.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      TestMachinery/FutestSuite.h
+//! @file      Core/TestMachinery/FutestSuite.h
 //! @brief     Declares class FutestSuite.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/TestMachinery/IFutest.cpp b/Core/TestMachinery/IFutest.cpp
index 0294a28e350..572c985e3c6 100644
--- a/Core/TestMachinery/IFutest.cpp
+++ b/Core/TestMachinery/IFutest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/IFutest.cpp
+//! @file      Core/TestMachinery/IFutest.cpp
 //! @brief     Implements class IFutest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/TestMachinery/IFutest.h b/Core/TestMachinery/IFutest.h
index 7256429a156..309013705d5 100644
--- a/Core/TestMachinery/IFutest.h
+++ b/Core/TestMachinery/IFutest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/IFutest.h
+//! @file      Core/TestMachinery/IFutest.h
 //! @brief     Declares pure virtual base class IFutest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/TestMachinery/IRegistry.h b/Core/TestMachinery/IRegistry.h
index 5257bbb0b91..344ead4f043 100644
--- a/Core/TestMachinery/IRegistry.h
+++ b/Core/TestMachinery/IRegistry.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/IRegistry.h
+//! @file      Core/TestMachinery/IRegistry.h
 //! @brief     Declares templated registry for ICloneable objects
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/TestMachinery/PyScriptFutest.cpp b/Core/TestMachinery/PyScriptFutest.cpp
index d8e406a4023..be897d9ab0c 100644
--- a/Core/TestMachinery/PyScriptFutest.cpp
+++ b/Core/TestMachinery/PyScriptFutest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/PyScriptFutest.cpp
+//! @file      Core/TestMachinery/PyScriptFutest.cpp
 //! @brief     Implements class PyScriptFutest
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/TestMachinery/PyScriptFutest.h b/Core/TestMachinery/PyScriptFutest.h
index 8ec3807b798..ab3815cc9b0 100644
--- a/Core/TestMachinery/PyScriptFutest.h
+++ b/Core/TestMachinery/PyScriptFutest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/PyScriptFutest.h
+//! @file      Core/TestMachinery/PyScriptFutest.h
 //! @brief     Declares class PyScriptFutest
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/TestMachinery/SubtestRegistry.cpp b/Core/TestMachinery/SubtestRegistry.cpp
index 13e8564ca8a..3dd7d3dbd4b 100644
--- a/Core/TestMachinery/SubtestRegistry.cpp
+++ b/Core/TestMachinery/SubtestRegistry.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/SubtestRegistry.cpp
+//! @file      Core/TestMachinery/SubtestRegistry.cpp
 //! @brief     Implements different registries for subtests of functional tests.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/TestMachinery/SubtestRegistry.h b/Core/TestMachinery/SubtestRegistry.h
index 0f50a4a0a94..5fa1f4b9b1f 100644
--- a/Core/TestMachinery/SubtestRegistry.h
+++ b/Core/TestMachinery/SubtestRegistry.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/SubtestRegistry.h
+//! @file      Core/TestMachinery/SubtestRegistry.h
 //! @brief     Declares different registries for subtests of functional tests.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/AttLimits.cpp b/Core/Tools/AttLimits.cpp
index 40421edaf59..7565c7dcba8 100644
--- a/Core/Tools/AttLimits.cpp
+++ b/Core/Tools/AttLimits.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/AttLimits.cpp
+//! @file      Core/Tools/AttLimits.cpp
 //! @brief     Implements class AttLimits.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/AttLimits.h b/Core/Tools/AttLimits.h
index 1af68913843..00299474ec9 100644
--- a/Core/Tools/AttLimits.h
+++ b/Core/Tools/AttLimits.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/AttLimits.h
+//! @file      Core/Tools/AttLimits.h
 //! @brief     Declares class AttLimits.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Bin.h b/Core/Tools/Bin.h
index c78a3e3278d..50f3163d35d 100644
--- a/Core/Tools/Bin.h
+++ b/Core/Tools/Bin.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/Bin.h
+//! @file      Core/Tools/Bin.h
 //! @brief     Declares structs Bin1D, Bin1DCVector
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/BornAgainNamespace.h b/Core/Tools/BornAgainNamespace.h
index 34a89e2e8bf..e578ee31bc7 100644
--- a/Core/Tools/BornAgainNamespace.h
+++ b/Core/Tools/BornAgainNamespace.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/BornAgainNamespace.h
+//! @file      Core/Tools/BornAgainNamespace.h
 //! @brief     Declares BornAgain namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Complex.h b/Core/Tools/Complex.h
index 3528304f740..8bc1226fcfa 100644
--- a/Core/Tools/Complex.h
+++ b/Core/Tools/Complex.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/Complex.h
+//! @file      Core/Tools/Complex.h
 //! @brief     Declares complex_t, and a few elementary functions
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/ConstKBinAxis.cpp b/Core/Tools/ConstKBinAxis.cpp
index e2b8970c6e7..402fe76e18a 100644
--- a/Core/Tools/ConstKBinAxis.cpp
+++ b/Core/Tools/ConstKBinAxis.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/ConstKBinAxis.cpp
+//! @file      Core/Tools/ConstKBinAxis.cpp
 //! @brief     Implement class ConstKBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/ConstKBinAxis.h b/Core/Tools/ConstKBinAxis.h
index 24a2ce1608f..c2fe3a38b2c 100644
--- a/Core/Tools/ConstKBinAxis.h
+++ b/Core/Tools/ConstKBinAxis.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/ConstKBinAxis.h
+//! @file      Core/Tools/ConstKBinAxis.h
 //! @brief     Declares class ConstKBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Convolve.cpp b/Core/Tools/Convolve.cpp
index 4a4ee35c036..c81783e35e1 100644
--- a/Core/Tools/Convolve.cpp
+++ b/Core/Tools/Convolve.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/Convolve.cpp
+//! @file      Core/Tools/Convolve.cpp
 //! @brief     Implements class Convolve.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Convolve.h b/Core/Tools/Convolve.h
index 4ffb2a2e3b5..bd9eeee89d8 100644
--- a/Core/Tools/Convolve.h
+++ b/Core/Tools/Convolve.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/Convolve.h
+//! @file      Core/Tools/Convolve.h
 //! @brief     Declares class MathFunctions::Convolve.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/CumulativeValue.h b/Core/Tools/CumulativeValue.h
index e4a7db93817..692a68dc414 100644
--- a/Core/Tools/CumulativeValue.h
+++ b/Core/Tools/CumulativeValue.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/CumulativeValue.h
+//! @file      Core/Tools/CumulativeValue.h
 //! @brief     Declares class CumulativeValue.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/CustomBinAxis.cpp b/Core/Tools/CustomBinAxis.cpp
index d5fd671f7b6..e935e74259b 100644
--- a/Core/Tools/CustomBinAxis.cpp
+++ b/Core/Tools/CustomBinAxis.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/CustomBinAxis.cpp
+//! @file      Core/Tools/CustomBinAxis.cpp
 //! @brief     Implement class CustomBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/CustomBinAxis.h b/Core/Tools/CustomBinAxis.h
index 96681d8bf34..5b780ec16b0 100644
--- a/Core/Tools/CustomBinAxis.h
+++ b/Core/Tools/CustomBinAxis.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/CustomBinAxis.h
+//! @file      Core/Tools/CustomBinAxis.h
 //! @brief     Declares class CustomBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/EigenCore.h b/Core/Tools/EigenCore.h
index 23dbf8ebb62..c5a7f91e714 100644
--- a/Core/Tools/EigenCore.h
+++ b/Core/Tools/EigenCore.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/EigenCore.h
+//! @file      Core/Tools/EigenCore.h
 //! @brief     Include to deal with Eigen alignment centrally
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Exceptions.cpp b/Core/Tools/Exceptions.cpp
index 4b3b92daada..be1cbfabf37 100644
--- a/Core/Tools/Exceptions.cpp
+++ b/Core/Tools/Exceptions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/Exceptions.cpp
+//! @file      Core/Tools/Exceptions.cpp
 //! @brief     Implements class Exceptions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Exceptions.h b/Core/Tools/Exceptions.h
index 2f4f8ff5a1c..89b9e85cd19 100644
--- a/Core/Tools/Exceptions.h
+++ b/Core/Tools/Exceptions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/Exceptions.h
+//! @file      Core/Tools/Exceptions.h
 //! @brief     Declares many exception classes in namespace Exceptions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/FastVector.h b/Core/Tools/FastVector.h
index ff2d59bb242..5024d3822ca 100644
--- a/Core/Tools/FastVector.h
+++ b/Core/Tools/FastVector.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/FastVector.h
+//! @file      Core/Tools/FastVector.h
 //! @brief     Declares class KVectorContainer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/FileSystem.cpp b/Core/Tools/FileSystem.cpp
index 228cdbad0a7..728ce53e575 100644
--- a/Core/Tools/FileSystem.cpp
+++ b/Core/Tools/FileSystem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/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 7e64f679a15..85c5172588e 100644
--- a/Core/Tools/FileSystem.h
+++ b/Core/Tools/FileSystem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/FileSystem.h
+//! @file      Core/Tools/FileSystem.h
 //! @brief     Declares class FileSystem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/FixedBinAxis.cpp b/Core/Tools/FixedBinAxis.cpp
index 991cb1f895a..951d4ce7694 100644
--- a/Core/Tools/FixedBinAxis.cpp
+++ b/Core/Tools/FixedBinAxis.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/FixedBinAxis.cpp
+//! @file      Core/Tools/FixedBinAxis.cpp
 //! @brief     Implement class FixedBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/FixedBinAxis.h b/Core/Tools/FixedBinAxis.h
index 46f531c2e32..3cdfcda2a18 100644
--- a/Core/Tools/FixedBinAxis.h
+++ b/Core/Tools/FixedBinAxis.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/FixedBinAxis.h
+//! @file      Core/Tools/FixedBinAxis.h
 //! @brief     Declares class FixedBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Histogram1D.cpp b/Core/Tools/Histogram1D.cpp
index 265955b4d28..a90b798ff62 100644
--- a/Core/Tools/Histogram1D.cpp
+++ b/Core/Tools/Histogram1D.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/inc/Histogram1D.cpp
+//! @file      Core/Tools/Histogram1D.cpp
 //! @brief     Implements class Histogram1D.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Histogram1D.h b/Core/Tools/Histogram1D.h
index 02dd2bfa328..71b0151df1b 100644
--- a/Core/Tools/Histogram1D.h
+++ b/Core/Tools/Histogram1D.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/Histogram1D.h
+//! @file      Core/Tools/Histogram1D.h
 //! @brief     Declares class Histogram1D.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Histogram2D.cpp b/Core/Tools/Histogram2D.cpp
index 3410cbb1633..ae1ed71cff2 100644
--- a/Core/Tools/Histogram2D.cpp
+++ b/Core/Tools/Histogram2D.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/inc/Histogram2D.cpp
+//! @file      Core/Tools/Histogram2D.cpp
 //! @brief     Implements class Histogram2D.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Histogram2D.h b/Core/Tools/Histogram2D.h
index ed39089f7fe..6df436a69bb 100644
--- a/Core/Tools/Histogram2D.h
+++ b/Core/Tools/Histogram2D.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/Histogram2D.h
+//! @file      Core/Tools/Histogram2D.h
 //! @brief     Declares class Histogram2D.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/IAxis.h b/Core/Tools/IAxis.h
index 44b0e9e597a..f9fc02e33d3 100644
--- a/Core/Tools/IAxis.h
+++ b/Core/Tools/IAxis.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/IAxis.h
+//! @file      Core/Tools/IAxis.h
 //! @brief     Declares class IAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/ICloneable.h b/Core/Tools/ICloneable.h
index 65451ac8c2a..3cb2d530021 100644
--- a/Core/Tools/ICloneable.h
+++ b/Core/Tools/ICloneable.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/ICloneable.h
+//! @file      Core/Tools/ICloneable.h
 //! @brief     Declares the standard mix-in ICloneable.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/IFactory.h b/Core/Tools/IFactory.h
index 81c33956970..ef076998c61 100644
--- a/Core/Tools/IFactory.h
+++ b/Core/Tools/IFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/IFactory.h
+//! @file      Core/Tools/IFactory.h
 //! @brief     Declares interface class IFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/IHistogram.cpp b/Core/Tools/IHistogram.cpp
index 2ba71a93085..63b0d74d922 100644
--- a/Core/Tools/IHistogram.cpp
+++ b/Core/Tools/IHistogram.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/inc/IntensityDataObject.cpp
+//! @file      Core/Tools/IHistogram.cpp
 //! @brief     Implements class IntensityDataObject.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/IHistogram.h b/Core/Tools/IHistogram.h
index 5edf89450cb..fd140226d82 100644
--- a/Core/Tools/IHistogram.h
+++ b/Core/Tools/IHistogram.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/IHistogram.h
+//! @file      Core/Tools/IHistogram.h
 //! @brief     Declares class IHistogram.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/INamed.h b/Core/Tools/INamed.h
index 4c7515d1739..e2fb3c57232 100644
--- a/Core/Tools/INamed.h
+++ b/Core/Tools/INamed.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/INamed.h
+//! @file      Core/Tools/INamed.h
 //! @brief     Declares and implements the standard mix-in INamed.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/IObserver.cpp b/Core/Tools/IObserver.cpp
index 4a4b32177d0..8aeb436a781 100644
--- a/Core/Tools/IObserver.cpp
+++ b/Core/Tools/IObserver.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/IObserver.cpp
+//! @file      Core/Tools/IObserver.cpp
 //! @brief     Implements class IObserver, mostly by including IObserver.h.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/IObserver.h b/Core/Tools/IObserver.h
index a7d8077114a..e24513fecaf 100644
--- a/Core/Tools/IObserver.h
+++ b/Core/Tools/IObserver.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/IObserver.h
+//! @file      Core/Tools/IObserver.h
 //! @brief     Declares classes IObserver and IObservable (Observer pattern).
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/IParameterized.cpp b/Core/Tools/IParameterized.cpp
index 77d6dd9b48e..8e051bd26e8 100644
--- a/Core/Tools/IParameterized.cpp
+++ b/Core/Tools/IParameterized.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/IParameterized.cpp
+//! @file      Core/Tools/IParameterized.cpp
 //! @brief     Implements classes IParameterized and ParameterPattern.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/IParameterized.h b/Core/Tools/IParameterized.h
index 9372a14f5cb..ab1203ff78f 100644
--- a/Core/Tools/IParameterized.h
+++ b/Core/Tools/IParameterized.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/IParameterized.h
+//! @file      Core/Tools/IParameterized.h
 //! @brief     Declares classes IParameterized and ParameterPattern
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/IShareable.h b/Core/Tools/IShareable.h
index 7bdcf6e8d68..af9f01e5e96 100644
--- a/Core/Tools/IShareable.h
+++ b/Core/Tools/IShareable.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/IShareable.h
+//! @file      Core/Tools/IShareable.h
 //! @brief     Declares the class ISharable (used for SWIG smart pointers)
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/ISingleton.h b/Core/Tools/ISingleton.h
index 9b8cc174eab..4b758bfb798 100644
--- a/Core/Tools/ISingleton.h
+++ b/Core/Tools/ISingleton.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/ISingleton.h
+//! @file      Core/Tools/ISingleton.h
 //! @brief     Declares the standard mix-in ISingleton.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/IntegratorComplex.h b/Core/Tools/IntegratorComplex.h
index 1a28440237a..0208dfcf7e0 100644
--- a/Core/Tools/IntegratorComplex.h
+++ b/Core/Tools/IntegratorComplex.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/IntegratorComplex.h
+//! @file      Core/Tools/IntegratorComplex.h
 //! @brief     Declares and implements class template IntegratorComplex.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/IntegratorMCMiser.h b/Core/Tools/IntegratorMCMiser.h
index da288e2defe..e8e552bf61a 100644
--- a/Core/Tools/IntegratorMCMiser.h
+++ b/Core/Tools/IntegratorMCMiser.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/IntegratorMCMiser.h
+//! @file      Core/Tools/IntegratorMCMiser.h
 //! @brief     Declares and implements template class IntegratorMCMiser.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/IntegratorReal.h b/Core/Tools/IntegratorReal.h
index fef7b919a18..fb8e71e0f71 100644
--- a/Core/Tools/IntegratorReal.h
+++ b/Core/Tools/IntegratorReal.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/IntegratorReal.h
+//! @file      Core/Tools/IntegratorReal.h
 //! @brief     Declares and implements class template IntegratorReal.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/IntensityDataFunctions.cpp b/Core/Tools/IntensityDataFunctions.cpp
index 95d238ffb19..86dfae875f9 100644
--- a/Core/Tools/IntensityDataFunctions.cpp
+++ b/Core/Tools/IntensityDataFunctions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/IntensityDataFunctions.cpp
+//! @file      Core/Tools/IntensityDataFunctions.cpp
 //! @brief     Implement class IntensityDataFunctions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/IntensityDataFunctions.h b/Core/Tools/IntensityDataFunctions.h
index afda40ddaa4..b8faf8aa442 100644
--- a/Core/Tools/IntensityDataFunctions.h
+++ b/Core/Tools/IntensityDataFunctions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/IntensityDataFunctions.h
+//! @file      Core/Tools/IntensityDataFunctions.h
 //! @brief     Declares class IntensityDataFunctions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/LLData.cpp b/Core/Tools/LLData.cpp
index 0cc277db474..8070476b94c 100644
--- a/Core/Tools/LLData.cpp
+++ b/Core/Tools/LLData.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/LLData.cpp
+//! @file      Core/Tools/LLData.cpp
 //! @brief     Implements template specializations for LLData.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/LLData.h b/Core/Tools/LLData.h
index 32990537591..3de1a95dd96 100644
--- a/Core/Tools/LLData.h
+++ b/Core/Tools/LLData.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/LLData.h
+//! @file      Core/Tools/LLData.h
 //! @brief     Declares class LLData.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Macros.h b/Core/Tools/Macros.h
index b4ec7483082..465a54df710 100644
--- a/Core/Tools/Macros.h
+++ b/Core/Tools/Macros.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/Macros.h
+//! @file      Core/Tools/Macros.h
 //! @brief     Workarounds concerning diagnostic warnings.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/MathFunctions.cpp b/Core/Tools/MathFunctions.cpp
index bf61d3c6633..d16eace6e5e 100644
--- a/Core/Tools/MathFunctions.cpp
+++ b/Core/Tools/MathFunctions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/MathFunctions.cpp
+//! @file      Core/Tools/MathFunctions.cpp
 //! @brief     Implements functions in namespace MathFunctions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/MathFunctions.h b/Core/Tools/MathFunctions.h
index f66bb130677..d52fef08743 100644
--- a/Core/Tools/MathFunctions.h
+++ b/Core/Tools/MathFunctions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/MathFunctions.h
+//! @file      Core/Tools/MathFunctions.h
 //! @brief     Declares functions in namespace MathFunctions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/MessageService.cpp b/Core/Tools/MessageService.cpp
index f0e85baf047..7ebdd380fc2 100644
--- a/Core/Tools/MessageService.cpp
+++ b/Core/Tools/MessageService.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/MessageService.cpp
+//! @file      Core/Tools/MessageService.cpp
 //! @brief     Implement Logger class.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/MessageService.h b/Core/Tools/MessageService.h
index b5508d210e3..23557fcba98 100644
--- a/Core/Tools/MessageService.h
+++ b/Core/Tools/MessageService.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/MessageService.h
+//! @file      Core/Tools/MessageService.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 8d3b4935d4c..d406d95acd9 100644
--- a/Core/Tools/Numeric.cpp
+++ b/Core/Tools/Numeric.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/inc/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 c41c15c11d4..bcbc887268c 100644
--- a/Core/Tools/Numeric.h
+++ b/Core/Tools/Numeric.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/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 933ebbf0a79..95af463ff33 100644
--- a/Core/Tools/NumpyUtils.cpp
+++ b/Core/Tools/NumpyUtils.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      PythonAPI/inc/NumpyUtils.h
+//! @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 7173d512aa3..b123dfaf474 100644
--- a/Core/Tools/NumpyUtils.h
+++ b/Core/Tools/NumpyUtils.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      PythonAPI/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/OutputData.cpp b/Core/Tools/OutputData.cpp
index ab08a878be9..d1e1b6cff51 100644
--- a/Core/Tools/OutputData.cpp
+++ b/Core/Tools/OutputData.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/OutputData.cpp
+//! @file      Core/Tools/OutputData.cpp
 //! @brief     Implements template specializations of class OutputData.cpp.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/OutputData.h b/Core/Tools/OutputData.h
index ce5fd0ee34e..bb4230b6ba0 100644
--- a/Core/Tools/OutputData.h
+++ b/Core/Tools/OutputData.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/OutputData.h
+//! @file      Core/Tools/OutputData.h
 //! @brief     Declares and implements template class OutputData.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/OutputDataFunctions.cpp b/Core/Tools/OutputDataFunctions.cpp
index 1c135441e42..e688f6e375b 100644
--- a/Core/Tools/OutputDataFunctions.cpp
+++ b/Core/Tools/OutputDataFunctions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/OutputDataFunctions.cpp
+//! @file      Core/Tools/OutputDataFunctions.cpp
 //! @brief     Implements class OutputDataFunctions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/OutputDataFunctions.h b/Core/Tools/OutputDataFunctions.h
index 95adfb2c6d9..1d1833f2e80 100644
--- a/Core/Tools/OutputDataFunctions.h
+++ b/Core/Tools/OutputDataFunctions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/OutputDataFunctions.h
+//! @file      Core/Tools/OutputDataFunctions.h
 //! @brief     Declares functions in namespace OutputDataFunctions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/OutputDataIterator.h b/Core/Tools/OutputDataIterator.h
index fa2730f3583..ac7b4596092 100644
--- a/Core/Tools/OutputDataIterator.h
+++ b/Core/Tools/OutputDataIterator.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/OutputDataIterator.h
+//! @file      Core/Tools/OutputDataIterator.h
 //! @brief     Declares and implements template class OutputDataIterator.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/ParameterDistribution.cpp b/Core/Tools/ParameterDistribution.cpp
index 666ba0abc3b..13cfa3ed904 100644
--- a/Core/Tools/ParameterDistribution.cpp
+++ b/Core/Tools/ParameterDistribution.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/ParameterDistribution.cpp
+//! @file      Core/Tools/ParameterDistribution.cpp
 //! @brief     Implements class ParameterDistribution.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/ParameterDistribution.h b/Core/Tools/ParameterDistribution.h
index b00163b4e2c..b1a6602d2ae 100644
--- a/Core/Tools/ParameterDistribution.h
+++ b/Core/Tools/ParameterDistribution.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      ParameterDistribution.h
+//! @file      Core/Tools/ParameterDistribution.h
 //! @brief     Declares class ParameterDistribution.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/ParameterPool.cpp b/Core/Tools/ParameterPool.cpp
index 06b652c5f57..a85e09681cb 100644
--- a/Core/Tools/ParameterPool.cpp
+++ b/Core/Tools/ParameterPool.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/ParameterPool.cpp
+//! @file      Core/Tools/ParameterPool.cpp
 //! @brief     Implements standard mix-in ParameterPool.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/ParameterPool.h b/Core/Tools/ParameterPool.h
index 543c5a4b338..066bf03f480 100644
--- a/Core/Tools/ParameterPool.h
+++ b/Core/Tools/ParameterPool.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/ParameterPool.h
+//! @file      Core/Tools/ParameterPool.h
 //! @brief     Declares class ParameterPool.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Precomputed.cpp b/Core/Tools/Precomputed.cpp
index 2d8a486978f..fddaf0da06d 100644
--- a/Core/Tools/Precomputed.cpp
+++ b/Core/Tools/Precomputed.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/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 a4cd21b72b1..1d794439650 100644
--- a/Core/Tools/Precomputed.h
+++ b/Core/Tools/Precomputed.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/Precomputed.h
+//! @file      Core/Tools/Precomputed.h
 //! @brief     Declares classes Precomputed, providing precomputed constants
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/PyGenTools.cpp b/Core/Tools/PyGenTools.cpp
index 7ba0f6bad73..be7118be813 100644
--- a/Core/Tools/PyGenTools.cpp
+++ b/Core/Tools/PyGenTools.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/PyGenTools.cpp
+//! @file      Core/Tools/PyGenTools.cpp
 //! @brief     Implements functions from PyGenTools namespace.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/PyGenTools.h b/Core/Tools/PyGenTools.h
index 9472d21e7e0..ad1a02cf0a7 100644
--- a/Core/Tools/PyGenTools.h
+++ b/Core/Tools/PyGenTools.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/PyGenTools.h
+//! @file      Core/Tools/PyGenTools.h
 //! @brief     Declares PyGenTools namespace.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/PyGenVisitor.cpp b/Core/Tools/PyGenVisitor.cpp
index 2c866a9e367..d4f3a71e361 100644
--- a/Core/Tools/PyGenVisitor.cpp
+++ b/Core/Tools/PyGenVisitor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/PyGenVisitor.cpp
+//! @file      Core/Tools/PyGenVisitor.cpp
 //! @brief     Implements standard mix-in PyGenVisitor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/PyGenVisitor.h b/Core/Tools/PyGenVisitor.h
index a087c14fa8b..ab2baee5a19 100644
--- a/Core/Tools/PyGenVisitor.h
+++ b/Core/Tools/PyGenVisitor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/PyGenVisitor.h
+//! @file      Core/Tools/PyGenVisitor.h
 //! @brief     Declares PyGenVisitor class.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/RealParameterWrapper.cpp b/Core/Tools/RealParameterWrapper.cpp
index 84b6e91b182..f1e0179bdeb 100644
--- a/Core/Tools/RealParameterWrapper.cpp
+++ b/Core/Tools/RealParameterWrapper.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/RealParameterWrapper.cpp
+//! @file      Core/Tools/RealParameterWrapper.cpp
 //! @brief     Implements class RealParameterWrapper.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/RealParameterWrapper.h b/Core/Tools/RealParameterWrapper.h
index 9ca315a8951..41a018f1a36 100644
--- a/Core/Tools/RealParameterWrapper.h
+++ b/Core/Tools/RealParameterWrapper.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/RealParameterWrapper.h
+//! @file      Core/Tools/RealParameterWrapper.h
 //! @brief     Declares class RealParameterWrapper.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/SafePointerVector.h b/Core/Tools/SafePointerVector.h
index e8652afb761..0e7eee022dc 100644
--- a/Core/Tools/SafePointerVector.h
+++ b/Core/Tools/SafePointerVector.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/SafePointerVector.h
+//! @file      Core/Tools/SafePointerVector.h
 //! @brief     Declares and implements template class SafePointerVector.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/SampleLabelHandler.cpp b/Core/Tools/SampleLabelHandler.cpp
index beadf5d91d8..edcb25d6835 100644
--- a/Core/Tools/SampleLabelHandler.cpp
+++ b/Core/Tools/SampleLabelHandler.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/SampleLabelHandler.cpp
+//! @file      Core/Tools/SampleLabelHandler.cpp
 //! @brief     Implement class SampleLabelHandler.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/SampleLabelHandler.h b/Core/Tools/SampleLabelHandler.h
index 7732f5ea49f..c63a954a544 100644
--- a/Core/Tools/SampleLabelHandler.h
+++ b/Core/Tools/SampleLabelHandler.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/SampleLabelHandler.h
+//! @file      Core/Tools/SampleLabelHandler.h
 //! @brief     Declares SampleLabelHandler class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/SampleMaterialVisitor.cpp b/Core/Tools/SampleMaterialVisitor.cpp
index 2c5b0188a60..8cd1b6584fd 100644
--- a/Core/Tools/SampleMaterialVisitor.cpp
+++ b/Core/Tools/SampleMaterialVisitor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/SampleMaterialVisitor.cpp
+//! @file      Core/Tools/SampleMaterialVisitor.cpp
 //! @brief     Implements class SampleMaterialVisitor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/SampleMaterialVisitor.h b/Core/Tools/SampleMaterialVisitor.h
index b16349c3b2b..ad30d6a0805 100644
--- a/Core/Tools/SampleMaterialVisitor.h
+++ b/Core/Tools/SampleMaterialVisitor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/SampleMaterialVisitor.h
+//! @file      Core/Tools/SampleMaterialVisitor.h
 //! @brief     Declares class SampleMaterialVisitor.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/SamplePrintVisitor.cpp b/Core/Tools/SamplePrintVisitor.cpp
index 0e3db6a5604..a40debc7d4b 100644
--- a/Core/Tools/SamplePrintVisitor.cpp
+++ b/Core/Tools/SamplePrintVisitor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/SamplePrintVisitor.cpp
+//! @file      Core/Tools/SamplePrintVisitor.cpp
 //! @brief     Implements SamplePrintVisitor class.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/SamplePrintVisitor.h b/Core/Tools/SamplePrintVisitor.h
index c0d85b01f7b..e9cf5983573 100644
--- a/Core/Tools/SamplePrintVisitor.h
+++ b/Core/Tools/SamplePrintVisitor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/SamplePrintVisitor.h
+//! @file      Core/Tools/SamplePrintVisitor.h
 //! @brief     Declares SamplePrintVisitor class.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/TRange.h b/Core/Tools/TRange.h
index f49d94f8cbb..3158fa14020 100644
--- a/Core/Tools/TRange.h
+++ b/Core/Tools/TRange.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/TRange.h
+//! @file      Core/Tools/TRange.h
 //! @brief     Declares and implements template classes TRange and TSampledRange.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Units.h b/Core/Tools/Units.h
index 12b1ce70f3c..352166e280a 100644
--- a/Core/Tools/Units.h
+++ b/Core/Tools/Units.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/Units.h
+//! @file      Core/Tools/Units.h
 //! @brief     Declares some unit conversion factors and other constants in namespace Units.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/Utils.cpp b/Core/Tools/Utils.cpp
index f8eb982eb27..12a173a4abd 100644
--- a/Core/Tools/Utils.cpp
+++ b/Core/Tools/Utils.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/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 1fd75ef14b1..2a253d478af 100644
--- a/Core/Tools/Utils.h
+++ b/Core/Tools/Utils.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/Utils.h
+//! @file      Core/Tools/Utils.h
 //! @brief     Declares various stuff in namespace Utils.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/VDouble.h b/Core/Tools/VDouble.h
index 29515c51842..2cffd76398a 100644
--- a/Core/Tools/VDouble.h
+++ b/Core/Tools/VDouble.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/VDouble.h
+//! @file      Core/Tools/VDouble.h
 //! @brief     Declares the array types vdouble1d_t, vdouble2d_t.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/VariableBinAxis.cpp b/Core/Tools/VariableBinAxis.cpp
index 714a5818e5e..42acd13468a 100644
--- a/Core/Tools/VariableBinAxis.cpp
+++ b/Core/Tools/VariableBinAxis.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/VariableBinAxis.cpp
+//! @file      Core/Tools/VariableBinAxis.cpp
 //! @brief     Implements VariableBinAxis class.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/VariableBinAxis.h b/Core/Tools/VariableBinAxis.h
index 6e411d74845..06a1a3671a8 100644
--- a/Core/Tools/VariableBinAxis.h
+++ b/Core/Tools/VariableBinAxis.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/VariableBinAxis.h
+//! @file      Core/Tools/VariableBinAxis.h
 //! @brief     Declares class VariableBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/WinDllMacros.h b/Core/Tools/WinDllMacros.h
index a6e7166ddd3..af42530af16 100644
--- a/Core/Tools/WinDllMacros.h
+++ b/Core/Tools/WinDllMacros.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/WinDllMacros.h
+//! @file      Core/Tools/WinDllMacros.h
 //! @brief     Declares macroses for building dll.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Tools/fp_exception_glibc_extension.h b/Core/Tools/fp_exception_glibc_extension.h
index 500e7a0c038..1a2f24a96db 100644
--- a/Core/Tools/fp_exception_glibc_extension.h
+++ b/Core/Tools/fp_exception_glibc_extension.h
@@ -1,6 +1,6 @@
 // ************************************************************************** //
 //                                                                         
-//! @file      Tools/fp_exception_glibc_extension.h
+//! @file      Core/Tools/fp_exception_glibc_extension.h
 //! @brief     glibc floating point extension replacement for OS X.
 //
 //! License:   Public Domain
diff --git a/Core/Tools/w32pragma.h b/Core/Tools/w32pragma.h
index 5e6a2b3d90f..d544e86162c 100644
--- a/Core/Tools/w32pragma.h
+++ b/Core/Tools/w32pragma.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tools/w32pragma.h
+//! @file      Core/Tools/w32pragma.h
 //! @brief     Pragmas and defines for MSVC
 //
 // ************************************************************************** //
diff --git a/Fit/FitKernel/FitKernel.cpp b/Fit/FitKernel/FitKernel.cpp
index 7972862ae2a..3ce89169325 100644
--- a/Fit/FitKernel/FitKernel.cpp
+++ b/Fit/FitKernel/FitKernel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitKernel.cpp
+//! @file      Fit/FitKernel/FitKernel.cpp
 //! @brief     Implements class FitKernel.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitKernel.h b/Fit/FitKernel/FitKernel.h
index b93c7fd9fa4..2c3143faa87 100644
--- a/Fit/FitKernel/FitKernel.h
+++ b/Fit/FitKernel/FitKernel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitKernel.h
+//! @file      Fit/FitKernel/FitKernel.h
 //! @brief     Declares class FitKernel.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitObject.cpp b/Fit/FitKernel/FitObject.cpp
index f564457d030..d18d921565d 100644
--- a/Fit/FitKernel/FitObject.cpp
+++ b/Fit/FitKernel/FitObject.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitObject.cpp
+//! @file      Fit/FitKernel/FitObject.cpp
 //! @brief     Implements class FitObject.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitObject.h b/Fit/FitKernel/FitObject.h
index b4b83868d65..09c12c8c524 100644
--- a/Fit/FitKernel/FitObject.h
+++ b/Fit/FitKernel/FitObject.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitObject.h
+//! @file      Fit/FitKernel/FitObject.h
 //! @brief     Declares class FitObject.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitOptions.h b/Fit/FitKernel/FitOptions.h
index f8f37e25570..cccdc716895 100644
--- a/Fit/FitKernel/FitOptions.h
+++ b/Fit/FitKernel/FitOptions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitOptions.h
+//! @file      Fit/FitKernel/FitOptions.h
 //! @brief     Declares class FitOptions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitParameter.cpp b/Fit/FitKernel/FitParameter.cpp
index e5a0e4e573d..b51a9bac648 100644
--- a/Fit/FitKernel/FitParameter.cpp
+++ b/Fit/FitKernel/FitParameter.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitParameter.cpp
+//! @file      Fit/FitKernel/FitParameter.cpp
 //! @brief     Implements class FitParameter.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitParameter.h b/Fit/FitKernel/FitParameter.h
index 6bdf7e77de0..4480502cad5 100644
--- a/Fit/FitKernel/FitParameter.h
+++ b/Fit/FitKernel/FitParameter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitParameter.h
+//! @file      Fit/FitKernel/FitParameter.h
 //! @brief     Declares class FitParameter.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitParameterLinked.cpp b/Fit/FitKernel/FitParameterLinked.cpp
index cffe5b64103..a5bf11d5da9 100644
--- a/Fit/FitKernel/FitParameterLinked.cpp
+++ b/Fit/FitKernel/FitParameterLinked.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitParameterLinked.cpp
+//! @file      Fit/FitKernel/FitParameterLinked.cpp
 //! @brief     Implements class FitParameterLinked.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitParameterLinked.h b/Fit/FitKernel/FitParameterLinked.h
index 675d2916937..ff485cbe404 100644
--- a/Fit/FitKernel/FitParameterLinked.h
+++ b/Fit/FitKernel/FitParameterLinked.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitParameterLinked.h
+//! @file      Fit/FitKernel/FitParameterLinked.h
 //! @brief     Declares class FitParameterLinked.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitStrategyAdjustMinimizer.cpp b/Fit/FitKernel/FitStrategyAdjustMinimizer.cpp
index 6051f38578d..375da879922 100644
--- a/Fit/FitKernel/FitStrategyAdjustMinimizer.cpp
+++ b/Fit/FitKernel/FitStrategyAdjustMinimizer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitStrategyAdjustMinimizer.cpp
+//! @file      Fit/FitKernel/FitStrategyAdjustMinimizer.cpp
 //! @brief     Implements class FitStrategyAdjustMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitStrategyAdjustMinimizer.h b/Fit/FitKernel/FitStrategyAdjustMinimizer.h
index 05d3c530876..0a574214cd2 100644
--- a/Fit/FitKernel/FitStrategyAdjustMinimizer.h
+++ b/Fit/FitKernel/FitStrategyAdjustMinimizer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitStrategyAdjustMinimizer.h
+//! @file      Fit/FitKernel/FitStrategyAdjustMinimizer.h
 //! @brief     Declares class FitStrategyAdjustMinimizer
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitStrategyAdjustParameters.cpp b/Fit/FitKernel/FitStrategyAdjustParameters.cpp
index c7c49ebd54b..e1105d2e908 100644
--- a/Fit/FitKernel/FitStrategyAdjustParameters.cpp
+++ b/Fit/FitKernel/FitStrategyAdjustParameters.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitStrategyAdjustParameters.cpp
+//! @file      Fit/FitKernel/FitStrategyAdjustParameters.cpp
 //! @brief     Implements class FitStrategyAdjustParameters.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitStrategyAdjustParameters.h b/Fit/FitKernel/FitStrategyAdjustParameters.h
index d4702e0cd8b..ca956363730 100644
--- a/Fit/FitKernel/FitStrategyAdjustParameters.h
+++ b/Fit/FitKernel/FitStrategyAdjustParameters.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitStrategyAdjustParameters.h
+//! @file      Fit/FitKernel/FitStrategyAdjustParameters.h
 //! @brief     Declares classes FitStrategyAdjustParameters and related
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitSuite.cpp b/Fit/FitKernel/FitSuite.cpp
index ba0636b2d6e..ed8e4ac2cf1 100644
--- a/Fit/FitKernel/FitSuite.cpp
+++ b/Fit/FitKernel/FitSuite.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitSuite.cpp
+//! @file      Fit/FitKernel/FitSuite.cpp
 //! @brief     Implements class FitSuite.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitSuite.h b/Fit/FitKernel/FitSuite.h
index 322e8b007cc..c61d86dd7b1 100644
--- a/Fit/FitKernel/FitSuite.h
+++ b/Fit/FitKernel/FitSuite.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitSuite.h
+//! @file      Fit/FitKernel/FitSuite.h
 //! @brief     Declares class FitSuite.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitSuiteFunctions.cpp b/Fit/FitKernel/FitSuiteFunctions.cpp
index e853e9957f5..5bc5b7a823d 100644
--- a/Fit/FitKernel/FitSuiteFunctions.cpp
+++ b/Fit/FitKernel/FitSuiteFunctions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitSuiteFunctions.cpp
+//! @file      Fit/FitKernel/FitSuiteFunctions.cpp
 //! @brief     Implements classes FitSuiteChiSquaredFunction and FitSuiteGradientFunction.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitSuiteFunctions.h b/Fit/FitKernel/FitSuiteFunctions.h
index a4f13f750a8..c165c630d8e 100644
--- a/Fit/FitKernel/FitSuiteFunctions.h
+++ b/Fit/FitKernel/FitSuiteFunctions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitSuiteFunctions.h
+//! @file      Fit/FitKernel/FitSuiteFunctions.h
 //! @brief     Declares classes IFitSuiteFunction,
 //!              FitSuiteChiSquaredFunction, FitSuiteGradientFunction
 //!
diff --git a/Fit/FitKernel/FitSuiteObjects.cpp b/Fit/FitKernel/FitSuiteObjects.cpp
index 2933fcf776e..d091ad096ce 100644
--- a/Fit/FitKernel/FitSuiteObjects.cpp
+++ b/Fit/FitKernel/FitSuiteObjects.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitSuiteObjects.cpp
+//! @file      Fit/FitKernel/FitSuiteObjects.cpp
 //! @brief     Implements class FitSuiteObjects.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitSuiteObjects.h b/Fit/FitKernel/FitSuiteObjects.h
index edc68e5f121..ebc3bbc6b3b 100644
--- a/Fit/FitKernel/FitSuiteObjects.h
+++ b/Fit/FitKernel/FitSuiteObjects.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitSuiteObjects.h
+//! @file      Fit/FitKernel/FitSuiteObjects.h
 //! @brief     Declares class FitSuiteObjects.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitSuiteParameters.cpp b/Fit/FitKernel/FitSuiteParameters.cpp
index dbddeca0b7a..1fd9f7c92c1 100644
--- a/Fit/FitKernel/FitSuiteParameters.cpp
+++ b/Fit/FitKernel/FitSuiteParameters.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitSuiteParameters.cpp
+//! @file      Fit/FitKernel/FitSuiteParameters.cpp
 //! @brief     Implements class FitSuiteParameters.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitSuiteParameters.h b/Fit/FitKernel/FitSuiteParameters.h
index 82d7f2e96e2..814638a5175 100644
--- a/Fit/FitKernel/FitSuiteParameters.h
+++ b/Fit/FitKernel/FitSuiteParameters.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitSuiteParameters.h
+//! @file      Fit/FitKernel/FitSuiteParameters.h
 //! @brief     Declares class FitSuiteParameters.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitSuitePrintObserver.cpp b/Fit/FitKernel/FitSuitePrintObserver.cpp
index 32f98b5701b..d7587c0d2cf 100644
--- a/Fit/FitKernel/FitSuitePrintObserver.cpp
+++ b/Fit/FitKernel/FitSuitePrintObserver.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitSuitePrintObserver.cpp
+//! @file      Fit/FitKernel/FitSuitePrintObserver.cpp
 //! @brief     Implements class FitSuitePrintObserver.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitSuitePrintObserver.h b/Fit/FitKernel/FitSuitePrintObserver.h
index 4f28c99c6a4..a8e4627f9be 100644
--- a/Fit/FitKernel/FitSuitePrintObserver.h
+++ b/Fit/FitKernel/FitSuitePrintObserver.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitSuitePrintObserver.h
+//! @file      Fit/FitKernel/FitSuitePrintObserver.h
 //! @brief     Declares class FitSuitePrintObserver.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitSuiteStrategies.cpp b/Fit/FitKernel/FitSuiteStrategies.cpp
index efdccd5c4b5..06b5f3ade22 100644
--- a/Fit/FitKernel/FitSuiteStrategies.cpp
+++ b/Fit/FitKernel/FitSuiteStrategies.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitSuiteStrategies.cpp
+//! @file      Fit/FitKernel/FitSuiteStrategies.cpp
 //! @brief     Implements class FitSuiteStrategies.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/FitSuiteStrategies.h b/Fit/FitKernel/FitSuiteStrategies.h
index 333c3c7325f..bca01ca40a7 100644
--- a/Fit/FitKernel/FitSuiteStrategies.h
+++ b/Fit/FitKernel/FitSuiteStrategies.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/FitSuiteStrategies.h
+//! @file      Fit/FitKernel/FitSuiteStrategies.h
 //! @brief     Declares class FitSuiteStrategies.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/IFitObserver.cpp b/Fit/FitKernel/IFitObserver.cpp
index 5276b81e88e..ef908c845f9 100644
--- a/Fit/FitKernel/IFitObserver.cpp
+++ b/Fit/FitKernel/IFitObserver.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/IFitObserver.cpp
+//! @file      Fit/FitKernel/IFitObserver.cpp
 //! @brief     Implements class IFitObserver.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/IFitObserver.h b/Fit/FitKernel/IFitObserver.h
index 666ac99b85c..393397c1955 100644
--- a/Fit/FitKernel/IFitObserver.h
+++ b/Fit/FitKernel/IFitObserver.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/IFitObserver.h
+//! @file      Fit/FitKernel/IFitObserver.h
 //! @brief     Declares class IFitObserver.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/IFitStrategy.cpp b/Fit/FitKernel/IFitStrategy.cpp
index f1775be8c2c..49f2cfaba6a 100644
--- a/Fit/FitKernel/IFitStrategy.cpp
+++ b/Fit/FitKernel/IFitStrategy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/IFitStrategy.cpp
+//! @file      Fit/FitKernel/IFitStrategy.cpp
 //! @brief     Implements class IFitStrategy.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/IFitStrategy.h b/Fit/FitKernel/IFitStrategy.h
index 946210300d1..ee4471ffe94 100644
--- a/Fit/FitKernel/IFitStrategy.h
+++ b/Fit/FitKernel/IFitStrategy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/IFitStrategy.h
+//! @file      Fit/FitKernel/IFitStrategy.h
 //! @brief     Declares interface class IFitStrategy
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/IMinimizer.h b/Fit/FitKernel/IMinimizer.h
index bd650c32330..33c5ac95e99 100644
--- a/Fit/FitKernel/IMinimizer.h
+++ b/Fit/FitKernel/IMinimizer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/IMinimizer.h
+//! @file      Fit/FitKernel/IMinimizer.h
 //! @brief     Declares class IMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/MinimizerFactory.cpp b/Fit/FitKernel/MinimizerFactory.cpp
index 7d1d479f432..458eeaed423 100644
--- a/Fit/FitKernel/MinimizerFactory.cpp
+++ b/Fit/FitKernel/MinimizerFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/MinimizerFactory.cpp
+//! @file      Fit/FitKernel/MinimizerFactory.cpp
 //! @brief     Implements class MinimizerFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/MinimizerFactory.h b/Fit/FitKernel/MinimizerFactory.h
index 4b05c20f6d2..4f11e93a1ca 100644
--- a/Fit/FitKernel/MinimizerFactory.h
+++ b/Fit/FitKernel/MinimizerFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/MinimizerFactory.h
+//! @file      Fit/FitKernel/MinimizerFactory.h
 //! @brief     Declares class MinimizerFactory.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/MinimizerOptions.cpp b/Fit/FitKernel/MinimizerOptions.cpp
index d0e9ef6228c..cfb841e30b8 100644
--- a/Fit/FitKernel/MinimizerOptions.cpp
+++ b/Fit/FitKernel/MinimizerOptions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/MinimizerOptions.cpp
+//! @file      Fit/FitKernel/MinimizerOptions.cpp
 //! @brief     Implement class MinimizerOptions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/MinimizerOptions.h b/Fit/FitKernel/MinimizerOptions.h
index c3e1e261eb8..c176b4b160c 100644
--- a/Fit/FitKernel/MinimizerOptions.h
+++ b/Fit/FitKernel/MinimizerOptions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/MinimizerOptions.h
+//! @file      Fit/FitKernel/MinimizerOptions.h
 //! @brief     Declares class MinimizerOptions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/MinimizerScan.cpp b/Fit/FitKernel/MinimizerScan.cpp
index 6308ddc30e4..942145c8fee 100644
--- a/Fit/FitKernel/MinimizerScan.cpp
+++ b/Fit/FitKernel/MinimizerScan.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/MinimizerScan.cpp
+//! @file      Fit/FitKernel/MinimizerScan.cpp
 //! @brief     Implements class MinimizerScan.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/MinimizerScan.h b/Fit/FitKernel/MinimizerScan.h
index a1d2b14abba..95dfcb88319 100644
--- a/Fit/FitKernel/MinimizerScan.h
+++ b/Fit/FitKernel/MinimizerScan.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/MinimizerScan.h
+//! @file      Fit/FitKernel/MinimizerScan.h
 //! @brief     Declares class MinimizerScan.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/MinimizerTest.cpp b/Fit/FitKernel/MinimizerTest.cpp
index ee64c55425e..7c8b6c1ced8 100644
--- a/Fit/FitKernel/MinimizerTest.cpp
+++ b/Fit/FitKernel/MinimizerTest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/MinimizerTest.cpp
+//! @file      Fit/FitKernel/MinimizerTest.cpp
 //! @brief     Implements class MinimizerTest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/MinimizerTest.h b/Fit/FitKernel/MinimizerTest.h
index 29007b86ee4..48e66423ce2 100644
--- a/Fit/FitKernel/MinimizerTest.h
+++ b/Fit/FitKernel/MinimizerTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/MinimizerTest.h
+//! @file      Fit/FitKernel/MinimizerTest.h
 //! @brief     Declares class MinimizerTest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/ROOTGeneticMinimizer.cpp b/Fit/FitKernel/ROOTGeneticMinimizer.cpp
index f617e608eee..c2950493df3 100644
--- a/Fit/FitKernel/ROOTGeneticMinimizer.cpp
+++ b/Fit/FitKernel/ROOTGeneticMinimizer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/ROOTGeneticMinimizer.cpp
+//! @file      Fit/FitKernel/ROOTGeneticMinimizer.cpp
 //! @brief     Implements class ROOTGeneticMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/ROOTGeneticMinimizer.h b/Fit/FitKernel/ROOTGeneticMinimizer.h
index 072914383d6..47443b13e5b 100644
--- a/Fit/FitKernel/ROOTGeneticMinimizer.h
+++ b/Fit/FitKernel/ROOTGeneticMinimizer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/ROOTGeneticMinimizer.h
+//! @file      Fit/FitKernel/ROOTGeneticMinimizer.h
 //! @brief     Declares class ROOTGeneticMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/ROOTLMAMinimizer.cpp b/Fit/FitKernel/ROOTLMAMinimizer.cpp
index 9792d155796..4580a3a99f2 100644
--- a/Fit/FitKernel/ROOTLMAMinimizer.cpp
+++ b/Fit/FitKernel/ROOTLMAMinimizer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/ROOTLMAMinimizer.cpp
+//! @file      Fit/FitKernel/ROOTLMAMinimizer.cpp
 //! @brief     Implements class ROOTLMAMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/ROOTLMAMinimizer.h b/Fit/FitKernel/ROOTLMAMinimizer.h
index d27ec488424..6826c922e45 100644
--- a/Fit/FitKernel/ROOTLMAMinimizer.h
+++ b/Fit/FitKernel/ROOTLMAMinimizer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/ROOTLMAMinimizer.h
+//! @file      Fit/FitKernel/ROOTLMAMinimizer.h
 //! @brief     Declares class ROOTLMAMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/ROOTMinimizer.cpp b/Fit/FitKernel/ROOTMinimizer.cpp
index 802483ba02c..e7c5a98bdfd 100644
--- a/Fit/FitKernel/ROOTMinimizer.cpp
+++ b/Fit/FitKernel/ROOTMinimizer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/ROOTMinimizer.cpp
+//! @file      Fit/FitKernel/ROOTMinimizer.cpp
 //! @brief     Implements class ROOTMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/ROOTMinimizer.h b/Fit/FitKernel/ROOTMinimizer.h
index aa2f383b863..0b847b70096 100644
--- a/Fit/FitKernel/ROOTMinimizer.h
+++ b/Fit/FitKernel/ROOTMinimizer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/ROOTMinimizer.h
+//! @file      Fit/FitKernel/ROOTMinimizer.h
 //! @brief     Declares class ROOTMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/ROOTMinimizerFunction.h b/Fit/FitKernel/ROOTMinimizerFunction.h
index f335de823fe..35013240c1d 100644
--- a/Fit/FitKernel/ROOTMinimizerFunction.h
+++ b/Fit/FitKernel/ROOTMinimizerFunction.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/ROOTMinimizerFunction.h
+//! @file      Fit/FitKernel/ROOTMinimizerFunction.h
 //! @brief     Declares classes ROOTMinimizerChiSquaredFunction and ROOTMinimizerGradientFunction
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/ROOTMinimizerHelper.cpp b/Fit/FitKernel/ROOTMinimizerHelper.cpp
index 9354d80d9f5..d8ef674c080 100644
--- a/Fit/FitKernel/ROOTMinimizerHelper.cpp
+++ b/Fit/FitKernel/ROOTMinimizerHelper.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/ROOTMinimizerHelper.cpp
+//! @file      Fit/FitKernel/ROOTMinimizerHelper.cpp
 //! @brief     Implements class ROOTMinimizerHelper.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/ROOTMinimizerHelper.h b/Fit/FitKernel/ROOTMinimizerHelper.h
index af30ef2f58c..d4a4f5f1bfd 100644
--- a/Fit/FitKernel/ROOTMinimizerHelper.h
+++ b/Fit/FitKernel/ROOTMinimizerHelper.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/ROOTMinimizerHelper.h
+//! @file      Fit/FitKernel/ROOTMinimizerHelper.h
 //! @brief     Declares class ROOTMinimizerHelper.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/ROOTMinuit2Minimizer.cpp b/Fit/FitKernel/ROOTMinuit2Minimizer.cpp
index 96e8f5c7a53..e17f38f9dc7 100644
--- a/Fit/FitKernel/ROOTMinuit2Minimizer.cpp
+++ b/Fit/FitKernel/ROOTMinuit2Minimizer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/ROOTMinuit2Minimizer.cpp
+//! @file      Fit/FitKernel/ROOTMinuit2Minimizer.cpp
 //! @brief     Implements class ROOTMinuit2Minimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/ROOTMinuit2Minimizer.h b/Fit/FitKernel/ROOTMinuit2Minimizer.h
index 20354803f71..c313c97f573 100644
--- a/Fit/FitKernel/ROOTMinuit2Minimizer.h
+++ b/Fit/FitKernel/ROOTMinuit2Minimizer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/ROOTMinuitMinimizer.h
+//! @file      Fit/FitKernel/ROOTMinuit2Minimizer.h
 //! @brief     Declares class ROOTMinuitMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/ROOTMultiMinMinimizer.cpp b/Fit/FitKernel/ROOTMultiMinMinimizer.cpp
index 26e3d781998..1f18077bc41 100644
--- a/Fit/FitKernel/ROOTMultiMinMinimizer.cpp
+++ b/Fit/FitKernel/ROOTMultiMinMinimizer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/ROOTMultiMinMinimizer.cpp
+//! @file      Fit/FitKernel/ROOTMultiMinMinimizer.cpp
 //! @brief     Implements class ROOTMultiMinMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/ROOTMultiMinMinimizer.h b/Fit/FitKernel/ROOTMultiMinMinimizer.h
index 74701ca361b..acb220c327e 100644
--- a/Fit/FitKernel/ROOTMultiMinMinimizer.h
+++ b/Fit/FitKernel/ROOTMultiMinMinimizer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/ROOTMultiMinMinimizer.h
+//! @file      Fit/FitKernel/ROOTMultiMinMinimizer.h
 //! @brief     Declares class ROOTMultiMinMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/ROOTSimAnMinimizer.cpp b/Fit/FitKernel/ROOTSimAnMinimizer.cpp
index 734595a4ae6..df5d4e85568 100644
--- a/Fit/FitKernel/ROOTSimAnMinimizer.cpp
+++ b/Fit/FitKernel/ROOTSimAnMinimizer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/ROOTSimAnMinimizer.cpp
+//! @file      Fit/FitKernel/ROOTSimAnMinimizer.cpp
 //! @brief     Implements class ROOTSimAnMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/FitKernel/ROOTSimAnMinimizer.h b/Fit/FitKernel/ROOTSimAnMinimizer.h
index 154d3d4f9ca..ec8e472b692 100644
--- a/Fit/FitKernel/ROOTSimAnMinimizer.h
+++ b/Fit/FitKernel/ROOTSimAnMinimizer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FitKernel/ROOTSimAnMinimizer.h
+//! @file      Fit/FitKernel/ROOTSimAnMinimizer.h
 //! @brief     Declares class ROOTSimAnMinimizer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/StandardFits/IMinimizerFutest.cpp b/Fit/StandardFits/IMinimizerFutest.cpp
index f5d8408397a..8f45499e135 100644
--- a/Fit/StandardFits/IMinimizerFutest.cpp
+++ b/Fit/StandardFits/IMinimizerFutest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardFits/IMinimizerFutest.cpp
+//! @file      Fit/StandardFits/IMinimizerFutest.cpp
 //! @brief     Implements class IMinimizerFutest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/StandardFits/IMinimizerFutest.h b/Fit/StandardFits/IMinimizerFutest.h
index d85aec98941..83e1276db2a 100644
--- a/Fit/StandardFits/IMinimizerFutest.h
+++ b/Fit/StandardFits/IMinimizerFutest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardFits/IMinimizerFutest.h
+//! @file      Fit/StandardFits/IMinimizerFutest.h
 //! @brief     Declares class IMinimizerFutest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/StandardFits/MinimizerFutests.cpp b/Fit/StandardFits/MinimizerFutests.cpp
index 9bf829f6407..4c3e7326c79 100644
--- a/Fit/StandardFits/MinimizerFutests.cpp
+++ b/Fit/StandardFits/MinimizerFutests.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardFits/MinimizerFutests.cpp
+//! @file      Fit/StandardFits/MinimizerFutests.cpp
 //! @brief     Implements classes MinimizerFutests.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/StandardFits/MinimizerFutests.h b/Fit/StandardFits/MinimizerFutests.h
index 694a1d8317f..50a0e3efc30 100644
--- a/Fit/StandardFits/MinimizerFutests.h
+++ b/Fit/StandardFits/MinimizerFutests.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardFits/MinimizerFutests.h
+//! @file      Fit/StandardFits/MinimizerFutests.h
 //! @brief     Declares classes MinimizerFutests.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/StandardFits/RectDetectorFitTest.cpp b/Fit/StandardFits/RectDetectorFitTest.cpp
index 5df01f9b01e..20cf523fb58 100644
--- a/Fit/StandardFits/RectDetectorFitTest.cpp
+++ b/Fit/StandardFits/RectDetectorFitTest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardFits/RectDetectorFitTest.cpp
+//! @file      Fit/StandardFits/RectDetectorFitTest.cpp
 //! @brief     Implements class RectDetectorFitTest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Fit/StandardFits/RectDetectorFitTest.h b/Fit/StandardFits/RectDetectorFitTest.h
index c1541fe64a5..a4521b235a3 100644
--- a/Fit/StandardFits/RectDetectorFitTest.h
+++ b/Fit/StandardFits/RectDetectorFitTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardFits/RectDetectorFitTest.h
+//! @file      Fit/StandardFits/RectDetectorFitTest.h
 //! @brief     Declares class RectDetectorFitTest.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/AngleProperty.cpp b/GUI/coregui/Models/AngleProperty.cpp
index 57e65871cd9..5ecd43e3bda 100644
--- a/GUI/coregui/Models/AngleProperty.cpp
+++ b/GUI/coregui/Models/AngleProperty.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/AngleProperty.cpp
+//! @file      GUI/coregui/Models/AngleProperty.cpp
 //! @brief     Implements class AngleProperty
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/AngleProperty.h b/GUI/coregui/Models/AngleProperty.h
index 7e80ab5790e..040bf829122 100644
--- a/GUI/coregui/Models/AngleProperty.h
+++ b/GUI/coregui/Models/AngleProperty.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/AngleProperty.h
+//! @file      GUI/coregui/Models/AngleProperty.h
 //! @brief     Declares class AngleProperty
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ApplicationModels.cpp b/GUI/coregui/Models/ApplicationModels.cpp
index a705cd17a9f..fb788b0474a 100644
--- a/GUI/coregui/Models/ApplicationModels.cpp
+++ b/GUI/coregui/Models/ApplicationModels.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ApplicationModels.h
+//! @file      GUI/coregui/Models/ApplicationModels.cpp
 //! @brief     Defines class holding all application models
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ApplicationModels.h b/GUI/coregui/Models/ApplicationModels.h
index 83bc867115d..d1dc1dcb1be 100644
--- a/GUI/coregui/Models/ApplicationModels.h
+++ b/GUI/coregui/Models/ApplicationModels.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ApplicationModels.h
+//! @file      GUI/coregui/Models/ApplicationModels.h
 //! @brief     Declares class holding all application models
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/AxesItems.cpp b/GUI/coregui/Models/AxesItems.cpp
index 379fed2de70..a9fb46f69e9 100644
--- a/GUI/coregui/Models/AxesItems.cpp
+++ b/GUI/coregui/Models/AxesItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/AxesItems.cpp
+//! @file      GUI/coregui/Models/AxesItems.cpp
 //! @brief     Implements various axis items
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/AxesItems.h b/GUI/coregui/Models/AxesItems.h
index d2e28d1ffdd..ea395aba5f3 100644
--- a/GUI/coregui/Models/AxesItems.h
+++ b/GUI/coregui/Models/AxesItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/AxesItems.h
+//! @file      GUI/coregui/Models/AxesItems.h
 //! @brief     Declares various axis items
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/BeamAngleItems.cpp b/GUI/coregui/Models/BeamAngleItems.cpp
index b3c5eaaf6dc..8ea82c52f15 100644
--- a/GUI/coregui/Models/BeamAngleItems.cpp
+++ b/GUI/coregui/Models/BeamAngleItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/BeamAngleItems.cpp
+//! @file      GUI/coregui/Models/BeamAngleItems.cpp
 //! @brief     Implements class BeamAngleItems
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/BeamAngleItems.h b/GUI/coregui/Models/BeamAngleItems.h
index c1fdf4452ab..a4633c57704 100644
--- a/GUI/coregui/Models/BeamAngleItems.h
+++ b/GUI/coregui/Models/BeamAngleItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/BeamAngleItems.h
+//! @file      GUI/coregui/Models/BeamAngleItems.h
 //! @brief     Declares class BeamAngleItems
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/BeamDistributionItem.cpp b/GUI/coregui/Models/BeamDistributionItem.cpp
index b46eccc596b..5d155bc4f0e 100644
--- a/GUI/coregui/Models/BeamDistributionItem.cpp
+++ b/GUI/coregui/Models/BeamDistributionItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/BeamDistributionItem.cpp
+//! @file      GUI/coregui/Models/BeamDistributionItem.cpp
 //! @brief     Implements class BeamDistributionItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/BeamDistributionItem.h b/GUI/coregui/Models/BeamDistributionItem.h
index 4af55909107..04b54eaeccb 100644
--- a/GUI/coregui/Models/BeamDistributionItem.h
+++ b/GUI/coregui/Models/BeamDistributionItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/BeamDistributionItem.h
+//! @file      GUI/coregui/Models/BeamDistributionItem.h
 //! @brief     Declares class BeamDistributionItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/BeamItem.cpp b/GUI/coregui/Models/BeamItem.cpp
index 064e2bae440..6e2f52efae3 100644
--- a/GUI/coregui/Models/BeamItem.cpp
+++ b/GUI/coregui/Models/BeamItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/BeamItem.cpp
+//! @file      GUI/coregui/Models/BeamItem.cpp
 //! @brief     Implements class BeamItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/BeamItem.h b/GUI/coregui/Models/BeamItem.h
index a049986c75c..eb3ecfa591d 100644
--- a/GUI/coregui/Models/BeamItem.h
+++ b/GUI/coregui/Models/BeamItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/BeamItem.h
+//! @file      GUI/coregui/Models/BeamItem.h
 //! @brief     Declares class BeamItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/BeamWavelengthItem.cpp b/GUI/coregui/Models/BeamWavelengthItem.cpp
index a50f6df4a04..5325c40b99f 100644
--- a/GUI/coregui/Models/BeamWavelengthItem.cpp
+++ b/GUI/coregui/Models/BeamWavelengthItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/BeamWavelengthItem.cpp
+//! @file      GUI/coregui/Models/BeamWavelengthItem.cpp
 //! @brief     Implements class BeamWavelengthItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/BeamWavelengthItem.h b/GUI/coregui/Models/BeamWavelengthItem.h
index 1cf6d8485be..5c2d73ba636 100644
--- a/GUI/coregui/Models/BeamWavelengthItem.h
+++ b/GUI/coregui/Models/BeamWavelengthItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/BeamWavelengthItem.h
+//! @file      GUI/coregui/Models/BeamWavelengthItem.h
 //! @brief     Declares class BeamWavelengthItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ColorProperty.h b/GUI/coregui/Models/ColorProperty.h
index 243fc7df705..c4aa7beb4a0 100644
--- a/GUI/coregui/Models/ColorProperty.h
+++ b/GUI/coregui/Models/ColorProperty.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ColorProperty.h
+//! @file      GUI/coregui/Models/ColorProperty.h
 //! @brief     Declares class ColorProperty
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ComboProperty.cpp b/GUI/coregui/Models/ComboProperty.cpp
index 4d360831b43..4741de04f99 100644
--- a/GUI/coregui/Models/ComboProperty.cpp
+++ b/GUI/coregui/Models/ComboProperty.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ComboProperty.cpp
+//! @file      GUI/coregui/Models/ComboProperty.cpp
 //! @brief     Implements class ComboProperty
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ComboProperty.h b/GUI/coregui/Models/ComboProperty.h
index f325876c5a2..a46615ab0ac 100644
--- a/GUI/coregui/Models/ComboProperty.h
+++ b/GUI/coregui/Models/ComboProperty.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ComboProperty.h
+//! @file      GUI/coregui/Models/ComboProperty.h
 //! @brief     Declares class ComboProperty
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/DetectorItems.cpp b/GUI/coregui/Models/DetectorItems.cpp
index 0d5c5614562..73c3d7f71f9 100644
--- a/GUI/coregui/Models/DetectorItems.cpp
+++ b/GUI/coregui/Models/DetectorItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/DetectorItems.cpp
+//! @file      GUI/coregui/Models/DetectorItems.cpp
 //! @brief     Implements classes DetectorItems
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/DetectorItems.h b/GUI/coregui/Models/DetectorItems.h
index 18ba32407a3..93e91d28712 100644
--- a/GUI/coregui/Models/DetectorItems.h
+++ b/GUI/coregui/Models/DetectorItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/DetectorItems.h
+//! @file      GUI/coregui/Models/DetectorItems.h
 //! @brief     Declares classes DetectorItems
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/DistributionItem.cpp b/GUI/coregui/Models/DistributionItem.cpp
index bc7ae7de325..3fcde0023a7 100644
--- a/GUI/coregui/Models/DistributionItem.cpp
+++ b/GUI/coregui/Models/DistributionItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/DistributionItem.cpp
+//! @file      GUI/coregui/Models/DistributionItem.cpp
 //! @brief     Implements class DistributionItem and several subclasses
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/DistributionItem.h b/GUI/coregui/Models/DistributionItem.h
index 2b32e0813db..31cf0b6e421 100644
--- a/GUI/coregui/Models/DistributionItem.h
+++ b/GUI/coregui/Models/DistributionItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/DistributionItem.h
+//! @file      GUI/coregui/Models/DistributionItem.h
 //! @brief     Declares class DistributionItem and several subclasses
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/DocumentModel.cpp b/GUI/coregui/Models/DocumentModel.cpp
index bc02ce3ebe1..8afe0ebc275 100644
--- a/GUI/coregui/Models/DocumentModel.cpp
+++ b/GUI/coregui/Models/DocumentModel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/DocumentModel.cpp
+//! @file      GUI/coregui/Models/DocumentModel.cpp
 //! @brief     Implements class DocumentModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/DocumentModel.h b/GUI/coregui/Models/DocumentModel.h
index 50a52d66ef8..d8aaa6ec804 100644
--- a/GUI/coregui/Models/DocumentModel.h
+++ b/GUI/coregui/Models/DocumentModel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/DocumentModel.h
+//! @file      GUI/coregui/Models/DocumentModel.h
 //! @brief     Declares class DocumentModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/DomainFittingBuilder.cpp b/GUI/coregui/Models/DomainFittingBuilder.cpp
index 95866a19110..5360c4a3c52 100644
--- a/GUI/coregui/Models/DomainFittingBuilder.cpp
+++ b/GUI/coregui/Models/DomainFittingBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/DomainFittingBuilder.cpp
+//! @file      GUI/coregui/Models/DomainFittingBuilder.cpp
 //! @brief     Implements class DomainFittingBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/DomainFittingBuilder.h b/GUI/coregui/Models/DomainFittingBuilder.h
index 87eaf51edc6..317e9c785f1 100644
--- a/GUI/coregui/Models/DomainFittingBuilder.h
+++ b/GUI/coregui/Models/DomainFittingBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/DomainFittingBuilder.h
+//! @file      GUI/coregui/Models/DomainFittingBuilder.h
 //! @brief     Declares class DomainFittingBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/DomainObjectBuilder.cpp b/GUI/coregui/Models/DomainObjectBuilder.cpp
index b719911f785..f6c45a23f31 100644
--- a/GUI/coregui/Models/DomainObjectBuilder.cpp
+++ b/GUI/coregui/Models/DomainObjectBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/DomainObjectBuilder.cpp
+//! @file      GUI/coregui/Models/DomainObjectBuilder.cpp
 //! @brief     Implements class DomainObjectBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/DomainObjectBuilder.h b/GUI/coregui/Models/DomainObjectBuilder.h
index 48d124b5c38..eb78bcf7ac4 100644
--- a/GUI/coregui/Models/DomainObjectBuilder.h
+++ b/GUI/coregui/Models/DomainObjectBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/DomainObjectBuilder.h
+//! @file      GUI/coregui/Models/DomainObjectBuilder.h
 //! @brief     Declares class DomainObjectBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/DomainSimulationBuilder.cpp b/GUI/coregui/Models/DomainSimulationBuilder.cpp
index e990cccf89e..9589fa2eccf 100644
--- a/GUI/coregui/Models/DomainSimulationBuilder.cpp
+++ b/GUI/coregui/Models/DomainSimulationBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/DomainSimulationBuilder.cpp
+//! @file      GUI/coregui/Models/DomainSimulationBuilder.cpp
 //! @brief     Implements class DomainSimulationBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/DomainSimulationBuilder.h b/GUI/coregui/Models/DomainSimulationBuilder.h
index 237246be392..273a9259696 100644
--- a/GUI/coregui/Models/DomainSimulationBuilder.h
+++ b/GUI/coregui/Models/DomainSimulationBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/DomainSimulationBuilder.h
+//! @file      GUI/coregui/Models/DomainSimulationBuilder.h
 //! @brief     Declares class DomainSimulationBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/FTDecayFunctionItems.cpp b/GUI/coregui/Models/FTDecayFunctionItems.cpp
index 11ea888dcc2..3cf5fc6d004 100644
--- a/GUI/coregui/Models/FTDecayFunctionItems.cpp
+++ b/GUI/coregui/Models/FTDecayFunctionItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FTDecayFunctionItems.cpp
+//! @file      GUI/coregui/Models/FTDecayFunctionItems.cpp
 //! @brief     Implements FTDecayFunction1DItem classes
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/FTDecayFunctionItems.h b/GUI/coregui/Models/FTDecayFunctionItems.h
index e8f92df67dd..6e5f4be1f41 100644
--- a/GUI/coregui/Models/FTDecayFunctionItems.h
+++ b/GUI/coregui/Models/FTDecayFunctionItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FTDecayFunctionItems.h
+//! @file      GUI/coregui/Models/FTDecayFunctionItems.h
 //! @brief     Declares FTDecayFunction1DItem classes
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/FTDistributionItems.cpp b/GUI/coregui/Models/FTDistributionItems.cpp
index bf7331b502f..839b54bc992 100644
--- a/GUI/coregui/Models/FTDistributionItems.cpp
+++ b/GUI/coregui/Models/FTDistributionItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FTDistributionItems.cpp
+//! @file      GUI/coregui/Models/FTDistributionItems.cpp
 //! @brief     Implements FTDistribution1DItem's classes
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/FTDistributionItems.h b/GUI/coregui/Models/FTDistributionItems.h
index 8dbd7b2b18e..f0dbb5b3814 100644
--- a/GUI/coregui/Models/FTDistributionItems.h
+++ b/GUI/coregui/Models/FTDistributionItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FTDistributionItems.h
+//! @file      GUI/coregui/Models/FTDistributionItems.h
 //! @brief     Declares FTDistribution1DItem's classes
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/FilterPropertyProxy.cpp b/GUI/coregui/Models/FilterPropertyProxy.cpp
index b28e9bc1351..91ea5bac13c 100644
--- a/GUI/coregui/Models/FilterPropertyProxy.cpp
+++ b/GUI/coregui/Models/FilterPropertyProxy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FilterPropertyProxy.cpp
+//! @file      GUI/coregui/Models/FilterPropertyProxy.cpp
 //! @brief     Implements class FilterPropertyProxy
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/FilterPropertyProxy.h b/GUI/coregui/Models/FilterPropertyProxy.h
index 3013dbbc20f..6dc778c20be 100644
--- a/GUI/coregui/Models/FilterPropertyProxy.h
+++ b/GUI/coregui/Models/FilterPropertyProxy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FilterPropertyProxy.h
+//! @file      GUI/coregui/Models/FilterPropertyProxy.h
 //! @brief     Declares class FilterPropertyProxy
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/FitModelHelper.cpp b/GUI/coregui/Models/FitModelHelper.cpp
index 55fabf56da7..adb68887bdc 100644
--- a/GUI/coregui/Models/FitModelHelper.cpp
+++ b/GUI/coregui/Models/FitModelHelper.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FitModelHelper.cpp
+//! @file      GUI/coregui/Models/FitModelHelper.cpp
 //! @brief     Implements class FitModelHelper
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/FitModelHelper.h b/GUI/coregui/Models/FitModelHelper.h
index ecdb5eff614..ce24008637f 100644
--- a/GUI/coregui/Models/FitModelHelper.h
+++ b/GUI/coregui/Models/FitModelHelper.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FitModelHelper.h
+//! @file      GUI/coregui/Models/FitModelHelper.h
 //! @brief     Declares class FitModelHelper
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/FitParameterAbsModel.cpp b/GUI/coregui/Models/FitParameterAbsModel.cpp
index 86e97614a8b..b5e04cc9525 100644
--- a/GUI/coregui/Models/FitParameterAbsModel.cpp
+++ b/GUI/coregui/Models/FitParameterAbsModel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FitParameterAbsModel.cpp
+//! @file      GUI/coregui/Models/FitParameterAbsModel.cpp
 //! @brief     Implements class FitParameterAbsModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/FitParameterAbsModel.h b/GUI/coregui/Models/FitParameterAbsModel.h
index 16ebc34d267..e02fd48988c 100644
--- a/GUI/coregui/Models/FitParameterAbsModel.h
+++ b/GUI/coregui/Models/FitParameterAbsModel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FitParameterProxyModel.h
+//! @file      GUI/coregui/Models/FitParameterAbsModel.h
 //! @brief     Declares class FitParameterProxyModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/FitParameterItems.cpp b/GUI/coregui/Models/FitParameterItems.cpp
index b2dfb7e4804..f9fffebdfb5 100644
--- a/GUI/coregui/Models/FitParameterItems.cpp
+++ b/GUI/coregui/Models/FitParameterItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FitParameterItems.cpp
+//! @file      GUI/coregui/Models/FitParameterItems.cpp
 //! @brief     Implements class FitParameterItems
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/FitParameterItems.h b/GUI/coregui/Models/FitParameterItems.h
index 5d9ab0de7db..3352f97056c 100644
--- a/GUI/coregui/Models/FitParameterItems.h
+++ b/GUI/coregui/Models/FitParameterItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FitParameterItems.h
+//! @file      GUI/coregui/Models/FitParameterItems.h
 //! @brief     Declares class FitParameterItems
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/FitSuiteItem.cpp b/GUI/coregui/Models/FitSuiteItem.cpp
index 56ccde8c292..5fbb8b92297 100644
--- a/GUI/coregui/Models/FitSuiteItem.cpp
+++ b/GUI/coregui/Models/FitSuiteItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FitSuiteItem.cpp
+//! @file      GUI/coregui/Models/FitSuiteItem.cpp
 //! @brief     Implements class FitSuiteItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/FitSuiteItem.h b/GUI/coregui/Models/FitSuiteItem.h
index ceeae99cc5b..e7beba30998 100644
--- a/GUI/coregui/Models/FitSuiteItem.h
+++ b/GUI/coregui/Models/FitSuiteItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FitSuiteItem.h
+//! @file      GUI/coregui/Models/FitSuiteItem.h
 //! @brief     Declares class FitSuiteItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/FormFactorItems.cpp b/GUI/coregui/Models/FormFactorItems.cpp
index ce0f66a487e..c56a7379855 100644
--- a/GUI/coregui/Models/FormFactorItems.cpp
+++ b/GUI/coregui/Models/FormFactorItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FormFactorItems.cpp
+//! @file      GUI/coregui/Models/FormFactorItems.cpp
 //! @brief     Implements FormFactorItems classes
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/FormFactorItems.h b/GUI/coregui/Models/FormFactorItems.h
index 6c2d9ed80cc..8d4c2c12cfc 100644
--- a/GUI/coregui/Models/FormFactorItems.h
+++ b/GUI/coregui/Models/FormFactorItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FormFactorItems.h
+//! @file      GUI/coregui/Models/FormFactorItems.h
 //! @brief     Declares FormFactorItems classes
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/GUIExamplesFactory.cpp b/GUI/coregui/Models/GUIExamplesFactory.cpp
index d4161874bf3..2dc96877369 100644
--- a/GUI/coregui/Models/GUIExamplesFactory.cpp
+++ b/GUI/coregui/Models/GUIExamplesFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/GUIExamplesFactory.cpp
+//! @file      GUI/coregui/Models/GUIExamplesFactory.cpp
 //! @brief     Implements class GUIExamplesFactory
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/GUIExamplesFactory.h b/GUI/coregui/Models/GUIExamplesFactory.h
index 8d494989964..95517a869f1 100644
--- a/GUI/coregui/Models/GUIExamplesFactory.h
+++ b/GUI/coregui/Models/GUIExamplesFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/GUIExamplesFactory.h
+//! @file      GUI/coregui/Models/GUIExamplesFactory.h
 //! @brief     Declares class GUIExamplesFactory
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/GUIObjectBuilder.cpp b/GUI/coregui/Models/GUIObjectBuilder.cpp
index da1fd705e84..f15b1da00fa 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.cpp
+++ b/GUI/coregui/Models/GUIObjectBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/GUIObjectBuilder.cpp
+//! @file      GUI/coregui/Models/GUIObjectBuilder.cpp
 //! @brief     Implements class GUIObjectBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/GUIObjectBuilder.h b/GUI/coregui/Models/GUIObjectBuilder.h
index 4ea53653d62..5aa3a32233c 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.h
+++ b/GUI/coregui/Models/GUIObjectBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/GUIObjectBuilder.h
+//! @file      GUI/coregui/Models/GUIObjectBuilder.h
 //! @brief     Declares class GUIObjectBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/GroupItem.cpp b/GUI/coregui/Models/GroupItem.cpp
index 75a202ff52e..32e6c986286 100644
--- a/GUI/coregui/Models/GroupItem.cpp
+++ b/GUI/coregui/Models/GroupItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/GroupItem.cpp
+//! @file      GUI/coregui/Models/GroupItem.cpp
 //! @brief     Implements class GroupItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/GroupItem.h b/GUI/coregui/Models/GroupItem.h
index 4d3b35d6a0c..78dab7746f6 100644
--- a/GUI/coregui/Models/GroupItem.h
+++ b/GUI/coregui/Models/GroupItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/GroupItem.h
+//! @file      GUI/coregui/Models/GroupItem.h
 //! @brief     Declares class GroupItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/GroupProperty.cpp b/GUI/coregui/Models/GroupProperty.cpp
index dfb7af81e9e..f9e8d0f2d9b 100644
--- a/GUI/coregui/Models/GroupProperty.cpp
+++ b/GUI/coregui/Models/GroupProperty.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/GroupProperty.cpp
+//! @file      GUI/coregui/Models/GroupProperty.cpp
 //! @brief     Implements class GroupProperty
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/GroupProperty.h b/GUI/coregui/Models/GroupProperty.h
index 3bb5f23caee..8a625a4987a 100644
--- a/GUI/coregui/Models/GroupProperty.h
+++ b/GUI/coregui/Models/GroupProperty.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/GroupProperty.h
+//! @file      GUI/coregui/Models/GroupProperty.h
 //! @brief     Declares class GroupProperty
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/GroupPropertyRegistry.cpp b/GUI/coregui/Models/GroupPropertyRegistry.cpp
index 54ba02099f5..e66dc986186 100644
--- a/GUI/coregui/Models/GroupPropertyRegistry.cpp
+++ b/GUI/coregui/Models/GroupPropertyRegistry.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/GroupPropertyRegistry.cpp
+//! @file      GUI/coregui/Models/GroupPropertyRegistry.cpp
 //! @brief     Implements class GroupPropertyRegistry
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/GroupPropertyRegistry.h b/GUI/coregui/Models/GroupPropertyRegistry.h
index c282a9bafea..a33e6d1fa23 100644
--- a/GUI/coregui/Models/GroupPropertyRegistry.h
+++ b/GUI/coregui/Models/GroupPropertyRegistry.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/GroupPropertyRegistry.h
+//! @file      GUI/coregui/Models/GroupPropertyRegistry.h
 //! @brief     Declares class GroupPropertyRegistry
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/IconProvider.cpp b/GUI/coregui/Models/IconProvider.cpp
index 59af8353537..d30e4baa677 100644
--- a/GUI/coregui/Models/IconProvider.cpp
+++ b/GUI/coregui/Models/IconProvider.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/IconProvider.cpp
+//! @file      GUI/coregui/Models/IconProvider.cpp
 //! @brief     Implements class IconProvider
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/IconProvider.h b/GUI/coregui/Models/IconProvider.h
index a11539277cf..29f6f0ee1c3 100644
--- a/GUI/coregui/Models/IconProvider.h
+++ b/GUI/coregui/Models/IconProvider.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/IconProvider.h
+//! @file      GUI/coregui/Models/IconProvider.h
 //! @brief     Declares class IconProvider
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/InstrumentItem.cpp b/GUI/coregui/Models/InstrumentItem.cpp
index 45a36298910..e36e95427bd 100644
--- a/GUI/coregui/Models/InstrumentItem.cpp
+++ b/GUI/coregui/Models/InstrumentItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/InstrumentItem.cpp
+//! @file      GUI/coregui/Models/InstrumentItem.cpp
 //! @brief     Implements class InstrumentItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/InstrumentItem.h b/GUI/coregui/Models/InstrumentItem.h
index 545eccf6a11..7039a0463d2 100644
--- a/GUI/coregui/Models/InstrumentItem.h
+++ b/GUI/coregui/Models/InstrumentItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/InstrumentItem.h
+//! @file      GUI/coregui/Models/InstrumentItem.h
 //! @brief     Declares class InstrumentItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/InstrumentModel.cpp b/GUI/coregui/Models/InstrumentModel.cpp
index 4ccab805b07..d3cb3169fdc 100644
--- a/GUI/coregui/Models/InstrumentModel.cpp
+++ b/GUI/coregui/Models/InstrumentModel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/InstrumentModel.cpp
+//! @file      GUI/coregui/Models/InstrumentModel.cpp
 //! @brief     Implements class InstrumentModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/InstrumentModel.h b/GUI/coregui/Models/InstrumentModel.h
index e97e4aa3bd9..8fa3087d05f 100644
--- a/GUI/coregui/Models/InstrumentModel.h
+++ b/GUI/coregui/Models/InstrumentModel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/InstrumentModel.h
+//! @file      GUI/coregui/Models/InstrumentModel.h
 //! @brief     Declares class InstrumentModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/IntensityDataItem.cpp b/GUI/coregui/Models/IntensityDataItem.cpp
index f45b960d43c..f97f967ee4d 100644
--- a/GUI/coregui/Models/IntensityDataItem.cpp
+++ b/GUI/coregui/Models/IntensityDataItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/IntensityDataItem.cpp
+//! @file      GUI/coregui/Models/IntensityDataItem.cpp
 //! @brief     Implements class IntensityDataItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/IntensityDataItem.h b/GUI/coregui/Models/IntensityDataItem.h
index ce375c3ff96..7bd8e582d54 100644
--- a/GUI/coregui/Models/IntensityDataItem.h
+++ b/GUI/coregui/Models/IntensityDataItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/IntensityDataItem.h
+//! @file      GUI/coregui/Models/IntensityDataItem.h
 //! @brief     Declares class IntensityDataItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/InterferenceFunctionItems.cpp b/GUI/coregui/Models/InterferenceFunctionItems.cpp
index 009c1c49a26..afe4306c0f5 100644
--- a/GUI/coregui/Models/InterferenceFunctionItems.cpp
+++ b/GUI/coregui/Models/InterferenceFunctionItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/InterferenceFunctionItems.cpp
+//! @file      GUI/coregui/Models/InterferenceFunctionItems.cpp
 //! @brief     Implements InterferenceFunctionItems's classes
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/InterferenceFunctionItems.h b/GUI/coregui/Models/InterferenceFunctionItems.h
index c36c294c02d..04865599e08 100644
--- a/GUI/coregui/Models/InterferenceFunctionItems.h
+++ b/GUI/coregui/Models/InterferenceFunctionItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/InterferenceFunctionItems.h
+//! @file      GUI/coregui/Models/InterferenceFunctionItems.h
 //! @brief     Declares InterferenceFunctionItems's classes
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ItemFactory.cpp b/GUI/coregui/Models/ItemFactory.cpp
index f18df748618..2eede7cbe51 100644
--- a/GUI/coregui/Models/ItemFactory.cpp
+++ b/GUI/coregui/Models/ItemFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ItemFactory.cpp
+//! @file      GUI/coregui/Models/ItemFactory.cpp
 //! @brief     Implements class ItemFactory
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ItemFactory.h b/GUI/coregui/Models/ItemFactory.h
index 0d6eaab9bcf..29ea68f9cb1 100644
--- a/GUI/coregui/Models/ItemFactory.h
+++ b/GUI/coregui/Models/ItemFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ItemFactory.h
+//! @file      GUI/coregui/Models/ItemFactory.h
 //! @brief     Declares class ItemFactory
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/JobItem.cpp b/GUI/coregui/Models/JobItem.cpp
index d1ff79c8779..1f29a9ba7e3 100644
--- a/GUI/coregui/Models/JobItem.cpp
+++ b/GUI/coregui/Models/JobItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/JobItem.cpp
+//! @file      GUI/coregui/Models/JobItem.cpp
 //! @brief     Implements class JobItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/JobItem.h b/GUI/coregui/Models/JobItem.h
index bdc5dbc5c6c..2a39644664e 100644
--- a/GUI/coregui/Models/JobItem.h
+++ b/GUI/coregui/Models/JobItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/JobItem.h
+//! @file      GUI/coregui/Models/JobItem.h
 //! @brief     Declares class JobItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/JobModel.cpp b/GUI/coregui/Models/JobModel.cpp
index 69a13d1a479..fcca676c372 100644
--- a/GUI/coregui/Models/JobModel.cpp
+++ b/GUI/coregui/Models/JobModel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/JobModel.cpp
+//! @file      GUI/coregui/Models/JobModel.cpp
 //! @brief     Implements class JobModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/JobModel.h b/GUI/coregui/Models/JobModel.h
index 111ec4302ad..34accb9c9e5 100644
--- a/GUI/coregui/Models/JobModel.h
+++ b/GUI/coregui/Models/JobModel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/JobModel.h
+//! @file      GUI/coregui/Models/JobModel.h
 //! @brief     Declares class JobModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/JobQueueData.cpp b/GUI/coregui/Models/JobQueueData.cpp
index 761f1c8642a..3e8f177c60b 100644
--- a/GUI/coregui/Models/JobQueueData.cpp
+++ b/GUI/coregui/Models/JobQueueData.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/JobQueueData.cpp
+//! @file      GUI/coregui/Models/JobQueueData.cpp
 //! @brief     Implements class JobQueueData
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/JobQueueData.h b/GUI/coregui/Models/JobQueueData.h
index d81628aa8a7..a3c0e5f7ab6 100644
--- a/GUI/coregui/Models/JobQueueData.h
+++ b/GUI/coregui/Models/JobQueueData.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/JobQueueData.h
+//! @file      GUI/coregui/Models/JobQueueData.h
 //! @brief     Declares class JobQueueData
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/JobResultsPresenter.cpp b/GUI/coregui/Models/JobResultsPresenter.cpp
index 8ff3ee09308..a1a625312c9 100644
--- a/GUI/coregui/Models/JobResultsPresenter.cpp
+++ b/GUI/coregui/Models/JobResultsPresenter.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/JobResultsPresenter.cpp
+//! @file      GUI/coregui/Models/JobResultsPresenter.cpp
 //! @brief     Implements class JobResultsPresenter
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/JobResultsPresenter.h b/GUI/coregui/Models/JobResultsPresenter.h
index 2d55523769a..71376ac2091 100644
--- a/GUI/coregui/Models/JobResultsPresenter.h
+++ b/GUI/coregui/Models/JobResultsPresenter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/JobResultsPresenter.h
+//! @file      GUI/coregui/Models/JobResultsPresenter.h
 //! @brief     Declares class JobResultsPresenter
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/JobRunner.cpp b/GUI/coregui/Models/JobRunner.cpp
index e76324b73e7..a4d15fe97f4 100644
--- a/GUI/coregui/Models/JobRunner.cpp
+++ b/GUI/coregui/Models/JobRunner.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/JobRunner.cpp
+//! @file      GUI/coregui/Models/JobRunner.cpp
 //! @brief     Implements class JobRunner
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/JobRunner.h b/GUI/coregui/Models/JobRunner.h
index 0a6c3cb3195..3840a88f4d9 100644
--- a/GUI/coregui/Models/JobRunner.h
+++ b/GUI/coregui/Models/JobRunner.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/JobRunner.h
+//! @file      GUI/coregui/Models/JobRunner.h
 //! @brief     Declares class JobRunner
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/LatticeTypeItems.cpp b/GUI/coregui/Models/LatticeTypeItems.cpp
index 27cd9d74d50..6df88822746 100644
--- a/GUI/coregui/Models/LatticeTypeItems.cpp
+++ b/GUI/coregui/Models/LatticeTypeItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/LatticeTypeItems.cpp
+//! @file      GUI/coregui/Models/LatticeTypeItems.cpp
 //! @brief     Implements classes LatticeTypeItems
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/LatticeTypeItems.h b/GUI/coregui/Models/LatticeTypeItems.h
index 435f0d52d83..827f07edfd1 100644
--- a/GUI/coregui/Models/LatticeTypeItems.h
+++ b/GUI/coregui/Models/LatticeTypeItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/LatticeTypeItems.h
+//! @file      GUI/coregui/Models/LatticeTypeItems.h
 //! @brief     Declares classes LatticeTypeItems
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/LayerItem.cpp b/GUI/coregui/Models/LayerItem.cpp
index c2d9dcec208..2a765ecd207 100644
--- a/GUI/coregui/Models/LayerItem.cpp
+++ b/GUI/coregui/Models/LayerItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/LayerItem.cpp
+//! @file      GUI/coregui/Models/LayerItem.cpp
 //! @brief     Implements class LayerItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/LayerItem.h b/GUI/coregui/Models/LayerItem.h
index 8bb12d39ee4..a56e429b63f 100644
--- a/GUI/coregui/Models/LayerItem.h
+++ b/GUI/coregui/Models/LayerItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/LayerItem.h
+//! @file      GUI/coregui/Models/LayerItem.h
 //! @brief     Declares class LayerItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/LayerRoughnessItems.cpp b/GUI/coregui/Models/LayerRoughnessItems.cpp
index 93f1f34378c..f67571e298b 100644
--- a/GUI/coregui/Models/LayerRoughnessItems.cpp
+++ b/GUI/coregui/Models/LayerRoughnessItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/LayerRoughnessItems.cpp
+//! @file      GUI/coregui/Models/LayerRoughnessItems.cpp
 //! @brief     Implements classes LayerRoughnessItems
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/LayerRoughnessItems.h b/GUI/coregui/Models/LayerRoughnessItems.h
index 347c7ffa5e5..5dbba3670be 100644
--- a/GUI/coregui/Models/LayerRoughnessItems.h
+++ b/GUI/coregui/Models/LayerRoughnessItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/LayerRoughnessItems.h
+//! @file      GUI/coregui/Models/LayerRoughnessItems.h
 //! @brief     Declares classes LayerRoughnessItems
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/MagneticFieldItem.cpp b/GUI/coregui/Models/MagneticFieldItem.cpp
index 2458403290b..7408cd565a6 100644
--- a/GUI/coregui/Models/MagneticFieldItem.cpp
+++ b/GUI/coregui/Models/MagneticFieldItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/MagneticFieldItem.cpp
+//! @file      GUI/coregui/Models/MagneticFieldItem.cpp
 //! @brief     Implements class MagneticFieldItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/MagneticFieldItem.h b/GUI/coregui/Models/MagneticFieldItem.h
index f64f6abf236..be766678050 100644
--- a/GUI/coregui/Models/MagneticFieldItem.h
+++ b/GUI/coregui/Models/MagneticFieldItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/MagneticFieldItem.h
+//! @file      GUI/coregui/Models/MagneticFieldItem.h
 //! @brief     Declares class MagneticFieldItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/MaskItems.cpp b/GUI/coregui/Models/MaskItems.cpp
index 2019109135d..01752e12996 100644
--- a/GUI/coregui/Models/MaskItems.cpp
+++ b/GUI/coregui/Models/MaskItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/MaskItems.cpp
+//! @file      GUI/coregui/Models/MaskItems.cpp
 //! @brief     Implements MaskItems classes
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/MaskItems.h b/GUI/coregui/Models/MaskItems.h
index 29cd65c9072..589930e924a 100644
--- a/GUI/coregui/Models/MaskItems.h
+++ b/GUI/coregui/Models/MaskItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/MaskItems.h
+//! @file      GUI/coregui/Models/MaskItems.h
 //! @brief     Declares MaskItems classes
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/MaskModel.cpp b/GUI/coregui/Models/MaskModel.cpp
index 9aa7853190e..94062489592 100644
--- a/GUI/coregui/Models/MaskModel.cpp
+++ b/GUI/coregui/Models/MaskModel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/MaskModel.cpp
+//! @file      GUI/coregui/Models/MaskModel.cpp
 //! @brief     Implements MaskModel classes
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/MaskModel.h b/GUI/coregui/Models/MaskModel.h
index b409796d077..8ab6c5a0b33 100644
--- a/GUI/coregui/Models/MaskModel.h
+++ b/GUI/coregui/Models/MaskModel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/MaskModel.h
+//! @file      GUI/coregui/Models/MaskModel.h
 //! @brief     Declares MaskModel classes
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/MaterialItem.cpp b/GUI/coregui/Models/MaterialItem.cpp
index 5aae28f3d48..5beb634e66c 100644
--- a/GUI/coregui/Models/MaterialItem.cpp
+++ b/GUI/coregui/Models/MaterialItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/MaterialItem.cpp
+//! @file      GUI/coregui/Models/MaterialItem.cpp
 //! @brief     Implements class MaterialItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/MaterialItem.h b/GUI/coregui/Models/MaterialItem.h
index f1f93048d39..7b7416c8adf 100644
--- a/GUI/coregui/Models/MaterialItem.h
+++ b/GUI/coregui/Models/MaterialItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/MaterialItem.h
+//! @file      GUI/coregui/Models/MaterialItem.h
 //! @brief     Declares class MaterialItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/MaterialModel.cpp b/GUI/coregui/Models/MaterialModel.cpp
index 3b1e191e06e..fba45b491e9 100644
--- a/GUI/coregui/Models/MaterialModel.cpp
+++ b/GUI/coregui/Models/MaterialModel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/MaterialModel.cpp
+//! @file      GUI/coregui/Models/MaterialModel.cpp
 //! @brief     Implements class MaterialModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/MaterialModel.h b/GUI/coregui/Models/MaterialModel.h
index 31a34b49e62..47a9d821d9b 100644
--- a/GUI/coregui/Models/MaterialModel.h
+++ b/GUI/coregui/Models/MaterialModel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/MaterialModel.h
+//! @file      GUI/coregui/Models/MaterialModel.h
 //! @brief     Declares class MaterialModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ModelMapper.cpp b/GUI/coregui/Models/ModelMapper.cpp
index 3150fb6bf34..c357e04ce23 100644
--- a/GUI/coregui/Models/ModelMapper.cpp
+++ b/GUI/coregui/Models/ModelMapper.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ModelMapper.cpp
+//! @file      GUI/coregui/Models/ModelMapper.cpp
 //! @brief     Implements class ModelMapper
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ModelMapper.h b/GUI/coregui/Models/ModelMapper.h
index b7a8d4e4bc4..18ca59c4e3d 100644
--- a/GUI/coregui/Models/ModelMapper.h
+++ b/GUI/coregui/Models/ModelMapper.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ModelMapper.h
+//! @file      GUI/coregui/Models/ModelMapper.h
 //! @brief     Declares class ModelMapper
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ModelPath.cpp b/GUI/coregui/Models/ModelPath.cpp
index 84734324e91..390727de115 100644
--- a/GUI/coregui/Models/ModelPath.cpp
+++ b/GUI/coregui/Models/ModelPath.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ModelPath.cpp
+//! @file      GUI/coregui/Models/ModelPath.cpp
 //! @brief     Implements class ModelPath
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ModelPath.h b/GUI/coregui/Models/ModelPath.h
index 4b8ac90dee9..2b5ec643405 100644
--- a/GUI/coregui/Models/ModelPath.h
+++ b/GUI/coregui/Models/ModelPath.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ModelPath.h
+//! @file      GUI/coregui/Models/ModelPath.h
 //! @brief     Declares class ModelPath
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/MultiLayerItem.cpp b/GUI/coregui/Models/MultiLayerItem.cpp
index 07c886ab7a6..3acf87d7792 100644
--- a/GUI/coregui/Models/MultiLayerItem.cpp
+++ b/GUI/coregui/Models/MultiLayerItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/MultiLayerItem.cpp
+//! @file      GUI/coregui/Models/MultiLayerItem.cpp
 //! @brief     Implements class MultiLayerItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/MultiLayerItem.h b/GUI/coregui/Models/MultiLayerItem.h
index 1a62d8abd8d..c44c372ba3c 100644
--- a/GUI/coregui/Models/MultiLayerItem.h
+++ b/GUI/coregui/Models/MultiLayerItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/MultiLayerItem.h
+//! @file      GUI/coregui/Models/MultiLayerItem.h
 //! @brief     Declares class MultiLayerItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ObsoleteFitModel.cpp b/GUI/coregui/Models/ObsoleteFitModel.cpp
index 8d0bac9b94b..a6cd1671b9f 100644
--- a/GUI/coregui/Models/ObsoleteFitModel.cpp
+++ b/GUI/coregui/Models/ObsoleteFitModel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ObsoleteFitModel.cpp
+//! @file      GUI/coregui/Models/ObsoleteFitModel.cpp
 //! @brief     Implements class ObsoleteFitModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ObsoleteFitModel.h b/GUI/coregui/Models/ObsoleteFitModel.h
index 960b1457b4d..3f09d858f7d 100644
--- a/GUI/coregui/Models/ObsoleteFitModel.h
+++ b/GUI/coregui/Models/ObsoleteFitModel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ObsoleteFitModel.h
+//! @file      GUI/coregui/Models/ObsoleteFitModel.h
 //! @brief     Declares class ObsoleteFitModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ObsoleteFitParameterItems.cpp b/GUI/coregui/Models/ObsoleteFitParameterItems.cpp
index 2bd8b853ed0..6416bae2c40 100644
--- a/GUI/coregui/Models/ObsoleteFitParameterItems.cpp
+++ b/GUI/coregui/Models/ObsoleteFitParameterItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ObsoleteFitParameterItems.cpp
+//! @file      GUI/coregui/Models/ObsoleteFitParameterItems.cpp
 //! @brief     Implements class ObsoleteFitParameterItems
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ObsoleteFitParameterItems.h b/GUI/coregui/Models/ObsoleteFitParameterItems.h
index 15a8d1c72ed..bf7b28abff8 100644
--- a/GUI/coregui/Models/ObsoleteFitParameterItems.h
+++ b/GUI/coregui/Models/ObsoleteFitParameterItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ObsoleteFitParameterItems.h
+//! @file      GUI/coregui/Models/ObsoleteFitParameterItems.h
 //! @brief     Declares class ObsoleteFitParameterItems
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ObsoleteFitParameterModel.cpp b/GUI/coregui/Models/ObsoleteFitParameterModel.cpp
index 5efdaedfa8d..024356dd4ac 100644
--- a/GUI/coregui/Models/ObsoleteFitParameterModel.cpp
+++ b/GUI/coregui/Models/ObsoleteFitParameterModel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/FitParameterModel.cpp
+//! @file      GUI/coregui/Models/ObsoleteFitParameterModel.cpp
 //! @brief     Implements class FitParameterModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ObsoleteFitParameterModel.h b/GUI/coregui/Models/ObsoleteFitParameterModel.h
index a2b0ca2989e..0fd89adb169 100644
--- a/GUI/coregui/Models/ObsoleteFitParameterModel.h
+++ b/GUI/coregui/Models/ObsoleteFitParameterModel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ObsoleteFitParameterModel.h
+//! @file      GUI/coregui/Models/ObsoleteFitParameterModel.h
 //! @brief     Declares class ObsoleteFitParameterModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ObsoleteFitSelectorModel.cpp b/GUI/coregui/Models/ObsoleteFitSelectorModel.cpp
index c4914ea0738..c6bd57a453f 100644
--- a/GUI/coregui/Models/ObsoleteFitSelectorModel.cpp
+++ b/GUI/coregui/Models/ObsoleteFitSelectorModel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ObsoleteFitSelectorModel.cpp
+//! @file      GUI/coregui/Models/ObsoleteFitSelectorModel.cpp
 //! @brief     Implements class ObsoleteFitSelectorModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ObsoleteFitSelectorModel.h b/GUI/coregui/Models/ObsoleteFitSelectorModel.h
index c775941b448..ece4d87b819 100644
--- a/GUI/coregui/Models/ObsoleteFitSelectorModel.h
+++ b/GUI/coregui/Models/ObsoleteFitSelectorModel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ObsoleteFitSelectorModel.h
+//! @file      GUI/coregui/Models/ObsoleteFitSelectorModel.h
 //! @brief     Declares class ObsoleteFitSelectorModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParameterModelBuilder.cpp b/GUI/coregui/Models/ParameterModelBuilder.cpp
index eebf20cb6dd..bf4b2c8e24b 100644
--- a/GUI/coregui/Models/ParameterModelBuilder.cpp
+++ b/GUI/coregui/Models/ParameterModelBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParameterModelBuilder.cpp
+//! @file      GUI/coregui/Models/ParameterModelBuilder.cpp
 //! @brief     Implements class ParameterModelBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParameterModelBuilder.h b/GUI/coregui/Models/ParameterModelBuilder.h
index a1df64b7fad..56d1a877831 100644
--- a/GUI/coregui/Models/ParameterModelBuilder.h
+++ b/GUI/coregui/Models/ParameterModelBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParameterModelBuilder.h
+//! @file      GUI/coregui/Models/ParameterModelBuilder.h
 //! @brief     Declares class ParameterModelBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParameterTranslators.cpp b/GUI/coregui/Models/ParameterTranslators.cpp
index e5736338109..2c51f0d8087 100644
--- a/GUI/coregui/Models/ParameterTranslators.cpp
+++ b/GUI/coregui/Models/ParameterTranslators.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParameterTranslators.cpp
+//! @file      GUI/coregui/Models/ParameterTranslators.cpp
 //! @brief     Implements subclasses of IParameterTranslator
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParameterTranslators.h b/GUI/coregui/Models/ParameterTranslators.h
index f655af901d3..ddda550ae30 100644
--- a/GUI/coregui/Models/ParameterTranslators.h
+++ b/GUI/coregui/Models/ParameterTranslators.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParameterTranslators.h
+//! @file      GUI/coregui/Models/ParameterTranslators.h
 //! @brief     Declares interface IParameterTranslator and subclasses
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParameterTreeItems.cpp b/GUI/coregui/Models/ParameterTreeItems.cpp
index c153a3e4626..76eab13d42f 100644
--- a/GUI/coregui/Models/ParameterTreeItems.cpp
+++ b/GUI/coregui/Models/ParameterTreeItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParameterTreeItem.h
+//! @file      GUI/coregui/Models/ParameterTreeItems.cpp
 //! @brief     Implements classes for ParameterTreeItems
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParameterTreeItems.h b/GUI/coregui/Models/ParameterTreeItems.h
index 7535c8eba11..362c4d3e719 100644
--- a/GUI/coregui/Models/ParameterTreeItems.h
+++ b/GUI/coregui/Models/ParameterTreeItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParameterTreeItems.h
+//! @file      GUI/coregui/Models/ParameterTreeItems.h
 //! @brief     Declares classes for ParameterTreeItems
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParameterTuningModel.cpp b/GUI/coregui/Models/ParameterTuningModel.cpp
index b3adcac788e..7ad455f45e5 100644
--- a/GUI/coregui/Models/ParameterTuningModel.cpp
+++ b/GUI/coregui/Models/ParameterTuningModel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParameterTuningModel.cpp
+//! @file      GUI/coregui/Models/ParameterTuningModel.cpp
 //! @brief     Implements class ParameterTuningModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParameterTuningModel.h b/GUI/coregui/Models/ParameterTuningModel.h
index b7a01c3f380..ff8b61badcb 100644
--- a/GUI/coregui/Models/ParameterTuningModel.h
+++ b/GUI/coregui/Models/ParameterTuningModel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParameterTuningModel.h
+//! @file      GUI/coregui/Models/ParameterTuningModel.h
 //! @brief     Declares class ParameterTuningModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParticleCompositionItem.cpp b/GUI/coregui/Models/ParticleCompositionItem.cpp
index 02a933d2d1f..fbc53e8e744 100644
--- a/GUI/coregui/Models/ParticleCompositionItem.cpp
+++ b/GUI/coregui/Models/ParticleCompositionItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParticleCompositionItem.cpp
+//! @file      GUI/coregui/Models/ParticleCompositionItem.cpp
 //! @brief     Implements class ParticleCompositionItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParticleCompositionItem.h b/GUI/coregui/Models/ParticleCompositionItem.h
index 76ab85fbb5b..59259b7b7be 100644
--- a/GUI/coregui/Models/ParticleCompositionItem.h
+++ b/GUI/coregui/Models/ParticleCompositionItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParticleCompositionItem.h
+//! @file      GUI/coregui/Models/ParticleCompositionItem.h
 //! @brief     Declares class ParticleCompositionItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParticleCoreShellItem.cpp b/GUI/coregui/Models/ParticleCoreShellItem.cpp
index 08bdddf2214..5584d0c061c 100644
--- a/GUI/coregui/Models/ParticleCoreShellItem.cpp
+++ b/GUI/coregui/Models/ParticleCoreShellItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParticleCoreShellItem.cpp
+//! @file      GUI/coregui/Models/ParticleCoreShellItem.cpp
 //! @brief     Implements class ParticleCoreShellItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParticleCoreShellItem.h b/GUI/coregui/Models/ParticleCoreShellItem.h
index d62db2b03a7..d03c66d33fc 100644
--- a/GUI/coregui/Models/ParticleCoreShellItem.h
+++ b/GUI/coregui/Models/ParticleCoreShellItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParticleCoreShellItem.h
+//! @file      GUI/coregui/Models/ParticleCoreShellItem.h
 //! @brief     Declares class ParticleCoreShellItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParticleDistributionItem.cpp b/GUI/coregui/Models/ParticleDistributionItem.cpp
index 2643ddcbe8b..87b05ab2901 100644
--- a/GUI/coregui/Models/ParticleDistributionItem.cpp
+++ b/GUI/coregui/Models/ParticleDistributionItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParticleDistributionItem.cpp
+//! @file      GUI/coregui/Models/ParticleDistributionItem.cpp
 //! @brief     Implements class ParticleDistributionItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParticleDistributionItem.h b/GUI/coregui/Models/ParticleDistributionItem.h
index f771d7eb003..801534e80e9 100644
--- a/GUI/coregui/Models/ParticleDistributionItem.h
+++ b/GUI/coregui/Models/ParticleDistributionItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParticleDistributionItem.h
+//! @file      GUI/coregui/Models/ParticleDistributionItem.h
 //! @brief     Declares class ParticleDistributionItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParticleItem.cpp b/GUI/coregui/Models/ParticleItem.cpp
index a653d35d95a..d1671365d53 100644
--- a/GUI/coregui/Models/ParticleItem.cpp
+++ b/GUI/coregui/Models/ParticleItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParticleItem.cpp
+//! @file      GUI/coregui/Models/ParticleItem.cpp
 //! @brief     Implements class ParticleItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParticleItem.h b/GUI/coregui/Models/ParticleItem.h
index 0e3348c9b2c..e7a57d6c686 100644
--- a/GUI/coregui/Models/ParticleItem.h
+++ b/GUI/coregui/Models/ParticleItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParticleItem.h
+//! @file      GUI/coregui/Models/ParticleItem.h
 //! @brief     Declares class ParticleItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParticleLayoutItem.cpp b/GUI/coregui/Models/ParticleLayoutItem.cpp
index 4d90ab0e327..08d7a1bfda0 100644
--- a/GUI/coregui/Models/ParticleLayoutItem.cpp
+++ b/GUI/coregui/Models/ParticleLayoutItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParticleLayoutItem.cpp
+//! @file      GUI/coregui/Models/ParticleLayoutItem.cpp
 //! @brief     Implements class ParticleLayoutItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ParticleLayoutItem.h b/GUI/coregui/Models/ParticleLayoutItem.h
index 4b4323b90b1..0ba4c8fb87c 100644
--- a/GUI/coregui/Models/ParticleLayoutItem.h
+++ b/GUI/coregui/Models/ParticleLayoutItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ParticleLayoutItem.h
+//! @file      GUI/coregui/Models/ParticleLayoutItem.h
 //! @brief     Declares class ParticleLayoutItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/PropertyAttribute.cpp b/GUI/coregui/Models/PropertyAttribute.cpp
index 4eaf18820c1..0054c660189 100644
--- a/GUI/coregui/Models/PropertyAttribute.cpp
+++ b/GUI/coregui/Models/PropertyAttribute.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/PropertyAttribute.cpp
+//! @file      GUI/coregui/Models/PropertyAttribute.cpp
 //! @brief     Implements class PropertyAttribute
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/PropertyAttribute.h b/GUI/coregui/Models/PropertyAttribute.h
index 7342df48f54..6c002a2a949 100644
--- a/GUI/coregui/Models/PropertyAttribute.h
+++ b/GUI/coregui/Models/PropertyAttribute.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/PropertyAttribute.h
+//! @file      GUI/coregui/Models/PropertyAttribute.h
 //! @brief     Declares class PropertyAttribute
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/PropertyItem.cpp b/GUI/coregui/Models/PropertyItem.cpp
index 1f7e6ed0fe2..8c9f801ab16 100644
--- a/GUI/coregui/Models/PropertyItem.cpp
+++ b/GUI/coregui/Models/PropertyItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/PropertyItem.cpp
+//! @file      GUI/coregui/Models/PropertyItem.cpp
 //! @brief     Implements class PropertyItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/PropertyItem.h b/GUI/coregui/Models/PropertyItem.h
index 886e8e5b548..630536f2c97 100644
--- a/GUI/coregui/Models/PropertyItem.h
+++ b/GUI/coregui/Models/PropertyItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/PropertyItem.h
+//! @file      GUI/coregui/Models/PropertyItem.h
 //! @brief     Declares class PropertyItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/RealDataItem.cpp b/GUI/coregui/Models/RealDataItem.cpp
index 1c314ce04b5..4b0f3291d9a 100644
--- a/GUI/coregui/Models/RealDataItem.cpp
+++ b/GUI/coregui/Models/RealDataItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/RealDataItem.h
+//! @file      GUI/coregui/Models/RealDataItem.cpp
 //! @brief     Implements class RealDataItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/RealDataItem.h b/GUI/coregui/Models/RealDataItem.h
index aa36e42a801..ff665467817 100644
--- a/GUI/coregui/Models/RealDataItem.h
+++ b/GUI/coregui/Models/RealDataItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/RealDataItem.h
+//! @file      GUI/coregui/Models/RealDataItem.h
 //! @brief     Declares class RealDataItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/RealDataModel.cpp b/GUI/coregui/Models/RealDataModel.cpp
index 5b8a77e22dd..577eff51f69 100644
--- a/GUI/coregui/Models/RealDataModel.cpp
+++ b/GUI/coregui/Models/RealDataModel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/RealDataModel.cpp
+//! @file      GUI/coregui/Models/RealDataModel.cpp
 //! @brief     Implements class RealDataModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/RealDataModel.h b/GUI/coregui/Models/RealDataModel.h
index 1d368c28ca8..6f064e9cc6b 100644
--- a/GUI/coregui/Models/RealDataModel.h
+++ b/GUI/coregui/Models/RealDataModel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/RealDataModel.h
+//! @file      GUI/coregui/Models/RealDataModel.h
 //! @brief     Declares class RealDataModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/RectangularDetectorItem.cpp b/GUI/coregui/Models/RectangularDetectorItem.cpp
index 00570485796..177ef752270 100644
--- a/GUI/coregui/Models/RectangularDetectorItem.cpp
+++ b/GUI/coregui/Models/RectangularDetectorItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/RectangularDetectorItem.cpp
+//! @file      GUI/coregui/Models/RectangularDetectorItem.cpp
 //! @brief     Implements class RectangularDetectorItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/RectangularDetectorItem.h b/GUI/coregui/Models/RectangularDetectorItem.h
index ae88740e735..9a216265445 100644
--- a/GUI/coregui/Models/RectangularDetectorItem.h
+++ b/GUI/coregui/Models/RectangularDetectorItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/RectangularDetectorItem.h
+//! @file      GUI/coregui/Models/RectangularDetectorItem.h
 //! @brief     Declares class RectangularDetectorItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/RefractiveIndexItem.cpp b/GUI/coregui/Models/RefractiveIndexItem.cpp
index 09af91ecb4c..7f8d7cedd40 100644
--- a/GUI/coregui/Models/RefractiveIndexItem.cpp
+++ b/GUI/coregui/Models/RefractiveIndexItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/RefractiveIndexItem.cpp
+//! @file      GUI/coregui/Models/RefractiveIndexItem.cpp
 //! @brief     Implements class RefractiveIndexItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/RefractiveIndexItem.h b/GUI/coregui/Models/RefractiveIndexItem.h
index 9bedb6931ef..5daaa78eab3 100644
--- a/GUI/coregui/Models/RefractiveIndexItem.h
+++ b/GUI/coregui/Models/RefractiveIndexItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/RefractiveIndexItem.h
+//! @file      GUI/coregui/Models/RefractiveIndexItem.h
 //! @brief     Declares class RefractiveIndexItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ResolutionFunctionItems.cpp b/GUI/coregui/Models/ResolutionFunctionItems.cpp
index b542d492856..81aaac75d76 100644
--- a/GUI/coregui/Models/ResolutionFunctionItems.cpp
+++ b/GUI/coregui/Models/ResolutionFunctionItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ResolutionFunctionItems.cpp
+//! @file      GUI/coregui/Models/ResolutionFunctionItems.cpp
 //! @brief     Implements family of ResolutionFunctionItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ResolutionFunctionItems.h b/GUI/coregui/Models/ResolutionFunctionItems.h
index 39c95745059..76fe17b27f6 100644
--- a/GUI/coregui/Models/ResolutionFunctionItems.h
+++ b/GUI/coregui/Models/ResolutionFunctionItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ResolutionFunctionItems.h
+//! @file      GUI/coregui/Models/ResolutionFunctionItems.h
 //! @brief     Declares family of ResolutionFunctionItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/RotationItems.cpp b/GUI/coregui/Models/RotationItems.cpp
index ab8f63710f8..e42914ce1fb 100644
--- a/GUI/coregui/Models/RotationItems.cpp
+++ b/GUI/coregui/Models/RotationItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/RotationItems.cpp
+//! @file      GUI/coregui/Models/RotationItems.cpp
 //! @brief     Implements class RotationItems
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/RotationItems.h b/GUI/coregui/Models/RotationItems.h
index 171a0e0669d..7b111286689 100644
--- a/GUI/coregui/Models/RotationItems.h
+++ b/GUI/coregui/Models/RotationItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/RotationItems.h
+//! @file      GUI/coregui/Models/RotationItems.h
 //! @brief     Declares class RotationItems
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SampleModel.cpp b/GUI/coregui/Models/SampleModel.cpp
index 9be6488e273..46c6a34746e 100644
--- a/GUI/coregui/Models/SampleModel.cpp
+++ b/GUI/coregui/Models/SampleModel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SampleModel.cpp
+//! @file      GUI/coregui/Models/SampleModel.cpp
 //! @brief     Implements class SampleModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SampleModel.h b/GUI/coregui/Models/SampleModel.h
index 1549471b426..7967514d24a 100644
--- a/GUI/coregui/Models/SampleModel.h
+++ b/GUI/coregui/Models/SampleModel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SampleModel.h
+//! @file      GUI/coregui/Models/SampleModel.h
 //! @brief     Declares class SampleModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SampleValidator.cpp b/GUI/coregui/Models/SampleValidator.cpp
index e8cbde0e2df..a41fe871eb4 100644
--- a/GUI/coregui/Models/SampleValidator.cpp
+++ b/GUI/coregui/Models/SampleValidator.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SampleValidator.cpp
+//! @file      GUI/coregui/Models/SampleValidator.cpp
 //! @brief     Implements class SampleValidator
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SampleValidator.h b/GUI/coregui/Models/SampleValidator.h
index 0a2112380c1..b44a06338e4 100644
--- a/GUI/coregui/Models/SampleValidator.h
+++ b/GUI/coregui/Models/SampleValidator.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SampleValidator.h
+//! @file      GUI/coregui/Models/SampleValidator.h
 //! @brief     Declares class SampleValidator
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/ScientificDoubleProperty.h b/GUI/coregui/Models/ScientificDoubleProperty.h
index 7339334ce98..cc3eb1ec672 100644
--- a/GUI/coregui/Models/ScientificDoubleProperty.h
+++ b/GUI/coregui/Models/ScientificDoubleProperty.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/ScientificDoubleProperty.h
+//! @file      GUI/coregui/Models/ScientificDoubleProperty.h
 //! @brief     Declares class ScientificDoubleProperty
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SessionGraphicsItem.cpp b/GUI/coregui/Models/SessionGraphicsItem.cpp
index 8905ccfda91..42f15bf6c43 100644
--- a/GUI/coregui/Models/SessionGraphicsItem.cpp
+++ b/GUI/coregui/Models/SessionGraphicsItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SessionGraphicsItem.cpp
+//! @file      GUI/coregui/Models/SessionGraphicsItem.cpp
 //! @brief     Implements class SessionGraphicsItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SessionGraphicsItem.h b/GUI/coregui/Models/SessionGraphicsItem.h
index 8908f452007..eb7224c0199 100644
--- a/GUI/coregui/Models/SessionGraphicsItem.h
+++ b/GUI/coregui/Models/SessionGraphicsItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SessionGraphicsItem.h
+//! @file      GUI/coregui/Models/SessionGraphicsItem.h
 //! @brief     Declares class SessionGraphicsItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SessionItem.cpp b/GUI/coregui/Models/SessionItem.cpp
index cbb32dd60e7..02c2e786fbe 100644
--- a/GUI/coregui/Models/SessionItem.cpp
+++ b/GUI/coregui/Models/SessionItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SessionItem.cpp
+//! @file      GUI/coregui/Models/SessionItem.cpp
 //! @brief     Implements class SessionItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SessionItem.h b/GUI/coregui/Models/SessionItem.h
index cb52d1047e5..85134ca45f5 100644
--- a/GUI/coregui/Models/SessionItem.h
+++ b/GUI/coregui/Models/SessionItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SessionItem.h
+//! @file      GUI/coregui/Models/SessionItem.h
 //! @brief     Declares class SessionItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SessionModel.cpp b/GUI/coregui/Models/SessionModel.cpp
index afb6ad9b2d4..00e55595c3d 100644
--- a/GUI/coregui/Models/SessionModel.cpp
+++ b/GUI/coregui/Models/SessionModel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SessionModel.cpp
+//! @file      GUI/coregui/Models/SessionModel.cpp
 //! @brief     Implements class SessionModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SessionModel.h b/GUI/coregui/Models/SessionModel.h
index 7e72fb8f115..5e35cab0323 100644
--- a/GUI/coregui/Models/SessionModel.h
+++ b/GUI/coregui/Models/SessionModel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SessionModel.h
+//! @file      GUI/coregui/Models/SessionModel.h
 //! @brief     Declares class SessionModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SessionModelAssistant.cpp b/GUI/coregui/Models/SessionModelAssistant.cpp
index c9f291092bb..fbb83f3fc9c 100644
--- a/GUI/coregui/Models/SessionModelAssistant.cpp
+++ b/GUI/coregui/Models/SessionModelAssistant.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SessionModelAssistant.cpp
+//! @file      GUI/coregui/Models/SessionModelAssistant.cpp
 //! @brief     Implements class SessionModelAssistant
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SessionModelAssistant.h b/GUI/coregui/Models/SessionModelAssistant.h
index 7e90d945b24..3d823e3330c 100644
--- a/GUI/coregui/Models/SessionModelAssistant.h
+++ b/GUI/coregui/Models/SessionModelAssistant.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SessionModelAssistant.h
+//! @file      GUI/coregui/Models/SessionModelAssistant.h
 //! @brief     Declares class SessionModelAssistant
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SessionModelDelegate.cpp b/GUI/coregui/Models/SessionModelDelegate.cpp
index e4f95ec1e8a..3c9c0104683 100644
--- a/GUI/coregui/Models/SessionModelDelegate.cpp
+++ b/GUI/coregui/Models/SessionModelDelegate.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SessionModelDelegate.cpp
+//! @file      GUI/coregui/Models/SessionModelDelegate.cpp
 //! @brief     Implements class SessionModelDelegate
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SessionModelDelegate.h b/GUI/coregui/Models/SessionModelDelegate.h
index 97146c18952..e7e96de2c9f 100644
--- a/GUI/coregui/Models/SessionModelDelegate.h
+++ b/GUI/coregui/Models/SessionModelDelegate.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SessionModelDelegate.h
+//! @file      GUI/coregui/Models/SessionModelDelegate.h
 //! @brief     Declares class SessionModelDelegate
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SessionXML.cpp b/GUI/coregui/Models/SessionXML.cpp
index ca440f6b1b3..704b6adc24c 100644
--- a/GUI/coregui/Models/SessionXML.cpp
+++ b/GUI/coregui/Models/SessionXML.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SessionXML.cpp
+//! @file      GUI/coregui/Models/SessionXML.cpp
 //! @brief     Implements reader and writer classes for SessionModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SessionXML.h b/GUI/coregui/Models/SessionXML.h
index efbc722254e..21fa24208d1 100644
--- a/GUI/coregui/Models/SessionXML.h
+++ b/GUI/coregui/Models/SessionXML.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SessionXML.h
+//! @file      GUI/coregui/Models/SessionXML.h
 //! @brief     Declares reader and writer classes for SessionModel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SimulationOptionsItem.cpp b/GUI/coregui/Models/SimulationOptionsItem.cpp
index 8a4faefc96d..6faf7b63ed0 100644
--- a/GUI/coregui/Models/SimulationOptionsItem.cpp
+++ b/GUI/coregui/Models/SimulationOptionsItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SimulationOptionsItem.h
+//! @file      GUI/coregui/Models/SimulationOptionsItem.cpp
 //! @brief     Defines class SimulationOptionsItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SimulationOptionsItem.h b/GUI/coregui/Models/SimulationOptionsItem.h
index 74527e75964..6a712f339e6 100644
--- a/GUI/coregui/Models/SimulationOptionsItem.h
+++ b/GUI/coregui/Models/SimulationOptionsItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SimulationOptionsItem.h
+//! @file      GUI/coregui/Models/SimulationOptionsItem.h
 //! @brief     Declares class SimulationOptionsItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SphericalDetectorItem.cpp b/GUI/coregui/Models/SphericalDetectorItem.cpp
index e644690743f..4ef40281247 100644
--- a/GUI/coregui/Models/SphericalDetectorItem.cpp
+++ b/GUI/coregui/Models/SphericalDetectorItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SphericalDetectorItem.cpp
+//! @file      GUI/coregui/Models/SphericalDetectorItem.cpp
 //! @brief     Implements class SphericalDetectorItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/SphericalDetectorItem.h b/GUI/coregui/Models/SphericalDetectorItem.h
index 8a004493477..8c83dd1e390 100644
--- a/GUI/coregui/Models/SphericalDetectorItem.h
+++ b/GUI/coregui/Models/SphericalDetectorItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/SphericalDetectorItem.h
+//! @file      GUI/coregui/Models/SphericalDetectorItem.h
 //! @brief     Declares class SphericalDetectorItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/TestItem.cpp b/GUI/coregui/Models/TestItem.cpp
index c495924601f..ebda956fb3f 100644
--- a/GUI/coregui/Models/TestItem.cpp
+++ b/GUI/coregui/Models/TestItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/TestItem.cpp
+//! @file      GUI/coregui/Models/TestItem.cpp
 //! @brief     Implements class TestItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/TestItem.h b/GUI/coregui/Models/TestItem.h
index 64856e7af52..233142d80f4 100644
--- a/GUI/coregui/Models/TestItem.h
+++ b/GUI/coregui/Models/TestItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/TestItem.h
+//! @file      GUI/coregui/Models/TestItem.h
 //! @brief     Declares class TestItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/coregui/Models/TransformFromDomain.cpp
index 40736dd1306..4bad7cc384c 100644
--- a/GUI/coregui/Models/TransformFromDomain.cpp
+++ b/GUI/coregui/Models/TransformFromDomain.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/TransformFromDomain.cpp
+//! @file      GUI/coregui/Models/TransformFromDomain.cpp
 //! @brief     Implements namespace TransformFromDomain
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/TransformFromDomain.h b/GUI/coregui/Models/TransformFromDomain.h
index 7c6c9f02f21..7f684ebeb81 100644
--- a/GUI/coregui/Models/TransformFromDomain.h
+++ b/GUI/coregui/Models/TransformFromDomain.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/TransformFromDomain.h
+//! @file      GUI/coregui/Models/TransformFromDomain.h
 //! @brief     Declares namespace TransformFromDomain
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/TransformToDomain.cpp b/GUI/coregui/Models/TransformToDomain.cpp
index f9b7ea7c36f..72992fe33ab 100644
--- a/GUI/coregui/Models/TransformToDomain.cpp
+++ b/GUI/coregui/Models/TransformToDomain.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/TransformToDomain.cpp
+//! @file      GUI/coregui/Models/TransformToDomain.cpp
 //! @brief     Implements class TransformToDomain
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/TransformToDomain.h b/GUI/coregui/Models/TransformToDomain.h
index 35244671059..284eec55581 100644
--- a/GUI/coregui/Models/TransformToDomain.h
+++ b/GUI/coregui/Models/TransformToDomain.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/TransformToDomain.h
+//! @file      GUI/coregui/Models/TransformToDomain.h
 //! @brief     Declares class TransformToDomain
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/TransformationItem.cpp b/GUI/coregui/Models/TransformationItem.cpp
index bcc699f4083..f74ddd10638 100644
--- a/GUI/coregui/Models/TransformationItem.cpp
+++ b/GUI/coregui/Models/TransformationItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/TransformationItem.cpp
+//! @file      GUI/coregui/Models/TransformationItem.cpp
 //! @brief     Implements class TransformationItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/TransformationItem.h b/GUI/coregui/Models/TransformationItem.h
index bc04eb7122e..b15e6843629 100644
--- a/GUI/coregui/Models/TransformationItem.h
+++ b/GUI/coregui/Models/TransformationItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/TransformationItem.h
+//! @file      GUI/coregui/Models/TransformationItem.h
 //! @brief     Declares class TransformationItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/VectorItem.cpp b/GUI/coregui/Models/VectorItem.cpp
index 0266a2e3134..d3eea6f075e 100644
--- a/GUI/coregui/Models/VectorItem.cpp
+++ b/GUI/coregui/Models/VectorItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/VectorItem.cpp
+//! @file      GUI/coregui/Models/VectorItem.cpp
 //! @brief     Implements class VectorItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/VectorItem.h b/GUI/coregui/Models/VectorItem.h
index 6e8b8ed9f52..a150aeb0d5c 100644
--- a/GUI/coregui/Models/VectorItem.h
+++ b/GUI/coregui/Models/VectorItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/VectorItem.h
+//! @file      GUI/coregui/Models/VectorItem.h
 //! @brief     Declares class VectorItem
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/item_constants.h b/GUI/coregui/Models/item_constants.h
index 363a43ad625..29e2cec2898 100644
--- a/GUI/coregui/Models/item_constants.h
+++ b/GUI/coregui/Models/item_constants.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/item_constants.h
+//! @file      GUI/coregui/Models/item_constants.h
 //! @brief     Declares item constants
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp b/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
index 28e3b021188..82481304f47 100644
--- a/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
+++ b/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/AccordionWidget/AccordionWidget.h
+//! @file      GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
 //! @brief     Implements AccordionWidget class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/AccordionWidget/AccordionWidget.h b/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
index 1762f13a4a6..bae92c05f3c 100644
--- a/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
+++ b/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/AccordionWidget/AccordionWidget.h
+//! @file      GUI/coregui/Views/AccordionWidget/AccordionWidget.h
 //! @brief     Declares AccordionWidget class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp b/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
index ea21c8d29ef..111483503e2 100644
--- a/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
+++ b/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/AccordionWidget/ClickableFrame.cpp
+//! @file      GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
 //! @brief     Implements AccordionWidget class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/AccordionWidget/ClickableFrame.h b/GUI/coregui/Views/AccordionWidget/ClickableFrame.h
index cdf7c8fa645..8c26ae632bb 100644
--- a/GUI/coregui/Views/AccordionWidget/ClickableFrame.h
+++ b/GUI/coregui/Views/AccordionWidget/ClickableFrame.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/AccordionWidget/ClickableFrame.h
+//! @file      GUI/coregui/Views/AccordionWidget/ClickableFrame.h
 //! @brief     Declares AccordionWidget class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/AccordionWidget/ContentPane.cpp b/GUI/coregui/Views/AccordionWidget/ContentPane.cpp
index 776c038d301..a2ea32da95f 100644
--- a/GUI/coregui/Views/AccordionWidget/ContentPane.cpp
+++ b/GUI/coregui/Views/AccordionWidget/ContentPane.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/AccordionWidget/ContentPane.cpp
+//! @file      GUI/coregui/Views/AccordionWidget/ContentPane.cpp
 //! @brief     Implements ContentPane class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/AccordionWidget/ContentPane.h b/GUI/coregui/Views/AccordionWidget/ContentPane.h
index c3b1bb17703..19b79f5457b 100644
--- a/GUI/coregui/Views/AccordionWidget/ContentPane.h
+++ b/GUI/coregui/Views/AccordionWidget/ContentPane.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/AccordionWidget/ContentPane.h
+//! @file      GUI/coregui/Views/AccordionWidget/ContentPane.h
 //! @brief     Declares ContentPane class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
index 76a6d0a6073..2354b3648d5 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
+//! @file      GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
 //! @brief     Implements class ItemSelectorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h
index 55a97a115ce..1894a0a4902 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/CommonWidgets/ItemSelectorWidget.h
+//! @file      GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h
 //! @brief     Declares class ItemSelectorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h b/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
index 1f84bb05f07..2238ad1cab1 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/CommonWidgets/ItemStackPresenter.h
+//! @file      GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
 //! @brief     Declares class ItemStackPresenter
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
index 7000daf595e..42948d0f6a6 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/CommonWidgets/ItemStackWidget.cpp
+//! @file      GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
 //! @brief     Implements class ItemStackWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h
index 623e03ef872..808442daf08 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/CommonWidgets/ItemStackWidget.h
+//! @file      GUI/coregui/Views/CommonWidgets/ItemStackWidget.h
 //! @brief     Declares class ItemStackWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp b/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
index 1295bfc27d3..48ad82109f2 100644
--- a/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/FitActivityPanel.h
+//! @file      GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
 //! @brief     Implements class FitActivityPanel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/FitActivityPanel.h b/GUI/coregui/Views/FitWidgets/FitActivityPanel.h
index 2c2f88be7ea..2d32592bb20 100644
--- a/GUI/coregui/Views/FitWidgets/FitActivityPanel.h
+++ b/GUI/coregui/Views/FitWidgets/FitActivityPanel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/FitActivityPanel.h
+//! @file      GUI/coregui/Views/FitWidgets/FitActivityPanel.h
 //! @brief     Declares class FitActivityPanel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp b/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
index 1dedeedb3af..f68e3fe255a 100644
--- a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/FitParameterWidget.cpp
+//! @file      GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
 //! @brief     Implements class FitParameterWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/FitParameterWidget.h b/GUI/coregui/Views/FitWidgets/FitParameterWidget.h
index 9d03f914d95..7bdeb5e02f7 100644
--- a/GUI/coregui/Views/FitWidgets/FitParameterWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitParameterWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/FitParameterWidget.h
+//! @file      GUI/coregui/Views/FitWidgets/FitParameterWidget.h
 //! @brief     Declares class FitParameterWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/FitResultsWidget.cpp b/GUI/coregui/Views/FitWidgets/FitResultsWidget.cpp
index 21adcb57717..5b1142debf0 100644
--- a/GUI/coregui/Views/FitWidgets/FitResultsWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitResultsWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/FitResultsWidget.cpp
+//! @file      GUI/coregui/Views/FitWidgets/FitResultsWidget.cpp
 //! @brief     Implements class FitResultsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/FitResultsWidget.h b/GUI/coregui/Views/FitWidgets/FitResultsWidget.h
index 8fb2d644672..dd4d3f93d7a 100644
--- a/GUI/coregui/Views/FitWidgets/FitResultsWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitResultsWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/FitResultsWidget.h
+//! @file      GUI/coregui/Views/FitWidgets/FitResultsWidget.h
 //! @brief     Declares class FitResultsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
index a9dc7e08bbe..e3673be6ebc 100644
--- a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/FitSuiteWidget.cpp
+//! @file      GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
 //! @brief     Implements class FitSuiteWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.h b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.h
index 90a85035ca6..280fc7af0a6 100644
--- a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/FitSuiteWidget.h
+//! @file      GUI/coregui/Views/FitWidgets/FitSuiteWidget.h
 //! @brief     Declares class FitSuiteWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/FittingWorker.cpp b/GUI/coregui/Views/FitWidgets/FittingWorker.cpp
index 0da53a4cf46..142b6514d36 100644
--- a/GUI/coregui/Views/FitWidgets/FittingWorker.cpp
+++ b/GUI/coregui/Views/FitWidgets/FittingWorker.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/FittingWorker.cpp
+//! @file      GUI/coregui/Views/FitWidgets/FittingWorker.cpp
 //! @brief     Implements class FittingWorker
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/FittingWorker.h b/GUI/coregui/Views/FitWidgets/FittingWorker.h
index c96bda1dd4f..a616f0b55cc 100644
--- a/GUI/coregui/Views/FitWidgets/FittingWorker.h
+++ b/GUI/coregui/Views/FitWidgets/FittingWorker.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/FittingWorker.h
+//! @file      GUI/coregui/Views/FitWidgets/FittingWorker.h
 //! @brief     Implements class FittingWorker
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
index 079023ac765..86dd4a8f7c7 100644
--- a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
+++ b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/GUIFitObserver.h
+//! @file      GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
 //! @brief     Implements class GUIFitObserver
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/GUIFitObserver.h b/GUI/coregui/Views/FitWidgets/GUIFitObserver.h
index cc0be307ca5..7f976f23e48 100644
--- a/GUI/coregui/Views/FitWidgets/GUIFitObserver.h
+++ b/GUI/coregui/Views/FitWidgets/GUIFitObserver.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/GUIFitObserver.h
+//! @file      GUI/coregui/Views/FitWidgets/GUIFitObserver.h
 //! @brief     Implements class GUIFitObserver
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
index 11a787d9a79..d5873e71e8f 100644
--- a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
+//! @file      GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
 //! @brief     Implements class MinimizerSettingsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
index 50110733462..7d4642492a5 100644
--- a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
+++ b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/MinimizerSettingsWidget.h
+//! @file      GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
 //! @brief     Declares class MinimizerSettingsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteFitParameterWidget.cpp b/GUI/coregui/Views/FitWidgets/ObsoleteFitParameterWidget.cpp
index 315066c7061..d1bab14f2eb 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteFitParameterWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteFitParameterWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/ObsoleteFitParameterWidget.cpp
+//! @file      GUI/coregui/Views/FitWidgets/ObsoleteFitParameterWidget.cpp
 //! @brief     Implements class ObsoleteFitParameterWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteFitParameterWidget.h b/GUI/coregui/Views/FitWidgets/ObsoleteFitParameterWidget.h
index b11b7d8b9dd..642b5b46fb8 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteFitParameterWidget.h
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteFitParameterWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/ObsoleteFitParameterWidget.h
+//! @file      GUI/coregui/Views/FitWidgets/ObsoleteFitParameterWidget.h
 //! @brief     Declares class ObsoleteFitParameterWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteFitProgressWidget.cpp b/GUI/coregui/Views/FitWidgets/ObsoleteFitProgressWidget.cpp
index 006215f32e6..94fc2f05a81 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteFitProgressWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteFitProgressWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/ObsoleteFitProgressWidget.h
+//! @file      GUI/coregui/Views/FitWidgets/ObsoleteFitProgressWidget.cpp
 //! @brief     Defines class ObsoleteFitProgressWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteFitProgressWidget.h b/GUI/coregui/Views/FitWidgets/ObsoleteFitProgressWidget.h
index 782880e36e6..b3b2fa4e1a4 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteFitProgressWidget.h
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteFitProgressWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/ObsoleteFitProgressWidget.h
+//! @file      GUI/coregui/Views/FitWidgets/ObsoleteFitProgressWidget.h
 //! @brief     Declares class ObsoleteFitProgressWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.cpp b/GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.cpp
index f95abde2b4d..f6d41b515a7 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.h
+//! @file      GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.cpp
 //! @brief     Defines class ObsoleteFitSettingsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.h b/GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.h
index 0ccf1496af2..562e5fe038e 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.h
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.h
+//! @file      GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.h
 //! @brief     Declares class ObsoleteFitSettingsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteFitTools.cpp b/GUI/coregui/Views/FitWidgets/ObsoleteFitTools.cpp
index f7db89cd7f7..c9790fbbf03 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteFitTools.cpp
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteFitTools.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/ModelTuningWidget.cpp
+//! @file      GUI/coregui/Views/FitWidgets/ObsoleteFitTools.cpp
 //! @brief     Implements class ModelTuningWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteFitTools.h b/GUI/coregui/Views/FitWidgets/ObsoleteFitTools.h
index d537d5403e1..8d92605f1b7 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteFitTools.h
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteFitTools.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/ObsoleteFitTools.h
+//! @file      GUI/coregui/Views/FitWidgets/ObsoleteFitTools.h
 //! @brief     Declares class ObsoleteFitTools
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteImportDataWidget.cpp b/GUI/coregui/Views/FitWidgets/ObsoleteImportDataWidget.cpp
index b7395851ff1..0f54bc6cdfd 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteImportDataWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteImportDataWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/ObsoleteImportDataWidget.cpp
+//! @file      GUI/coregui/Views/FitWidgets/ObsoleteImportDataWidget.cpp
 //! @brief     Implements class ObsoleteImportDataWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteImportDataWidget.h b/GUI/coregui/Views/FitWidgets/ObsoleteImportDataWidget.h
index 6d3a4036a16..36fa679223b 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteImportDataWidget.h
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteImportDataWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/ObsoleteImportDataWidget.h
+//! @file      GUI/coregui/Views/FitWidgets/ObsoleteImportDataWidget.h
 //! @brief     Declares class ObsoleteImportDataWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.cpp b/GUI/coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.cpp
index 1b88921036d..3599bf1cb95 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.cpp
+//! @file      GUI/coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.cpp
 //! @brief     Implements class ObsoleteMinimizerSettingsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.h b/GUI/coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.h
index 0f6466146b9..1232b544a40 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.h
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.h
+//! @file      GUI/coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.h
 //! @brief     Declares class ObsoleteMinimizerSettingsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteRealDataWindow.cpp b/GUI/coregui/Views/FitWidgets/ObsoleteRealDataWindow.cpp
index e7aff880cbf..6b27bff422c 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteRealDataWindow.cpp
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteRealDataWindow.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/ObsoleteRealDataWindow.cpp
+//! @file      GUI/coregui/Views/FitWidgets/ObsoleteRealDataWindow.cpp
 //! @brief     Implements class ObsoleteRealDataWindow
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteRealDataWindow.h b/GUI/coregui/Views/FitWidgets/ObsoleteRealDataWindow.h
index 9c7006d6679..72d2bee2b20 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteRealDataWindow.h
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteRealDataWindow.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/ObsoleteRealDataWindow.h
+//! @file      GUI/coregui/Views/FitWidgets/ObsoleteRealDataWindow.h
 //! @brief     Declares class ObsoleteRealDataWindow
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.cpp b/GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.cpp
index a6217c87c67..eafb398c131 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/ObsoleteRunFitWidget.cpp
+//! @file      GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.cpp
 //! @brief     Implements class ObsoleteRunFitWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.h b/GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.h
index 7a1358e4f10..338a5294fd8 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.h
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/ObsoleteRunFitWidget.h
+//! @file      GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.h
 //! @brief     Declares class ObsoleteRunFitWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
index dc5d02fb9e9..8fa1cc27259 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/RunFitControlWidget.cpp
+//! @file      GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
 //! @brief     Implements class RunFitControlWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h
index 8710349f64d..0733b3c889a 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h
+++ b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/RunFitControlWidget.h
+//! @file      GUI/coregui/Views/FitWidgets/RunFitControlWidget.h
 //! @brief     Declares class RunFitControlWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/RunFitManager.cpp b/GUI/coregui/Views/FitWidgets/RunFitManager.cpp
index 341e7e4b12b..e568eff6096 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitManager.cpp
+++ b/GUI/coregui/Views/FitWidgets/RunFitManager.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/RunFitManager.cpp
+//! @file      GUI/coregui/Views/FitWidgets/RunFitManager.cpp
 //! @brief     Implements class RunFitManager
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/RunFitManager.h b/GUI/coregui/Views/FitWidgets/RunFitManager.h
index 23be3005607..0d65503d50e 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitManager.h
+++ b/GUI/coregui/Views/FitWidgets/RunFitManager.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/RunFitManager.h
+//! @file      GUI/coregui/Views/FitWidgets/RunFitManager.h
 //! @brief     Implements class RunFitManager
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp b/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp
index affed6ff80d..03881691647 100644
--- a/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp
+++ b/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/TestFitWidgets.cpp
+//! @file      GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp
 //! @brief     Implements class TestFitWidgets
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/FitWidgets/TestFitWidgets.h b/GUI/coregui/Views/FitWidgets/TestFitWidgets.h
index 5afd670ba4b..f4a5087533f 100644
--- a/GUI/coregui/Views/FitWidgets/TestFitWidgets.h
+++ b/GUI/coregui/Views/FitWidgets/TestFitWidgets.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/FitWidgets/TestFitWidgets.h
+//! @file      GUI/coregui/Views/FitWidgets/TestFitWidgets.h
 //! @brief     Declares class TestFitWidgets
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/ImportDataView.cpp b/GUI/coregui/Views/ImportDataView.cpp
index d8fb14c2ef4..eec8b497992 100644
--- a/GUI/coregui/Views/ImportDataView.cpp
+++ b/GUI/coregui/Views/ImportDataView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/ImportDataView.cpp
+//! @file      GUI/coregui/Views/ImportDataView.cpp
 //! @brief     Implements class ImportDataView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/ImportDataView.h b/GUI/coregui/Views/ImportDataView.h
index 69bcfe202b9..8eaa10c3ead 100644
--- a/GUI/coregui/Views/ImportDataView.h
+++ b/GUI/coregui/Views/ImportDataView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/ImportDataView.h
+//! @file      GUI/coregui/Views/ImportDataView.h
 //! @brief     Declares class ImportDataView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
index 383e754e651..c745c5bf1c5 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
+//! @file      GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
 //! @brief     Implements class ImportDataAssistant
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.h b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.h
index 723ff3b1fe5..fd06db4fdae 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.h
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/ImportDataWidgets/ImportDataAssistant.h
+//! @file      GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.h
 //! @brief     Declares class ImportDataAssistant
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp b/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
index fc21a131a5c..e254f1ce617 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
+//! @file      GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
 //! @brief     Implements class ImportDataToolBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.h b/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.h
index 59e37168e84..3f679f75313 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.h
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/ImportDataWidgets/ImportDataToolBar.h
+//! @file      GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.h
 //! @brief     Declares class ImportDataToolBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp
index 822572ada7b..44eea9cd948 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp
+//! @file      GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp
 //! @brief     Declares class RealDataEditorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.h b/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.h
index 810d5f01dfa..36aea27dca5 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/ImportDataWidgets/RealDataEditorWidget.h
+//! @file      GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.h
 //! @brief     Declares class RealDataEditorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index a8ece8cfc77..156b482cdf7 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+//! @file      GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
 //! @brief     Implements class RealDataSelectorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
index c4994268e31..5da964bf627 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
+//! @file      GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
 //! @brief     Declares class RealDataSelectorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp b/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
index 77925f82740..4d3af5f873e 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/DistributionDialog.cpp
+//! @file      GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
 //! @brief     Implements class DistributionDialog
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionDialog.h b/GUI/coregui/Views/InfoWidgets/DistributionDialog.h
index 1650bbd73dc..e60acf43c42 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionDialog.h
+++ b/GUI/coregui/Views/InfoWidgets/DistributionDialog.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/DistributionDialog.h
+//! @file      GUI/coregui/Views/InfoWidgets/DistributionDialog.h
 //! @brief     Declares class DistributionDialog
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp b/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
index 98c9a6ba68c..21f106ce6f4 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/DistributionEditor.cpp
+//! @file      GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
 //! @brief     Implements class DistributionEditor
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionEditor.h b/GUI/coregui/Views/InfoWidgets/DistributionEditor.h
index 506863eb24f..2f1503e937f 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionEditor.h
+++ b/GUI/coregui/Views/InfoWidgets/DistributionEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/DistributionEditor.h
+//! @file      GUI/coregui/Views/InfoWidgets/DistributionEditor.h
 //! @brief     Declares class DistributionEditor
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp b/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
index 8a3b13f4de1..2b2bc669fd3 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/DistributionWidget.cpp
+//! @file      GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
 //! @brief     Implements class DistributionWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionWidget.h b/GUI/coregui/Views/InfoWidgets/DistributionWidget.h
index 4dd866e766c..8850d41a62c 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/DistributionWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/DistributionWidget.h
+//! @file      GUI/coregui/Views/InfoWidgets/DistributionWidget.h
 //! @brief     Declares class DistributionWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp b/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
index dd0f947bc2b..2d8f537adc3 100644
--- a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
+++ b/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/GroupInfoBox.cpp
+//! @file      GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
 //! @brief     Implements class GroupInfoBox
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.h b/GUI/coregui/Views/InfoWidgets/GroupInfoBox.h
index ad0287a82fa..9e39072779c 100644
--- a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.h
+++ b/GUI/coregui/Views/InfoWidgets/GroupInfoBox.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/GroupInfoBox.h
+//! @file      GUI/coregui/Views/InfoWidgets/GroupInfoBox.h
 //! @brief     Declares class GroupInfoBox
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/InfoToolBar.cpp b/GUI/coregui/Views/InfoWidgets/InfoToolBar.cpp
index 0f16f70f615..bd462174d1e 100644
--- a/GUI/coregui/Views/InfoWidgets/InfoToolBar.cpp
+++ b/GUI/coregui/Views/InfoWidgets/InfoToolBar.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/InfoToolBar.cpp
+//! @file      GUI/coregui/Views/InfoWidgets/InfoToolBar.cpp
 //! @brief     Implements class InfoToolBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/InfoToolBar.h b/GUI/coregui/Views/InfoWidgets/InfoToolBar.h
index f2be905c8ab..b30f10977c0 100644
--- a/GUI/coregui/Views/InfoWidgets/InfoToolBar.h
+++ b/GUI/coregui/Views/InfoWidgets/InfoToolBar.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/InfoToolBar.h
+//! @file      GUI/coregui/Views/InfoWidgets/InfoToolBar.h
 //! @brief     Declares class InfoToolBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp b/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
index 56032303ac5..02e855c17a8 100644
--- a/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/InfoWidget.cpp
+//! @file      GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
 //! @brief     Implements class InfoWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/InfoWidget.h b/GUI/coregui/Views/InfoWidgets/InfoWidget.h
index 08a660716e2..204f21e354e 100644
--- a/GUI/coregui/Views/InfoWidgets/InfoWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/InfoWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/InfoWidget.h
+//! @file      GUI/coregui/Views/InfoWidgets/InfoWidget.h
 //! @brief     Declares class InfoWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
index 5840ca7f7b9..b30c1f9eb28 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/OverlayLabelController.cpp
+//! @file      GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
 //! @brief     Implements class OverlayLabelController
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h
index 45676a0eac2..d32f1ab9ced 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/OverlayLabelController.h
+//! @file      GUI/coregui/Views/InfoWidgets/OverlayLabelController.h
 //! @brief     Declares class OverlayLabelController
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp b/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp
index 6b32ec893f5..369460fe029 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/OverlayLabelWidget.cpp
+//! @file      GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp
 //! @brief     Implements class OverlayLabelWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h b/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h
index 11dc7169fae..f36d7904fbd 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/OverlayLabelWidget.h
+//! @file      GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h
 //! @brief     Declares class OverlayLabelWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
index c9d645e1176..fb1ba62d492 100644
--- a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
+++ b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
+//! @file      GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
 //! @brief     Implements class ProjectLoadWarningDialog
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h
index 9fb32b64ce0..976bad0c824 100644
--- a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h
+++ b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h
+//! @file      GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h
 //! @brief     Declares class ProjectLoadWarningDialog
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp b/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
index 6f8e4c29a9f..c86c1d4974a 100644
--- a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/PySampleWidget.cpp
+//! @file      GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
 //! @brief     Implements class PySampleWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/PySampleWidget.h b/GUI/coregui/Views/InfoWidgets/PySampleWidget.h
index 9b418e0c052..07d2d4617dd 100644
--- a/GUI/coregui/Views/InfoWidgets/PySampleWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/PySampleWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/PySampleWidget.h
+//! @file      GUI/coregui/Views/InfoWidgets/PySampleWidget.h
 //! @brief     Declares class PySampleWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.cpp b/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
index b7abc9532f5..842238777bc 100644
--- a/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
+++ b/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
+//! @file      GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
 //! @brief     Defines class PythonSyntaxHighlighter
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h b/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h
index 493ce204aec..428c97d178f 100644
--- a/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h
+++ b/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h
+//! @file      GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h
 //! @brief     Declares class PythonSyntaxHighlighter
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/WarningSignWidget.cpp b/GUI/coregui/Views/InfoWidgets/WarningSignWidget.cpp
index 80e4ed82afb..456fd4bdcaa 100644
--- a/GUI/coregui/Views/InfoWidgets/WarningSignWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/WarningSignWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/WarningSignWidget.cpp
+//! @file      GUI/coregui/Views/InfoWidgets/WarningSignWidget.cpp
 //! @brief     Implements class WarningSignWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h b/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h
index d4dfe584596..fd081c1744e 100644
--- a/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/WarningSignWidget.h
+//! @file      GUI/coregui/Views/InfoWidgets/WarningSignWidget.h
 //! @brief     Declares class WarningSignWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentView.cpp b/GUI/coregui/Views/InstrumentView.cpp
index 13ecab73121..d84c32cfef1 100644
--- a/GUI/coregui/Views/InstrumentView.cpp
+++ b/GUI/coregui/Views/InstrumentView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentView.cpp
+//! @file      GUI/coregui/Views/InstrumentView.cpp
 //! @brief     Implements class InstrumentView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentView.h b/GUI/coregui/Views/InstrumentView.h
index 66afd38b4e6..cd2e05e71aa 100644
--- a/GUI/coregui/Views/InstrumentView.h
+++ b/GUI/coregui/Views/InstrumentView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentView.h
+//! @file      GUI/coregui/Views/InstrumentView.h
 //! @brief     Declares class InstrumentView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
index 4fca8aae557..f0bf85253c5 100644
--- a/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
+//! @file      GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
 //! @brief     Implements class BeamEditorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.h b/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.h
index b20e46c12ac..e9e46328d98 100644
--- a/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/BeamEditorWidget.h
+//! @file      GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.h
 //! @brief     Declares class BeamEditorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp
index 1b1565e4c69..ab507eda82e 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/ComboWidget.cpp
+//! @file      GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp
 //! @brief     Implements class ComboWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/ComboWidget.h b/GUI/coregui/Views/InstrumentWidgets/ComboWidget.h
index e80276d174c..27ef5a1ca90 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ComboWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/ComboWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/ComboWidget.h
+//! @file      GUI/coregui/Views/InstrumentWidgets/ComboWidget.h
 //! @brief     Declares class ComboWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp b/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp
index 2ec20ef421d..40bb0068fa4 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/ComponentInfoBox.h
+//! @file      GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp
 //! @brief     Implements class ComponentInfoBox
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.h b/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.h
index f20b73faa72..da60340906c 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.h
+++ b/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/ComponentInfoBox.h
+//! @file      GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.h
 //! @brief     Declares class ComponentInfoBox
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
index 0c78091d2b3..9f59f7a0a1d 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
+//! @file      GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
 //! @brief     Implements class DetectorEditorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h
index a76fe07b75c..e00cef8b846 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/DetectorEditorWidget.h
+//! @file      GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h
 //! @brief     Declares class DetectorEditorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
index 4438ccddc26..8a4521196c3 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
+//! @file      GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
 //! @brief     Implements class DetectorMaskDelegate
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
index d6566235633..5a79082efc6 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
+//! @file      GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
 //! @brief     Declares class DetectorMaskDelegate
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
index e180153f790..d2ff92e28a5 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/ExtendedDetectorDialog.cpp
+//! @file      GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
 //! @brief     Implements class DistributionDialog
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h
index f61708a03cb..91f97a6bff6 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h
+++ b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/ExtendedDetectorDialog.h
+//! @file      GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h
 //! @brief     Declares class DistributionDialog
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
index 161e05522b5..0cb7380a4a0 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
+//! @file      GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
 //! @brief     Implements class InstrumentComponentsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h
index b961bd89884..f91e81c9d00 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h
+//! @file      GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h
 //! @brief     Declares class InstrumentComponentsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
index 13ad4a13326..c09ee354c5e 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
+//! @file      GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
 //! @brief     Implements class InstrumentEditorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
index 65e3863a343..d4c3e514aee 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
+//! @file      GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
 //! @brief     Declares class InstrumentEditorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
index 9f5f5c0ec73..e5b56ebbce3 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
+//! @file      GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
 //! @brief     Implements class InstrumentSelectorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h
index 23640955319..6709caf160c 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h
+//! @file      GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h
 //! @brief     Declares class InstrumentSelectorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
index 82e1663758e..d254bc25802 100644
--- a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
+//! @file      GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
 //! @brief     Implements class RectangularDetectorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.h b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.h
index 5268cda7a45..d53ba99de68 100644
--- a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/RectangularDetectorWidget.h
+//! @file      GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.h
 //! @brief     Declares class RectangularDetectorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
index 7c440891d6d..2ca7aaa20d3 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
+//! @file      GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
 //! @brief     Implements class SphericalDetectorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h
index 15682f0fa42..cc4309f7e45 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h
+//! @file      GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h
 //! @brief     Declares class SphericalDetectorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp b/GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp
index 06e5d0bcf2e..0d13340053e 100644
--- a/GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/ColumnResizer.cpp
+//! @file      GUI/coregui/Views/InstrumentWidgets/columnresizer.cpp
 //! @brief     Implements class ColumnResizer
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/InstrumentWidgets/columnresizer.h b/GUI/coregui/Views/InstrumentWidgets/columnresizer.h
index 52f20776872..0340fead2ab 100644
--- a/GUI/coregui/Views/InstrumentWidgets/columnresizer.h
+++ b/GUI/coregui/Views/InstrumentWidgets/columnresizer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InstrumentWidgets/ColumnResizer.h
+//! @file      GUI/coregui/Views/InstrumentWidgets/columnresizer.h
 //! @brief     Declares class ColumnResizer
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
index bb65c652877..dbc7f0a28c7 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
+//! @file      GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
 //! @brief     Implements class ColorMapPlot
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.h
index 83bb2c2bbe9..f0ee2f586e9 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/IntensityDataWidgets/ColorMapPlot.h
+//! @file      GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.h
 //! @brief     Declares class ColorMapPlot
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp
index 24ab840cdf4..3bef94cb09d 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp
+//! @file      GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp
 //! @brief     Implements class HorizontalSlicePlot
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.h b/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.h
index dfab4e34f1c..915c1555966 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.h
+//! @file      GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.h
 //! @brief     Declares class HorizontalSlicePlot
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPlotWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPlotWidget.cpp
index 91a91388d3f..bfe9634e64b 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPlotWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPlotWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/IntensityDataWidgets/IntensityDataPlotWidget.cpp
+//! @file      GUI/coregui/Views/IntensityDataWidgets/IntensityDataPlotWidget.cpp
 //! @brief     Implements class IntensityDataPlotWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPlotWidget.h b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPlotWidget.h
index 042018d8e2d..c97c091039f 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPlotWidget.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPlotWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/IntensityDataWidgets/IntensityDataPlotWidget.h
+//! @file      GUI/coregui/Views/IntensityDataWidgets/IntensityDataPlotWidget.h
 //! @brief     Declares class IntensityDataPlotWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
index ce590679513..c5b8c570680 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
+//! @file      GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
 //! @brief     Implements class IntensityDataPropertyWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
index 92035dfd82f..5f8a3038d63 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
+//! @file      GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
 //! @brief     Declares class IntensityDataPropertyWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
index 2887cf63fea..814c2dcc41e 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
+//! @file      GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
 //! @brief     Implements class IntensityDataWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
index abe43abaec2..cfccbdf23e3 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
+//! @file      GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
 //! @brief     Declares class IntensityDataWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
index 3d40f09af57..decd5ed9c3a 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
+//! @file      GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
 //! @brief     Implements class SavePlotAssistant
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
index 531f05855b4..d5b4ff532de 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
+//! @file      GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
 //! @brief     Declares class SavePlotAssistant
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp
index 2b6d8431972..66504d4d3d0 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp
+//! @file      GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp
 //! @brief     Implements class VerticalSlicePlot
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.h b/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.h
index 345ff481c6a..a102ea8657e 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/IntensityDataWidgets/VerticalSlicePlot.h
+//! @file      GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.h
 //! @brief     Declares class VerticalSlicePlot
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobView.cpp b/GUI/coregui/Views/JobView.cpp
index dc5621288ad..001c57b8f3f 100644
--- a/GUI/coregui/Views/JobView.cpp
+++ b/GUI/coregui/Views/JobView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobView.cpp
+//! @file      GUI/coregui/Views/JobView.cpp
 //! @brief     Implements class JobView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobView.h b/GUI/coregui/Views/JobView.h
index ee4c1259a67..0a1ad14ca79 100644
--- a/GUI/coregui/Views/JobView.h
+++ b/GUI/coregui/Views/JobView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobView.h
+//! @file      GUI/coregui/Views/JobView.h
 //! @brief     Declares class JobView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp b/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp
index 90913b4eb39..4185cf4fb2e 100644
--- a/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobActivityStatusBar.cpp
+//! @file      GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp
 //! @brief     Implements class JobActivityStatusBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.h b/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.h
index 4a990ef70d7..ae683c17a8b 100644
--- a/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.h
+++ b/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobActivityStatusBar.h
+//! @file      GUI/coregui/Views/JobWidgets/JobActivityStatusBar.h
 //! @brief     Declares class JobActivityStatusBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
index 830620a1d47..7af08470ada 100644
--- a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobListViewDelegate.cpp
+//! @file      GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
 //! @brief     Implements class JobListViewDelegate
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h
index 0b4dc201ce7..3b45042b9b6 100644
--- a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h
+++ b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobListViewDelegate.h
+//! @file      GUI/coregui/Views/JobWidgets/JobListViewDelegate.h
 //! @brief     Declares class JobListViewDelegate
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobListWidget.cpp b/GUI/coregui/Views/JobWidgets/JobListWidget.cpp
index 3f9aec2d155..e8e32b7996e 100644
--- a/GUI/coregui/Views/JobWidgets/JobListWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobListWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobListWidget.cpp
+//! @file      GUI/coregui/Views/JobWidgets/JobListWidget.cpp
 //! @brief     Implements class JobListWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobListWidget.h b/GUI/coregui/Views/JobWidgets/JobListWidget.h
index 54d79bdd512..90759be9def 100644
--- a/GUI/coregui/Views/JobWidgets/JobListWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobListWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobListWidget.h
+//! @file      GUI/coregui/Views/JobWidgets/JobListWidget.h
 //! @brief     Declares class JobListWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp b/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp
index 87a42e3b572..a3643b61fec 100644
--- a/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobMessagePanel.cpp
+//! @file      GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp
 //! @brief     Implements class JobMessagePanel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobMessagePanel.h b/GUI/coregui/Views/JobWidgets/JobMessagePanel.h
index 19bb5f584b5..dc8e3f4d324 100644
--- a/GUI/coregui/Views/JobWidgets/JobMessagePanel.h
+++ b/GUI/coregui/Views/JobWidgets/JobMessagePanel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobMessagePanel.h
+//! @file      GUI/coregui/Views/JobWidgets/JobMessagePanel.h
 //! @brief     Declares class JobMessagePanel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobOutputDataToolBar.cpp b/GUI/coregui/Views/JobWidgets/JobOutputDataToolBar.cpp
index 8901486997e..3df08325ee3 100644
--- a/GUI/coregui/Views/JobWidgets/JobOutputDataToolBar.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobOutputDataToolBar.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobOutputDataToolBar.cpp
+//! @file      GUI/coregui/Views/JobWidgets/JobOutputDataToolBar.cpp
 //! @brief     Implements class JobOutputDataToolBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobOutputDataToolBar.h b/GUI/coregui/Views/JobWidgets/JobOutputDataToolBar.h
index ba1c1aac697..add52a51df5 100644
--- a/GUI/coregui/Views/JobWidgets/JobOutputDataToolBar.h
+++ b/GUI/coregui/Views/JobWidgets/JobOutputDataToolBar.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobOutputDataToolBar.h
+//! @file      GUI/coregui/Views/JobWidgets/JobOutputDataToolBar.h
 //! @brief     Declares class JobOutputDataToolBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
index 49bc2799678..07bf381facf 100644
--- a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobOutputDataWidget.cpp
+//! @file      GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
 //! @brief     Implements class JobOutputDataWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h
index c3d0c80e5ab..ea19ca6434e 100644
--- a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobOutputDataWidget.h
+//! @file      GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h
 //! @brief     Declares class JobOutputDataWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobProgressAssistant.cpp b/GUI/coregui/Views/JobWidgets/JobProgressAssistant.cpp
index c8611031194..9480dfdae87 100644
--- a/GUI/coregui/Views/JobWidgets/JobProgressAssistant.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobProgressAssistant.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobProgressAssistant.cpp
+//! @file      GUI/coregui/Views/JobWidgets/JobProgressAssistant.cpp
 //! @brief     Implements class JobProgressAssistant
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h b/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h
index 9919bbd7825..af2670b0f3a 100644
--- a/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h
+++ b/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobProgressAssistant.h
+//! @file      GUI/coregui/Views/JobWidgets/JobProgressAssistant.h
 //! @brief     Declares class JobProgressAssistant
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
index 0779abdba1d..51d3b590cf3 100644
--- a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobPropertiesWidget.cpp
+//! @file      GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
 //! @brief     Implements class JobPropertiesWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h
index 558e47bae09..6c6d606a603 100644
--- a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobPropertiesWidget.h
+//! @file      GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h
 //! @brief     Declares class JobPropertiesWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp b/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp
index 4f864e376b6..ed77a03224a 100644
--- a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobRealTimeToolBar.cpp
+//! @file      GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp
 //! @brief     Implements class JobRealTimeToolBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h b/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h
index b9f607dc945..45b4d86fa36 100644
--- a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h
+++ b/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobRealTimeToolBar.h
+//! @file      GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h
 //! @brief     Declares class JobRealTimeToolBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp b/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp
index 05dcbf8adfa..544873c0592 100644
--- a/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobRealTimeWidget.cpp
+//! @file      GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp
 //! @brief     Implements class JobRealTimeWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h b/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h
index 19d285c23ae..f488c5dec90 100644
--- a/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobRealTimeWidget.h
+//! @file      GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h
 //! @brief     Declares class JobRealTimeWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp b/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
index 3f29eab16eb..7959a2f12ae 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobSelectorActions.cpp
+//! @file      GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
 //! @brief     Implements class JobSelectorActions
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorActions.h b/GUI/coregui/Views/JobWidgets/JobSelectorActions.h
index 40137a52d1e..f3152f608dc 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorActions.h
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorActions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobSelectorActions.h
+//! @file      GUI/coregui/Views/JobWidgets/JobSelectorActions.h
 //! @brief     Declares class JobSelectorActions
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
index 63f84d365b5..c87c6055fb8 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobSelectorWidget.cpp
+//! @file      GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
 //! @brief     Implements class JobSelectorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h
index 33181437b3b..f2b3dce2c95 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobSelectorWidget.h
+//! @file      GUI/coregui/Views/JobWidgets/JobSelectorWidget.h
 //! @brief     Declares class JobSelectorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp b/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp
index dd60139ab56..a75e39f5707 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobViewActivities.cpp
+//! @file      GUI/coregui/Views/JobWidgets/JobViewActivities.cpp
 //! @brief     Implements class JobViewActivities
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobViewActivities.h b/GUI/coregui/Views/JobWidgets/JobViewActivities.h
index 757615220aa..6f2ddacfba5 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewActivities.h
+++ b/GUI/coregui/Views/JobWidgets/JobViewActivities.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobViewActivities.h
+//! @file      GUI/coregui/Views/JobWidgets/JobViewActivities.h
 //! @brief     Declares class JobViewActivities
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp b/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
index 33f596fc3ce..0a667ed5aa2 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobViewDocks.cpp
+//! @file      GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
 //! @brief     Implements class JobViewDocks
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobViewDocks.h b/GUI/coregui/Views/JobWidgets/JobViewDocks.h
index e540e81135e..c73a35201ff 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewDocks.h
+++ b/GUI/coregui/Views/JobWidgets/JobViewDocks.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobViewDocks.h
+//! @file      GUI/coregui/Views/JobWidgets/JobViewDocks.h
 //! @brief     Declares class JobViewDocks
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/JobViewFlags.h b/GUI/coregui/Views/JobWidgets/JobViewFlags.h
index 9eded6eb4ad..8c824f94c04 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewFlags.h
+++ b/GUI/coregui/Views/JobWidgets/JobViewFlags.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/JobViewFlags.h
+//! @file      GUI/coregui/Views/JobWidgets/JobViewFlags.h
 //! @brief     Declares class JobViewFlags
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
index d1b74e1a6a0..b5dd04a5b85 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
+//! @file      GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
 //! @brief     Implements class ParameterTuningDelegate
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h
index 2b5ad75c064..77c653ef21f 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/ParameterTuningDelegate.h
+//! @file      GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h
 //! @brief     Declares class ParameterTuningDelegate
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
index 6e96a77a478..a30ab0700ce 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/ParameterTuningWidget.cpp
+//! @file      GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
 //! @brief     Implements class ParameterTuningWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h
index 55878b5e635..1c82af55be9 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/ParameterTuningWidget.h
+//! @file      GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h
 //! @brief     Declares class ParameterTuningWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp b/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp
index 64beee71242..7714704b841 100644
--- a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/SliderSettingsWidget.cpp
+//! @file      GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp
 //! @brief     Implements class SliderSettingsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h b/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h
index 183fd025a08..252d8d189e1 100644
--- a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h
+++ b/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/JobWidgets/SliderSettingsWidget.h
+//! @file      GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h
 //! @brief     Declares class SliderSettingsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
index 343ca17c36a..5ca4cb2da9a 100644
--- a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
+++ b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
 //! @brief     Implements class ColorMapSceneAdaptor
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h
index 28ad7e82cd2..695f159979f 100644
--- a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h
+++ b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h
+//! @file      GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h
 //! @brief     Declares class ColorMapSceneAdaptor
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/EllipseView.cpp b/GUI/coregui/Views/MaskWidgets/EllipseView.cpp
index 84108876b83..d7f7ebdb344 100644
--- a/GUI/coregui/Views/MaskWidgets/EllipseView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/EllipseView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/EllipseView.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/EllipseView.cpp
 //! @brief     Implements EllipseView class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/EllipseView.h b/GUI/coregui/Views/MaskWidgets/EllipseView.h
index 94f3e3bc598..10dfbf5d228 100644
--- a/GUI/coregui/Views/MaskWidgets/EllipseView.h
+++ b/GUI/coregui/Views/MaskWidgets/EllipseView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/EllipseView.h
+//! @file      GUI/coregui/Views/MaskWidgets/EllipseView.h
 //! @brief     Declares EllipseView class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/IMaskView.cpp b/GUI/coregui/Views/MaskWidgets/IMaskView.cpp
index 0497a08aa7f..2f205828467 100644
--- a/GUI/coregui/Views/MaskWidgets/IMaskView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/IMaskView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/IMaskView.h
+//! @file      GUI/coregui/Views/MaskWidgets/IMaskView.cpp
 //! @brief     Implements interface class IMaskView for all masks on graphics scene
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/IMaskView.h b/GUI/coregui/Views/MaskWidgets/IMaskView.h
index ac96da857e8..47f7595f9f8 100644
--- a/GUI/coregui/Views/MaskWidgets/IMaskView.h
+++ b/GUI/coregui/Views/MaskWidgets/IMaskView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/IMaskView.h
+//! @file      GUI/coregui/Views/MaskWidgets/IMaskView.h
 //! @brief     Declares interface class IMaskView for all masks on graphics scene
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h b/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h
index 8e6de5ce93a..49660291331 100644
--- a/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h
+++ b/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/ISceneAdaptor.h
+//! @file      GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h
 //! @brief     Declares interface class ISceneAdaptor
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp b/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
index f04faa359ac..4e61e2a0a48 100644
--- a/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/IntensityDataView.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
 //! @brief     Implements IntensityDataView class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/IntensityDataView.h b/GUI/coregui/Views/MaskWidgets/IntensityDataView.h
index 39d2d5a1fe3..ac01d7eb2ea 100644
--- a/GUI/coregui/Views/MaskWidgets/IntensityDataView.h
+++ b/GUI/coregui/Views/MaskWidgets/IntensityDataView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/IntensityDataView.h
+//! @file      GUI/coregui/Views/MaskWidgets/IntensityDataView.h
 //! @brief     Declares IntensityDataView class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/LineViews.cpp b/GUI/coregui/Views/MaskWidgets/LineViews.cpp
index e040766b3cb..1cfaad5abff 100644
--- a/GUI/coregui/Views/MaskWidgets/LineViews.cpp
+++ b/GUI/coregui/Views/MaskWidgets/LineViews.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/LineViews.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/LineViews.cpp
 //! @brief     Implements classes VerticalLineView and HorizontalLineView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/LineViews.h b/GUI/coregui/Views/MaskWidgets/LineViews.h
index 5eb455d807e..1b95ff70b61 100644
--- a/GUI/coregui/Views/MaskWidgets/LineViews.h
+++ b/GUI/coregui/Views/MaskWidgets/LineViews.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/LineViews.h
+//! @file      GUI/coregui/Views/MaskWidgets/LineViews.h
 //! @brief     Declares classes VerticalLineView and HorizontalLineView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp b/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
index 623f7acf6c2..a3307ce4546 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskAllView.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
 //! @brief     Implements MaskAllView class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskAllView.h b/GUI/coregui/Views/MaskWidgets/MaskAllView.h
index ba1f934791f..52f5355ca35 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskAllView.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskAllView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskAllView.h
+//! @file      GUI/coregui/Views/MaskWidgets/MaskAllView.h
 //! @brief     Declares MaskAllView class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp b/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
index 9a20b17f367..38a7b58bf5a 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskContainerView.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
 //! @brief     Implements MaskContainerView class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskContainerView.h b/GUI/coregui/Views/MaskWidgets/MaskContainerView.h
index 32bfd7a453d..2e66c6408ab 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskContainerView.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskContainerView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskContainerView.h
+//! @file      GUI/coregui/Views/MaskWidgets/MaskContainerView.h
 //! @brief     Declares MaskContainerView class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
index 9d1773dafff..8a0d49848e2 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskDrawingContext.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
 //! @brief     Implements class MaskDrawingContext
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h
index 889bec28e1d..ad66e8c2d12 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskDrawingContext.h
+//! @file      GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h
 //! @brief     Declares class MaskDrawingContext
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
index da24d36253e..a4c054ba1af 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskEditor.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
 //! @brief     Implements class MaskEditor
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditor.h b/GUI/coregui/Views/MaskWidgets/MaskEditor.h
index 605d0554f9f..d6f188e1260 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditor.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskEditor.h
+//! @file      GUI/coregui/Views/MaskWidgets/MaskEditor.h
 //! @brief     Declares class MaskEditor
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
index 2867d82b0c3..53b9fa441a3 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskEditorActions.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
 //! @brief     Implement class MaskEditorActions
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h
index d055fb739e0..e8858b2638d 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskEditorActions.h
+//! @file      GUI/coregui/Views/MaskWidgets/MaskEditorActions.h
 //! @brief     Declares class MaskEditorActions
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
index 8bac236ed6a..3baf55f4767 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
 //! @brief     Implements class MaskEditorCanvas
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h
index 470f6bf436b..82d06735f33 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskEditorCanvas.h
+//! @file      GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h
 //! @brief     Declares class MaskEditorCanvas
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h b/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h
index 34651af0d7e..a1a25728c56 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskEditorFlags.h
+//! @file      GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h
 //! @brief     Declares class MaskEditorFlags
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.cpp
index 7fd211a152e..3aad8b338af 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskEditorHelper.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/MaskEditorHelper.cpp
 //! @brief     Implements class MaskEditorHelper
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h b/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h
index 1bce0b576ec..8a590fd296c 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskEditorHelper.h
+//! @file      GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h
 //! @brief     Declares class MaskEditorHelper
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
index 229af352e1c..b89ffcaa780 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
 //! @brief     Implements class MaskEditorPropertyPanel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h
index 699b35652ec..dcbe06134e1 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h
+//! @file      GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h
 //! @brief     Declares class MaskEditorPropertyPanel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
index be6fc0fb8b6..28bfa492485 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
 //! @brief     Implements class MaskEditorToolBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h
index 1f345af9e4d..5ea964ae8a8 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskEditorToolBar.h
+//! @file      GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h
 //! @brief     Declares class MaskEditorToolBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
index 6e4b0bb47bf..ef8ece1207b 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
 //! @brief     Implements class MaskGraphicsProxy
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
index 6ff90d1a880..196bbb0018b 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskGraphicsProxy.h
+//! @file      GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
 //! @brief     Declares class MaskGraphicsProxy
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
index 5e94b5d29b0..209cd075b90 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
 //! @brief     Implements class MaskGraphicsScene
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h
index 79826d1862c..1efef022043 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskGraphicsScene.h
+//! @file      GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h
 //! @brief     Declares class MaskGraphicsScene
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
index 31fe8fc8678..e74b27953ff 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskGraphicsView.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
 //! @brief     Implements class MaskGraphicsView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h
index a9a70050a2f..488c055e20e 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskGraphicsView.h
+//! @file      GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h
 //! @brief     Declares class MaskGraphicsView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
index 0ae09d576d7..e588f4704b3 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
 //! @brief     Implements class MaskResultsPresenter
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h
index 1642fee6a2e..1a8b708f7a3 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskResultsPresenter.h
+//! @file      GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h
 //! @brief     Declares class MaskResultsPresenter
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
index 36b9a0b442d..e4f45737d40 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskViewFactory.h
+//! @file      GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
 //! @brief     Implements class MaskViewFactory
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h
index 3f3fb7f2644..fe4da0dd651 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/MaskViewFactory.h
+//! @file      GUI/coregui/Views/MaskWidgets/MaskViewFactory.h
 //! @brief     Declares class MaskViewFactory
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp b/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
index ad784205444..f988cd424d4 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/PolygonPointView.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
 //! @brief     Implements PolygonPointView class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonPointView.h b/GUI/coregui/Views/MaskWidgets/PolygonPointView.h
index d4d66947866..9671f5f6d20 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonPointView.h
+++ b/GUI/coregui/Views/MaskWidgets/PolygonPointView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/PolygonPointView.h
+//! @file      GUI/coregui/Views/MaskWidgets/PolygonPointView.h
 //! @brief     Declares PolygonPointView class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonView.cpp b/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
index 34ab16b0f9f..6df0f97e0f2 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/PolygonView.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/PolygonView.cpp
 //! @brief     Implements PolygonView class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonView.h b/GUI/coregui/Views/MaskWidgets/PolygonView.h
index d86870c5e38..b15ae3edd2e 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonView.h
+++ b/GUI/coregui/Views/MaskWidgets/PolygonView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/PolygonView.h
+//! @file      GUI/coregui/Views/MaskWidgets/PolygonView.h
 //! @brief     Declares PolygonView class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleView.cpp b/GUI/coregui/Views/MaskWidgets/RectangleView.cpp
index ebbe140136c..afcc2b4c073 100644
--- a/GUI/coregui/Views/MaskWidgets/RectangleView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/RectangleView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/RectangleView.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/RectangleView.cpp
 //! @brief     Implements RectangleView class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleView.h b/GUI/coregui/Views/MaskWidgets/RectangleView.h
index 1ece3c72c63..a767e226e4c 100644
--- a/GUI/coregui/Views/MaskWidgets/RectangleView.h
+++ b/GUI/coregui/Views/MaskWidgets/RectangleView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/RectangleView.h
+//! @file      GUI/coregui/Views/MaskWidgets/RectangleView.h
 //! @brief     Declares RectangleView class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
index 85aecac518a..79ba6e4b327 100644
--- a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
+++ b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/SizeHandleElement.cpp
+//! @file      GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
 //! @brief     Implements SizeHandleElement class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h
index b03819ea200..257687fe5ea 100644
--- a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h
+++ b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaskWidgets/SizeHandleElement.h
+//! @file      GUI/coregui/Views/MaskWidgets/SizeHandleElement.h
 //! @brief     Declares SizeHandleElement class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
index 5422cbaa2a9..e51f5a80dfe 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaterialEditor/MaterialEditor.cpp
+//! @file      GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
 //! @brief     Implements class MaterialEditor
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditor.h b/GUI/coregui/Views/MaterialEditor/MaterialEditor.h
index cc02f74df0e..c692897dc0b 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditor.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaterialEditor/MaterialEditor.h
+//! @file      GUI/coregui/Views/MaterialEditor/MaterialEditor.h
 //! @brief     Declares class MaterialEditor
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
index 9e64a37804b..72eaba3f626 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
+//! @file      GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
 //! @brief     Implements class MaterialEditorDialog
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h
index ec6967a4b1c..42c19139bed 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaterialEditor/MaterialEditorDialog.h
+//! @file      GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h
 //! @brief     Declares class MaterialEditorDialog
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
index 55160bcc421..f204d950923 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
+//! @file      GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
 //! @brief     Implements class MaterialEditorToolBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h
index f59a05f7ebf..07faaf72773 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaterialEditor/MaterialEditorToolBar.h
+//! @file      GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h
 //! @brief     Declares class MaterialEditorToolBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialProperty.cpp b/GUI/coregui/Views/MaterialEditor/MaterialProperty.cpp
index e3e663c78e2..8ac0f4f4e05 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialProperty.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialProperty.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaterialEditor/MaterialProperty.cpp
+//! @file      GUI/coregui/Views/MaterialEditor/MaterialProperty.cpp
 //! @brief     Implements class MaterialProperty
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialProperty.h b/GUI/coregui/Views/MaterialEditor/MaterialProperty.h
index 28aa4d9f938..d0feacb20b4 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialProperty.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialProperty.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaterialEditor/MaterialProperty.h
+//! @file      GUI/coregui/Views/MaterialEditor/MaterialProperty.h
 //! @brief     Declares class MaterialProperty
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp b/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
index 57fa0b1f864..b9c754708cc 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaterialEditor/MaterialSvc.cpp
+//! @file      GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
 //! @brief     Implements class MaterialSvc
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialSvc.h b/GUI/coregui/Views/MaterialEditor/MaterialSvc.h
index 9d40eeae613..859a06e9838 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialSvc.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialSvc.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaterialEditor/MaterialSvc.h
+//! @file      GUI/coregui/Views/MaterialEditor/MaterialSvc.h
 //! @brief     Declares class MaterialSvc
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp b/GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp
index 8f1477b4827..f8d6ecd3816 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaterialEditor/MaterialUtils.cpp
+//! @file      GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp
 //! @brief     Implements class MaterialUtils
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialUtils.h b/GUI/coregui/Views/MaterialEditor/MaterialUtils.h
index c1ed87436d7..87d12d97e69 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialUtils.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialUtils.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/MaterialEditor/MaterialUtils.h
+//! @file      GUI/coregui/Views/MaterialEditor/MaterialUtils.h
 //! @brief     Declares class MaterialUtils
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/ObsoleteFitView.cpp b/GUI/coregui/Views/ObsoleteFitView.cpp
index 0c309058d1b..ac60a7bc857 100644
--- a/GUI/coregui/Views/ObsoleteFitView.cpp
+++ b/GUI/coregui/Views/ObsoleteFitView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/ObsoleteFitView.cpp
+//! @file      GUI/coregui/Views/ObsoleteFitView.cpp
 //! @brief     Implements class ObsoleteFitView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/ObsoleteFitView.h b/GUI/coregui/Views/ObsoleteFitView.h
index e9c134b30cd..6245ad81c1a 100644
--- a/GUI/coregui/Views/ObsoleteFitView.h
+++ b/GUI/coregui/Views/ObsoleteFitView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/ObsoleteFitView.h
+//! @file      GUI/coregui/Views/ObsoleteFitView.h
 //! @brief     Declares class ObsoleteFitView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.cpp b/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.cpp
index 5bc9b10f7b4..50aa0e6aa0f 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/PropertyEditor/ComponentBoxEditor.cpp
+//! @file      GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.cpp
 //! @brief     Implements class ComponentBoxEditor
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.h b/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.h
index 0029e70ca27..c665f213799 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/PropertyEditor/ComponentBoxEditor.h
+//! @file      GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.h
 //! @brief     Declares class ComponentBoxEditor
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp b/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
index 82a1aa66f82..8b8cc3260ff 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/PropertyEditor/ComponentEditor.cpp
+//! @file      GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
 //! @brief     Implements class ComponentEditor
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditor.h b/GUI/coregui/Views/PropertyEditor/ComponentEditor.h
index fb0dfc0b4f8..fa101b59f0f 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditor.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/PropertyEditor/ComponentEditor.h
+//! @file      GUI/coregui/Views/PropertyEditor/ComponentEditor.h
 //! @brief     Declares class ComponentEditor
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditorFlags.h b/GUI/coregui/Views/PropertyEditor/ComponentEditorFlags.h
index b56efe0b5cb..5985ab30a78 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditorFlags.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditorFlags.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/PropertyEditor/ComponentEditorFlags.h
+//! @file      GUI/coregui/Views/PropertyEditor/ComponentEditorFlags.h
 //! @brief     Declares class ComponentEditorFlags
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp b/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp
index 5e0cccec338..42992d3dbcd 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp
+//! @file      GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp
 //! @brief     Implements class ComponentEditorPrivate
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.h b/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.h
index bb027c0e9aa..ffe70486266 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/PropertyEditor/ComponentEditorPrivate.h
+//! @file      GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.h
 //! @brief     Declares class ComponentEditorPrivate
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp b/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
index 4d9d94ef91f..c3f27c7be71 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
+//! @file      GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
 //! @brief     Implements class PropertyBrowserUtils
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.h b/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.h
index 915b7277e3f..408d54e5057 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.h
+++ b/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/PropertyEditor/PropertyBrowserUtils.h
+//! @file      GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.h
 //! @brief     Declares class PropertyBrowserUtils
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp b/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
index 29848a39afb..22578710479 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
+//! @file      GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
 //! @brief     Implements class PropertyVariantFactory
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.h b/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.h
index 1139170a478..9282c812c95 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.h
+++ b/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/PropertyEditor/PropertyVariantFactory.h
+//! @file      GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.h
 //! @brief     Declares class PropertyVariantFactory
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp b/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp
index 35fab3fbeef..c4a706e78db 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/PropertyEditor/PropertyVariantManager.cpp
+//! @file      GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp
 //! @brief     Implements class PropertyVariantManager
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.h b/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.h
index d5a297e734b..e16e73dafee 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.h
+++ b/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/PropertyEditor/PropertyVariantManager.h
+//! @file      GUI/coregui/Views/PropertyEditor/PropertyVariantManager.h
 //! @brief     Declares class PropertyVariantManager
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp b/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
index dd1bba82b8e..f3caecf5fd4 100644
--- a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/ConnectableView.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
 //! @brief     Implements class ConnectableView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/ConnectableView.h b/GUI/coregui/Views/SampleDesigner/ConnectableView.h
index d0e2e29d1f9..3d40b1b41e6 100644
--- a/GUI/coregui/Views/SampleDesigner/ConnectableView.h
+++ b/GUI/coregui/Views/SampleDesigner/ConnectableView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/ConnectableView.h
+//! @file      GUI/coregui/Views/SampleDesigner/ConnectableView.h
 //! @brief     Declares class ConnectableView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp b/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
index 8585409246e..a4a5fe2ead2 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/DesignerHelper.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
 //! @brief     Implements class DesignerHelper
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerHelper.h b/GUI/coregui/Views/SampleDesigner/DesignerHelper.h
index 6717876fec2..6fded6a88e7 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerHelper.h
+++ b/GUI/coregui/Views/SampleDesigner/DesignerHelper.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/DesignerHelper.h
+//! @file      GUI/coregui/Views/SampleDesigner/DesignerHelper.h
 //! @brief     Declares class DesignerHelper
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp b/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp
index 7c6315f894c..6c7fbb1abf5 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/DesignerMimeData.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp
 //! @brief     Implements class DesignerMimeData
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h b/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h
index 0088234411e..38a8658704e 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h
+++ b/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/DesignerMimeData.h
+//! @file      GUI/coregui/Views/SampleDesigner/DesignerMimeData.h
 //! @brief     Declares class DesignerMimeData
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
index 114fa5b1b85..8cb26eefb1b 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/DesignerScene.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
 //! @brief     Implements class DesignerScene
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.h b/GUI/coregui/Views/SampleDesigner/DesignerScene.h
index d5412c07edf..65675ec8ac2 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.h
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/DesignerScene.h
+//! @file      GUI/coregui/Views/SampleDesigner/DesignerScene.h
 //! @brief     Declares class DesignerScene
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerView.cpp b/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
index 58d4a4c01fc..a5c87494806 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/DesignerView.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/DesignerView.cpp
 //! @brief     Implements class DesignerView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerView.h b/GUI/coregui/Views/SampleDesigner/DesignerView.h
index 75493ef6a33..bc8d9862934 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerView.h
+++ b/GUI/coregui/Views/SampleDesigner/DesignerView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/DesignerView.h
+//! @file      GUI/coregui/Views/SampleDesigner/DesignerView.h
 //! @brief     Declares class DesignerView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
index 40474d28784..a578c9000de 100644
--- a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/ILayerView.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/ILayerView.cpp
 //! @brief     Implements class ILayerView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/ILayerView.h b/GUI/coregui/Views/SampleDesigner/ILayerView.h
index 3e999fa1351..83aa969ffd6 100644
--- a/GUI/coregui/Views/SampleDesigner/ILayerView.h
+++ b/GUI/coregui/Views/SampleDesigner/ILayerView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/ILayerView.h
+//! @file      GUI/coregui/Views/SampleDesigner/ILayerView.h
 //! @brief     Declares class ILayerView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/IView.cpp b/GUI/coregui/Views/SampleDesigner/IView.cpp
index 0b00d56c9a2..a038f8bc6f0 100644
--- a/GUI/coregui/Views/SampleDesigner/IView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/IView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/IView.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/IView.cpp
 //! @brief     Implements class IView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/IView.h b/GUI/coregui/Views/SampleDesigner/IView.h
index 540a7737d81..79f3a94241b 100644
--- a/GUI/coregui/Views/SampleDesigner/IView.h
+++ b/GUI/coregui/Views/SampleDesigner/IView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/IView.h
+//! @file      GUI/coregui/Views/SampleDesigner/IView.h
 //! @brief     Declares class IView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp b/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp
index ea8d473577f..4614f62febb 100644
--- a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp
+++ b/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp
 //! @brief     Implements classes InterferenceFunctionViews
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h b/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h
index 7ef6407c8c0..194ec7f72be 100644
--- a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h
+++ b/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/InterferenceFunctionViews.h
+//! @file      GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h
 //! @brief     Declares classes InterferenceFunctionViews
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp b/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
index b37b0f673dc..8293fcdc3e7 100644
--- a/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/ItemTreeView.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
 //! @brief     Implements class ItemTreeView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/ItemTreeView.h b/GUI/coregui/Views/SampleDesigner/ItemTreeView.h
index 1d77bdd8ccd..6cc4f396c83 100644
--- a/GUI/coregui/Views/SampleDesigner/ItemTreeView.h
+++ b/GUI/coregui/Views/SampleDesigner/ItemTreeView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/ItemTreeView.h
+//! @file      GUI/coregui/Views/SampleDesigner/ItemTreeView.h
 //! @brief     Declares class ItemTreeView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/LayerView.cpp b/GUI/coregui/Views/SampleDesigner/LayerView.cpp
index 35b336a2a70..12993439794 100644
--- a/GUI/coregui/Views/SampleDesigner/LayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/LayerView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/LayerView.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/LayerView.cpp
 //! @brief     Implements class LayerView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/LayerView.h b/GUI/coregui/Views/SampleDesigner/LayerView.h
index 081a058bd93..ca3c72c0bc1 100644
--- a/GUI/coregui/Views/SampleDesigner/LayerView.h
+++ b/GUI/coregui/Views/SampleDesigner/LayerView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/LayerView.h
+//! @file      GUI/coregui/Views/SampleDesigner/LayerView.h
 //! @brief     Declares class LayerView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp b/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
index 474eb431718..7531b584380 100644
--- a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/MultiLayerView.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
 //! @brief     Implements class MultiLayerView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/MultiLayerView.h b/GUI/coregui/Views/SampleDesigner/MultiLayerView.h
index e43f3852758..e5387c3bd1a 100644
--- a/GUI/coregui/Views/SampleDesigner/MultiLayerView.h
+++ b/GUI/coregui/Views/SampleDesigner/MultiLayerView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/MultiLayerView.h
+//! @file      GUI/coregui/Views/SampleDesigner/MultiLayerView.h
 //! @brief     Declares class MultiLayerView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp b/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp
index cfaee6f0e45..3315811f044 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/NodeEditor.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/NodeEditor.cpp
 //! @brief     Implements class NodeEditor
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditor.h b/GUI/coregui/Views/SampleDesigner/NodeEditor.h
index 66659397e8d..4471f9ef08d 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditor.h
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/NodeEditor.h
+//! @file      GUI/coregui/Views/SampleDesigner/NodeEditor.h
 //! @brief     Declares class NodeEditor
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
index 7df90522359..17ad23dca11 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/NodeEditorConnection.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
 //! @brief     Implements class NodeEditorConnection
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h
index e3e9b2871ef..9cba454cf68 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/NodeEditorConnection.h
+//! @file      GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h
 //! @brief     Declares class NodeEditorConnection
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
index 6014e7257ac..016f91c37ba 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/NodeEditorPort.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
 //! @brief     Implements class NodeEditorPort
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
index 8c4312f13bb..aef1810b52e 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/NodeEditorPort.h
+//! @file      GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
 //! @brief     Declares class NodeEditorPort
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
index bfce10b47e3..c5de8949ed3 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/ParticleCompositionView.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
 //! @brief     Implements class ParticleCompositionView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h
index e74d5d3d621..26871ac6597 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/ParticleCompositionView.h
+//! @file      GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h
 //! @brief     Declares class ParticleCompositionView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
index eea4e9e1ed0..5d56c416de5 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
 //! @brief     Implements class ParticleCoreShellView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h
index 42e50488236..e121f73ad5a 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/ParticleCoreShellView.h
+//! @file      GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h
 //! @brief     Declares class ParticleCoreShellView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
index 466b6e5bf07..ee2af84263d 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/ParticleDistributionView.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
 //! @brief     Implements class ParticleDistributionView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h
index 817ea417205..20ace9aab6c 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/ParticleDistributionView.h
+//! @file      GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h
 //! @brief     Declares class ParticleDistributionView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
index ac0105fe54f..5f0e9d5829a 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/ParticleLayoutView.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
 //! @brief     Implements class ParticleLayoutView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h
index 3d5265a6510..e7517c31882 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/ParticleLayoutView.h
+//! @file      GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h
 //! @brief     Declares class ParticleLayoutView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
index 08109d4a6c9..cc959b51a55 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/ParticleView.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/ParticleView.cpp
 //! @brief     Implements class ParticleView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleView.h b/GUI/coregui/Views/SampleDesigner/ParticleView.h
index 8ebe282b351..6a9d0f5f640 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/ParticleView.h
+//! @file      GUI/coregui/Views/SampleDesigner/ParticleView.h
 //! @brief     Declares class ParticleView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
index 4b7815913d9..d6094d00eda 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/SampleDesigner.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
 //! @brief     Implements class SampleDesigner
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.h b/GUI/coregui/Views/SampleDesigner/SampleDesigner.h
index a84b13ea22d..e64dd202b43 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleDesigner.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleDesigner.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/SampleDesigner.h
+//! @file      GUI/coregui/Views/SampleDesigner/SampleDesigner.h
 //! @brief     Declares class SampleDesigner
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
index 6104e52afad..1875f4b76c8 100644
--- a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
 //! @brief     Implements class IntensityDataPropertyWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h
index 98d00cb3a0e..df09d90174f 100644
--- a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h
+++ b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/SamplePropertyWidget.h
+//! @file      GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h
 //! @brief     Declares class SamplePropertyWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
index 51071d43552..f83f7e10af0 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/SampleToolBar.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
 //! @brief     Implements class SampleToolBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.h b/GUI/coregui/Views/SampleDesigner/SampleToolBar.h
index f90676d0e8f..908d4ebea2b 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleToolBar.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleToolBar.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/SampleToolBar.h
+//! @file      GUI/coregui/Views/SampleDesigner/SampleToolBar.h
 //! @brief     Declares class SampleToolBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
index 4b7d7b8128a..2ff0f452927 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/SampleViewAligner.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
 //! @brief     Implements class SampleViewAligner
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h
index 8adfc068b6b..0eb5ede540b 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/SampleViewAligner.h
+//! @file      GUI/coregui/Views/SampleDesigner/SampleViewAligner.h
 //! @brief     Declares class SampleViewAligner
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
index c9e00a2dd44..e4b22827e29 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/SampleViewFactory.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
 //! @brief     Implements class SampleViewFactory
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h
index a9c8a618fed..2083b9820cd 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/SampleViewFactory.h
+//! @file      GUI/coregui/Views/SampleDesigner/SampleViewFactory.h
 //! @brief     Declares class SampleViewFactory
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
index af13eb40d0b..b32a4721886 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/SampleWidgetBox.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
 //! @brief     Implements class SampleWidgetBox
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
index e5348ee4f71..b6131b223cd 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/SampleWidgetBox.h
+//! @file      GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
 //! @brief     Declares class SampleWidgetBox
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/TransformationView.cpp b/GUI/coregui/Views/SampleDesigner/TransformationView.cpp
index 89f62951ac1..71d1b940709 100644
--- a/GUI/coregui/Views/SampleDesigner/TransformationView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/TransformationView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/TransformationView.cpp
+//! @file      GUI/coregui/Views/SampleDesigner/TransformationView.cpp
 //! @brief     Implements class TransformationView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleDesigner/TransformationView.h b/GUI/coregui/Views/SampleDesigner/TransformationView.h
index 8f2d46658bb..14511818d51 100644
--- a/GUI/coregui/Views/SampleDesigner/TransformationView.h
+++ b/GUI/coregui/Views/SampleDesigner/TransformationView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleDesigner/TransformationView.h
+//! @file      GUI/coregui/Views/SampleDesigner/TransformationView.h
 //! @brief     Declares class TransformationView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleView.cpp b/GUI/coregui/Views/SampleView.cpp
index 011be266fde..5dc9cf709ee 100644
--- a/GUI/coregui/Views/SampleView.cpp
+++ b/GUI/coregui/Views/SampleView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleView.cpp
+//! @file      GUI/coregui/Views/SampleView.cpp
 //! @brief     Implements class SampleView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleView.h b/GUI/coregui/Views/SampleView.h
index 1aa1f4aa48e..8ee8da5639a 100644
--- a/GUI/coregui/Views/SampleView.h
+++ b/GUI/coregui/Views/SampleView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleView.h
+//! @file      GUI/coregui/Views/SampleView.h
 //! @brief     Declares class SampleView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleViewComponents.cpp b/GUI/coregui/Views/SampleViewComponents.cpp
index 7d08233f1e6..8e4a9caa954 100644
--- a/GUI/coregui/Views/SampleViewComponents.cpp
+++ b/GUI/coregui/Views/SampleViewComponents.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleViewComponents.cpp
+//! @file      GUI/coregui/Views/SampleViewComponents.cpp
 //! @brief     Implements class SampleViewComponents
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SampleViewComponents.h b/GUI/coregui/Views/SampleViewComponents.h
index c4985df1302..7de8f029e5b 100644
--- a/GUI/coregui/Views/SampleViewComponents.h
+++ b/GUI/coregui/Views/SampleViewComponents.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SampleViewComponents.h
+//! @file      GUI/coregui/Views/SampleViewComponents.h
 //! @brief     Declares class SampleViewComponents
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SessionModelView.cpp b/GUI/coregui/Views/SessionModelView.cpp
index 703a642f7ed..359e9a423f3 100644
--- a/GUI/coregui/Views/SessionModelView.cpp
+++ b/GUI/coregui/Views/SessionModelView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SessionModelView.cpp
+//! @file      GUI/coregui/Views/SessionModelView.cpp
 //! @brief     Implements class SessionModelView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SessionModelView.h b/GUI/coregui/Views/SessionModelView.h
index c5f18cc77ff..812268411b7 100644
--- a/GUI/coregui/Views/SessionModelView.h
+++ b/GUI/coregui/Views/SessionModelView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SessionModelView.h
+//! @file      GUI/coregui/Views/SessionModelView.h
 //! @brief     Declares class SessionModelView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SimulationView.cpp b/GUI/coregui/Views/SimulationView.cpp
index 925e584e84a..4ed380bd351 100644
--- a/GUI/coregui/Views/SimulationView.cpp
+++ b/GUI/coregui/Views/SimulationView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SimulationView.cpp
+//! @file      GUI/coregui/Views/SimulationView.cpp
 //! @brief     Implements class SimulationView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SimulationView.h b/GUI/coregui/Views/SimulationView.h
index 30ba6eec0f1..3abcf1ba99e 100644
--- a/GUI/coregui/Views/SimulationView.h
+++ b/GUI/coregui/Views/SimulationView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SimulationView.h
+//! @file      GUI/coregui/Views/SimulationView.h
 //! @brief     Declares class SimulationView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
index c61dab41053..aba9498ebc7 100644
--- a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/PythonScriptWidget.cpp
+//! @file      GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
 //! @brief     Implements class PythonScriptWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
index f261785e446..c0251b34c6e 100644
--- a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/InfoWidgets/PythonScriptWidget.h
+//! @file      GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
 //! @brief     Declares class PythonScriptWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
index 87db3a74898..d484e289220 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
+//! @file      GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
 //! @brief     Implements class SimulationDataSelectorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h
index 897df76ed19..c4f7d5161ea 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h
+//! @file      GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h
 //! @brief     Declares class SimulationDataSelectorWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
index d843fb2d419..ccd1efeeb07 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
+//! @file      GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
 //! @brief     Implements class SimulationOptionsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h
index 98c611a9e6b..abaaa46b0e7 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SimulationWidgets/SimulationOptionsWidget.h
+//! @file      GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h
 //! @brief     Declares class SimulationOptionsWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
index bb230227d6d..4ad401c5a72 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
+//! @file      GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
 //! @brief     Implements class SimulationSetupWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h
index 1d36562c00e..422e67b41d3 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/SimulationWidgets/SimulationSetupWidget.h
+//! @file      GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h
 //! @brief     Declares class SimulationSetupWidget
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/TestComponentView.cpp b/GUI/coregui/Views/TestComponentView.cpp
index 6a148adef79..97a376406dd 100644
--- a/GUI/coregui/Views/TestComponentView.cpp
+++ b/GUI/coregui/Views/TestComponentView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/TestComponentView.cpp
+//! @file      GUI/coregui/Views/TestComponentView.cpp
 //! @brief     Implements class TestComponentView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/TestComponentView.h b/GUI/coregui/Views/TestComponentView.h
index 48da92c0fe0..c4dd829046d 100644
--- a/GUI/coregui/Views/TestComponentView.h
+++ b/GUI/coregui/Views/TestComponentView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/TestComponentView.h
+//! @file      GUI/coregui/Views/TestComponentView.h
 //! @brief     Declares class TestComponentView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/TestView.cpp b/GUI/coregui/Views/TestView.cpp
index 8d3a4271756..17a04fd5896 100644
--- a/GUI/coregui/Views/TestView.cpp
+++ b/GUI/coregui/Views/TestView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/TestView.cpp
+//! @file      GUI/coregui/Views/TestView.cpp
 //! @brief     Implements class TestView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/TestView.h b/GUI/coregui/Views/TestView.h
index 9c52a1ffe61..cf4a04905db 100644
--- a/GUI/coregui/Views/TestView.h
+++ b/GUI/coregui/Views/TestView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/TestView.h
+//! @file      GUI/coregui/Views/TestView.h
 //! @brief     Declares class TestView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/WelcomeView.cpp b/GUI/coregui/Views/WelcomeView.cpp
index d808b596ac0..75ad8b7f0c0 100644
--- a/GUI/coregui/Views/WelcomeView.cpp
+++ b/GUI/coregui/Views/WelcomeView.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/WelcomeView.cpp
+//! @file      GUI/coregui/Views/WelcomeView.cpp
 //! @brief     Implements class WelcomeView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/WelcomeView.h b/GUI/coregui/Views/WelcomeView.h
index a0714e71cbb..5b21e118f17 100644
--- a/GUI/coregui/Views/WelcomeView.h
+++ b/GUI/coregui/Views/WelcomeView.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Views/WelcomeView.h
+//! @file      GUI/coregui/Views/WelcomeView.h
 //! @brief     Declares class WelcomeView
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/AppSvc.cpp b/GUI/coregui/mainwindow/AppSvc.cpp
index 2a25926bbc6..21733a644ef 100644
--- a/GUI/coregui/mainwindow/AppSvc.cpp
+++ b/GUI/coregui/mainwindow/AppSvc.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/AppSvc.cpp
+//! @file      GUI/coregui/mainwindow/AppSvc.cpp
 //! @brief     Implements class AppSvc
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/AppSvc.h b/GUI/coregui/mainwindow/AppSvc.h
index 1b715db6323..0415e54c876 100644
--- a/GUI/coregui/mainwindow/AppSvc.h
+++ b/GUI/coregui/mainwindow/AppSvc.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/AppSvc.h
+//! @file      GUI/coregui/mainwindow/AppSvc.h
 //! @brief     Declares class AppSvc
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/SplashScreen.cpp b/GUI/coregui/mainwindow/SplashScreen.cpp
index 56c26449483..c8d2b6bdd7c 100644
--- a/GUI/coregui/mainwindow/SplashScreen.cpp
+++ b/GUI/coregui/mainwindow/SplashScreen.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/SplashScreen.cpp
+//! @file      GUI/coregui/mainwindow/SplashScreen.cpp
 //! @brief     Implements class SplashScreen
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/SplashScreen.h b/GUI/coregui/mainwindow/SplashScreen.h
index e0739f39e48..fd5630bcc1c 100644
--- a/GUI/coregui/mainwindow/SplashScreen.h
+++ b/GUI/coregui/mainwindow/SplashScreen.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/SplashScreen.h
+//! @file      GUI/coregui/mainwindow/SplashScreen.h
 //! @brief     Declares class SplashScreen
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/StyledToolBar.cpp b/GUI/coregui/mainwindow/StyledToolBar.cpp
index dc7648a298b..d47c5f6e469 100644
--- a/GUI/coregui/mainwindow/StyledToolBar.cpp
+++ b/GUI/coregui/mainwindow/StyledToolBar.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/StyledToolBar.cpp
+//! @file      GUI/coregui/mainwindow/StyledToolBar.cpp
 //! @brief     Implements class StyledToolBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/StyledToolBar.h b/GUI/coregui/mainwindow/StyledToolBar.h
index b9f5fef3df3..e59409fb112 100644
--- a/GUI/coregui/mainwindow/StyledToolBar.h
+++ b/GUI/coregui/mainwindow/StyledToolBar.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/StyledToolBar.h
+//! @file      GUI/coregui/mainwindow/StyledToolBar.h
 //! @brief     Declares class StyledToolBar
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/UpdateNotifier.cpp b/GUI/coregui/mainwindow/UpdateNotifier.cpp
index f6605d8ea8e..d2abe758d00 100644
--- a/GUI/coregui/mainwindow/UpdateNotifier.cpp
+++ b/GUI/coregui/mainwindow/UpdateNotifier.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/UpdateNotifier.cpp
+//! @file      GUI/coregui/mainwindow/UpdateNotifier.cpp
 //! @brief     Implements class UpdateNotifier
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/UpdateNotifier.h b/GUI/coregui/mainwindow/UpdateNotifier.h
index 1109fd304c4..021861c4d64 100644
--- a/GUI/coregui/mainwindow/UpdateNotifier.h
+++ b/GUI/coregui/mainwindow/UpdateNotifier.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/UpdateNotifier.cpp
+//! @file      GUI/coregui/mainwindow/UpdateNotifier.h
 //! @brief     Implements class UpdateNotifier
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/aboutapplicationdialog.cpp b/GUI/coregui/mainwindow/aboutapplicationdialog.cpp
index e6267a3262f..d892ad6472c 100644
--- a/GUI/coregui/mainwindow/aboutapplicationdialog.cpp
+++ b/GUI/coregui/mainwindow/aboutapplicationdialog.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/aboutapplicationdialog.cpp
+//! @file      GUI/coregui/mainwindow/aboutapplicationdialog.cpp
 //! @brief     Implements class AboutApplicationDialog
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/aboutapplicationdialog.h b/GUI/coregui/mainwindow/aboutapplicationdialog.h
index cf69f50fa7f..e4bd37cb40e 100644
--- a/GUI/coregui/mainwindow/aboutapplicationdialog.h
+++ b/GUI/coregui/mainwindow/aboutapplicationdialog.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/aboutapplicationdialog.h
+//! @file      GUI/coregui/mainwindow/aboutapplicationdialog.h
 //! @brief     Declares class AboutApplicationDialog
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/actionmanager.cpp b/GUI/coregui/mainwindow/actionmanager.cpp
index d9af04489ff..9fab7411841 100644
--- a/GUI/coregui/mainwindow/actionmanager.cpp
+++ b/GUI/coregui/mainwindow/actionmanager.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/actionmanager.cpp
+//! @file      GUI/coregui/mainwindow/actionmanager.cpp
 //! @brief     Implements class ActionManager
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/actionmanager.h b/GUI/coregui/mainwindow/actionmanager.h
index 499db0b9238..b5ba44dd17f 100644
--- a/GUI/coregui/mainwindow/actionmanager.h
+++ b/GUI/coregui/mainwindow/actionmanager.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/actionmanager.cpp
+//! @file      GUI/coregui/mainwindow/actionmanager.h
 //! @brief     Declares class ActionManager
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/mainwindow.cpp b/GUI/coregui/mainwindow/mainwindow.cpp
index c5fb3df9ec1..b1376de4b43 100644
--- a/GUI/coregui/mainwindow/mainwindow.cpp
+++ b/GUI/coregui/mainwindow/mainwindow.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/mainwindow.cpp
+//! @file      GUI/coregui/mainwindow/mainwindow.cpp
 //! @brief     Implements class MainWindow
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/mainwindow.h b/GUI/coregui/mainwindow/mainwindow.h
index c6a09803d41..884ebc0eaa7 100644
--- a/GUI/coregui/mainwindow/mainwindow.h
+++ b/GUI/coregui/mainwindow/mainwindow.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/mainwindow.h
+//! @file      GUI/coregui/mainwindow/mainwindow.h
 //! @brief     Declares class MainWindow
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/mainwindow_constants.h b/GUI/coregui/mainwindow/mainwindow_constants.h
index d854778e6a2..5884b73cc21 100644
--- a/GUI/coregui/mainwindow/mainwindow_constants.h
+++ b/GUI/coregui/mainwindow/mainwindow_constants.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/mainwindow_constants.h
+//! @file      GUI/coregui/mainwindow/mainwindow_constants.h
 //! @brief     Declares namespace Constants
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/newprojectdialog.cpp b/GUI/coregui/mainwindow/newprojectdialog.cpp
index b0980a2105e..714fb131d99 100644
--- a/GUI/coregui/mainwindow/newprojectdialog.cpp
+++ b/GUI/coregui/mainwindow/newprojectdialog.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/newprojectdialog.cpp
+//! @file      GUI/coregui/mainwindow/newprojectdialog.cpp
 //! @brief     Implements class NewProjectDialog
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/newprojectdialog.h b/GUI/coregui/mainwindow/newprojectdialog.h
index ca868be6216..c884fce065f 100644
--- a/GUI/coregui/mainwindow/newprojectdialog.h
+++ b/GUI/coregui/mainwindow/newprojectdialog.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/newprojectdialog.h
+//! @file      GUI/coregui/mainwindow/newprojectdialog.h
 //! @brief     Declares class NewProjectDialog
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/projectdocument.cpp b/GUI/coregui/mainwindow/projectdocument.cpp
index 8c5dbc19536..e2c4dc46404 100644
--- a/GUI/coregui/mainwindow/projectdocument.cpp
+++ b/GUI/coregui/mainwindow/projectdocument.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/projectdocument.cpp
+//! @file      GUI/coregui/mainwindow/projectdocument.cpp
 //! @brief     Implements class ProjectDocument
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/projectdocument.h b/GUI/coregui/mainwindow/projectdocument.h
index 1451855eea0..70666011c97 100644
--- a/GUI/coregui/mainwindow/projectdocument.h
+++ b/GUI/coregui/mainwindow/projectdocument.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/projectdocument.h
+//! @file      GUI/coregui/mainwindow/projectdocument.h
 //! @brief     Declares class ProjectDocument
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/projectmanager.cpp b/GUI/coregui/mainwindow/projectmanager.cpp
index 8a6ae383a89..57ddeef52ce 100644
--- a/GUI/coregui/mainwindow/projectmanager.cpp
+++ b/GUI/coregui/mainwindow/projectmanager.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/projectmanager.cpp
+//! @file      GUI/coregui/mainwindow/projectmanager.cpp
 //! @brief     Implements class ProjectManager
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/projectmanager.h b/GUI/coregui/mainwindow/projectmanager.h
index bab6d25c292..fd0c3baf481 100644
--- a/GUI/coregui/mainwindow/projectmanager.h
+++ b/GUI/coregui/mainwindow/projectmanager.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/projectmanager.h
+//! @file      GUI/coregui/mainwindow/projectmanager.h
 //! @brief     Declares class ProjectManager
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/tooltipdatabase.cpp b/GUI/coregui/mainwindow/tooltipdatabase.cpp
index 66f5d6882ef..b34272a4216 100644
--- a/GUI/coregui/mainwindow/tooltipdatabase.cpp
+++ b/GUI/coregui/mainwindow/tooltipdatabase.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/tooltipdatabase.cpp
+//! @file      GUI/coregui/mainwindow/tooltipdatabase.cpp
 //! @brief     Implements class ToolTipDataBase
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/mainwindow/tooltipdatabase.h b/GUI/coregui/mainwindow/tooltipdatabase.h
index f8784940715..9d4283fc779 100644
--- a/GUI/coregui/mainwindow/tooltipdatabase.h
+++ b/GUI/coregui/mainwindow/tooltipdatabase.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/mainwindow/tooltipdatabase.h
+//! @file      GUI/coregui/mainwindow/tooltipdatabase.h
 //! @brief     Declares class ToolTipDataBase
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/CustomEventFilters.cpp b/GUI/coregui/utils/CustomEventFilters.cpp
index e7fd9d3bb01..3de642fc458 100644
--- a/GUI/coregui/utils/CustomEventFilters.cpp
+++ b/GUI/coregui/utils/CustomEventFilters.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/CustomEventFilters.cpp
+//! @file      GUI/coregui/utils/CustomEventFilters.cpp
 //! @brief     Defines classes releted to event filtering
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/CustomEventFilters.h b/GUI/coregui/utils/CustomEventFilters.h
index ab61e50c64f..ba984cd56f3 100644
--- a/GUI/coregui/utils/CustomEventFilters.h
+++ b/GUI/coregui/utils/CustomEventFilters.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/CustomEventFilters.h
+//! @file      GUI/coregui/utils/CustomEventFilters.h
 //! @brief     Declares classes releted to event filtering
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/FancyLabel.cpp b/GUI/coregui/utils/FancyLabel.cpp
index 2bc382e34b4..2ab68786ca7 100644
--- a/GUI/coregui/utils/FancyLabel.cpp
+++ b/GUI/coregui/utils/FancyLabel.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/FancyLabel.cpp
+//! @file      GUI/coregui/utils/FancyLabel.cpp
 //! @brief     Implements class FancyLabel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/FancyLabel.h b/GUI/coregui/utils/FancyLabel.h
index 4cddb9f2433..c8fc39a7cc0 100644
--- a/GUI/coregui/utils/FancyLabel.h
+++ b/GUI/coregui/utils/FancyLabel.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/FancyLabel.h
+//! @file      GUI/coregui/utils/FancyLabel.h
 //! @brief     Declares class FancyLabel
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/GUIFutest.cpp b/GUI/coregui/utils/GUIFutest.cpp
index 3c5dd476abd..051291512c0 100644
--- a/GUI/coregui/utils/GUIFutest.cpp
+++ b/GUI/coregui/utils/GUIFutest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/GUIFutest.cpp
+//! @file      GUI/coregui/utils/GUIFutest.cpp
 //! @brief     Implements class GUIFutest
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/GUIFutest.h b/GUI/coregui/utils/GUIFutest.h
index 6780c664edb..06832a84f02 100644
--- a/GUI/coregui/utils/GUIFutest.h
+++ b/GUI/coregui/utils/GUIFutest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/GUIFutest.h
+//! @file      GUI/coregui/utils/GUIFutest.h
 //! @brief     Declares class GUIFutest
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/GUIHelpers.cpp b/GUI/coregui/utils/GUIHelpers.cpp
index 04847aff7e6..2b4371961d5 100644
--- a/GUI/coregui/utils/GUIHelpers.cpp
+++ b/GUI/coregui/utils/GUIHelpers.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/GUIHelpers.cpp
+//! @file      GUI/coregui/utils/GUIHelpers.cpp
 //! @brief     Implements GUIHelpers functions
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/GUIHelpers.h b/GUI/coregui/utils/GUIHelpers.h
index 3f4b7f9ec43..59fc2aa67f0 100644
--- a/GUI/coregui/utils/GUIHelpers.h
+++ b/GUI/coregui/utils/GUIHelpers.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/GUIHelpers.h
+//! @file      GUI/coregui/utils/GUIHelpers.h
 //! @brief     Declares class GUIHelpers functions
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/GUIMessage.cpp b/GUI/coregui/utils/GUIMessage.cpp
index 4332e1d8b57..53467f61dd2 100644
--- a/GUI/coregui/utils/GUIMessage.cpp
+++ b/GUI/coregui/utils/GUIMessage.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/GUIMessage.cpp
+//! @file      GUI/coregui/utils/GUIMessage.cpp
 //! @brief     Implements class GUIMessage.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/GUIMessage.h b/GUI/coregui/utils/GUIMessage.h
index 27e6210a291..1e743bd0cec 100644
--- a/GUI/coregui/utils/GUIMessage.h
+++ b/GUI/coregui/utils/GUIMessage.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/GUIMessage.h
+//! @file      GUI/coregui/utils/GUIMessage.h
 //! @brief     Declares class GUIMessage.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/IMessageService.h b/GUI/coregui/utils/IMessageService.h
index 238a303038a..973209ce079 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      coregui/utils/IMessageService.h
+//! @file      GUI/coregui/utils/IMessageService.h
 //! @brief     Declares abstract IMessageService interface
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/ItemIDFactory.cpp b/GUI/coregui/utils/ItemIDFactory.cpp
index bf0e536fe8d..48972df1a9d 100644
--- a/GUI/coregui/utils/ItemIDFactory.cpp
+++ b/GUI/coregui/utils/ItemIDFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Util/ItemIDFactory.cpp
+//! @file      GUI/coregui/utils/ItemIDFactory.cpp
 //! @brief     Implements class ItemIDFactory
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/ItemIDFactory.h b/GUI/coregui/utils/ItemIDFactory.h
index 03b22ab0913..90afdc8433c 100644
--- a/GUI/coregui/utils/ItemIDFactory.h
+++ b/GUI/coregui/utils/ItemIDFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Util/ItemIDFactory.h
+//! @file      GUI/coregui/utils/ItemIDFactory.h
 //! @brief     Declares class ItemIDFactory
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/MessageContainer.cpp b/GUI/coregui/utils/MessageContainer.cpp
index ae79c83907e..47258247497 100644
--- a/GUI/coregui/utils/MessageContainer.cpp
+++ b/GUI/coregui/utils/MessageContainer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/MessageContainer.cpp
+//! @file      GUI/coregui/utils/MessageContainer.cpp
 //! @brief     Implements class MessageContainer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/MessageContainer.h b/GUI/coregui/utils/MessageContainer.h
index 1519a64becd..89f464d2404 100644
--- a/GUI/coregui/utils/MessageContainer.h
+++ b/GUI/coregui/utils/MessageContainer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/MessageContainer.h
+//! @file      GUI/coregui/utils/MessageContainer.h
 //! @brief     Declares class MessageContainer.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/WarningMessageService.cpp b/GUI/coregui/utils/WarningMessageService.cpp
index 571792a5f76..1ac8c37ac04 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      coregui/utils/WarningMessageService.h
+//! @file      GUI/coregui/utils/WarningMessageService.cpp
 //! @brief     Defines abstract IMessageService interface
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/WarningMessageService.h b/GUI/coregui/utils/WarningMessageService.h
index 5870e85bc69..dbf8809c673 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      coregui/utils/WarningMessageService.h
+//! @file      GUI/coregui/utils/WarningMessageService.h
 //! @brief     Declares abstract IMessageService interface
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/hostosinfo.h b/GUI/coregui/utils/hostosinfo.h
index cb04c465a03..3b3a5d3783e 100644
--- a/GUI/coregui/utils/hostosinfo.h
+++ b/GUI/coregui/utils/hostosinfo.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/hostosinfo.h
+//! @file      GUI/coregui/utils/hostosinfo.h
 //! @brief     Declares Utils namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/stringutils.cpp b/GUI/coregui/utils/stringutils.cpp
index a17c4c34eff..5bcc6dbdf08 100644
--- a/GUI/coregui/utils/stringutils.cpp
+++ b/GUI/coregui/utils/stringutils.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/stringutils.cpp
+//! @file      GUI/coregui/utils/stringutils.cpp
 //! @brief     Implements functions from Utils namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/utils/stringutils.h b/GUI/coregui/utils/stringutils.h
index b27a59be005..1968fde671b 100644
--- a/GUI/coregui/utils/stringutils.h
+++ b/GUI/coregui/utils/stringutils.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/utils/stringutils.h
+//! @file      GUI/coregui/utils/stringutils.h
 //! @brief     Declares functions from Utils namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/main/appoptions.cpp b/GUI/main/appoptions.cpp
index 328c38bd29b..bf5da6d6e1f 100644
--- a/GUI/main/appoptions.cpp
+++ b/GUI/main/appoptions.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      appoptions.cpp
+//! @file      GUI/main/appoptions.cpp
 //! @brief     Implements class ProgramOptions.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/main/appoptions.h b/GUI/main/appoptions.h
index 43f2824a2c8..dbd05279e61 100644
--- a/GUI/main/appoptions.h
+++ b/GUI/main/appoptions.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      appoptions.h
+//! @file      GUI/main/appoptions.h
 //! @brief     Collection of utilities to parse command line options
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/main/main.cpp b/GUI/main/main.cpp
index 8f535387eac..e26a45e0f80 100644
--- a/GUI/main/main.cpp
+++ b/GUI/main/main.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      main.cpp
+//! @file      GUI/main/main.cpp
 //! @brief     Main function of the whole GUI
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/TestCore/CoreSuite.cpp b/Tests/Functional/TestCore/CoreSuite.cpp
index e0dcb240e81..4706dc27624 100644
--- a/Tests/Functional/TestCore/CoreSuite.cpp
+++ b/Tests/Functional/TestCore/CoreSuite.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      StandardSamples/core_functional_test.h
+//! @file      Tests/Functional/TestCore/CoreSuite.cpp
 //! @brief     Implements program CoreSuite, to run core functional tests
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/TestFit/FitSuite.cpp b/Tests/Functional/TestFit/FitSuite.cpp
index f805918e656..874d5b5891e 100644
--- a/Tests/Functional/TestFit/FitSuite.cpp
+++ b/Tests/Functional/TestFit/FitSuite.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tests/Futests/TestFit/FitSuite/FitSuite.cpp
+//! @file      Tests/Functional/TestFit/FitSuite.cpp
 //! @brief     Implements program FitSuite to run fit functional tests
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/TestGUI/GUISuite.cpp b/Tests/Functional/TestGUI/GUISuite.cpp
index 61440938719..d3d4e034fb3 100644
--- a/Tests/Functional/TestGUI/GUISuite.cpp
+++ b/Tests/Functional/TestGUI/GUISuite.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tests/Futests/TestGUI/GUISuite/GUITestSuite.cpp
+//! @file      Tests/Functional/TestGUI/GUISuite.cpp
 //! @brief     Implements program GUISuite to run gui functional tests
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/TestPyDump/PyDump.cpp b/Tests/Functional/TestPyDump/PyDump.cpp
index c80bc2847e3..cce6e6c211e 100644
--- a/Tests/Functional/TestPyDump/PyDump.cpp
+++ b/Tests/Functional/TestPyDump/PyDump.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tests/Futests/TestPyCore/PySuite.cpp
+//! @file      Tests/Functional/TestPyDump/PyDump.cpp
 //! @brief     Implements program PySuite, to run pyscript functional tests
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/UnitTests/Core/3/SpecialFunctionsTest.h b/Tests/UnitTests/Core/3/SpecialFunctionsTest.h
index b09c1a27020..c7479100e6d 100644
--- a/Tests/UnitTests/Core/3/SpecialFunctionsTest.h
+++ b/Tests/UnitTests/Core/3/SpecialFunctionsTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactorTest.h
+//! @file      Tests/UnitTests/Core/3/SpecialFunctionsTest.h
 //! @brief     Declares unit test for Form factors.
 //!
 //! @homepage  http://bornagainproject.org
diff --git a/Tests/UnitTests/Core/4/ThreadInfoTest.h b/Tests/UnitTests/Core/4/ThreadInfoTest.h
index 9efe1ade6a7..8e796ede9d1 100644
--- a/Tests/UnitTests/Core/4/ThreadInfoTest.h
+++ b/Tests/UnitTests/Core/4/ThreadInfoTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      ThreadInfoTest.h
+//! @file      Tests/UnitTests/Core/4/ThreadInfoTest.h
 //! @brief     Declares unit test for ThreadInfo class.
 //!
 //! @homepage  http://bornagainproject.org
diff --git a/Tests/UnitTests/Core/P/FormFactorSymmetryTest.h b/Tests/UnitTests/Core/P/FormFactorSymmetryTest.h
index 35a59ce3c77..171ef0d922c 100644
--- a/Tests/UnitTests/Core/P/FormFactorSymmetryTest.h
+++ b/Tests/UnitTests/Core/P/FormFactorSymmetryTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactorSymmetryTest.h
+//! @file      Tests/UnitTests/Core/P/FormFactorSymmetryTest.h
 //! @brief     Unit tests for symmetry of particle-shape form factors.
 //!
 //! @homepage  http://bornagainproject.org
diff --git a/Tests/UnitTests/Core/Q/FormFactorSpecializationTest.h b/Tests/UnitTests/Core/Q/FormFactorSpecializationTest.h
index 58f68f71ae0..2114f69ec5b 100644
--- a/Tests/UnitTests/Core/Q/FormFactorSpecializationTest.h
+++ b/Tests/UnitTests/Core/Q/FormFactorSpecializationTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactorSpecializationTest.h
+//! @file      Tests/UnitTests/Core/Q/FormFactorSpecializationTest.h
 //! @brief     Unit tests for special cases of particle-shape form factors.
 //!
 //! @homepage  http://bornagainproject.org
diff --git a/Tests/UnitTests/Core/S/FormFactorBasicTest.h b/Tests/UnitTests/Core/S/FormFactorBasicTest.h
index 859aa3d3cfe..e599cd25779 100644
--- a/Tests/UnitTests/Core/S/FormFactorBasicTest.h
+++ b/Tests/UnitTests/Core/S/FormFactorBasicTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      FormFactorBasicTest.h
+//! @file      Tests/UnitTests/Core/S/FormFactorBasicTest.h
 //! @brief     Trvial and basic unit tests for particle-shape form factors.
 //!
 //! @homepage  http://bornagainproject.org
diff --git a/Tests/UnitTests/GUI/verify_throw_macro.h b/Tests/UnitTests/GUI/verify_throw_macro.h
index 582b002a645..e2a79b5d510 100644
--- a/Tests/UnitTests/GUI/verify_throw_macro.h
+++ b/Tests/UnitTests/GUI/verify_throw_macro.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      coregui/Models/verify_throw_macro.h
+//! @file      Tests/UnitTests/GUI/verify_throw_macro.h
 //! @brief     Declares macro to test exception throw
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/UnitTests/utilities/qLoopedTest.h b/Tests/UnitTests/utilities/qLoopedTest.h
index d225cdf9f2e..2bc00dddf50 100644
--- a/Tests/UnitTests/utilities/qLoopedTest.h
+++ b/Tests/UnitTests/utilities/qLoopedTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      qLoopedTest.h
+//! @file      Tests/UnitTests/utilities/qLoopedTest.h
 //! @brief     Auxiliary utility to loop over q vectors for tests.
 //!
 //! @homepage  http://bornagainproject.org
diff --git a/dev-tools/code-tools/update-filename.py b/dev-tools/code-tools/update-filename.py
new file mode 100755
index 00000000000..73251b6ec90
--- /dev/null
+++ b/dev-tools/code-tools/update-filename.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+
+# Automatically rewrite the Doxygen parameter @file in the headers of all given files
+
+# Does not provide backup files:
+# to be safe, work on fresh git commit, and use 'git stash' to revert.
+
+import glob, re, sys
+
+def edit( fn ):
+    # print( "File " + fn )
+
+    # read in
+    fd = open( fn, 'r' )
+    t = fd.read()
+    fd.close
+
+    t = re.sub( r'(//! @file).*', r'\1      '+fn[2:], t, re.M )
+
+    # save result
+    fd = open( fn, 'w' )
+    fd.write( t )
+    fd.close
+
+## Main
+
+flist = sys.argv[1:]
+for fn in flist:
+    edit( fn )
-- 
GitLab