diff --git a/Core/Basics/Algorithms.h b/Core/Basics/Algorithms.h
index 39c2f1480b313e62166547e263ce9cd0bfa36694..edb605666c5eb4cd392b66a1a2827957a8c0fa91 100644
--- a/Core/Basics/Algorithms.h
+++ b/Core/Basics/Algorithms.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Basics/Algorithms
+//! @file      Core/Basics/Algorithms.h
 //! @brief     Defines and implements namespace algo with some algorithms
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/SampleBuilderNode.cpp b/Core/Multilayer/SampleBuilderNode.cpp
index 846b54fda7eb48926b20f7124ac98d78805f86ca..1ac5b34007e758d8b0b19e76037aa2354b667dc3 100644
--- a/Core/Multilayer/SampleBuilderNode.cpp
+++ b/Core/Multilayer/SampleBuilderNode.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/SampleBuilderNode.cpp
+//! @file      Core/Multilayer/SampleBuilderNode.cpp
 //! @brief     Implements class SampleBuilderNode.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/SampleBuilderNode.h b/Core/Multilayer/SampleBuilderNode.h
index 8735849c1193698cfb890d52485f74e7aa398845..ffda54203e683ca913a3a1bcd03d2b56942346c0 100644
--- a/Core/Multilayer/SampleBuilderNode.h
+++ b/Core/Multilayer/SampleBuilderNode.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/SampleBuilderNode.h
+//! @file      Core/Multilayer/SampleBuilderNode.h
 //! @brief     Defines class SampleBuilderNode.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/SampleProvider.cpp b/Core/Multilayer/SampleProvider.cpp
index b53e797329faeeab7e5313ce36ad3595b3655aaa..8e26d0112db67daef0af2dd3ba23abc4635c3b8d 100644
--- a/Core/Multilayer/SampleProvider.cpp
+++ b/Core/Multilayer/SampleProvider.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/SampleProvider.cpp
+//! @file      Core/Multilayer/SampleProvider.cpp
 //! @brief     Implements class SampleProvider.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Core/Multilayer/SampleProvider.h b/Core/Multilayer/SampleProvider.h
index 49b54bf648391f842deec57da4b95376e760aac3..df654c941135febe7358ebcc9baea38571b83efb 100644
--- a/Core/Multilayer/SampleProvider.h
+++ b/Core/Multilayer/SampleProvider.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Core/Instrument/SampleProvider.h
+//! @file      Core/Multilayer/SampleProvider.h
 //! @brief     Defines class SampleProvider.
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.cpp b/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.cpp
index c99e5107db511dbf5485442ad0d2d08847fe3a62..f5d90ce753ba4852bc765520c680bb3c096e022f 100644
--- a/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.cpp
+++ b/Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.h
+//! @file      Tests/Functional/Core/CoreSpecial/MultiThreadPerformanceTestComponents.cpp
 //! @brief     Defines TestComponents namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/dev-tools/code-tools/update-sourcecode-header.py b/dev-tools/code-tools/update-sourcecode-header.py
index fc47e8748470254704157c0f6cddf75c65625ef4..b19aabe3f4c2adb457d7d83a6ea5da3a824ac03f 100644
--- a/dev-tools/code-tools/update-sourcecode-header.py
+++ b/dev-tools/code-tools/update-sourcecode-header.py
@@ -23,7 +23,7 @@ header_top = [
     u"//                                                                              "
     ]
 header_center = [
-    u"//! @file      dev-tools/edit/update-sourcecode-header.py                       "
+    u"//! @file      dev-tools/code-tools/update-sourcecode-header.py                       "
     u"//! @brief     Defines class Beam                                               "
     ]
 header_bottom = [
diff --git a/dev-tools/sandboxes/realSpace/demo1/demo_model.cpp b/dev-tools/sandboxes/realSpace/demo1/demo_model.cpp
index eae3775e23dd189892bd40499c192fbb7f9298a8..9632516e5017e06e06230150830203bfd04e4a24 100644
--- a/dev-tools/sandboxes/realSpace/demo1/demo_model.cpp
+++ b/dev-tools/sandboxes/realSpace/demo1/demo_model.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/demo/demo_model.cpp
+//! @file      dev-tools/sandboxes/realSpace/demo1/demo_model.cpp
 //! @brief     Implements DemoModel class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/dev-tools/sandboxes/realSpace/demo1/demo_model.h b/dev-tools/sandboxes/realSpace/demo1/demo_model.h
index a21dadbfd070a012914a4c815df53f69c0c40e33..059b4cf9d9f4be515627945d03c66845de083c15 100644
--- a/dev-tools/sandboxes/realSpace/demo1/demo_model.h
+++ b/dev-tools/sandboxes/realSpace/demo1/demo_model.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/demo/demo_model.h
+//! @file      dev-tools/sandboxes/realSpace/demo1/demo_model.h
 //! @brief     Defines DemoModel class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/dev-tools/sandboxes/realSpace/demo1/lattice.cpp b/dev-tools/sandboxes/realSpace/demo1/lattice.cpp
index 57d92847947262b69c9cc211a4a839266df95c14..76ee40d34696862be7de02938b27136af12c62fc 100644
--- a/dev-tools/sandboxes/realSpace/demo1/lattice.cpp
+++ b/dev-tools/sandboxes/realSpace/demo1/lattice.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/demo/lattice.cpp
+//! @file      dev-tools/sandboxes/realSpace/demo1/lattice.cpp
 //! @brief     Implements Lattice class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/dev-tools/sandboxes/realSpace/demo1/lattice.h b/dev-tools/sandboxes/realSpace/demo1/lattice.h
index 4f286b258916fbd881030bf7d981a89cdab78dcc..8a936075f0613ad76571b3d503d72345d24f2c32 100644
--- a/dev-tools/sandboxes/realSpace/demo1/lattice.h
+++ b/dev-tools/sandboxes/realSpace/demo1/lattice.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/demo/lattice.h
+//! @file      dev-tools/sandboxes/realSpace/demo1/lattice.h
 //! @brief     Defines Lattice class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/dev-tools/sandboxes/realSpace/demo1/main.cpp b/dev-tools/sandboxes/realSpace/demo1/main.cpp
index a7a9ce5483520a888fdbffe15e6c9cf08ec14c30..67fee4f528dec435ea8f099bb137c8a8c66cdeb9 100644
--- a/dev-tools/sandboxes/realSpace/demo1/main.cpp
+++ b/dev-tools/sandboxes/realSpace/demo1/main.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/demo/main.cpp
+//! @file      dev-tools/sandboxes/realSpace/demo1/main.cpp
 //! @brief     Main program
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/dev-tools/sandboxes/realSpace/demo1/mainwindow.cpp b/dev-tools/sandboxes/realSpace/demo1/mainwindow.cpp
index a5813621bb437df0f6024266100b4d347ccd2695..c842f752cd295980dff5ca26023a875a9342dde5 100644
--- a/dev-tools/sandboxes/realSpace/demo1/mainwindow.cpp
+++ b/dev-tools/sandboxes/realSpace/demo1/mainwindow.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/demo/mainwindow.cpp
+//! @file      dev-tools/sandboxes/realSpace/demo1/mainwindow.cpp
 //! @brief     Implement MainWin class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/dev-tools/sandboxes/realSpace/demo1/mainwindow.h b/dev-tools/sandboxes/realSpace/demo1/mainwindow.h
index aca81a6fac27774e95efc6c99231d0d6e173cb87..af753c1525cb9c128575de8aeb97c78c9e6a3131 100644
--- a/dev-tools/sandboxes/realSpace/demo1/mainwindow.h
+++ b/dev-tools/sandboxes/realSpace/demo1/mainwindow.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/demo/mainwindow.h
+//! @file      dev-tools/sandboxes/realSpace/demo1/mainwindow.h
 //! @brief     Defines MainWin class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/dev-tools/sandboxes/realSpace/demo2/main.cpp b/dev-tools/sandboxes/realSpace/demo2/main.cpp
index 9fd8e75687c5e3fc63c88e3683cff958cad8a0a8..40360fcb8c1e4a4cae0b9d4d602cd5ec6602f441 100644
--- a/dev-tools/sandboxes/realSpace/demo2/main.cpp
+++ b/dev-tools/sandboxes/realSpace/demo2/main.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/showcase/main.cpp
+//! @file      dev-tools/sandboxes/realSpace/demo2/main.cpp
 //! @brief     Main program
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/dev-tools/sandboxes/realSpace/demo2/mainwindow.cpp b/dev-tools/sandboxes/realSpace/demo2/mainwindow.cpp
index 85731b50c8f345f1372f047c2f02590fefd11317..f3f415659d99c2a3d3ebc67de9e3e50a01c20552 100644
--- a/dev-tools/sandboxes/realSpace/demo2/mainwindow.cpp
+++ b/dev-tools/sandboxes/realSpace/demo2/mainwindow.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/showcase/mainwindow.cpp
+//! @file      dev-tools/sandboxes/realSpace/demo2/mainwindow.cpp
 //! @brief     Implements MainWin class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/dev-tools/sandboxes/realSpace/demo2/mainwindow.h b/dev-tools/sandboxes/realSpace/demo2/mainwindow.h
index 335c2afa265f09cff1beae494e1da0de1863a458..dc459295332cdd7de21b711aa066c1ba2d84ff3f 100644
--- a/dev-tools/sandboxes/realSpace/demo2/mainwindow.h
+++ b/dev-tools/sandboxes/realSpace/demo2/mainwindow.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/showcase/mainwindow.h
+//! @file      dev-tools/sandboxes/realSpace/demo2/mainwindow.h
 //! @brief     Defines MainWin class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/dev-tools/sandboxes/realSpace/demo2/modelLayers.cpp b/dev-tools/sandboxes/realSpace/demo2/modelLayers.cpp
index f22cd0bf31ed76d165cf6cce63d9f9c839b90c0d..5fbb1bf04f953d07bceacb1e3eaae0d4fc529e83 100644
--- a/dev-tools/sandboxes/realSpace/demo2/modelLayers.cpp
+++ b/dev-tools/sandboxes/realSpace/demo2/modelLayers.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/showcase/modelLayers.cpp
+//! @file      dev-tools/sandboxes/realSpace/demo2/modelLayers.cpp
 //! @brief     Implements ModelLayers class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/dev-tools/sandboxes/realSpace/demo2/modelLayers.h b/dev-tools/sandboxes/realSpace/demo2/modelLayers.h
index 7451619d5b68774f38322a4fa3907e362ecd98fe..5f36f915e1c2f1e05df59ddf07bada812a0dcadc 100644
--- a/dev-tools/sandboxes/realSpace/demo2/modelLayers.h
+++ b/dev-tools/sandboxes/realSpace/demo2/modelLayers.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/showcase/modelLayers.h
+//! @file      dev-tools/sandboxes/realSpace/demo2/modelLayers.h
 //! @brief     Defines ModelLayers class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/dev-tools/sandboxes/realSpace/demo2/modelShowcase.cpp b/dev-tools/sandboxes/realSpace/demo2/modelShowcase.cpp
index 77f01b18980397300049e9da77d6f58952f3f3a8..c7410f7f5bd55e3f0ed9e0ec012498c6434cd847 100644
--- a/dev-tools/sandboxes/realSpace/demo2/modelShowcase.cpp
+++ b/dev-tools/sandboxes/realSpace/demo2/modelShowcase.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/showcase/modelShowcase.cpp
+//! @file      dev-tools/sandboxes/realSpace/demo2/modelShowcase.cpp
 //! @brief     Implements ModelShowcase class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/dev-tools/sandboxes/realSpace/demo2/modelShowcase.h b/dev-tools/sandboxes/realSpace/demo2/modelShowcase.h
index 92fa4b4800db30859ea979817ffa58b4b06e7c5b..30f69909a4503eb8e9354452156014b1a0fa0cfb 100644
--- a/dev-tools/sandboxes/realSpace/demo2/modelShowcase.h
+++ b/dev-tools/sandboxes/realSpace/demo2/modelShowcase.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/showcase/modelShowcase.h
+//! @file      dev-tools/sandboxes/realSpace/demo2/modelShowcase.h
 //! @brief     Defines ModelShowcase class
 //!
 //! @homepage  http://www.bornagainproject.org