diff --git a/GUI/CMakeLists.txt b/GUI/CMakeLists.txt
index 3be38fe0030eadbe9b30e1f6604e5800ad958bf8..62655b408b3d73c090f4d3eb243ee00d45417cc6 100644
--- a/GUI/CMakeLists.txt
+++ b/GUI/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_AUTOMOC ON)
 
 if(BORNAGAIN_OPENGL)
     message(STATUS "Configuring BornAgain OpenGL")
-    add_subdirectory(ba3d/ba3d)
+    add_subdirectory(ba3d)
 endif()
 
 add_subdirectory(coregui)
diff --git a/GUI/ba3d/.gitignore b/GUI/ba3d/.gitignore
deleted file mode 100644
index 01e00f3af8129822388973bfc0eab8f4dcc5849a..0000000000000000000000000000000000000000
--- a/GUI/ba3d/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-CMakeLists.txt.user
diff --git a/GUI/ba3d/ba3d/CMakeLists.txt b/GUI/ba3d/CMakeLists.txt
similarity index 100%
rename from GUI/ba3d/ba3d/CMakeLists.txt
rename to GUI/ba3d/CMakeLists.txt
diff --git a/GUI/ba3d/ba3d/def.cpp b/GUI/ba3d/def.cpp
similarity index 98%
rename from GUI/ba3d/ba3d/def.cpp
rename to GUI/ba3d/def.cpp
index 980e11e8e509243d11d34871e124e3051e01dfca..a5f9866c74ebd128a0de38b3b6e9893a1f8bb548 100644
--- a/GUI/ba3d/ba3d/def.cpp
+++ b/GUI/ba3d/def.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/def.cpp
+//! @file      GUI/ba3d/def.cpp
 //! @brief     Definitions
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/def.h b/GUI/ba3d/def.h
similarity index 98%
rename from GUI/ba3d/ba3d/def.h
rename to GUI/ba3d/def.h
index effb332f8c0445f1533463ac988aea485bcf8abe..a699b07ff65ed9e221ce67e2cb9b6bfbb1607ad1 100644
--- a/GUI/ba3d/ba3d/def.h
+++ b/GUI/ba3d/def.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/def.h
+//! @file      GUI/ba3d/def.h
 //! @brief     Definitions
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry.cpp b/GUI/ba3d/model/geometry.cpp
similarity index 99%
rename from GUI/ba3d/ba3d/model/geometry.cpp
rename to GUI/ba3d/model/geometry.cpp
index 5ccdbd348ceac7118a4d1c58f4dda18af5492239..0619e6876a1b9cba7c125ce92466a6807f5c1449 100644
--- a/GUI/ba3d/ba3d/model/geometry.cpp
+++ b/GUI/ba3d/model/geometry.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/geometry.cpp
+//! @file      GUI/ba3d/model/geometry.cpp
 //! @brief     Implements Geometry class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry.h b/GUI/ba3d/model/geometry.h
similarity index 98%
rename from GUI/ba3d/ba3d/model/geometry.h
rename to GUI/ba3d/model/geometry.h
index f95a426536be6452da693287895ee747421608b0..302e86ae1380f27c6b9f42538ac224da962b939f 100644
--- a/GUI/ba3d/ba3d/model/geometry.h
+++ b/GUI/ba3d/model/geometry.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/geometry.h
+//! @file      GUI/ba3d/model/geometry.h
 //! @brief     Defines Geometry class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/box.cpp b/GUI/ba3d/model/geometry/box.cpp
similarity index 95%
rename from GUI/ba3d/ba3d/model/geometry/box.cpp
rename to GUI/ba3d/model/geometry/box.cpp
index 84ae36cc081c2298247d09eda6d002cf7c4be463..915dfc99b125ae5c54c3b6b7a75979e48ca767cc 100644
--- a/GUI/ba3d/ba3d/model/geometry/box.cpp
+++ b/GUI/ba3d/model/geometry/box.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/geometry/box.cpp
+//! @file      GUI/ba3d/model/geometry/box.cpp
 //! @brief     Implements utility functions in ba3d namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/column.cpp b/GUI/ba3d/model/geometry/column.cpp
similarity index 97%
rename from GUI/ba3d/ba3d/model/geometry/column.cpp
rename to GUI/ba3d/model/geometry/column.cpp
index d719c025241fe7a996d597a97464242493283d96..549dd6d229dd8e72d6df06cf0757a0270e7c9121 100644
--- a/GUI/ba3d/ba3d/model/geometry/column.cpp
+++ b/GUI/ba3d/model/geometry/column.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/geometry/column.cpp
+//! @file      GUI/ba3d/model/geometry/column.cpp
 //! @brief     Implements utility functions in ba3d namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/cuboctahedron.cpp b/GUI/ba3d/model/geometry/cuboctahedron.cpp
similarity index 96%
rename from GUI/ba3d/ba3d/model/geometry/cuboctahedron.cpp
rename to GUI/ba3d/model/geometry/cuboctahedron.cpp
index fb7be4e1c9bf880f65e7b33faa760be10c7d6c02..1885597c32cb08f41fdd554e6097924b0a4104aa 100644
--- a/GUI/ba3d/ba3d/model/geometry/cuboctahedron.cpp
+++ b/GUI/ba3d/model/geometry/cuboctahedron.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/geometry/cuboctahedron.cpp
+//! @file      GUI/ba3d/model/geometry/cuboctahedron.cpp
 //! @brief     Implements utility functions in ba3d namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/dodecahedron.cpp b/GUI/ba3d/model/geometry/dodecahedron.cpp
similarity index 97%
rename from GUI/ba3d/ba3d/model/geometry/dodecahedron.cpp
rename to GUI/ba3d/model/geometry/dodecahedron.cpp
index 0ee8b4ec7bbccd2bf78940ac134b9523a48c62c2..3a5fd6c2619b79f390ffc649c07bec6f9e7030da 100644
--- a/GUI/ba3d/ba3d/model/geometry/dodecahedron.cpp
+++ b/GUI/ba3d/model/geometry/dodecahedron.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/geometry/dodecahedron.cpp
+//! @file      GUI/ba3d/model/geometry/dodecahedron.cpp
 //! @brief     Implements utility functions in ba3d namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/icosahedron.cpp b/GUI/ba3d/model/geometry/icosahedron.cpp
similarity index 98%
rename from GUI/ba3d/ba3d/model/geometry/icosahedron.cpp
rename to GUI/ba3d/model/geometry/icosahedron.cpp
index bfac8f0641d8e7fe228e8f4a81a98df54ed2988a..17c5212c55a48ae522316f46b8bb4354e67f151f 100644
--- a/GUI/ba3d/ba3d/model/geometry/icosahedron.cpp
+++ b/GUI/ba3d/model/geometry/icosahedron.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/geometry/icosahedron.cpp
+//! @file      GUI/ba3d/model/geometry/icosahedron.cpp
 //! @brief     Implements utility functions in ba3d namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/plane.cpp b/GUI/ba3d/model/geometry/plane.cpp
similarity index 94%
rename from GUI/ba3d/ba3d/model/geometry/plane.cpp
rename to GUI/ba3d/model/geometry/plane.cpp
index 99fd03c7d406237e88a88b8f56c206875c36a409..7f75c0c01f088c80f58598b79e3b1c936a0157f4 100644
--- a/GUI/ba3d/ba3d/model/geometry/plane.cpp
+++ b/GUI/ba3d/model/geometry/plane.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/geometry/plane.cpp
+//! @file      GUI/ba3d/model/geometry/plane.cpp
 //! @brief     Implements utility functions in ba3d namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/ripple.cpp b/GUI/ba3d/model/geometry/ripple.cpp
similarity index 98%
rename from GUI/ba3d/ba3d/model/geometry/ripple.cpp
rename to GUI/ba3d/model/geometry/ripple.cpp
index 3e0ea3db66eb15a6b6933fba9d918195bd3bc7c3..c9606198049c514ba3c263a991ad10862a5b4be6 100644
--- a/GUI/ba3d/ba3d/model/geometry/ripple.cpp
+++ b/GUI/ba3d/model/geometry/ripple.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/geometry/ripple.cpp
+//! @file      GUI/ba3d/model/geometry/ripple.cpp
 //! @brief     Implements utility functions in ba3d namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/sphere.cpp b/GUI/ba3d/model/geometry/sphere.cpp
similarity index 98%
rename from GUI/ba3d/ba3d/model/geometry/sphere.cpp
rename to GUI/ba3d/model/geometry/sphere.cpp
index 4f1836ceb5785a85f98f98e5f66d4bbb2ef32077..7cfc77d3377ea5ef742ae2110847a7e43013d27a 100644
--- a/GUI/ba3d/ba3d/model/geometry/sphere.cpp
+++ b/GUI/ba3d/model/geometry/sphere.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/geometry/sphere.cpp
+//! @file      GUI/ba3d/model/geometry/sphere.cpp
 //! @brief     Implements utility functions in ba3d namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry/truncbox.cpp b/GUI/ba3d/model/geometry/truncbox.cpp
similarity index 97%
rename from GUI/ba3d/ba3d/model/geometry/truncbox.cpp
rename to GUI/ba3d/model/geometry/truncbox.cpp
index efb2646ef5105a445cac2290a532f82ddb466329..8a4a4a3661dd5b22d74f91fcfbb66c69d54327b8 100644
--- a/GUI/ba3d/ba3d/model/geometry/truncbox.cpp
+++ b/GUI/ba3d/model/geometry/truncbox.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/geometry/truncbox.cpp
+//! @file      GUI/ba3d/model/geometry/truncbox.cpp
 //! @brief     Implements utility functions in ba3d namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry_inc.cpp b/GUI/ba3d/model/geometry_inc.cpp
similarity index 96%
rename from GUI/ba3d/ba3d/model/geometry_inc.cpp
rename to GUI/ba3d/model/geometry_inc.cpp
index acbdd3c3428a4843d74e63e65048d4ec5037c6c5..0ecfa185ee63a88a9b47545a352f63b12aa682a5 100644
--- a/GUI/ba3d/ba3d/model/geometry_inc.cpp
+++ b/GUI/ba3d/model/geometry_inc.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/geometry_inc.cpp
+//! @file      GUI/ba3d/model/geometry_inc.cpp
 //! @brief     Implements geometry namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/geometry_inc.h b/GUI/ba3d/model/geometry_inc.h
similarity index 97%
rename from GUI/ba3d/ba3d/model/geometry_inc.h
rename to GUI/ba3d/model/geometry_inc.h
index b6179e3391c1325a92ad0b6f2ec082d5cf0f2951..0b317a60e4942ffe6686946faaa370d89c142e98 100644
--- a/GUI/ba3d/ba3d/model/geometry_inc.h
+++ b/GUI/ba3d/model/geometry_inc.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/geometry_inc.h
+//! @file      GUI/ba3d/model/geometry_inc.h
 //! @brief     Defines geometry namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/layer.cpp b/GUI/ba3d/model/layer.cpp
similarity index 94%
rename from GUI/ba3d/ba3d/model/layer.cpp
rename to GUI/ba3d/model/layer.cpp
index 7bd9be223f6874128b71108f6f2e3235cb324634..c752d5a07f35bea320c081054853e1ae2e6535e1 100644
--- a/GUI/ba3d/ba3d/model/layer.cpp
+++ b/GUI/ba3d/model/layer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/layer.cpp
+//! @file      GUI/ba3d/model/layer.cpp
 //! @brief     Implements Layer class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/layer.h b/GUI/ba3d/model/layer.h
similarity index 94%
rename from GUI/ba3d/ba3d/model/layer.h
rename to GUI/ba3d/model/layer.h
index 2724f64e10f4297c7e48fc3bbd78a3cf355ddae1..a13b2e05afa451e330a3b9b12736240e098a4ba7 100644
--- a/GUI/ba3d/ba3d/model/layer.h
+++ b/GUI/ba3d/model/layer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/layer.h
+//! @file      GUI/ba3d/model/layer.h
 //! @brief     Defines Layer class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/model.cpp b/GUI/ba3d/model/model.cpp
similarity index 99%
rename from GUI/ba3d/ba3d/model/model.cpp
rename to GUI/ba3d/model/model.cpp
index e12cf8dff352e3fe76289f2f1456b2a782aa908f..1b77c9cdca3c06b2e70ef3c18766a7e142aa2c16 100644
--- a/GUI/ba3d/ba3d/model/model.cpp
+++ b/GUI/ba3d/model/model.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/model.cpp
+//! @file      GUI/ba3d/model/model.cpp
 //! @brief     Implements Model class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/model.h b/GUI/ba3d/model/model.h
similarity index 97%
rename from GUI/ba3d/ba3d/model/model.h
rename to GUI/ba3d/model/model.h
index 258f55fb10058033977494eb1a0b6dd5d49fbd77..2e80fe3b037de413e825ccc544212a2a1b8a0f9b 100644
--- a/GUI/ba3d/ba3d/model/model.h
+++ b/GUI/ba3d/model/model.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/model.h
+//! @file      GUI/ba3d/model/model.h
 //! @brief     Defines Model class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/object.cpp b/GUI/ba3d/model/object.cpp
similarity index 98%
rename from GUI/ba3d/ba3d/model/object.cpp
rename to GUI/ba3d/model/object.cpp
index 146594781f9d89f36b3fe9686ed275496477cf89..f0807d0d66f123aa8f1dceca20f19b8cafb39f84 100644
--- a/GUI/ba3d/ba3d/model/object.cpp
+++ b/GUI/ba3d/model/object.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/object.cpp
+//! @file      GUI/ba3d/model/object.cpp
 //! @brief     Implements Object class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/object.h b/GUI/ba3d/model/object.h
similarity index 97%
rename from GUI/ba3d/ba3d/model/object.h
rename to GUI/ba3d/model/object.h
index 93c4de715385856ab263e3c3a8665d91753c92db..e0354050de10ac8bc9b3ccf194dbcd8fd79c95bd 100644
--- a/GUI/ba3d/ba3d/model/object.h
+++ b/GUI/ba3d/model/object.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/object.h
+//! @file      GUI/ba3d/model/object.h
 //! @brief     Defines Object class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/particles.cpp b/GUI/ba3d/model/particles.cpp
similarity index 99%
rename from GUI/ba3d/ba3d/model/particles.cpp
rename to GUI/ba3d/model/particles.cpp
index f5fecaed07cd568f20884e183883338313063592..5a17364059fb04e7be2802e0ea199794b1834b61 100644
--- a/GUI/ba3d/ba3d/model/particles.cpp
+++ b/GUI/ba3d/model/particles.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/particles.cpp
+//! @file      GUI/ba3d/model/particles.cpp
 //! @brief     Implements Particle class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/model/particles.h b/GUI/ba3d/model/particles.h
similarity index 99%
rename from GUI/ba3d/ba3d/model/particles.h
rename to GUI/ba3d/model/particles.h
index ffc5892002d4b72ad76f39ef8d992882808ea9f3..228573124aa4abab6adf18836b664dccb5b9bcc9 100644
--- a/GUI/ba3d/ba3d/model/particles.h
+++ b/GUI/ba3d/model/particles.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/model/particles.h
+//! @file      GUI/ba3d/model/particles.h
 //! @brief     Defines Particle class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/shaders.qrc b/GUI/ba3d/shaders.qrc
similarity index 100%
rename from GUI/ba3d/ba3d/shaders.qrc
rename to GUI/ba3d/shaders.qrc
diff --git a/GUI/ba3d/ba3d/shaders/fragment_shader.frag b/GUI/ba3d/shaders/fragment_shader.frag
similarity index 100%
rename from GUI/ba3d/ba3d/shaders/fragment_shader.frag
rename to GUI/ba3d/shaders/fragment_shader.frag
diff --git a/GUI/ba3d/ba3d/shaders/vertex_shader.vert b/GUI/ba3d/shaders/vertex_shader.vert
similarity index 100%
rename from GUI/ba3d/ba3d/shaders/vertex_shader.vert
rename to GUI/ba3d/shaders/vertex_shader.vert
diff --git a/GUI/ba3d/ba3d/view/buffer.cpp b/GUI/ba3d/view/buffer.cpp
similarity index 99%
rename from GUI/ba3d/ba3d/view/buffer.cpp
rename to GUI/ba3d/view/buffer.cpp
index d1b11ea4d10a7326c3b533a734e4e1d2c7527542..6c176338c793f859619eff2c947a872483b0ce75 100644
--- a/GUI/ba3d/ba3d/view/buffer.cpp
+++ b/GUI/ba3d/view/buffer.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/view/buffer.cpp
+//! @file      GUI/ba3d/view/buffer.cpp
 //! @brief     Implements Buffer class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/view/buffer.h b/GUI/ba3d/view/buffer.h
similarity index 96%
rename from GUI/ba3d/ba3d/view/buffer.h
rename to GUI/ba3d/view/buffer.h
index 225cec7f9c5dd44457f7b040e3857a054a57d748..577425a6705c4a718af5cc348cee244ec290c7cd 100644
--- a/GUI/ba3d/ba3d/view/buffer.h
+++ b/GUI/ba3d/view/buffer.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/view/buffer.h
+//! @file      GUI/ba3d/view/buffer.h
 //! @brief     Defines Buffer class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/view/camera.cpp b/GUI/ba3d/view/camera.cpp
similarity index 98%
rename from GUI/ba3d/ba3d/view/camera.cpp
rename to GUI/ba3d/view/camera.cpp
index e7a7a10b52ab93adb53571d65dd750025155677f..7f14cf0d1e849803aca89eedc7bf06533c4039b5 100644
--- a/GUI/ba3d/ba3d/view/camera.cpp
+++ b/GUI/ba3d/view/camera.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/view/camera.cpp
+//! @file      GUI/ba3d/view/camera.cpp
 //! @brief     Implements Camera class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/view/camera.h b/GUI/ba3d/view/camera.h
similarity index 97%
rename from GUI/ba3d/ba3d/view/camera.h
rename to GUI/ba3d/view/camera.h
index 2d8d0e970d4b0ae848f16df59064da1e74000266..a9885a279f0d84c04f2d899e9d2f8e4fd6dbe01b 100644
--- a/GUI/ba3d/ba3d/view/camera.h
+++ b/GUI/ba3d/view/camera.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/view/camera.h
+//! @file      GUI/ba3d/view/camera.h
 //! @brief     Defines Camera class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/view/canvas.cpp b/GUI/ba3d/view/canvas.cpp
similarity index 99%
rename from GUI/ba3d/ba3d/view/canvas.cpp
rename to GUI/ba3d/view/canvas.cpp
index f336115662bd1a0f55d95b79d1035945a20f0a10..af38ec89f86926d340d38282562414784646d8cd 100644
--- a/GUI/ba3d/ba3d/view/canvas.cpp
+++ b/GUI/ba3d/view/canvas.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/view/canvas.cpp
+//! @file      GUI/ba3d/view/canvas.cpp
 //! @brief     Implements Canvas class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/view/canvas.h b/GUI/ba3d/view/canvas.h
similarity index 98%
rename from GUI/ba3d/ba3d/view/canvas.h
rename to GUI/ba3d/view/canvas.h
index 76a8acab5998eeb03120fc3ff8c5325b01888419..be6df8a69a75349163f0fbe51546d379af0f74b8 100644
--- a/GUI/ba3d/ba3d/view/canvas.h
+++ b/GUI/ba3d/view/canvas.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/view/canvas.h
+//! @file      GUI/ba3d/view/canvas.h
 //! @brief     Defines Canvas class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/view/program.cpp b/GUI/ba3d/view/program.cpp
similarity index 98%
rename from GUI/ba3d/ba3d/view/program.cpp
rename to GUI/ba3d/view/program.cpp
index 55d85d5fa5f34d754a5c4e4bcef6f03cda55f31c..c26c307eb159ab4ea6d57b3a19ea45d22136490a 100644
--- a/GUI/ba3d/ba3d/view/program.cpp
+++ b/GUI/ba3d/view/program.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/view/program.cpp
+//! @file      GUI/ba3d/view/program.cpp
 //! @brief     Implements Program class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/view/program.h b/GUI/ba3d/view/program.h
similarity index 96%
rename from GUI/ba3d/ba3d/view/program.h
rename to GUI/ba3d/view/program.h
index 53f1cfeea09e234e2bfd47d08c9fcd7ba6cef031..b5f90891e623379524ca4b0fd721b03f8718bc1a 100644
--- a/GUI/ba3d/ba3d/view/program.h
+++ b/GUI/ba3d/view/program.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/view/program.h
+//! @file      GUI/ba3d/view/program.h
 //! @brief     Defines Program class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/widget.cpp b/GUI/ba3d/widget.cpp
similarity index 97%
rename from GUI/ba3d/ba3d/widget.cpp
rename to GUI/ba3d/widget.cpp
index 68abe50ff55e35d39525690bc58fb95d05ff2d09..63affacb95bacb6f126f0689f036628d9e401587 100644
--- a/GUI/ba3d/ba3d/widget.cpp
+++ b/GUI/ba3d/widget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/widget.cpp
+//! @file      GUI/ba3d/widget.cpp
 //! @brief     Implement Widget class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/ba3d/ba3d/widget.h b/GUI/ba3d/widget.h
similarity index 96%
rename from GUI/ba3d/ba3d/widget.h
rename to GUI/ba3d/widget.h
index 2471d25f7ceaf79d57c1a1950c9f7f9e86d34006..343d61a4691afcdba26b955b179c43b743cb241c 100644
--- a/GUI/ba3d/ba3d/widget.h
+++ b/GUI/ba3d/widget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/ba3d/ba3d/widget.h
+//! @file      GUI/ba3d/widget.h
 //! @brief     Defines Widget class
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h
index 9f4f2b8a3b6590504623679bc3b5b4d9e33b492d..f64b3a76c51c75991990fe696a767d0f384c57b4 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h
@@ -15,7 +15,7 @@
 #ifndef REALSPACEBUILDER_H
 #define REALSPACEBUILDER_H
 
-#include "../../ba3d/ba3d/view/camera.h"
+#include "../../ba3d/view/camera.h"
 #include "WinDllMacros.h"
 #include <QVector3D>
 #include <QWidget>