diff --git a/GUI/ba3d/CMakeLists.txt b/GUI/ba3d/CMakeLists.txt
index 79ffd084e626b1c961077aa2cd04f329168bb78f..4f967bcc4f53def8c752f76dd1636ff93c1a9129 100644
--- a/GUI/ba3d/CMakeLists.txt
+++ b/GUI/ba3d/CMakeLists.txt
@@ -6,9 +6,8 @@ set(CMAKE_AUTORCC ON)
 qt5_add_resources(RC_SHADERS "shaders.qrc")
 
 add_library (${lib} STATIC ${source_files} ${RC_SHADERS})
-target_include_directories(${lib} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
+target_include_directories(${lib} PUBLIC ${CMAKE_SOURCE_DIR})
 
 target_link_libraries (${lib} Qt5::Core Qt5::Widgets Qt5::OpenGL)
 
-set(${lib}_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/.. PARENT_SCOPE)
 set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
diff --git a/GUI/ba3d/model/model.h b/GUI/ba3d/model/model.h
index 2e80fe3b037de413e825ccc544212a2a1b8a0f9b..8cbbb4e06f004115519769fd2936b9b9d560b566 100644
--- a/GUI/ba3d/model/model.h
+++ b/GUI/ba3d/model/model.h
@@ -18,7 +18,7 @@
 #include "object.h"
 #include "particles.h"
 #include <QVector>
-#include <ba3d/view/camera.h>
+#include "GUI/ba3d/view/camera.h"
 
 namespace RealSpace
 {
diff --git a/GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.cpp b/GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.cpp
index 01e8904595c83fdc74e4bb6ca77624566997d51f..acfd8cc4bd6cdc300e141a9292228ff2c6f9a20e 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/Particle3DContainer.cpp
@@ -13,7 +13,7 @@
 // ************************************************************************** //
 
 #include "Particle3DContainer.h"
-#include <ba3d/model/particles.h>
+#include "GUI/ba3d/model/particles.h"
 
 // copy constructor
 Particle3DContainer::Particle3DContainer(const Particle3DContainer& other)
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
index a40754d16c213a47fe5c32a0ea1b4d6847e3726b..d5b0fe793d300b0b74d7844dc73abda6c1c754b4 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
@@ -37,7 +37,7 @@
 #include "Units.h"
 #include "VectorItem.h"
 #include <QDebug>
-#include <ba3d/model/layer.h>
+#include "GUI/ba3d/model/layer.h"
 
 namespace
 {
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
index 508dae0c3ef2fbe8819f87e6b0a1842d51c18e70..6382382d3e0e4a75419c6e75377f402856efe177 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
@@ -30,7 +30,7 @@
 #include "RealSpaceBuilderUtils.h"
 #include "TransformTo3D.h"
 #include "Units.h"
-#include <ba3d/model/particles.h>
+#include "GUI/ba3d/model/particles.h"
 
 namespace
 {
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h
index cb70b3d526fd62f726a6616cab61cae89aa3eb80..4e824e90b48fb9fd7cd8d470f0d7fb600c5916dd 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h
@@ -16,7 +16,7 @@
 #define REALSPACEMODEL_H
 
 #include "WinDllMacros.h"
-#include <ba3d/model/model.h>
+#include "GUI/ba3d/model/model.h"
 
 class RealSpaceModel : public RealSpace::Model
 {
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.cpp
index 7e686722511d5d383de48708335779a3dbd44fbf..3d5a0dac0124b41a5e7f531f587201803e596a6c 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.cpp
@@ -15,7 +15,7 @@
 #include "RealSpaceView.h"
 #include "RealSpaceModel.h"
 #include <QVBoxLayout>
-#include <ba3d/widget.h>
+#include "GUI/ba3d/widget.h"
 
 RealSpaceView::RealSpaceView(QWidget* parent) : QWidget(parent), m_3dview(new RealSpace::Widget3D)
 {
diff --git a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h
index 75fa375e0d696aa143d8fbe997fc881b7c9848fd..bdc926e231f8b59725ee7544975e9a0ebb781483 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h
@@ -17,8 +17,8 @@
 
 #include "WinDllMacros.h"
 #include <Vectors3D.h>
-#include <ba3d/model/layer.h>
-#include <ba3d/model/particles.h>
+#include "GUI/ba3d/model/layer.h"
+#include "GUI/ba3d/model/particles.h"
 #include <memory>
 
 class SessionItem;
diff --git a/dev-tools/sandboxes/realSpace/demo1/demo_model.cpp b/dev-tools/sandboxes/realSpace/demo1/demo_model.cpp
index 9632516e5017e06e06230150830203bfd04e4a24..4fadc21946b2b537b1bb6719b01848112874e989 100644
--- a/dev-tools/sandboxes/realSpace/demo1/demo_model.cpp
+++ b/dev-tools/sandboxes/realSpace/demo1/demo_model.cpp
@@ -14,7 +14,7 @@
 
 #include "demo_model.h"
 #include <QApplication>
-#include <ba3d/model/layer.h>
+#include "GUI/ba3d/model/layer.h"
 #include <qmath.h>
 #include <thread>
 
diff --git a/dev-tools/sandboxes/realSpace/demo1/demo_model.h b/dev-tools/sandboxes/realSpace/demo1/demo_model.h
index 059b4cf9d9f4be515627945d03c66845de083c15..5567d64a66dc0c989c0074d2e31d230e75aa928e 100644
--- a/dev-tools/sandboxes/realSpace/demo1/demo_model.h
+++ b/dev-tools/sandboxes/realSpace/demo1/demo_model.h
@@ -17,8 +17,8 @@
 
 #include "lattice.h"
 #include <QAtomicInteger>
-#include <ba3d/model/model.h>
-#include <ba3d/model/particles.h>
+#include "GUI/ba3d/model/model.h"
+#include "GUI/ba3d/model/particles.h"
 
 class DemoModel : public RealSpace::Model
 {
diff --git a/dev-tools/sandboxes/realSpace/demo1/lattice.h b/dev-tools/sandboxes/realSpace/demo1/lattice.h
index 8a936075f0613ad76571b3d503d72345d24f2c32..f6c2dc59a62fbd57873db1e1dadf7bb875d0980a 100644
--- a/dev-tools/sandboxes/realSpace/demo1/lattice.h
+++ b/dev-tools/sandboxes/realSpace/demo1/lattice.h
@@ -16,7 +16,7 @@
 #define BA3D_LATTICE_H
 
 #include <QVector>
-#include <ba3d/def.h>
+#include "GUI/ba3d/def.h"
 
 class Lattice : public QVector<RealSpace::Vector3D>
 {
diff --git a/dev-tools/sandboxes/realSpace/demo1/main.cpp b/dev-tools/sandboxes/realSpace/demo1/main.cpp
index 67fee4f528dec435ea8f099bb137c8a8c66cdeb9..d1572dbbb4e32e57b22b941665bc2b24a54561f4 100644
--- a/dev-tools/sandboxes/realSpace/demo1/main.cpp
+++ b/dev-tools/sandboxes/realSpace/demo1/main.cpp
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#include <ba3d/def.h>
-#include <ba3d/view/camera.h>
+#include "GUI/ba3d/def.h"
+#include "GUI/ba3d/view/camera.h"
 
 #include "demo_model.h"
 #include "mainwindow.h"
diff --git a/dev-tools/sandboxes/realSpace/demo1/mainwindow.h b/dev-tools/sandboxes/realSpace/demo1/mainwindow.h
index af753c1525cb9c128575de8aeb97c78c9e6a3131..a828a7d0742dfbcc72cd7fb72442c2fdb70e369f 100644
--- a/dev-tools/sandboxes/realSpace/demo1/mainwindow.h
+++ b/dev-tools/sandboxes/realSpace/demo1/mainwindow.h
@@ -17,8 +17,8 @@
 
 #include "demo_model.h"
 #include <QMainWindow>
-#include <ba3d/model/particles.h>
-#include <ba3d/widget.h>
+#include "GUI/ba3d/model/particles.h"
+#include "GUI/ba3d/widget.h"
 
 class QSlider;
 
diff --git a/dev-tools/sandboxes/realSpace/demo2/main.cpp b/dev-tools/sandboxes/realSpace/demo2/main.cpp
index 40360fcb8c1e4a4cae0b9d4d602cd5ec6602f441..0cf44a79fc33d7f0f2ea721d37f2716afc32f7fa 100644
--- a/dev-tools/sandboxes/realSpace/demo2/main.cpp
+++ b/dev-tools/sandboxes/realSpace/demo2/main.cpp
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#include <ba3d/def.h>
-#include <ba3d/view/camera.h>
+#include "GUI/ba3d/def.h"
+#include "GUI/ba3d/view/camera.h"
 
 #include "mainwindow.h"
 #include "modelLayers.h"
diff --git a/dev-tools/sandboxes/realSpace/demo2/mainwindow.h b/dev-tools/sandboxes/realSpace/demo2/mainwindow.h
index dc459295332cdd7de21b711aa066c1ba2d84ff3f..95a5838293b0bccf9da88d5b31d7f514b9804ef8 100644
--- a/dev-tools/sandboxes/realSpace/demo2/mainwindow.h
+++ b/dev-tools/sandboxes/realSpace/demo2/mainwindow.h
@@ -16,8 +16,8 @@
 #define BA3D_MAINWINDOW_H
 
 #include <QMainWindow>
-#include <ba3d/model/particles.h>
-#include <ba3d/widget.h>
+#include "GUI/ba3d/model/particles.h"
+#include "GUI/ba3d/widget.h"
 
 //------------------------------------------------------------------------------
 
diff --git a/dev-tools/sandboxes/realSpace/demo2/modelLayers.cpp b/dev-tools/sandboxes/realSpace/demo2/modelLayers.cpp
index 5fbb1bf04f953d07bceacb1e3eaae0d4fc529e83..32e2a4e398826198f1f7032ae89e7429ba86ce9f 100644
--- a/dev-tools/sandboxes/realSpace/demo2/modelLayers.cpp
+++ b/dev-tools/sandboxes/realSpace/demo2/modelLayers.cpp
@@ -14,7 +14,7 @@
 
 #include "modelLayers.h"
 #include "modelShowcase.h"
-#include <ba3d/model/layer.h>
+#include "GUI/ba3d/model/layer.h"
 
 //------------------------------------------------------------------------------
 
diff --git a/dev-tools/sandboxes/realSpace/demo2/modelLayers.h b/dev-tools/sandboxes/realSpace/demo2/modelLayers.h
index 5f36f915e1c2f1e05df59ddf07bada812a0dcadc..a1bf4f1ac5ff24b27654fb014ba8f793b88b7376 100644
--- a/dev-tools/sandboxes/realSpace/demo2/modelLayers.h
+++ b/dev-tools/sandboxes/realSpace/demo2/modelLayers.h
@@ -15,8 +15,8 @@
 #ifndef BA3D_MODEL_LAYERS_H
 #define BA3D_MODEL_LAYERS_H
 
-#include <ba3d/model/model.h>
-#include <ba3d/model/particles.h>
+#include "GUI/ba3d/model/model.h"
+#include "GUI/ba3d/model/particles.h"
 
 //------------------------------------------------------------------------------
 
diff --git a/dev-tools/sandboxes/realSpace/demo2/modelShowcase.h b/dev-tools/sandboxes/realSpace/demo2/modelShowcase.h
index 30f69909a4503eb8e9354452156014b1a0fa0cfb..0090d052aee7b56e23458fc7a1f235c267ac7428 100644
--- a/dev-tools/sandboxes/realSpace/demo2/modelShowcase.h
+++ b/dev-tools/sandboxes/realSpace/demo2/modelShowcase.h
@@ -15,8 +15,8 @@
 #ifndef BA3D_MODEL_SHOWCASE_H
 #define BA3D_MODEL_SHOWCASE_H
 
-#include <ba3d/model/model.h>
-#include <ba3d/model/particles.h>
+#include "GUI/ba3d/model/model.h"
+#include "GUI/ba3d/model/particles.h"
 
 //------------------------------------------------------------------------------