diff --git a/Tests/UnitTests/gui2/testdareflcore/applicationmodels.test.cpp b/Tests/UnitTests/gui2/testdareflcore/applicationmodels.test.cpp
index 673d7734d46c7d70b0995cbe419572895a1504a5..006e9a8ca8d5b4c20d803e2a3afa5b3a33f3e6c3 100644
--- a/Tests/UnitTests/gui2/testdareflcore/applicationmodels.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/applicationmodels.test.cpp
@@ -9,7 +9,7 @@
 
 #include "folderbasedtest.h"
 #include "google_test.h"
-#include <darefl/model/applicationmodels.h>
+#include "gui2/model/applicationmodels.h"
 #include "mvvm/factories/modeldocumentfactory.h"
 #include "mvvm/project/project.h"
 #include "mvvm/project/project_types.h"
diff --git a/Tests/UnitTests/gui2/testdareflcore/datahandler.test.cpp b/Tests/UnitTests/gui2/testdareflcore/datahandler.test.cpp
index 778ad61a87e37f509662a162bea4c8287541ffe6..55bc755ef7638db016087db41f4ec47685dfce05 100644
--- a/Tests/UnitTests/gui2/testdareflcore/datahandler.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/datahandler.test.cpp
@@ -9,7 +9,7 @@
 
 #include "folderbasedtest.h"
 #include "test_utils.h"
-#include <darefl/dataloader/datahandler.h>
+#include "gui2/dataloader/datahandler.h"
 #include "mvvm/utils/fileutils.h"
 
 using TestUtils::toStringVector;
diff --git a/Tests/UnitTests/gui2/testdareflcore/dataloader_utils.test.cpp b/Tests/UnitTests/gui2/testdareflcore/dataloader_utils.test.cpp
index dc736ffe207bec08b3b99d2411aab37d6dfdc270..c3ee09bb9e37de4db0e98a0fae8b13d8f3311c1b 100644
--- a/Tests/UnitTests/gui2/testdareflcore/dataloader_utils.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/dataloader_utils.test.cpp
@@ -9,9 +9,9 @@
 
 #include "folderbasedtest.h"
 #include "test_utils.h"
-#include <darefl/dataloader/dataloader_constants.h>
-#include <darefl/dataloader/dataloader_utils.h>
-#include <darefl/importdataview/graphimportdata.h>
+#include "gui2/dataloader/dataloader_constants.h"
+#include "gui2/dataloader/dataloader_utils.h"
+#include "gui2/importdataview/graphimportdata.h"
 #include <initializer_list>
 #include <vector>
 
diff --git a/Tests/UnitTests/gui2/testdareflcore/dataselectionmodel.test.cpp b/Tests/UnitTests/gui2/testdareflcore/dataselectionmodel.test.cpp
index e76ecd6970bd60139c2903bd3a56c1be1e4cd04b..9d5a3e3b8231f45d09d51c8c448385f1984220bd 100644
--- a/Tests/UnitTests/gui2/testdareflcore/dataselectionmodel.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/dataselectionmodel.test.cpp
@@ -10,10 +10,10 @@
 #include "google_test.h"
 #include "test_utils.h"
 #include <QDebug>
-#include <darefl/importdataview/dataselectionmodel.h>
-#include <darefl/importdataview/dataviewmodel.h>
-#include <darefl/model/experimentaldataitems.h>
-#include <darefl/model/experimentaldatamodel.h>
+#include "gui2/importdataview/dataselectionmodel.h"
+#include "gui2/importdataview/dataviewmodel.h"
+#include "gui2/model/experimentaldataitems.h"
+#include "gui2/model/experimentaldatamodel.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/standarditems/graphitem.h"
 
diff --git a/Tests/UnitTests/gui2/testdareflcore/defaultparser.test.cpp b/Tests/UnitTests/gui2/testdareflcore/defaultparser.test.cpp
index 3798925eebf3db74037e98198397c7d7ca8bc4de..b4a77c2e9e301dc3be0bec79b06943c92c517d44 100644
--- a/Tests/UnitTests/gui2/testdareflcore/defaultparser.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/defaultparser.test.cpp
@@ -9,8 +9,8 @@
 
 #include "google_test.h"
 #include "test_utils.h"
-#include <darefl/dataloader/dataloader_types.h>
-#include <darefl/dataloader/defaultparser.h>
+#include "gui2/dataloader/dataloader_types.h"
+#include "gui2/dataloader/defaultparser.h"
 
 using namespace DaRefl;
 using TestUtils::toStringVector;
diff --git a/Tests/UnitTests/gui2/testdareflcore/experimentaldatamodel.test.cpp b/Tests/UnitTests/gui2/testdareflcore/experimentaldatamodel.test.cpp
index e24e8ad187807c2d50385314213fb94d3d1cd082..844669af02d38ee02c447f0623fa17295c505fd5 100644
--- a/Tests/UnitTests/gui2/testdareflcore/experimentaldatamodel.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/experimentaldatamodel.test.cpp
@@ -9,10 +9,10 @@
 
 #include "google_test.h"
 
-#include <darefl/importdataview/graphimportdata.h>
-#include <darefl/model/experimentaldataitems.h>
-#include <darefl/model/experimentaldatamodel.h>
-#include <darefl/model/item_constants.h>
+#include "gui2/importdataview/graphimportdata.h"
+#include "gui2/model/experimentaldataitems.h"
+#include "gui2/model/experimentaldatamodel.h"
+#include "gui2/model/item_constants.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/standarditems/data1ditem.h"
 #include "mvvm/standarditems/graphitem.h"
diff --git a/Tests/UnitTests/gui2/testdareflcore/importdataeditoractions.test.cpp b/Tests/UnitTests/gui2/testdareflcore/importdataeditoractions.test.cpp
index 78c384c65d691e907bb0220a3cc1f4ae0e8bb3c6..36b6e7b8b7fcd6991c2673b5ac565825041df5eb 100644
--- a/Tests/UnitTests/gui2/testdareflcore/importdataeditoractions.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/importdataeditoractions.test.cpp
@@ -9,12 +9,12 @@
 
 #include "google_test.h"
 #include "test_utils.h"
-#include <darefl/importdataview/dataselectionmodel.h>
-#include <darefl/importdataview/dataviewmodel.h>
-#include <darefl/importdataview/graphimportdata.h>
-#include <darefl/importdataview/importdataeditoractions.h>
-#include <darefl/model/experimentaldataitems.h>
-#include <darefl/model/experimentaldatamodel.h>
+#include "gui2/importdataview/dataselectionmodel.h"
+#include "gui2/importdataview/dataviewmodel.h"
+#include "gui2/importdataview/graphimportdata.h"
+#include "gui2/importdataview/importdataeditoractions.h"
+#include "gui2/model/experimentaldataitems.h"
+#include "gui2/model/experimentaldatamodel.h"
 #include "mvvm/model/comboproperty.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/standarditems/graphitem.h"
diff --git a/Tests/UnitTests/gui2/testdareflcore/importtableheader.test.cpp b/Tests/UnitTests/gui2/testdareflcore/importtableheader.test.cpp
index e852be46b1e8e0d75f8154abfe72a52d18555f2e..4931c5936782303ab98b7077e2ba8994c2787d05 100644
--- a/Tests/UnitTests/gui2/testdareflcore/importtableheader.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/importtableheader.test.cpp
@@ -9,9 +9,9 @@
 
 #include "google_test.h"
 #include "test_utils.h"
-#include <darefl/dataloader/dataloader_constants.h>
-#include <darefl/dataloader/dataloader_types.h>
-#include <darefl/dataloader/importtableheader.h>
+#include "gui2/dataloader/dataloader_constants.h"
+#include "gui2/dataloader/dataloader_types.h"
+#include "gui2/dataloader/importtableheader.h"
 #include "mvvm/model/comboproperty.h"
 
 using namespace DaRefl;
diff --git a/Tests/UnitTests/gui2/testdareflcore/instrumentitems.test.cpp b/Tests/UnitTests/gui2/testdareflcore/instrumentitems.test.cpp
index d85a5a525b0855a887649df574a2486f7395e614..eac5cd6d042bcc068405996efabb915cff49317c 100644
--- a/Tests/UnitTests/gui2/testdareflcore/instrumentitems.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/instrumentitems.test.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <darefl/model/experimentaldataitems.h>
-#include <darefl/model/instrumentitems.h>
-#include <darefl/model/instrumentmodel.h>
+#include "gui2/model/experimentaldataitems.h"
+#include "gui2/model/instrumentitems.h"
+#include "gui2/model/instrumentmodel.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/data1ditem.h"
diff --git a/Tests/UnitTests/gui2/testdareflcore/layereditoractions.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layereditoractions.test.cpp
index 87db9a48df3a219628e7bc78e3b92a30f3b230fd..1caff388ff86292441074ed28d9d1d6c1e16b356 100644
--- a/Tests/UnitTests/gui2/testdareflcore/layereditoractions.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/layereditoractions.test.cpp
@@ -10,12 +10,12 @@
 #include "google_test.h"
 #include "test_utils.h"
 #include <QDebug>
-#include <darefl/layereditor/layereditoractions.h>
-#include <darefl/layereditor/layerselectionmodel.h>
-#include <darefl/layereditor/layerviewmodel.h>
-#include <darefl/model/item_constants.h>
-#include <darefl/model/sampleitems.h>
-#include <darefl/model/samplemodel.h>
+#include "gui2/layereditor/layereditoractions.h"
+#include "gui2/layereditor/layerselectionmodel.h"
+#include "gui2/layereditor/layerviewmodel.h"
+#include "gui2/model/item_constants.h"
+#include "gui2/model/sampleitems.h"
+#include "gui2/model/samplemodel.h"
 #include "mvvm/viewmodel/standardviewitems.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
 
diff --git a/Tests/UnitTests/gui2/testdareflcore/layerelements.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layerelements.test.cpp
index 8cf80abb2e4859afa6be686836911b0ed576ca42..eaaa037b9b2c0630827a0f2b76cc9fa7183ac392 100644
--- a/Tests/UnitTests/gui2/testdareflcore/layerelements.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/layerelements.test.cpp
@@ -10,15 +10,15 @@
 #include "google_test.h"
 
 #include "test_utils.h"
-#include <darefl/model/materialmodel.h>
-#include <darefl/model/samplemodel.h>
-#include <darefl/sldeditor/graphicsscene.h>
-#include <darefl/sldeditor/handleelementview.h>
-#include <darefl/sldeditor/layerelementcontroller.h>
-#include <darefl/sldeditor/layerelementitem.h>
-#include <darefl/sldeditor/roughnesselementview.h>
-#include <darefl/sldeditor/segmentelementview.h>
-#include <darefl/sldeditor/sldelementmodel.h>
+#include "gui2/model/materialmodel.h"
+#include "gui2/model/samplemodel.h"
+#include "gui2/sldeditor/graphicsscene.h"
+#include "gui2/sldeditor/handleelementview.h"
+#include "gui2/sldeditor/layerelementcontroller.h"
+#include "gui2/sldeditor/layerelementitem.h"
+#include "gui2/sldeditor/roughnesselementview.h"
+#include "gui2/sldeditor/segmentelementview.h"
+#include "gui2/sldeditor/sldelementmodel.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
 
 #include <QColor>
diff --git a/Tests/UnitTests/gui2/testdareflcore/layeritems.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layeritems.test.cpp
index fb8c3a95a009067b9fab5b22dff2fee0a157e58a..ac46cbedd6ebcdbcd9b6bcccb635c59fb90451d2 100644
--- a/Tests/UnitTests/gui2/testdareflcore/layeritems.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/layeritems.test.cpp
@@ -9,8 +9,8 @@
 
 #include "google_test.h"
 #include "test_utils.h"
-#include <darefl/model/sampleitems.h>
-#include <darefl/model/samplemodel.h>
+#include "gui2/model/sampleitems.h"
+#include "gui2/model/samplemodel.h"
 
 using namespace DaRefl;
 using namespace ModelView;
diff --git a/Tests/UnitTests/gui2/testdareflcore/layerselectionmodel.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layerselectionmodel.test.cpp
index fabf45e768de1d3ba9297e3c666633a7bf0f9320..7c69289b980230fe8be5285c22477df19c834126 100644
--- a/Tests/UnitTests/gui2/testdareflcore/layerselectionmodel.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/layerselectionmodel.test.cpp
@@ -9,10 +9,10 @@
 
 #include "google_test.h"
 #include "test_utils.h"
-#include <darefl/layereditor/layerselectionmodel.h>
-#include <darefl/layereditor/layerviewmodel.h>
-#include <darefl/model/sampleitems.h>
-#include <darefl/model/samplemodel.h>
+#include "gui2/layereditor/layerselectionmodel.h"
+#include "gui2/layereditor/layerviewmodel.h"
+#include "gui2/model/sampleitems.h"
+#include "gui2/model/samplemodel.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
 
 using namespace DaRefl;
diff --git a/Tests/UnitTests/gui2/testdareflcore/layerviewmodel.test.cpp b/Tests/UnitTests/gui2/testdareflcore/layerviewmodel.test.cpp
index 2bbdec0a7f26ae2729147ba5d80492444ed474be..e207c9a9dae9515d936527a39268d4f5909a8fa9 100644
--- a/Tests/UnitTests/gui2/testdareflcore/layerviewmodel.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/layerviewmodel.test.cpp
@@ -10,9 +10,9 @@
 #include "google_test.h"
 #include "test_utils.h"
 #include <QSignalSpy>
-#include <darefl/layereditor/layerviewmodel.h>
-#include <darefl/model/sampleitems.h>
-#include <darefl/model/samplemodel.h>
+#include "gui2/layereditor/layerviewmodel.h"
+#include "gui2/model/sampleitems.h"
+#include "gui2/model/samplemodel.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
 
 using namespace DaRefl;
diff --git a/Tests/UnitTests/gui2/testdareflcore/materialprofile.test.cpp b/Tests/UnitTests/gui2/testdareflcore/materialprofile.test.cpp
index 8f804eca662c934f3546b383540dc4c8d3775f5a..7c8a4ac860c93d7a8d838ee59181b769a70b4356 100644
--- a/Tests/UnitTests/gui2/testdareflcore/materialprofile.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/materialprofile.test.cpp
@@ -8,7 +8,7 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <darefl/quicksimeditor/materialprofile.h>
+#include "gui2/quicksimeditor/materialprofile.h"
 
 using namespace DaRefl;
 
diff --git a/Tests/UnitTests/gui2/testdareflcore/modelutils.test.cpp b/Tests/UnitTests/gui2/testdareflcore/modelutils.test.cpp
index 031adcf51883d400ee9935ae9c733fb2c8012f56..27f8b3d37b504a9b4409c25b4c5e4bb384d50065 100644
--- a/Tests/UnitTests/gui2/testdareflcore/modelutils.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/modelutils.test.cpp
@@ -8,7 +8,7 @@
 // ************************************************************************** //
 
 #include "google_test.h"
-#include <darefl/model/modelutils.h>
+#include "gui2/model/modelutils.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/data1ditem.h"
 
diff --git a/Tests/UnitTests/gui2/testdareflcore/quicksimutils.test.cpp b/Tests/UnitTests/gui2/testdareflcore/quicksimutils.test.cpp
index 92b3d9e0eb95bfac9ec6b2c1ac5a2be0a6e5f88d..c4558635b3070ac6fc2ba2d79bd96709c96a70ee 100644
--- a/Tests/UnitTests/gui2/testdareflcore/quicksimutils.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/quicksimutils.test.cpp
@@ -9,11 +9,11 @@
 
 #include "google_test.h"
 #include <QColor>
-#include <darefl/model/materialitems.h>
-#include <darefl/model/materialmodel.h>
-#include <darefl/model/sampleitems.h>
-#include <darefl/model/samplemodel.h>
-#include <darefl/quicksimeditor/quicksimutils.h>
+#include "gui2/model/materialitems.h"
+#include "gui2/model/materialmodel.h"
+#include "gui2/model/sampleitems.h"
+#include "gui2/model/samplemodel.h"
+#include "gui2/quicksimeditor/quicksimutils.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/itempool.h"
 #include <tuple>
diff --git a/Tests/UnitTests/gui2/testdareflcore/sldelementcontroller.test.cpp b/Tests/UnitTests/gui2/testdareflcore/sldelementcontroller.test.cpp
index f3a4af55887ebe5308fd271930701ab5191e58d3..20669c61cfaf565d03c6ab443739da19a81e65d9 100644
--- a/Tests/UnitTests/gui2/testdareflcore/sldelementcontroller.test.cpp
+++ b/Tests/UnitTests/gui2/testdareflcore/sldelementcontroller.test.cpp
@@ -11,13 +11,13 @@
 
 #include "test_utils.h"
 #include <QGraphicsScene>
-#include <darefl/model/materialmodel.h>
-#include <darefl/model/sampleitems.h>
-#include <darefl/model/samplemodel.h>
-#include <darefl/sldeditor/graphicsscene.h>
-#include <darefl/sldeditor/layerelementcontroller.h>
-#include <darefl/sldeditor/sldelementcontroller.cpp>
-#include <darefl/sldeditor/sldelementmodel.h>
+#include "gui2/model/materialmodel.h"
+#include "gui2/model/sampleitems.h"
+#include "gui2/model/samplemodel.h"
+#include "gui2/sldeditor/graphicsscene.h"
+#include "gui2/sldeditor/layerelementcontroller.h"
+#include "gui2/sldeditor/sldelementcontroller.cpp"
+#include "gui2/sldeditor/sldelementmodel.h"
 
 using namespace DaRefl;
 using namespace ModelView;
diff --git a/gui2/CMakeLists.txt b/gui2/CMakeLists.txt
index 45442546cfd45fbcf71441e96f94d2eb22114a3d..42fb7a6d115039d7dbf7310ba88f223a7db08139 100644
--- a/gui2/CMakeLists.txt
+++ b/gui2/CMakeLists.txt
@@ -8,4 +8,33 @@ option(DAREFL_BUMP_VERSION "Propagate version number" OFF)
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/modules)
 include(configuration)
 
-add_subdirectory(source)
+set(library_name dareflcore)
+
+add_library(${library_name} SHARED "")
+
+# -- Generate header for export --
+
+set(export_filename ${DAREFL_AUTOGEN_DIR}/darefl_export.h)
+generate_export_header(${library_name} EXPORT_FILE_NAME ${export_filename})
+
+add_subdirectory(dataloader)
+add_subdirectory(importdataview)
+add_subdirectory(layereditor)
+add_subdirectory(mainwindow)
+add_subdirectory(materialeditor)
+add_subdirectory(model)
+add_subdirectory(quicksimeditor)
+add_subdirectory(resources)
+add_subdirectory(settingsview)
+add_subdirectory(sldeditor)
+add_subdirectory(welcomeview)
+
+target_link_libraries(${library_name} PUBLIC MVVM::View Qt5::Core Qt5::Gui Qt5::Widgets
+    ${BornAgainCore_LIBRARY})
+target_include_directories(${library_name} PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..>
+    $<BUILD_INTERFACE:${DAREFL_AUTOGEN_DIR}>)
+
+set(executable_name darefl)
+add_executable(${executable_name} main.cpp)
+target_link_libraries(${executable_name} PRIVATE dareflcore)
diff --git a/gui2/source/darefl/core/CMakeLists.txt b/gui2/core/CMakeLists.txt
similarity index 100%
rename from gui2/source/darefl/core/CMakeLists.txt
rename to gui2/core/CMakeLists.txt
diff --git a/gui2/source/darefl/core/app_constants.h b/gui2/core/app_constants.h
similarity index 100%
rename from gui2/source/darefl/core/app_constants.h
rename to gui2/core/app_constants.h
diff --git a/gui2/source/darefl/core/version.h b/gui2/core/version.h
similarity index 100%
rename from gui2/source/darefl/core/version.h
rename to gui2/core/version.h
diff --git a/gui2/source/darefl/dataloader/CMakeLists.txt b/gui2/dataloader/CMakeLists.txt
similarity index 100%
rename from gui2/source/darefl/dataloader/CMakeLists.txt
rename to gui2/dataloader/CMakeLists.txt
diff --git a/gui2/source/darefl/dataloader/datahandler.cpp b/gui2/dataloader/datahandler.cpp
similarity index 94%
rename from gui2/source/darefl/dataloader/datahandler.cpp
rename to gui2/dataloader/datahandler.cpp
index 3acbb725633cd5de26b3e1d6ce335659eb8f03d6..777fb9e31a8dd89a1e998cb5538a08475641471d 100644
--- a/gui2/source/darefl/dataloader/datahandler.cpp
+++ b/gui2/dataloader/datahandler.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include <darefl/dataloader/datahandler.h>
-#include <darefl/dataloader/dataloader_utils.h>
+#include "gui2/dataloader/datahandler.h"
+#include "gui2/dataloader/dataloader_utils.h"
 #include <iostream>
 #include "mvvm/utils/containerutils.h"
 
diff --git a/gui2/source/darefl/dataloader/datahandler.h b/gui2/dataloader/datahandler.h
similarity index 97%
rename from gui2/source/darefl/dataloader/datahandler.h
rename to gui2/dataloader/datahandler.h
index b4d14e4735183841a7fa6e2110e905104bd53ca2..b97b03c176682b4f6d427a6cd37574d793376f23 100644
--- a/gui2/source/darefl/dataloader/datahandler.h
+++ b/gui2/dataloader/datahandler.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_DATALOADER_DATAHANDLER_H
 #define DAREFL_DATALOADER_DATAHANDLER_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <map>
 #include <string>
 #include <vector>
diff --git a/gui2/source/darefl/dataloader/dataloader_constants.h b/gui2/dataloader/dataloader_constants.h
similarity index 100%
rename from gui2/source/darefl/dataloader/dataloader_constants.h
rename to gui2/dataloader/dataloader_constants.h
diff --git a/gui2/source/darefl/dataloader/dataloader_types.h b/gui2/dataloader/dataloader_types.h
similarity index 97%
rename from gui2/source/darefl/dataloader/dataloader_types.h
rename to gui2/dataloader/dataloader_types.h
index cb49bbb2b11580c200c07d6c4555d3409a676703..d7cfe354a6c9ce69fafde2cf0ae8c816d5e6c87f 100644
--- a/gui2/source/darefl/dataloader/dataloader_types.h
+++ b/gui2/dataloader/dataloader_types.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_DATALOADER_DATALOADER_TYPES_H
 #define DAREFL_DATALOADER_DATALOADER_TYPES_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <functional>
 #include <string>
 #include <vector>
diff --git a/gui2/source/darefl/dataloader/dataloader_utils.cpp b/gui2/dataloader/dataloader_utils.cpp
similarity index 98%
rename from gui2/source/darefl/dataloader/dataloader_utils.cpp
rename to gui2/dataloader/dataloader_utils.cpp
index c160cd162e90ccfef2870be8ce0e651c1e3f5d35..fc26a6a416012b28b5973c20f93ab3518051cf49 100644
--- a/gui2/source/darefl/dataloader/dataloader_utils.cpp
+++ b/gui2/dataloader/dataloader_utils.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include <algorithm>
-#include <darefl/dataloader/dataloader_constants.h>
-#include <darefl/dataloader/dataloader_utils.h>
-#include <darefl/importdataview/graphimportdata.h>
+#include "gui2/dataloader/dataloader_constants.h"
+#include "gui2/dataloader/dataloader_utils.h"
+#include "gui2/importdataview/graphimportdata.h"
 #include <fstream>
 #include "mvvm/utils/stringutils.h"
 
diff --git a/gui2/source/darefl/dataloader/dataloader_utils.h b/gui2/dataloader/dataloader_utils.h
similarity index 98%
rename from gui2/source/darefl/dataloader/dataloader_utils.h
rename to gui2/dataloader/dataloader_utils.h
index e24ce162c990f5db9075c711b25e2280440b0c30..e0efa4edefcd2640aacf6c5f75d350615d523716 100644
--- a/gui2/source/darefl/dataloader/dataloader_utils.h
+++ b/gui2/dataloader/dataloader_utils.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_DATALOADER_PARSEUTILS_H
 #define DAREFL_DATALOADER_PARSEUTILS_H
 
-#include <darefl/dataloader/dataloader_types.h>
+#include "gui2/dataloader/dataloader_types.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/dataloader/dataloaderdialog.cpp b/gui2/dataloader/dataloaderdialog.cpp
similarity index 95%
rename from gui2/source/darefl/dataloader/dataloaderdialog.cpp
rename to gui2/dataloader/dataloaderdialog.cpp
index 6aeece4d7f18ec38396149238a7f08f64bc29369..1fffbc3e866059058ef958ee085654e01528e989 100644
--- a/gui2/source/darefl/dataloader/dataloaderdialog.cpp
+++ b/gui2/dataloader/dataloaderdialog.cpp
@@ -16,15 +16,15 @@
 #include <QSettings>
 #include <QSplitter>
 #include <QVBoxLayout>
-#include <darefl/core/app_constants.h>
-#include <darefl/dataloader/datahandler.h>
-#include <darefl/dataloader/dataloader_types.h>
-#include <darefl/dataloader/dataloader_utils.h>
-#include <darefl/dataloader/dataloaderdialog.h>
-#include <darefl/dataloader/dataloadertoolbar.h>
-#include <darefl/dataloader/loaderpreviewpanel.h>
-#include <darefl/dataloader/loaderselectorpanel.h>
-#include <darefl/dataloader/parserinterface.h>
+#include "gui2/core/app_constants.h"
+#include "gui2/dataloader/datahandler.h"
+#include "gui2/dataloader/dataloader_types.h"
+#include "gui2/dataloader/dataloader_utils.h"
+#include "gui2/dataloader/dataloaderdialog.h"
+#include "gui2/dataloader/dataloadertoolbar.h"
+#include "gui2/dataloader/loaderpreviewpanel.h"
+#include "gui2/dataloader/loaderselectorpanel.h"
+#include "gui2/dataloader/parserinterface.h"
 #include "mvvm/utils/fileutils.h"
 #include "mvvm/widgets/widgetutils.h"
 #include <sstream>
diff --git a/gui2/source/darefl/dataloader/dataloaderdialog.h b/gui2/dataloader/dataloaderdialog.h
similarity index 95%
rename from gui2/source/darefl/dataloader/dataloaderdialog.h
rename to gui2/dataloader/dataloaderdialog.h
index a26a2b5bb611c4af24fc10450687205e28274d53..69d7f0922abe3e4d2d4981011228ff6c3d9525db 100644
--- a/gui2/source/darefl/dataloader/dataloaderdialog.h
+++ b/gui2/dataloader/dataloaderdialog.h
@@ -11,8 +11,8 @@
 #define DAREFL_DATALOADER_DATALOADERDIALOG_H
 
 #include <QDialog>
-#include <darefl/darefl_export.h>
-#include <darefl/importdataview/graphimportdata.h>
+#include "darefl_export.h"
+#include "gui2/importdataview/graphimportdata.h"
 #include <memory>
 #include <vector>
 
diff --git a/gui2/source/darefl/dataloader/dataloadertoolbar.cpp b/gui2/dataloader/dataloadertoolbar.cpp
similarity index 92%
rename from gui2/source/darefl/dataloader/dataloadertoolbar.cpp
rename to gui2/dataloader/dataloadertoolbar.cpp
index 1c668d8c911836f2e012816095d31eba877834a8..1ed5586d62b84bea320cbefe96a3410e713a66ab 100644
--- a/gui2/source/darefl/dataloader/dataloadertoolbar.cpp
+++ b/gui2/dataloader/dataloadertoolbar.cpp
@@ -8,8 +8,8 @@
 // ************************************************************************** //
 
 #include <QAction>
-#include <darefl/dataloader/dataloadertoolbar.h>
-#include <darefl/mainwindow/styleutils.h>
+#include "gui2/dataloader/dataloadertoolbar.h"
+#include "gui2/mainwindow/styleutils.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/dataloader/dataloadertoolbar.h b/gui2/dataloader/dataloadertoolbar.h
similarity index 95%
rename from gui2/source/darefl/dataloader/dataloadertoolbar.h
rename to gui2/dataloader/dataloadertoolbar.h
index 96a5e6665bbd25f809206959e0898825eb800f3c..4dfb09ee7f007d6b38a09861f2e83b51978eaa0d 100644
--- a/gui2/source/darefl/dataloader/dataloadertoolbar.h
+++ b/gui2/dataloader/dataloadertoolbar.h
@@ -11,7 +11,7 @@
 #define DAREFL_DATALOADER_DATALOADERTOOLBAR_H
 
 #include <QToolBar>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/dataloader/defaultparser.cpp b/gui2/dataloader/defaultparser.cpp
similarity index 95%
rename from gui2/source/darefl/dataloader/defaultparser.cpp
rename to gui2/dataloader/defaultparser.cpp
index bc1346d25885c67c84c39be67e13c9c674bac9bb..663ef622f7dd018980e260de9ce751b944a850f1 100644
--- a/gui2/source/darefl/dataloader/defaultparser.cpp
+++ b/gui2/dataloader/defaultparser.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include <darefl/dataloader/dataloader_utils.h>
-#include <darefl/dataloader/defaultparser.h>
+#include "gui2/dataloader/dataloader_utils.h"
+#include "gui2/dataloader/defaultparser.h"
 #include <stdexcept>
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/dataloader/defaultparser.h b/gui2/dataloader/defaultparser.h
similarity index 92%
rename from gui2/source/darefl/dataloader/defaultparser.h
rename to gui2/dataloader/defaultparser.h
index c0cac56b438e4664462eb59edd166b650f42d85f..1a4f743e0a8a39ee13171c335357f66f96898986 100644
--- a/gui2/source/darefl/dataloader/defaultparser.h
+++ b/gui2/dataloader/defaultparser.h
@@ -10,9 +10,9 @@
 #ifndef DAREFL_DATALOADER_DEFAULTPARSER_H
 #define DAREFL_DATALOADER_DEFAULTPARSER_H
 
-#include <darefl/darefl_export.h>
-#include <darefl/dataloader/dataloader_types.h>
-#include <darefl/dataloader/parserinterface.h>
+#include "darefl_export.h"
+#include "gui2/dataloader/dataloader_types.h"
+#include "gui2/dataloader/parserinterface.h"
 #include <map>
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/dataloader/importfilewidget.cpp b/gui2/dataloader/importfilewidget.cpp
similarity index 98%
rename from gui2/source/darefl/dataloader/importfilewidget.cpp
rename to gui2/dataloader/importfilewidget.cpp
index 0174b8b30ebc1212317fdf059a114e40f52afee6..1eef932064f6974a741a8b6a6b1225c77080dc50 100644
--- a/gui2/source/darefl/dataloader/importfilewidget.cpp
+++ b/gui2/dataloader/importfilewidget.cpp
@@ -14,8 +14,8 @@
 #include <QSettings>
 #include <QStringListModel>
 #include <QVBoxLayout>
-#include <darefl/core/app_constants.h>
-#include <darefl/dataloader/importfilewidget.h>
+#include "gui2/core/app_constants.h"
+#include "gui2/dataloader/importfilewidget.h"
 #include "mvvm/utils/binutils.h"
 #include "mvvm/utils/fileutils.h"
 
diff --git a/gui2/source/darefl/dataloader/importfilewidget.h b/gui2/dataloader/importfilewidget.h
similarity index 97%
rename from gui2/source/darefl/dataloader/importfilewidget.h
rename to gui2/dataloader/importfilewidget.h
index c7ebcb6844efdb164a5589eb67a80fb70a1a6fcb..f2262d68cb1af2673caad0ad29cb20a95042e334 100644
--- a/gui2/source/darefl/dataloader/importfilewidget.h
+++ b/gui2/dataloader/importfilewidget.h
@@ -11,7 +11,7 @@
 #define DAREFL_DATALOADER_IMPORTFILEWIDGET_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 class QListView;
 class QStringListModel;
diff --git a/gui2/source/darefl/dataloader/importtableheader.cpp b/gui2/dataloader/importtableheader.cpp
similarity index 95%
rename from gui2/source/darefl/dataloader/importtableheader.cpp
rename to gui2/dataloader/importtableheader.cpp
index c4c098e55a9eeec98b9e4c2c879162ce4c647a96..f00a96d47b72324115b12c821961d9ad81d1179f 100644
--- a/gui2/source/darefl/dataloader/importtableheader.cpp
+++ b/gui2/dataloader/importtableheader.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
-#include <darefl/dataloader/dataloader_constants.h>
-#include <darefl/dataloader/dataloader_types.h>
-#include <darefl/dataloader/importtableheader.h>
+#include "gui2/dataloader/dataloader_constants.h"
+#include "gui2/dataloader/dataloader_types.h"
+#include "gui2/dataloader/importtableheader.h"
 #include "mvvm/model/comboproperty.h"
 
 using ModelView::ComboProperty;
diff --git a/gui2/source/darefl/dataloader/importtableheader.h b/gui2/dataloader/importtableheader.h
similarity index 97%
rename from gui2/source/darefl/dataloader/importtableheader.h
rename to gui2/dataloader/importtableheader.h
index a939c9555746c262f43faa1e55167530adc45139..5b28dff197e3bd31b8c6ff7e0c5c1938e0ea5798 100644
--- a/gui2/source/darefl/dataloader/importtableheader.h
+++ b/gui2/dataloader/importtableheader.h
@@ -11,7 +11,7 @@
 #define DAREFL_DATALOADER_IMPORTTABLEHEADER_H
 
 #include <QVariant>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <vector>
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/dataloader/importtablemodel.cpp b/gui2/dataloader/importtablemodel.cpp
similarity index 96%
rename from gui2/source/darefl/dataloader/importtablemodel.cpp
rename to gui2/dataloader/importtablemodel.cpp
index ff8f0e5cf948a8a745fbe916342ed02a87f58ecf..d37717ff29c33cddd1a27a93a5c8e15a586655de 100644
--- a/gui2/source/darefl/dataloader/importtablemodel.cpp
+++ b/gui2/dataloader/importtablemodel.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include <QBrush>
-#include <darefl/dataloader/dataloader_types.h>
-#include <darefl/dataloader/importtableheader.h>
-#include <darefl/dataloader/importtablemodel.h>
+#include "gui2/dataloader/dataloader_types.h"
+#include "gui2/dataloader/importtableheader.h"
+#include "gui2/dataloader/importtablemodel.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/dataloader/importtablemodel.h b/gui2/dataloader/importtablemodel.h
similarity index 98%
rename from gui2/source/darefl/dataloader/importtablemodel.h
rename to gui2/dataloader/importtablemodel.h
index 95be45f3740ef2e9d670aaee3581adc19d8bb548..0e32f5d335b3bd6398cdc9d4ef96d3a4bc77e989 100644
--- a/gui2/source/darefl/dataloader/importtablemodel.h
+++ b/gui2/dataloader/importtablemodel.h
@@ -11,7 +11,7 @@
 #define DAREFL_DATALOADER_IMPORTTABLEMODEL_H
 
 #include <QAbstractTableModel>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/gui2/source/darefl/dataloader/importtablewidget.cpp b/gui2/dataloader/importtablewidget.cpp
similarity index 89%
rename from gui2/source/darefl/dataloader/importtablewidget.cpp
rename to gui2/dataloader/importtablewidget.cpp
index a985562ebaf0fba3f2ac8ac0ffce70858c2eb29a..b9368f7555a2c9c4c6fc7c57313b6deb80cb49a5 100644
--- a/gui2/source/darefl/dataloader/importtablewidget.cpp
+++ b/gui2/dataloader/importtablewidget.cpp
@@ -10,9 +10,9 @@
 #include <QStandardItemModel>
 #include <QTableView>
 #include <QVBoxLayout>
-#include <darefl/dataloader/dataloader_types.h>
-#include <darefl/dataloader/importtablemodel.h>
-#include <darefl/dataloader/importtablewidget.h>
+#include "gui2/dataloader/dataloader_types.h"
+#include "gui2/dataloader/importtablemodel.h"
+#include "gui2/dataloader/importtablewidget.h"
 #include "mvvm/viewmodel/viewmodeldelegate.h"
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/dataloader/importtablewidget.h b/gui2/dataloader/importtablewidget.h
similarity index 97%
rename from gui2/source/darefl/dataloader/importtablewidget.h
rename to gui2/dataloader/importtablewidget.h
index a9d7e1f6fc55f9b1eee97d3806f3a89465fd7a24..6c7a5993cc361116799dd52276a9ab9ff49d5472 100644
--- a/gui2/source/darefl/dataloader/importtablewidget.h
+++ b/gui2/dataloader/importtablewidget.h
@@ -11,7 +11,7 @@
 #define DAREFL_DATALOADER_IMPORTTABLEWIDGET_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/gui2/source/darefl/dataloader/importtextview.cpp b/gui2/dataloader/importtextview.cpp
similarity index 98%
rename from gui2/source/darefl/dataloader/importtextview.cpp
rename to gui2/dataloader/importtextview.cpp
index e221c482e94e14f0194f5b50e96b901612873905..bdee0806be7d64105110257bccff6c853f98c61f 100644
--- a/gui2/source/darefl/dataloader/importtextview.cpp
+++ b/gui2/dataloader/importtextview.cpp
@@ -7,7 +7,7 @@
 //
 // ************************************************************************** //
 
-#include <darefl/dataloader/importtextview.h>
+#include "gui2/dataloader/importtextview.h"
 #include "mvvm/widgets/widgetutils.h"
 
 //! Based on Qt example "codeeditor"
diff --git a/gui2/source/darefl/dataloader/importtextview.h b/gui2/dataloader/importtextview.h
similarity index 97%
rename from gui2/source/darefl/dataloader/importtextview.h
rename to gui2/dataloader/importtextview.h
index 8e7e190669de098829ee494e4df389fd8828b098..49d551bf58e2942ffb83fe7e44d2e02575848b69 100644
--- a/gui2/source/darefl/dataloader/importtextview.h
+++ b/gui2/dataloader/importtextview.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_DATALOADER_IMPORTTEXTVIEW_H
 #define DAREFL_DATALOADER_IMPORTTEXTVIEW_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 //! Based on Qt example "codeeditor"
 //! Copyright (C) 2016 The Qt Company Ltd.
diff --git a/gui2/source/darefl/dataloader/loaderpreviewpanel.cpp b/gui2/dataloader/loaderpreviewpanel.cpp
similarity index 87%
rename from gui2/source/darefl/dataloader/loaderpreviewpanel.cpp
rename to gui2/dataloader/loaderpreviewpanel.cpp
index 711ee94c8225ae07cc0adc78e28fb1014346483e..ffaaf994411526ac6c503df190b50b15a3f95070 100644
--- a/gui2/source/darefl/dataloader/loaderpreviewpanel.cpp
+++ b/gui2/dataloader/loaderpreviewpanel.cpp
@@ -10,11 +10,11 @@
 #include <QColor>
 #include <QTabWidget>
 #include <QVBoxLayout>
-#include <darefl/dataloader/dataloader_utils.h>
-#include <darefl/dataloader/importtablewidget.h>
-#include <darefl/dataloader/importtextview.h>
-#include <darefl/dataloader/loaderpreviewpanel.h>
-#include <darefl/dataloader/parserinterface.h>
+#include "gui2/dataloader/dataloader_utils.h"
+#include "gui2/dataloader/importtablewidget.h"
+#include "gui2/dataloader/importtextview.h"
+#include "gui2/dataloader/loaderpreviewpanel.h"
+#include "gui2/dataloader/parserinterface.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/dataloader/loaderpreviewpanel.h b/gui2/dataloader/loaderpreviewpanel.h
similarity index 97%
rename from gui2/source/darefl/dataloader/loaderpreviewpanel.h
rename to gui2/dataloader/loaderpreviewpanel.h
index f79c4d8e55520fbaf4390990c988a3fea06b3a4e..bad8798cc81d52728285b786aee2e1ae97181969 100644
--- a/gui2/source/darefl/dataloader/loaderpreviewpanel.h
+++ b/gui2/dataloader/loaderpreviewpanel.h
@@ -11,7 +11,7 @@
 #define DAREFL_DATALOADER_LOADERPREVIEWPANEL_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 class ImportTextView;
 class ImportTableWidget;
diff --git a/gui2/source/darefl/dataloader/loaderselectorpanel.cpp b/gui2/dataloader/loaderselectorpanel.cpp
similarity index 92%
rename from gui2/source/darefl/dataloader/loaderselectorpanel.cpp
rename to gui2/dataloader/loaderselectorpanel.cpp
index 7b523b231b865e250be6f4cb5ba6a04ba3887ffc..b4d3b18e57ac5a39fe443e73d7cf88591796425d 100644
--- a/gui2/source/darefl/dataloader/loaderselectorpanel.cpp
+++ b/gui2/dataloader/loaderselectorpanel.cpp
@@ -9,10 +9,10 @@
 
 #include <QSplitter>
 #include <QVBoxLayout>
-#include <darefl/dataloader/defaultparser.h>
-#include <darefl/dataloader/importfilewidget.h>
-#include <darefl/dataloader/loaderselectorpanel.h>
-#include <darefl/dataloader/parserpropertywidget.h>
+#include "gui2/dataloader/defaultparser.h"
+#include "gui2/dataloader/importfilewidget.h"
+#include "gui2/dataloader/loaderselectorpanel.h"
+#include "gui2/dataloader/parserpropertywidget.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/dataloader/loaderselectorpanel.h b/gui2/dataloader/loaderselectorpanel.h
similarity index 97%
rename from gui2/source/darefl/dataloader/loaderselectorpanel.h
rename to gui2/dataloader/loaderselectorpanel.h
index 611fcc517f1ab44c21f78e48f317221b9d786505..856db89edd79b80aec7b2a97875e521523be15c0 100644
--- a/gui2/source/darefl/dataloader/loaderselectorpanel.h
+++ b/gui2/dataloader/loaderselectorpanel.h
@@ -11,7 +11,7 @@
 #define DAREFL_DATALOADER_LOADERSELECTORPANEL_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 
 class QSplitter;
diff --git a/gui2/source/darefl/dataloader/parserinterface.h b/gui2/dataloader/parserinterface.h
similarity index 97%
rename from gui2/source/darefl/dataloader/parserinterface.h
rename to gui2/dataloader/parserinterface.h
index 731ba49fef15e02869341e00da2540b6f000ec48..104f87f8fa4bd0105633e0310a5cb1ec3f2d2e00 100644
--- a/gui2/source/darefl/dataloader/parserinterface.h
+++ b/gui2/dataloader/parserinterface.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_DATALOADER_PARSERINTERFACE_H
 #define DAREFL_DATALOADER_PARSERINTERFACE_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <string>
 #include <vector>
 
diff --git a/gui2/source/darefl/dataloader/parserpropertywidget.cpp b/gui2/dataloader/parserpropertywidget.cpp
similarity index 98%
rename from gui2/source/darefl/dataloader/parserpropertywidget.cpp
rename to gui2/dataloader/parserpropertywidget.cpp
index 1e5e958d0235951b4c79dd9e1e4ffade5d69d3e8..1cb718885b7acb57d06cb96c7474a00a038ac1cc 100644
--- a/gui2/source/darefl/dataloader/parserpropertywidget.cpp
+++ b/gui2/dataloader/parserpropertywidget.cpp
@@ -18,9 +18,9 @@
 #include <QRegExpValidator>
 #include <QSettings>
 #include <QVBoxLayout>
-#include <darefl/core/app_constants.h>
-#include <darefl/dataloader/defaultparser.h>
-#include <darefl/dataloader/parserpropertywidget.h>
+#include "gui2/core/app_constants.h"
+#include "gui2/dataloader/defaultparser.h"
+#include "gui2/dataloader/parserpropertywidget.h"
 #include "mvvm/widgets/widgetutils.h"
 
 namespace {
diff --git a/gui2/source/darefl/dataloader/parserpropertywidget.h b/gui2/dataloader/parserpropertywidget.h
similarity index 96%
rename from gui2/source/darefl/dataloader/parserpropertywidget.h
rename to gui2/dataloader/parserpropertywidget.h
index 53d11f4a1e92dc06f537796fa83e289fbb0fc7c9..1189752047bdd9fe8fdff20ee2cdd7e8e26839ab 100644
--- a/gui2/source/darefl/dataloader/parserpropertywidget.h
+++ b/gui2/dataloader/parserpropertywidget.h
@@ -11,8 +11,8 @@
 #define DAREFL_DATALOADER_PARSERPROPERTYWIDGET_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
-#include <darefl/dataloader/dataloader_types.h>
+#include "darefl_export.h"
+#include "gui2/dataloader/dataloader_types.h"
 #include <memory>
 
 class QGridLayout;
diff --git a/gui2/source/darefl/importdataview/CMakeLists.txt b/gui2/importdataview/CMakeLists.txt
similarity index 100%
rename from gui2/source/darefl/importdataview/CMakeLists.txt
rename to gui2/importdataview/CMakeLists.txt
diff --git a/gui2/source/darefl/importdataview/dataselectionmodel.cpp b/gui2/importdataview/dataselectionmodel.cpp
similarity index 95%
rename from gui2/source/darefl/importdataview/dataselectionmodel.cpp
rename to gui2/importdataview/dataselectionmodel.cpp
index 1c06c2735fe9e17314517c1d948abb4318480788..653c38aaab47a3d95b3e5433c60e51082996f82b 100644
--- a/gui2/source/darefl/importdataview/dataselectionmodel.cpp
+++ b/gui2/importdataview/dataselectionmodel.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
-#include <darefl/importdataview/dataselectionmodel.h>
-#include <darefl/model/experimentaldataitems.h>
-#include <darefl/model/item_constants.h>
+#include "gui2/importdataview/dataselectionmodel.h"
+#include "gui2/model/experimentaldataitems.h"
+#include "gui2/model/item_constants.h"
 #include "mvvm/model/itemutils.h"
 #include "mvvm/model/mvvm_types.h"
 #include "mvvm/model/sessionitem.h"
diff --git a/gui2/source/darefl/importdataview/dataselectionmodel.h b/gui2/importdataview/dataselectionmodel.h
similarity index 97%
rename from gui2/source/darefl/importdataview/dataselectionmodel.h
rename to gui2/importdataview/dataselectionmodel.h
index 1b460fea6b2f9745d75f0f094ab678cca1d1d66b..451a4e76ab7e7481000c59e808a523e249e8fd7b 100644
--- a/gui2/source/darefl/importdataview/dataselectionmodel.h
+++ b/gui2/importdataview/dataselectionmodel.h
@@ -11,7 +11,7 @@
 #define DAREFL_IMPORTDATAVIEW_DATASELECTIONMODEL_H
 
 #include <QItemSelectionModel>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <vector>
 
 namespace ModelView {
diff --git a/gui2/source/darefl/importdataview/dataselectorwidget.cpp b/gui2/importdataview/dataselectorwidget.cpp
similarity index 91%
rename from gui2/source/darefl/importdataview/dataselectorwidget.cpp
rename to gui2/importdataview/dataselectorwidget.cpp
index 3123b2592a84fa63def9aa1bfa2d0bcce89f02f3..4634b74b59c8eb6c0268bcff4fa727c8a1bd8fcb 100644
--- a/gui2/source/darefl/importdataview/dataselectorwidget.cpp
+++ b/gui2/importdataview/dataselectorwidget.cpp
@@ -12,10 +12,10 @@
 #include <QSplitter>
 #include <QTreeView>
 #include <QVBoxLayout>
-#include <darefl/importdataview/dataselectionmodel.h>
-#include <darefl/importdataview/dataselectorwidget.h>
-#include <darefl/importdataview/dataviewmodel.h>
-#include <darefl/model/experimentaldataitems.h>
+#include "gui2/importdataview/dataselectionmodel.h"
+#include "gui2/importdataview/dataselectorwidget.h"
+#include "gui2/importdataview/dataviewmodel.h"
+#include "gui2/model/experimentaldataitems.h"
 #include "mvvm/standarditems/graphitem.h"
 #include "mvvm/widgets/collapsiblelistwidget.h"
 #include "mvvm/widgets/standardtreeviews.h"
diff --git a/gui2/source/darefl/importdataview/dataselectorwidget.h b/gui2/importdataview/dataselectorwidget.h
similarity index 97%
rename from gui2/source/darefl/importdataview/dataselectorwidget.h
rename to gui2/importdataview/dataselectorwidget.h
index 9b057fc2c92201b46bd1921960c17e11eb773b11..c7f0df1e7fa5f6d9a6325e4c5f7d5cd44ed87f9f 100644
--- a/gui2/source/darefl/importdataview/dataselectorwidget.h
+++ b/gui2/importdataview/dataselectorwidget.h
@@ -11,7 +11,7 @@
 #define DAREFL_IMPORTDATAVIEW_DATASELECTORWIDGET_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 class QTreeView;
 
diff --git a/gui2/source/darefl/importdataview/dataviewmodel.cpp b/gui2/importdataview/dataviewmodel.cpp
similarity index 96%
rename from gui2/source/darefl/importdataview/dataviewmodel.cpp
rename to gui2/importdataview/dataviewmodel.cpp
index 707663725caffaa1715170d22fde958ebeafa6f5..4d45bd864bb29442b8fbfd883e78246afb3ab24e 100644
--- a/gui2/source/darefl/importdataview/dataviewmodel.cpp
+++ b/gui2/importdataview/dataviewmodel.cpp
@@ -10,9 +10,9 @@
 #include <QByteArray>
 #include <QDataStream>
 #include <QMimeData>
-#include <darefl/importdataview/dataviewmodel.h>
-#include <darefl/model/experimentaldatamodel.h>
-#include <darefl/model/item_constants.h>
+#include "gui2/importdataview/dataviewmodel.h"
+#include "gui2/model/experimentaldatamodel.h"
+#include "gui2/model/item_constants.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
 #include "mvvm/widgets/widgetutils.h"
diff --git a/gui2/source/darefl/importdataview/dataviewmodel.h b/gui2/importdataview/dataviewmodel.h
similarity index 97%
rename from gui2/source/darefl/importdataview/dataviewmodel.h
rename to gui2/importdataview/dataviewmodel.h
index ffdfa6072a045d2058ff13d810bcd635013c4633..ba1ad6252bd78922bef1b092a256f2d69b5cfe25 100644
--- a/gui2/source/darefl/importdataview/dataviewmodel.h
+++ b/gui2/importdataview/dataviewmodel.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_IMPORTDATAVIEW_DATAVIEWMODEL_H
 #define DAREFL_IMPORTDATAVIEW_DATAVIEWMODEL_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/viewmodel/topitemsviewmodel.h"
 
 namespace ModelView {
diff --git a/gui2/source/darefl/importdataview/graphcanvaswidget.cpp b/gui2/importdataview/graphcanvaswidget.cpp
similarity index 89%
rename from gui2/source/darefl/importdataview/graphcanvaswidget.cpp
rename to gui2/importdataview/graphcanvaswidget.cpp
index 9fb987f8812fe7e074e045e9d510c500c0522360..c3a96fe0f73232e9b1529fd15daf4b7d04d0b0c7 100644
--- a/gui2/source/darefl/importdataview/graphcanvaswidget.cpp
+++ b/gui2/importdataview/graphcanvaswidget.cpp
@@ -8,8 +8,8 @@
 // ************************************************************************** //
 
 #include <QVBoxLayout>
-#include <darefl/importdataview/graphcanvaswidget.h>
-#include <darefl/model/experimentaldataitems.h>
+#include "gui2/importdataview/graphcanvaswidget.h"
+#include "gui2/model/experimentaldataitems.h"
 #include "mvvm/plotting/graphcanvas.h"
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/importdataview/graphcanvaswidget.h b/gui2/importdataview/graphcanvaswidget.h
similarity index 96%
rename from gui2/source/darefl/importdataview/graphcanvaswidget.h
rename to gui2/importdataview/graphcanvaswidget.h
index aa3f45920e064d6f4c528a52f8191a1000cc474c..6fd60d2f4ab4c0d8c59377f0e4b40fa1060035ab 100644
--- a/gui2/source/darefl/importdataview/graphcanvaswidget.h
+++ b/gui2/importdataview/graphcanvaswidget.h
@@ -11,7 +11,7 @@
 #define DAREFL_IMPORTDATAVIEW_GRAPHCANVASWIDGET_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 namespace ModelView {
 class GraphCanvas;
diff --git a/gui2/source/darefl/importdataview/graphimportdata.h b/gui2/importdataview/graphimportdata.h
similarity index 95%
rename from gui2/source/darefl/importdataview/graphimportdata.h
rename to gui2/importdataview/graphimportdata.h
index bcd952fef9d311ae894a0e1b668721de947a0a24..51ba1ca9f15454f402075e158748858f4d940602 100644
--- a/gui2/source/darefl/importdataview/graphimportdata.h
+++ b/gui2/importdataview/graphimportdata.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_IMPORTDATAVIEW_GRAPHIMPORTDATA_H
 #define DAREFL_IMPORTDATAVIEW_GRAPHIMPORTDATA_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <string>
 #include <vector>
 
diff --git a/gui2/source/darefl/importdataview/importdataeditor.cpp b/gui2/importdataview/importdataeditor.cpp
similarity index 87%
rename from gui2/source/darefl/importdataview/importdataeditor.cpp
rename to gui2/importdataview/importdataeditor.cpp
index 39f885276d918540669bd7dc4118c71ff7008a25..9c70b1f6e0da6f6541849acb9f4ba5281831822e 100644
--- a/gui2/source/darefl/importdataview/importdataeditor.cpp
+++ b/gui2/importdataview/importdataeditor.cpp
@@ -9,16 +9,16 @@
 
 #include <QSplitter>
 #include <QVBoxLayout>
-#include <darefl/dataloader/dataloaderdialog.h>
-#include <darefl/importdataview/dataselectionmodel.h>
-#include <darefl/importdataview/dataselectorwidget.h>
-#include <darefl/importdataview/dataviewmodel.h>
-#include <darefl/importdataview/graphcanvaswidget.h>
-#include <darefl/importdataview/importdataeditor.h>
-#include <darefl/importdataview/importdataeditoractions.h>
-#include <darefl/importdataview/importdataeditortoolbal.h>
-#include <darefl/model/experimentaldataitems.h>
-#include <darefl/model/experimentaldatamodel.h>
+#include "gui2/dataloader/dataloaderdialog.h"
+#include "gui2/importdataview/dataselectionmodel.h"
+#include "gui2/importdataview/dataselectorwidget.h"
+#include "gui2/importdataview/dataviewmodel.h"
+#include "gui2/importdataview/graphcanvaswidget.h"
+#include "gui2/importdataview/importdataeditor.h"
+#include "gui2/importdataview/importdataeditoractions.h"
+#include "gui2/importdataview/importdataeditortoolbal.h"
+#include "gui2/model/experimentaldataitems.h"
+#include "gui2/model/experimentaldatamodel.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/utils/containerutils.h"
 
diff --git a/gui2/source/darefl/importdataview/importdataeditor.h b/gui2/importdataview/importdataeditor.h
similarity index 97%
rename from gui2/source/darefl/importdataview/importdataeditor.h
rename to gui2/importdataview/importdataeditor.h
index 35cb7ef38f441fef18f84fbe04bbbbed3e3a434e..89125eeeeb5639d2ca161144a82ecbffc642b92f 100644
--- a/gui2/source/darefl/importdataview/importdataeditor.h
+++ b/gui2/importdataview/importdataeditor.h
@@ -11,7 +11,7 @@
 #define DAREFL_IMPORTDATAVIEW_IMPORTDATAEDITOR_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <string>
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/importdataview/importdataeditoractions.cpp b/gui2/importdataview/importdataeditoractions.cpp
similarity index 93%
rename from gui2/source/darefl/importdataview/importdataeditoractions.cpp
rename to gui2/importdataview/importdataeditoractions.cpp
index 80c8c523e4e7fbb666508748f667d705e25701b5..3de9ddc3560a0f953b096c5c226a24896e345275 100644
--- a/gui2/source/darefl/importdataview/importdataeditoractions.cpp
+++ b/gui2/importdataview/importdataeditoractions.cpp
@@ -7,11 +7,11 @@
 //
 // ************************************************************************** //
 
-#include <darefl/importdataview/dataselectionmodel.h>
-#include <darefl/importdataview/graphimportdata.h>
-#include <darefl/importdataview/importdataeditoractions.h>
-#include <darefl/model/experimentaldataitems.h>
-#include <darefl/model/experimentaldatamodel.h>
+#include "gui2/importdataview/dataselectionmodel.h"
+#include "gui2/importdataview/graphimportdata.h"
+#include "gui2/importdataview/importdataeditoractions.h"
+#include "gui2/model/experimentaldataitems.h"
+#include "gui2/model/experimentaldatamodel.h"
 #include "mvvm/interfaces/undostackinterface.h"
 #include "mvvm/model/comboproperty.h"
 #include "mvvm/model/itemutils.h"
diff --git a/gui2/source/darefl/importdataview/importdataeditoractions.h b/gui2/importdataview/importdataeditoractions.h
similarity index 97%
rename from gui2/source/darefl/importdataview/importdataeditoractions.h
rename to gui2/importdataview/importdataeditoractions.h
index 4f9a599ae8a855d5f01139ca899c9a9e8ff31ad1..b5ac96e83f748dab3ca9d60550de794c359fb502 100644
--- a/gui2/source/darefl/importdataview/importdataeditoractions.h
+++ b/gui2/importdataview/importdataeditoractions.h
@@ -11,7 +11,7 @@
 #define DAREFL_IMPORTDATAVIEW_IMPORTDATAEDITORACTIONS_H
 
 #include <QObject>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 class QItemSelection;
 
diff --git a/gui2/source/darefl/importdataview/importdataeditortoolbal.cpp b/gui2/importdataview/importdataeditortoolbal.cpp
similarity index 95%
rename from gui2/source/darefl/importdataview/importdataeditortoolbal.cpp
rename to gui2/importdataview/importdataeditortoolbal.cpp
index dfa6bdd81b7415a5eab8df7676e65ef1e638e01e..96234ae5440078ba23e97c157b2719c356df84e0 100644
--- a/gui2/source/darefl/importdataview/importdataeditortoolbal.cpp
+++ b/gui2/importdataview/importdataeditortoolbal.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include <QAction>
-#include <darefl/importdataview/importdataeditoractions.h>
-#include <darefl/importdataview/importdataeditortoolbal.h>
-#include <darefl/mainwindow/styleutils.h>
+#include "gui2/importdataview/importdataeditoractions.h"
+#include "gui2/importdataview/importdataeditortoolbal.h"
+#include "gui2/mainwindow/styleutils.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/importdataview/importdataeditortoolbal.h b/gui2/importdataview/importdataeditortoolbal.h
similarity index 96%
rename from gui2/source/darefl/importdataview/importdataeditortoolbal.h
rename to gui2/importdataview/importdataeditortoolbal.h
index 5161371f8e5ef90e25310d5dd20dd0e9c19bcd0d..54ca32dd1f0a5514b00dfdfd3835ee7fb0add867 100644
--- a/gui2/source/darefl/importdataview/importdataeditortoolbal.h
+++ b/gui2/importdataview/importdataeditortoolbal.h
@@ -11,7 +11,7 @@
 #define DAREFL_IMPORTDATAVIEW_IMPORTDATAEDITORTOOLBAL_H
 
 #include <QToolBar>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/importdataview/importdataview.cpp b/gui2/importdataview/importdataview.cpp
similarity index 81%
rename from gui2/source/darefl/importdataview/importdataview.cpp
rename to gui2/importdataview/importdataview.cpp
index 15dc7afeea0dca81c0db7e7ed572f5d1f2a3154d..1c44c22dbcbb4b948c3055df78e01107ca0d0134 100644
--- a/gui2/source/darefl/importdataview/importdataview.cpp
+++ b/gui2/importdataview/importdataview.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include <QVBoxLayout>
-#include <darefl/importdataview/importdataeditor.h>
-#include <darefl/importdataview/importdataview.h>
-#include <darefl/model/applicationmodels.h>
+#include "gui2/importdataview/importdataeditor.h"
+#include "gui2/importdataview/importdataview.h"
+#include "gui2/model/applicationmodels.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/importdataview/importdataview.h b/gui2/importdataview/importdataview.h
similarity index 95%
rename from gui2/source/darefl/importdataview/importdataview.h
rename to gui2/importdataview/importdataview.h
index 1f90ec8db38b825234bccfb761b416c50159a0b3..0a892ce8e40dbd9ef24e18d278dcbbd0260a65a3 100644
--- a/gui2/source/darefl/importdataview/importdataview.h
+++ b/gui2/importdataview/importdataview.h
@@ -11,7 +11,7 @@
 #define DAREFL_IMPORTDATAVIEW_IMPORTDATAVIEW_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/layereditor/CMakeLists.txt b/gui2/layereditor/CMakeLists.txt
similarity index 100%
rename from gui2/source/darefl/layereditor/CMakeLists.txt
rename to gui2/layereditor/CMakeLists.txt
diff --git a/gui2/source/darefl/layereditor/customlayertreeeditorfactory.cpp b/gui2/layereditor/customlayertreeeditorfactory.cpp
similarity index 92%
rename from gui2/source/darefl/layereditor/customlayertreeeditorfactory.cpp
rename to gui2/layereditor/customlayertreeeditorfactory.cpp
index 2f7304b1511c5a82e09e10aec2620cb0031b3d36..176b5bc437d49362f45e46cd6ed1ca439db5a40b 100644
--- a/gui2/source/darefl/layereditor/customlayertreeeditorfactory.cpp
+++ b/gui2/layereditor/customlayertreeeditorfactory.cpp
@@ -9,9 +9,9 @@
 
 #include <QModelIndex>
 #include <algorithm>
-#include <darefl/layereditor/customlayertreeeditorfactory.h>
-#include <darefl/model/applicationmodels.h>
-#include <darefl/model/materialmodel.h>
+#include "gui2/layereditor/customlayertreeeditorfactory.h"
+#include "gui2/model/applicationmodels.h"
+#include "gui2/model/materialmodel.h"
 #include "mvvm/editors/externalpropertycomboeditor.h"
 #include "mvvm/model/externalproperty.h"
 
diff --git a/gui2/source/darefl/layereditor/customlayertreeeditorfactory.h b/gui2/layereditor/customlayertreeeditorfactory.h
similarity index 97%
rename from gui2/source/darefl/layereditor/customlayertreeeditorfactory.h
rename to gui2/layereditor/customlayertreeeditorfactory.h
index 9488be89fb7e41f5fb740956fa4ae17590a11c3e..6a3e3eef41b2ded5d4e70f6748d2a3f1070b4c4f 100644
--- a/gui2/source/darefl/layereditor/customlayertreeeditorfactory.h
+++ b/gui2/layereditor/customlayertreeeditorfactory.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_LAYEREDITOR_CUSTOMLAYERTREEEDITORFACTORY_H
 #define DAREFL_LAYEREDITOR_CUSTOMLAYERTREEEDITORFACTORY_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/editors/defaulteditorfactory.h"
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/layereditor/layereditor.cpp b/gui2/layereditor/layereditor.cpp
similarity index 83%
rename from gui2/source/darefl/layereditor/layereditor.cpp
rename to gui2/layereditor/layereditor.cpp
index a1423026800ceb230fc33a19cf8fa68a1a1e9253..63c3941e6fffe80131e19d619850e659d1f208c7 100644
--- a/gui2/source/darefl/layereditor/layereditor.cpp
+++ b/gui2/layereditor/layereditor.cpp
@@ -8,13 +8,13 @@
 // ************************************************************************** //
 
 #include <QVBoxLayout>
-#include <darefl/layereditor/layereditor.h>
-#include <darefl/layereditor/layereditoractions.h>
-#include <darefl/layereditor/layereditortoolbar.h>
-#include <darefl/layereditor/layereditorwidget.h>
-#include <darefl/layereditor/layerselectionmodel.h>
-#include <darefl/mainwindow/styleutils.h>
-#include <darefl/model/applicationmodels.h>
+#include "gui2/layereditor/layereditor.h"
+#include "gui2/layereditor/layereditoractions.h"
+#include "gui2/layereditor/layereditortoolbar.h"
+#include "gui2/layereditor/layereditorwidget.h"
+#include "gui2/layereditor/layerselectionmodel.h"
+#include "gui2/mainwindow/styleutils.h"
+#include "gui2/model/applicationmodels.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/layereditor/layereditor.h b/gui2/layereditor/layereditor.h
similarity index 97%
rename from gui2/source/darefl/layereditor/layereditor.h
rename to gui2/layereditor/layereditor.h
index feba1e9d050e88000ea9e3eeae0fb05c8e76afc3..89edd266781c6f27e0eded9f8e5703b77e171406 100644
--- a/gui2/source/darefl/layereditor/layereditor.h
+++ b/gui2/layereditor/layereditor.h
@@ -11,7 +11,7 @@
 #define DAREFL_LAYEREDITOR_LAYEREDITOR_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 namespace ModelView {
 class AbstractViewModel;
diff --git a/gui2/source/darefl/layereditor/layereditoractions.cpp b/gui2/layereditor/layereditoractions.cpp
similarity index 94%
rename from gui2/source/darefl/layereditor/layereditoractions.cpp
rename to gui2/layereditor/layereditoractions.cpp
index 89a03858e388b33529a3377670a66ac5f74c0f28..554d583bbbcde34e80c7d4ba084eeb73a0d88ab5 100644
--- a/gui2/source/darefl/layereditor/layereditoractions.cpp
+++ b/gui2/layereditor/layereditoractions.cpp
@@ -8,11 +8,11 @@
 // ************************************************************************** //
 
 #include <QAction>
-#include <darefl/layereditor/layereditoractions.h>
-#include <darefl/layereditor/layerselectionmodel.h>
-#include <darefl/model/item_constants.h>
-#include <darefl/model/sampleitems.h>
-#include <darefl/model/samplemodel.h>
+#include "gui2/layereditor/layereditoractions.h"
+#include "gui2/layereditor/layerselectionmodel.h"
+#include "gui2/model/item_constants.h"
+#include "gui2/model/sampleitems.h"
+#include "gui2/model/samplemodel.h"
 #include "mvvm/model/itemutils.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/viewmodel/viewmodel.h"
diff --git a/gui2/source/darefl/layereditor/layereditoractions.h b/gui2/layereditor/layereditoractions.h
similarity index 97%
rename from gui2/source/darefl/layereditor/layereditoractions.h
rename to gui2/layereditor/layereditoractions.h
index 64ce141a67fcfa61ac66e01133b24a4e33e8b4b6..a5c480296a1c6d29ada453ab3641ca889df9f914 100644
--- a/gui2/source/darefl/layereditor/layereditoractions.h
+++ b/gui2/layereditor/layereditoractions.h
@@ -11,7 +11,7 @@
 #define DAREFL_LAYEREDITOR_LAYEREDITORACTIONS_H
 
 #include <QObject>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/layereditor/layereditortoolbar.cpp b/gui2/layereditor/layereditortoolbar.cpp
similarity index 97%
rename from gui2/source/darefl/layereditor/layereditortoolbar.cpp
rename to gui2/layereditor/layereditortoolbar.cpp
index eaf9ec12f4eb2c9da80fe816412a662585e89470..5b3a243f239082203cc12ad82214aa7c22777e8f 100644
--- a/gui2/source/darefl/layereditor/layereditortoolbar.cpp
+++ b/gui2/layereditor/layereditortoolbar.cpp
@@ -10,9 +10,9 @@
 #include <QAction>
 #include <QMenu>
 #include <QToolButton>
-#include <darefl/layereditor/layereditoractions.h>
-#include <darefl/layereditor/layereditortoolbar.h>
-#include <darefl/mainwindow/styleutils.h>
+#include "gui2/layereditor/layereditoractions.h"
+#include "gui2/layereditor/layereditortoolbar.h"
+#include "gui2/mainwindow/styleutils.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/layereditor/layereditortoolbar.h b/gui2/layereditor/layereditortoolbar.h
similarity index 96%
rename from gui2/source/darefl/layereditor/layereditortoolbar.h
rename to gui2/layereditor/layereditortoolbar.h
index 0b667c31dd98f2bebe0cc2cb6ef0b7b37ae80bd1..a7e064f491d8e3bbffe51102ec00ebbc70727256 100644
--- a/gui2/source/darefl/layereditor/layereditortoolbar.h
+++ b/gui2/layereditor/layereditortoolbar.h
@@ -12,7 +12,7 @@
 
 #include <QToolBar>
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <map>
 #include <string>
 
diff --git a/gui2/source/darefl/layereditor/layereditorwidget.cpp b/gui2/layereditor/layereditorwidget.cpp
similarity index 79%
rename from gui2/source/darefl/layereditor/layereditorwidget.cpp
rename to gui2/layereditor/layereditorwidget.cpp
index ec60c91b9473a62cbfc8190c4b7f27e618090c10..4cce0932c4914883e27a9fd9276dea23ff42a933 100644
--- a/gui2/source/darefl/layereditor/layereditorwidget.cpp
+++ b/gui2/layereditor/layereditorwidget.cpp
@@ -8,14 +8,14 @@
 // ************************************************************************** //
 
 #include <QVBoxLayout>
-#include <darefl/layereditor/customlayertreeeditorfactory.h>
-#include <darefl/layereditor/layereditorwidget.h>
-#include <darefl/layereditor/layerselectionmodel.h>
-#include <darefl/layereditor/layertreeview.h>
-#include <darefl/layereditor/layerviewmodel.h>
-#include <darefl/model/applicationmodels.h>
-#include <darefl/model/sampleitems.h>
-#include <darefl/model/samplemodel.h>
+#include "gui2/layereditor/customlayertreeeditorfactory.h"
+#include "gui2/layereditor/layereditorwidget.h"
+#include "gui2/layereditor/layerselectionmodel.h"
+#include "gui2/layereditor/layertreeview.h"
+#include "gui2/layereditor/layerviewmodel.h"
+#include "gui2/model/applicationmodels.h"
+#include "gui2/model/sampleitems.h"
+#include "gui2/model/samplemodel.h"
 #include "mvvm/viewmodel/viewmodeldelegate.h"
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/layereditor/layereditorwidget.h b/gui2/layereditor/layereditorwidget.h
similarity index 97%
rename from gui2/source/darefl/layereditor/layereditorwidget.h
rename to gui2/layereditor/layereditorwidget.h
index b951a27675da4cfefe4f5029a718ca106c9905d5..8c4e73de1796e376a55298005eef8d70bc69b8d8 100644
--- a/gui2/source/darefl/layereditor/layereditorwidget.h
+++ b/gui2/layereditor/layereditorwidget.h
@@ -11,7 +11,7 @@
 #define DAREFL_LAYEREDITOR_LAYEREDITORWIDGET_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 
 namespace ModelView {
diff --git a/gui2/source/darefl/layereditor/layerselectionmodel.cpp b/gui2/layereditor/layerselectionmodel.cpp
similarity index 96%
rename from gui2/source/darefl/layereditor/layerselectionmodel.cpp
rename to gui2/layereditor/layerselectionmodel.cpp
index e3855e1e93a8cd4132bc186b5e0a6393bbadf340..7d4954a450848c8b0f7e2b458014a8b416709312 100644
--- a/gui2/source/darefl/layereditor/layerselectionmodel.cpp
+++ b/gui2/layereditor/layerselectionmodel.cpp
@@ -8,8 +8,8 @@
 // ************************************************************************** //
 
 #include <QItemSelection>
-#include <darefl/layereditor/layerselectionmodel.h>
-#include <darefl/model/sampleitems.h>
+#include "gui2/layereditor/layerselectionmodel.h"
+#include "gui2/model/sampleitems.h"
 #include "mvvm/viewmodel/viewmodel.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
 
diff --git a/gui2/source/darefl/layereditor/layerselectionmodel.h b/gui2/layereditor/layerselectionmodel.h
similarity index 97%
rename from gui2/source/darefl/layereditor/layerselectionmodel.h
rename to gui2/layereditor/layerselectionmodel.h
index 03d2e4ea5ab7ed8104235db7c63ecebe3b60ae5d..a4ede1a8d3807481fd4aaeb8940b6d1f0590b72d 100644
--- a/gui2/source/darefl/layereditor/layerselectionmodel.h
+++ b/gui2/layereditor/layerselectionmodel.h
@@ -11,7 +11,7 @@
 #define DAREFL_LAYEREDITOR_LAYERSELECTIONMODEL_H
 
 #include <QItemSelectionModel>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <vector>
 
 namespace ModelView {
diff --git a/gui2/source/darefl/layereditor/layertreeview.cpp b/gui2/layereditor/layertreeview.cpp
similarity index 95%
rename from gui2/source/darefl/layereditor/layertreeview.cpp
rename to gui2/layereditor/layertreeview.cpp
index d920eece2f57ad91b765b793defb27a1dab9a9d6..39189e2f21d8996d49c0a2316c39d58bd152e5de 100644
--- a/gui2/source/darefl/layereditor/layertreeview.cpp
+++ b/gui2/layereditor/layertreeview.cpp
@@ -9,7 +9,7 @@
 
 #include <QHeaderView>
 #include <QMouseEvent>
-#include <darefl/layereditor/layertreeview.h>
+#include "gui2/layereditor/layertreeview.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/layereditor/layertreeview.h b/gui2/layereditor/layertreeview.h
similarity index 95%
rename from gui2/source/darefl/layereditor/layertreeview.h
rename to gui2/layereditor/layertreeview.h
index 1a5d0c0dcfcbbff517ff3a21e8df5e5f2238fa3d..241b44597680a47245495781443236a99c7959fc 100644
--- a/gui2/source/darefl/layereditor/layertreeview.h
+++ b/gui2/layereditor/layertreeview.h
@@ -11,7 +11,7 @@
 #define DAREFL_LAYEREDITOR_LAYERTREEVIEW_H
 
 #include <QTreeView>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/layereditor/layerviewmodel.cpp b/gui2/layereditor/layerviewmodel.cpp
similarity index 83%
rename from gui2/source/darefl/layereditor/layerviewmodel.cpp
rename to gui2/layereditor/layerviewmodel.cpp
index 654fdd4b0dcbc54c0be4c1c3dfafdb5e732ef7e8..cfaf2ae8f014a5817ae7799b4cd0a3b8c52b67b0 100644
--- a/gui2/source/darefl/layereditor/layerviewmodel.cpp
+++ b/gui2/layereditor/layerviewmodel.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include <darefl/layereditor/layerviewmodel.h>
-#include <darefl/layereditor/layerviewmodelcontroller.h>
+#include "gui2/layereditor/layerviewmodel.h"
+#include "gui2/layereditor/layerviewmodelcontroller.h"
 
 using namespace ModelView;
 
diff --git a/gui2/source/darefl/layereditor/layerviewmodel.h b/gui2/layereditor/layerviewmodel.h
similarity index 96%
rename from gui2/source/darefl/layereditor/layerviewmodel.h
rename to gui2/layereditor/layerviewmodel.h
index 44112599b08d1718974023fba38bbf583283b02f..7c3696acc2a121e5726b5b5d423bbb4cc7fcb3d0 100644
--- a/gui2/source/darefl/layereditor/layerviewmodel.h
+++ b/gui2/layereditor/layerviewmodel.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_LAYEREDITOR_LAYERVIEWMODEL_H
 #define DAREFL_LAYEREDITOR_LAYERVIEWMODEL_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/viewmodel/viewmodel.h"
 
 namespace ModelView {
diff --git a/gui2/source/darefl/layereditor/layerviewmodelcontroller.cpp b/gui2/layereditor/layerviewmodelcontroller.cpp
similarity index 97%
rename from gui2/source/darefl/layereditor/layerviewmodelcontroller.cpp
rename to gui2/layereditor/layerviewmodelcontroller.cpp
index 1162853ba7874722c65a456f8b7ae36c012798c2..ccbce17347a32553fcdf598a734203984aefad96 100644
--- a/gui2/source/darefl/layereditor/layerviewmodelcontroller.cpp
+++ b/gui2/layereditor/layerviewmodelcontroller.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include <darefl/layereditor/layerviewmodelcontroller.h>
-#include <darefl/model/sampleitems.h>
+#include "gui2/layereditor/layerviewmodelcontroller.h"
+#include "gui2/model/sampleitems.h"
 #include "mvvm/interfaces/rowstrategyinterface.h"
 #include "mvvm/viewmodel/standardchildrenstrategies.h"
 #include "mvvm/viewmodel/standardviewitems.h"
diff --git a/gui2/source/darefl/layereditor/layerviewmodelcontroller.h b/gui2/layereditor/layerviewmodelcontroller.h
similarity index 96%
rename from gui2/source/darefl/layereditor/layerviewmodelcontroller.h
rename to gui2/layereditor/layerviewmodelcontroller.h
index 10c7dae38511d7dd99eb06737a579f06e4005f77..10cf1afc2e7ceef1c9456ff306300c46b9e6504c 100644
--- a/gui2/source/darefl/layereditor/layerviewmodelcontroller.h
+++ b/gui2/layereditor/layerviewmodelcontroller.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_LAYEREDITOR_LAYERVIEWMODELCONTROLLER_H
 #define DAREFL_LAYEREDITOR_LAYERVIEWMODELCONTROLLER_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/viewmodel/viewmodelcontroller.h"
 
 namespace ModelView {
diff --git a/gui2/source/main.cpp b/gui2/main.cpp
similarity index 94%
rename from gui2/source/main.cpp
rename to gui2/main.cpp
index d2585e66640f0f957e7591a7bf988f8cce2c0c61..3ede179c9f56564a6c74e870daf89af463d38544 100644
--- a/gui2/source/main.cpp
+++ b/gui2/main.cpp
@@ -7,7 +7,7 @@
 //
 // ************************************************************************** //
 
-#include <darefl/mainwindow/mainwindow.h>
+#include "gui2/mainwindow/mainwindow.h"
 #include <QApplication>
 #include <QLocale>
 
diff --git a/gui2/source/darefl/mainwindow/CMakeLists.txt b/gui2/mainwindow/CMakeLists.txt
similarity index 100%
rename from gui2/source/darefl/mainwindow/CMakeLists.txt
rename to gui2/mainwindow/CMakeLists.txt
diff --git a/gui2/source/darefl/mainwindow/actionmanager.cpp b/gui2/mainwindow/actionmanager.cpp
similarity index 98%
rename from gui2/source/darefl/mainwindow/actionmanager.cpp
rename to gui2/mainwindow/actionmanager.cpp
index 0e80cb4c36eee7ecb683641c6f1ae853d145faca..6610da2d99a767609352394495096b1b0f1bcb99 100644
--- a/gui2/source/darefl/mainwindow/actionmanager.cpp
+++ b/gui2/mainwindow/actionmanager.cpp
@@ -11,7 +11,7 @@
 #include <QMainWindow>
 #include <QMenuBar>
 #include <QToolBar>
-#include <darefl/mainwindow/actionmanager.h>
+#include "gui2/mainwindow/actionmanager.h"
 #include "mvvm/widgets/widgetutils.h"
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/mainwindow/actionmanager.h b/gui2/mainwindow/actionmanager.h
similarity index 98%
rename from gui2/source/darefl/mainwindow/actionmanager.h
rename to gui2/mainwindow/actionmanager.h
index ee93fe11226e3b0e4aeacdda3275029833d4b6f6..e6f45e00fa9c4feff764369e7986fa174fb926a8 100644
--- a/gui2/source/darefl/mainwindow/actionmanager.h
+++ b/gui2/mainwindow/actionmanager.h
@@ -11,7 +11,7 @@
 #define DAREFL_MAINWINDOW_ACTIONMANAGER_H
 
 #include <QObject>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 class QMainWindow;
 class QAction;
diff --git a/gui2/source/darefl/mainwindow/fancytab.cpp b/gui2/mainwindow/fancytab.cpp
similarity index 97%
rename from gui2/source/darefl/mainwindow/fancytab.cpp
rename to gui2/mainwindow/fancytab.cpp
index 4c641cc2f3104488b543c6c28f5a91c8a8ef1145..d9a56b09767492ccd13d47fd1861c5f1b16e2da0 100644
--- a/gui2/source/darefl/mainwindow/fancytab.cpp
+++ b/gui2/mainwindow/fancytab.cpp
@@ -11,7 +11,7 @@
 #include <QLabel>
 #include <QMouseEvent>
 #include <QPainter>
-#include <darefl/mainwindow/fancytab.h>
+#include "gui2/mainwindow/fancytab.h"
 #include "mvvm/widgets/widgetutils.h"
 
 namespace {
diff --git a/gui2/source/darefl/mainwindow/fancytab.h b/gui2/mainwindow/fancytab.h
similarity index 96%
rename from gui2/source/darefl/mainwindow/fancytab.h
rename to gui2/mainwindow/fancytab.h
index a412830d7281f68b95d313de6196ffe6bbf9b445..f4be33a601bbb17c1a54bb6b7b491f40915523d0 100644
--- a/gui2/source/darefl/mainwindow/fancytab.h
+++ b/gui2/mainwindow/fancytab.h
@@ -12,7 +12,7 @@
 
 #include <QColor>
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 class QLabel;
 class QString;
diff --git a/gui2/source/darefl/mainwindow/mainbarwidget.cpp b/gui2/mainwindow/mainbarwidget.cpp
similarity index 94%
rename from gui2/source/darefl/mainwindow/mainbarwidget.cpp
rename to gui2/mainwindow/mainbarwidget.cpp
index 3860cfad98cbe89228e07e809fdab15d90e9a5bd..a56f7feb97eb6ed13df05abca8b9a8638f84e23c 100644
--- a/gui2/source/darefl/mainwindow/mainbarwidget.cpp
+++ b/gui2/mainwindow/mainbarwidget.cpp
@@ -12,8 +12,8 @@
 #include <QPushButton>
 #include <QStackedWidget>
 #include <QVBoxLayout>
-#include <darefl/mainwindow/fancytab.h>
-#include <darefl/mainwindow/mainbarwidget.h>
+#include "gui2/mainwindow/fancytab.h"
+#include "gui2/mainwindow/mainbarwidget.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/mainwindow/mainbarwidget.h b/gui2/mainwindow/mainbarwidget.h
similarity index 97%
rename from gui2/source/darefl/mainwindow/mainbarwidget.h
rename to gui2/mainwindow/mainbarwidget.h
index 48b202bd2dd38a489dc7f3eef86a2ddd032dffc9..9c67284528b348e655d3cbf4bb8395053bc97523 100644
--- a/gui2/source/darefl/mainwindow/mainbarwidget.h
+++ b/gui2/mainwindow/mainbarwidget.h
@@ -11,7 +11,7 @@
 #define DAREFL_MAINWINDOW_MAINBARWIDGET_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <map>
 
 class QStackedWidget;
diff --git a/gui2/source/darefl/mainwindow/mainwindow.cpp b/gui2/mainwindow/mainwindow.cpp
similarity index 90%
rename from gui2/source/darefl/mainwindow/mainwindow.cpp
rename to gui2/mainwindow/mainwindow.cpp
index 7085b03230b71e81665a593aa4af983ae6cb00c5..9966a199735b5dca8fc5318f1ad0190d29263103 100644
--- a/gui2/source/darefl/mainwindow/mainwindow.cpp
+++ b/gui2/mainwindow/mainwindow.cpp
@@ -12,14 +12,14 @@
 #include <QFileDialog>
 #include <QMenuBar>
 #include <QSettings>
-#include <darefl/importdataview/importdataview.h>
-#include <darefl/mainwindow/actionmanager.h>
-#include <darefl/mainwindow/mainbarwidget.h>
-#include <darefl/mainwindow/mainwindow.h>
-#include <darefl/mainwindow/simulationview.h>
-#include <darefl/model/applicationmodels.h>
-#include <darefl/settingsview/settingsview.h>
-#include <darefl/welcomeview/welcomeview.h>
+#include "gui2/importdataview/importdataview.h"
+#include "gui2/mainwindow/actionmanager.h"
+#include "gui2/mainwindow/mainbarwidget.h"
+#include "gui2/mainwindow/mainwindow.h"
+#include "gui2/mainwindow/simulationview.h"
+#include "gui2/model/applicationmodels.h"
+#include "gui2/settingsview/settingsview.h"
+#include "gui2/welcomeview/welcomeview.h"
 
 namespace {
 const QString main_window_group = "MainWindow";
diff --git a/gui2/source/darefl/mainwindow/mainwindow.h b/gui2/mainwindow/mainwindow.h
similarity index 97%
rename from gui2/source/darefl/mainwindow/mainwindow.h
rename to gui2/mainwindow/mainwindow.h
index e8dfe7d0134bb8e7e5b79b1bceebc44331bdaa06..6fc3790c1b32171c8cf8a6859ca0372196685bbc 100644
--- a/gui2/source/darefl/mainwindow/mainwindow.h
+++ b/gui2/mainwindow/mainwindow.h
@@ -11,7 +11,7 @@
 #define DAREFL_MAINWINDOW_MAINWINDOW_H
 
 #include <QMainWindow>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/mainwindow/simulationview.cpp b/gui2/mainwindow/simulationview.cpp
similarity index 85%
rename from gui2/source/darefl/mainwindow/simulationview.cpp
rename to gui2/mainwindow/simulationview.cpp
index 29a0006cf3c291bee65adb262f6c1150abe78948..83dc300d512f22ddb9dc8a39f3e70952775d294b 100644
--- a/gui2/source/darefl/mainwindow/simulationview.cpp
+++ b/gui2/mainwindow/simulationview.cpp
@@ -9,12 +9,12 @@
 
 #include <QSplitter>
 #include <QVBoxLayout>
-#include <darefl/layereditor/layereditor.h>
-#include <darefl/mainwindow/simulationview.h>
-#include <darefl/materialeditor/materialeditor.h>
-#include <darefl/quicksimeditor/instrumentpropertyeditor.h>
-#include <darefl/quicksimeditor/quicksimeditor.h>
-#include <darefl/sldeditor/sldeditor.h>
+#include "gui2/layereditor/layereditor.h"
+#include "gui2/mainwindow/simulationview.h"
+#include "gui2/materialeditor/materialeditor.h"
+#include "gui2/quicksimeditor/instrumentpropertyeditor.h"
+#include "gui2/quicksimeditor/quicksimeditor.h"
+#include "gui2/sldeditor/sldeditor.h"
 #include "mvvm/widgets/collapsiblelistwidget.h"
 
 using namespace ModelView;
diff --git a/gui2/source/darefl/mainwindow/simulationview.h b/gui2/mainwindow/simulationview.h
similarity index 96%
rename from gui2/source/darefl/mainwindow/simulationview.h
rename to gui2/mainwindow/simulationview.h
index 43fd06c42b0b8a550f4a7685cc06069076fc2a0f..2d968b9ab026a8ffb467c697de273d6ebfafe842 100644
--- a/gui2/source/darefl/mainwindow/simulationview.h
+++ b/gui2/mainwindow/simulationview.h
@@ -11,7 +11,7 @@
 #define DAREFL_MAINWINDOW_SIMULATIONVIEW_H
 
 #include <QMainWindow>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 
 namespace ModelView {
diff --git a/gui2/source/darefl/mainwindow/styleutils.cpp b/gui2/mainwindow/styleutils.cpp
similarity index 91%
rename from gui2/source/darefl/mainwindow/styleutils.cpp
rename to gui2/mainwindow/styleutils.cpp
index 63272b1116927151e15062f63c92f5ce00b61fa4..f1275ae4e2488ad0955668fbb633586ae138f548 100644
--- a/gui2/source/darefl/mainwindow/styleutils.cpp
+++ b/gui2/mainwindow/styleutils.cpp
@@ -11,8 +11,8 @@
 #include <QSize>
 #include <QToolBar>
 #include <QWidget>
-#include <darefl/mainwindow/styleutils.h>
-#include <darefl/resources/resources.h>
+#include "gui2/mainwindow/styleutils.h"
+#include "gui2/resources/resources.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/mainwindow/styleutils.h b/gui2/mainwindow/styleutils.h
similarity index 96%
rename from gui2/source/darefl/mainwindow/styleutils.h
rename to gui2/mainwindow/styleutils.h
index c7d3a7fb067c6906fb53712569ba866b7b228d27..75caa61e2fa7ebffe326017e62cfbbea8217c034 100644
--- a/gui2/source/darefl/mainwindow/styleutils.h
+++ b/gui2/mainwindow/styleutils.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_MAINWINDOW_STYLEUTILS_H
 #define DAREFL_MAINWINDOW_STYLEUTILS_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 class QSize;
 class QFont;
diff --git a/gui2/source/darefl/materialeditor/CMakeLists.txt b/gui2/materialeditor/CMakeLists.txt
similarity index 100%
rename from gui2/source/darefl/materialeditor/CMakeLists.txt
rename to gui2/materialeditor/CMakeLists.txt
diff --git a/gui2/source/darefl/materialeditor/materialeditor.cpp b/gui2/materialeditor/materialeditor.cpp
similarity index 79%
rename from gui2/source/darefl/materialeditor/materialeditor.cpp
rename to gui2/materialeditor/materialeditor.cpp
index 3e15b5515b7b4b070f79d49e7a106c64196c07f7..25c09d91d0b2763813da53ff4411665e2e9c12c4 100644
--- a/gui2/source/darefl/materialeditor/materialeditor.cpp
+++ b/gui2/materialeditor/materialeditor.cpp
@@ -8,13 +8,13 @@
 // ************************************************************************** //
 
 #include <QVBoxLayout>
-#include <darefl/mainwindow/styleutils.h>
-#include <darefl/materialeditor/materialeditor.h>
-#include <darefl/materialeditor/materialeditoractions.h>
-#include <darefl/materialeditor/materialeditortoolbar.h>
-#include <darefl/materialeditor/materialeditorwidget.h>
-#include <darefl/model/applicationmodels.h>
-#include <darefl/model/materialmodel.h>
+#include "gui2/mainwindow/styleutils.h"
+#include "gui2/materialeditor/materialeditor.h"
+#include "gui2/materialeditor/materialeditoractions.h"
+#include "gui2/materialeditor/materialeditortoolbar.h"
+#include "gui2/materialeditor/materialeditorwidget.h"
+#include "gui2/model/applicationmodels.h"
+#include "gui2/model/materialmodel.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/materialeditor/materialeditor.h b/gui2/materialeditor/materialeditor.h
similarity index 96%
rename from gui2/source/darefl/materialeditor/materialeditor.h
rename to gui2/materialeditor/materialeditor.h
index 07f744306ecdb37f448fe75025704eca184a673d..42affc20ac6a4d32e8dca2b196980bef192de08e 100644
--- a/gui2/source/darefl/materialeditor/materialeditor.h
+++ b/gui2/materialeditor/materialeditor.h
@@ -11,7 +11,7 @@
 #define DAREFL_MATERIALEDITOR_MATERIALEDITOR_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/materialeditor/materialeditoractions.cpp b/gui2/materialeditor/materialeditoractions.cpp
similarity index 96%
rename from gui2/source/darefl/materialeditor/materialeditoractions.cpp
rename to gui2/materialeditor/materialeditoractions.cpp
index 9fcfaf2a9a099b5129bd833efd47d6a37a2151f6..168e17f6804a69bfe1f9deecc75d97b3b75b09ff 100644
--- a/gui2/source/darefl/materialeditor/materialeditoractions.cpp
+++ b/gui2/materialeditor/materialeditoractions.cpp
@@ -9,10 +9,10 @@
 
 #include <QFile>
 #include <QTextStream>
-#include <darefl/materialeditor/materialeditoractions.h>
-#include <darefl/materialeditor/materialselectionmodel.h>
-#include <darefl/model/materialitems.h>
-#include <darefl/model/materialmodel.h>
+#include "gui2/materialeditor/materialeditoractions.h"
+#include "gui2/materialeditor/materialselectionmodel.h"
+#include "gui2/model/materialitems.h"
+#include "gui2/model/materialmodel.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/model/sessionitemdata.h"
 #include "mvvm/viewmodel/viewmodel.h"
diff --git a/gui2/source/darefl/materialeditor/materialeditoractions.h b/gui2/materialeditor/materialeditoractions.h
similarity index 97%
rename from gui2/source/darefl/materialeditor/materialeditoractions.h
rename to gui2/materialeditor/materialeditoractions.h
index ca0ccb823ab13eb7b9f5afb2f0deaa3ff0d9c9a5..c5eef6387ec2b319b06384ebb5252a813f744b0a 100644
--- a/gui2/source/darefl/materialeditor/materialeditoractions.h
+++ b/gui2/materialeditor/materialeditoractions.h
@@ -11,7 +11,7 @@
 #define DAREFL_MATERIALEDITOR_MATERIALEDITORACTIONS_H
 
 #include <QObject>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/materialeditor/materialeditortoolbar.cpp b/gui2/materialeditor/materialeditortoolbar.cpp
similarity index 94%
rename from gui2/source/darefl/materialeditor/materialeditortoolbar.cpp
rename to gui2/materialeditor/materialeditortoolbar.cpp
index a0a39cdcc3b25b67e6e53be1d30196f6bc9d5a43..f9b8f67cb151b5e51732e3053fcbc34a0c3f1ad6 100644
--- a/gui2/source/darefl/materialeditor/materialeditortoolbar.cpp
+++ b/gui2/materialeditor/materialeditortoolbar.cpp
@@ -9,9 +9,9 @@
 
 #include <QAction>
 #include <QToolButton>
-#include <darefl/mainwindow/styleutils.h>
-#include <darefl/materialeditor/materialeditoractions.h>
-#include <darefl/materialeditor/materialeditortoolbar.h>
+#include "gui2/mainwindow/styleutils.h"
+#include "gui2/materialeditor/materialeditoractions.h"
+#include "gui2/materialeditor/materialeditortoolbar.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/materialeditor/materialeditortoolbar.h b/gui2/materialeditor/materialeditortoolbar.h
similarity index 96%
rename from gui2/source/darefl/materialeditor/materialeditortoolbar.h
rename to gui2/materialeditor/materialeditortoolbar.h
index 1abea9aca02bad03b63c88e3dc498bc120237a7e..a20fb979d408ebcb80ffbab1a2267cb8a8789c13 100644
--- a/gui2/source/darefl/materialeditor/materialeditortoolbar.h
+++ b/gui2/materialeditor/materialeditortoolbar.h
@@ -11,7 +11,7 @@
 #define DAREFL_MATERIALEDITOR_MATERIALEDITORTOOLBAR_H
 
 #include <QToolBar>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/materialeditor/materialeditorwidget.cpp b/gui2/materialeditor/materialeditorwidget.cpp
similarity index 81%
rename from gui2/source/darefl/materialeditor/materialeditorwidget.cpp
rename to gui2/materialeditor/materialeditorwidget.cpp
index 0347a6331919e30969cb0c777bc3503778dc8ea4..b3527dc64d197acf82e3f0268ad69ffc89d35c2d 100644
--- a/gui2/source/darefl/materialeditor/materialeditorwidget.cpp
+++ b/gui2/materialeditor/materialeditorwidget.cpp
@@ -8,13 +8,13 @@
 // ************************************************************************** //
 
 #include <QVBoxLayout>
-#include <darefl/materialeditor/materialeditorwidget.h>
-#include <darefl/materialeditor/materialselectionmodel.h>
-#include <darefl/materialeditor/materialtableview.h>
-#include <darefl/materialeditor/materialtreeview.h>
-#include <darefl/model/applicationmodels.h>
-#include <darefl/model/materialitems.h>
-#include <darefl/model/materialmodel.h>
+#include "gui2/materialeditor/materialeditorwidget.h"
+#include "gui2/materialeditor/materialselectionmodel.h"
+#include "gui2/materialeditor/materialtableview.h"
+#include "gui2/materialeditor/materialtreeview.h"
+#include "gui2/model/applicationmodels.h"
+#include "gui2/model/materialitems.h"
+#include "gui2/model/materialmodel.h"
 #include "mvvm/factories/viewmodelfactory.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/viewmodel/viewmodeldelegate.h"
diff --git a/gui2/source/darefl/materialeditor/materialeditorwidget.h b/gui2/materialeditor/materialeditorwidget.h
similarity index 97%
rename from gui2/source/darefl/materialeditor/materialeditorwidget.h
rename to gui2/materialeditor/materialeditorwidget.h
index e0d86c97ed1fd49eb8ea31c89271094ac61d297f..5fe93093d31682ca6e490671c1e0e9818709970a 100644
--- a/gui2/source/darefl/materialeditor/materialeditorwidget.h
+++ b/gui2/materialeditor/materialeditorwidget.h
@@ -11,7 +11,7 @@
 #define DAREFL_MATERIALEDITOR_MATERIALEDITORWIDGET_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 
 namespace ModelView {
diff --git a/gui2/source/darefl/materialeditor/materialselectionmodel.cpp b/gui2/materialeditor/materialselectionmodel.cpp
similarity index 95%
rename from gui2/source/darefl/materialeditor/materialselectionmodel.cpp
rename to gui2/materialeditor/materialselectionmodel.cpp
index 1d070fbf2063198b344f363ceaabe5d5b2a4e4b7..2c5f318d57245c69ea8d168026d0d5247e168c17 100644
--- a/gui2/source/darefl/materialeditor/materialselectionmodel.cpp
+++ b/gui2/materialeditor/materialselectionmodel.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include <darefl/materialeditor/materialselectionmodel.h>
-#include <darefl/model/materialitems.h>
+#include "gui2/materialeditor/materialselectionmodel.h"
+#include "gui2/model/materialitems.h"
 #include "mvvm/viewmodel/viewmodel.h"
 #include "mvvm/viewmodel/viewmodelutils.h"
 
diff --git a/gui2/source/darefl/materialeditor/materialselectionmodel.h b/gui2/materialeditor/materialselectionmodel.h
similarity index 97%
rename from gui2/source/darefl/materialeditor/materialselectionmodel.h
rename to gui2/materialeditor/materialselectionmodel.h
index 52c354a64e1f8742399748bb4931d46edd3aac15..7e40053f4746569c989ed2942cee30623b41dfc1 100644
--- a/gui2/source/darefl/materialeditor/materialselectionmodel.h
+++ b/gui2/materialeditor/materialselectionmodel.h
@@ -11,7 +11,7 @@
 #define DAREFL_MATERIALEDITOR_MATERIALSELECTIONMODEL_H
 
 #include <QItemSelectionModel>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <vector>
 
 namespace ModelView {
diff --git a/gui2/source/darefl/materialeditor/materialtableview.cpp b/gui2/materialeditor/materialtableview.cpp
similarity index 97%
rename from gui2/source/darefl/materialeditor/materialtableview.cpp
rename to gui2/materialeditor/materialtableview.cpp
index cacb6db72a6496b91abe841377c54457fdc5aa60..7990fbe6580db1ec60c397ee3b36f8dddab8c5b6 100644
--- a/gui2/source/darefl/materialeditor/materialtableview.cpp
+++ b/gui2/materialeditor/materialtableview.cpp
@@ -9,7 +9,7 @@
 
 #include <QHeaderView>
 #include <QMouseEvent>
-#include <darefl/materialeditor/materialtableview.h>
+#include "gui2/materialeditor/materialtableview.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/materialeditor/materialtableview.h b/gui2/materialeditor/materialtableview.h
similarity index 97%
rename from gui2/source/darefl/materialeditor/materialtableview.h
rename to gui2/materialeditor/materialtableview.h
index 5dbb4e3806e9ee1f1c06e520f4ec4ebae8299e45..e5c663bc54f1552eab6090a47ae491ef9b49d6a7 100644
--- a/gui2/source/darefl/materialeditor/materialtableview.h
+++ b/gui2/materialeditor/materialtableview.h
@@ -11,7 +11,7 @@
 #define DAREFL_MATERIALEDITOR_MATERIALTABLEVIEW_H
 
 #include <QTableView>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/materialeditor/materialtreeview.cpp b/gui2/materialeditor/materialtreeview.cpp
similarity index 97%
rename from gui2/source/darefl/materialeditor/materialtreeview.cpp
rename to gui2/materialeditor/materialtreeview.cpp
index 788db1fe9785cf33cb764904f953d660629bef52..cc1323d859b31ead97351fd9314faaf8c560a9b2 100644
--- a/gui2/source/darefl/materialeditor/materialtreeview.cpp
+++ b/gui2/materialeditor/materialtreeview.cpp
@@ -9,7 +9,7 @@
 
 #include <QHeaderView>
 #include <QMouseEvent>
-#include <darefl/materialeditor/materialtreeview.h>
+#include "gui2/materialeditor/materialtreeview.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/materialeditor/materialtreeview.h b/gui2/materialeditor/materialtreeview.h
similarity index 97%
rename from gui2/source/darefl/materialeditor/materialtreeview.h
rename to gui2/materialeditor/materialtreeview.h
index 1e1db806ecc7000576c495b0d644172feb195d37..7be584d5d37cf37589abefcf88a4933b66ddc3ab 100644
--- a/gui2/source/darefl/materialeditor/materialtreeview.h
+++ b/gui2/materialeditor/materialtreeview.h
@@ -11,7 +11,7 @@
 #define DAREFL_MATERIALEDITOR_MATERIALTREEVIEW_H
 
 #include <QTreeView>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/model/CMakeLists.txt b/gui2/model/CMakeLists.txt
similarity index 100%
rename from gui2/source/darefl/model/CMakeLists.txt
rename to gui2/model/CMakeLists.txt
diff --git a/gui2/source/darefl/model/applicationmodels.cpp b/gui2/model/applicationmodels.cpp
similarity index 90%
rename from gui2/source/darefl/model/applicationmodels.cpp
rename to gui2/model/applicationmodels.cpp
index 16b134524a20718f36effe44cec376813607617a..3bd5e0675e784917978fb602c2ca3bed2fbc0b76 100644
--- a/gui2/source/darefl/model/applicationmodels.cpp
+++ b/gui2/model/applicationmodels.cpp
@@ -7,16 +7,16 @@
 //
 // ************************************************************************** //
 
-#include <darefl/model/applicationmodels.h>
-#include <darefl/model/experimentaldatacontroller.h>
-#include <darefl/model/experimentaldatamodel.h>
-#include <darefl/model/instrumentmodel.h>
-#include <darefl/model/jobmodel.h>
-#include <darefl/model/materialmodel.h>
-#include <darefl/model/materialpropertycontroller.h>
-#include <darefl/model/sampleitems.h>
-#include <darefl/model/samplemodel.h>
-#include <darefl/sldeditor/sldelementmodel.h>
+#include "gui2/model/applicationmodels.h"
+#include "gui2/model/experimentaldatacontroller.h"
+#include "gui2/model/experimentaldatamodel.h"
+#include "gui2/model/instrumentmodel.h"
+#include "gui2/model/jobmodel.h"
+#include "gui2/model/materialmodel.h"
+#include "gui2/model/materialpropertycontroller.h"
+#include "gui2/model/sampleitems.h"
+#include "gui2/model/samplemodel.h"
+#include "gui2/sldeditor/sldelementmodel.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/itempool.h"
 #include "mvvm/model/modelutils.h"
diff --git a/gui2/source/darefl/model/applicationmodels.h b/gui2/model/applicationmodels.h
similarity index 97%
rename from gui2/source/darefl/model/applicationmodels.h
rename to gui2/model/applicationmodels.h
index aa039a84de60f15c4063430818e5924a396850eb..29e9cfa2192fb2f551107683a37f305ef27e4561 100644
--- a/gui2/source/darefl/model/applicationmodels.h
+++ b/gui2/model/applicationmodels.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_MODEL_APPLICATIONMODELS_H
 #define DAREFL_MODEL_APPLICATIONMODELS_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 #include "mvvm/interfaces/applicationmodelsinterface.h"
 
diff --git a/gui2/source/darefl/model/experimentaldatacontroller.cpp b/gui2/model/experimentaldatacontroller.cpp
similarity index 85%
rename from gui2/source/darefl/model/experimentaldatacontroller.cpp
rename to gui2/model/experimentaldatacontroller.cpp
index c4cc81f4ba05fcc3f56495f50553fa6f56924551..4a8acca8a8bbaeb62460f3ae0c99cb956cc2f320 100644
--- a/gui2/source/darefl/model/experimentaldatacontroller.cpp
+++ b/gui2/model/experimentaldatacontroller.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
-#include <darefl/model/experimentaldatacontroller.h>
-#include <darefl/model/experimentaldataitems.h>
-#include <darefl/model/experimentaldatamodel.h>
-#include <darefl/model/instrumentitems.h>
-#include <darefl/model/instrumentmodel.h>
-#include <darefl/model/modelutils.h>
+#include "gui2/model/experimentaldatacontroller.h"
+#include "gui2/model/experimentaldataitems.h"
+#include "gui2/model/experimentaldatamodel.h"
+#include "gui2/model/instrumentitems.h"
+#include "gui2/model/instrumentmodel.h"
+#include "gui2/model/modelutils.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/modelutils.h"
 
diff --git a/gui2/source/darefl/model/experimentaldatacontroller.h b/gui2/model/experimentaldatacontroller.h
similarity index 97%
rename from gui2/source/darefl/model/experimentaldatacontroller.h
rename to gui2/model/experimentaldatacontroller.h
index e0c3b1f0c014d45f3c618898a61a2eb87d4b8b95..f0718fbe94fa9663bef1661ee717d0bd1769d099 100644
--- a/gui2/source/darefl/model/experimentaldatacontroller.h
+++ b/gui2/model/experimentaldatacontroller.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_MODEL_EXPERIMENTALDATACONTROLLER_H
 #define DAREFL_MODEL_EXPERIMENTALDATACONTROLLER_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/signals/modellistener.h"
 
diff --git a/gui2/source/darefl/model/experimentaldataitems.cpp b/gui2/model/experimentaldataitems.cpp
similarity index 93%
rename from gui2/source/darefl/model/experimentaldataitems.cpp
rename to gui2/model/experimentaldataitems.cpp
index 410ba76c0d54a366482b771bfd6ed37e05d6a5ff..7a1e4259c7ec8dd9981cca46ec19bd194cbca344 100644
--- a/gui2/source/darefl/model/experimentaldataitems.cpp
+++ b/gui2/model/experimentaldataitems.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include <darefl/model/experimentaldataitems.h>
-#include <darefl/model/item_constants.h>
+#include "gui2/model/experimentaldataitems.h"
+#include "gui2/model/item_constants.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/data1ditem.h"
 
diff --git a/gui2/source/darefl/model/experimentaldataitems.h b/gui2/model/experimentaldataitems.h
similarity index 98%
rename from gui2/source/darefl/model/experimentaldataitems.h
rename to gui2/model/experimentaldataitems.h
index c15fa15067ef04a1a2c3a4c1e879d969cf6523c4..fbaa726127ea703da84603b7e31ecabfac1be88d 100644
--- a/gui2/source/darefl/model/experimentaldataitems.h
+++ b/gui2/model/experimentaldataitems.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_MODEL_EXPERIMENTALDATAITEMS_H
 #define DAREFL_MODEL_EXPERIMENTALDATAITEMS_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/standarditems/containeritem.h"
 #include "mvvm/standarditems/graphviewportitem.h"
 
diff --git a/gui2/source/darefl/model/experimentaldatamodel.cpp b/gui2/model/experimentaldatamodel.cpp
similarity index 96%
rename from gui2/source/darefl/model/experimentaldatamodel.cpp
rename to gui2/model/experimentaldatamodel.cpp
index 0e2e05b5c898258ae41b7a9d5ece6e628d1c8cc8..73ce0e0887046548e1ffba35cc1aff0e603efade 100644
--- a/gui2/source/darefl/model/experimentaldatamodel.cpp
+++ b/gui2/model/experimentaldatamodel.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
-#include <darefl/importdataview/graphimportdata.h>
-#include <darefl/model/experimentaldataitems.h>
-#include <darefl/model/experimentaldatamodel.h>
+#include "gui2/importdataview/graphimportdata.h"
+#include "gui2/model/experimentaldataitems.h"
+#include "gui2/model/experimentaldatamodel.h"
 
 #include "mvvm/model/itemcatalogue.h"
 #include "mvvm/model/modelutils.h"
diff --git a/gui2/source/darefl/model/experimentaldatamodel.h b/gui2/model/experimentaldatamodel.h
similarity index 97%
rename from gui2/source/darefl/model/experimentaldatamodel.h
rename to gui2/model/experimentaldatamodel.h
index 4385e9ad36fefb76503d0608b3d0d8f09b0d8cc3..faced09f7b67270792f1fcee17b59d964082b3b6 100644
--- a/gui2/source/darefl/model/experimentaldatamodel.h
+++ b/gui2/model/experimentaldatamodel.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_MODEL_EXPERIMENTALDATAMODEL_H
 #define DAREFL_MODEL_EXPERIMENTALDATAMODEL_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/model/sessionmodel.h"
 #include <vector>
 
diff --git a/gui2/source/darefl/model/instrumentitems.cpp b/gui2/model/instrumentitems.cpp
similarity index 96%
rename from gui2/source/darefl/model/instrumentitems.cpp
rename to gui2/model/instrumentitems.cpp
index e1138660f1101e3ac7e7003d326f539d319e4e94..e1552e4212c8beb0068ccc7670621a8d8176757e 100644
--- a/gui2/source/darefl/model/instrumentitems.cpp
+++ b/gui2/model/instrumentitems.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include <QColor>
-#include <darefl/model/instrumentitems.h>
-#include <darefl/model/item_constants.h>
-#include <darefl/model/modelutils.h>
+#include "gui2/model/instrumentitems.h"
+#include "gui2/model/item_constants.h"
+#include "gui2/model/modelutils.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/standarditems/axisitems.h"
diff --git a/gui2/source/darefl/model/instrumentitems.h b/gui2/model/instrumentitems.h
similarity index 98%
rename from gui2/source/darefl/model/instrumentitems.h
rename to gui2/model/instrumentitems.h
index e11fe5ff48fbac729a1aa2b3a1d597685a4b5732..3b931698c43657c2fd54ec68fd945472a03c6677 100644
--- a/gui2/source/darefl/model/instrumentitems.h
+++ b/gui2/model/instrumentitems.h
@@ -13,7 +13,7 @@
 //! @file instrumentitems.h
 //! Collection of items to construct specular instrument.
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/model/compounditem.h"
 #include "mvvm/model/groupitem.h"
 
diff --git a/gui2/source/darefl/model/instrumentmodel.cpp b/gui2/model/instrumentmodel.cpp
similarity index 92%
rename from gui2/source/darefl/model/instrumentmodel.cpp
rename to gui2/model/instrumentmodel.cpp
index af1f3b89f2f39094d9f2310d1dd19c621d5588d3..5c2be3f4153a56b31d2bc41af66e8a99c59e9dc6 100644
--- a/gui2/source/darefl/model/instrumentmodel.cpp
+++ b/gui2/model/instrumentmodel.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include <darefl/model/instrumentitems.h>
-#include <darefl/model/instrumentmodel.h>
+#include "gui2/model/instrumentitems.h"
+#include "gui2/model/instrumentmodel.h"
 #include "mvvm/model/itemcatalogue.h"
 
 using namespace ModelView;
diff --git a/gui2/source/darefl/model/instrumentmodel.h b/gui2/model/instrumentmodel.h
similarity index 95%
rename from gui2/source/darefl/model/instrumentmodel.h
rename to gui2/model/instrumentmodel.h
index f100885222cd4d95d0669cb77abd86a9bd197aff..ca89fe9fc847505266bddfdad411c843fba5a8ac 100644
--- a/gui2/source/darefl/model/instrumentmodel.h
+++ b/gui2/model/instrumentmodel.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_MODEL_INSTRUMENTMODEL_H
 #define DAREFL_MODEL_INSTRUMENTMODEL_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/model/sessionmodel.h"
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/model/item_constants.h b/gui2/model/item_constants.h
similarity index 100%
rename from gui2/source/darefl/model/item_constants.h
rename to gui2/model/item_constants.h
diff --git a/gui2/source/darefl/model/jobitem.cpp b/gui2/model/jobitem.cpp
similarity index 97%
rename from gui2/source/darefl/model/jobitem.cpp
rename to gui2/model/jobitem.cpp
index 628a4cc275439db934bf9c0a4bd3dd76eb919131..1fc1280235a763c71cde680618fcdb13cbc12389 100644
--- a/gui2/source/darefl/model/jobitem.cpp
+++ b/gui2/model/jobitem.cpp
@@ -8,11 +8,11 @@
 // ************************************************************************** //
 
 #include <QColor>
-#include <darefl/model/experimentaldataitems.h>
-#include <darefl/model/item_constants.h>
-#include <darefl/model/jobitem.h>
-#include <darefl/model/jobmodel.h>
-#include <darefl/model/modelutils.h>
+#include "gui2/model/experimentaldataitems.h"
+#include "gui2/model/item_constants.h"
+#include "gui2/model/jobitem.h"
+#include "gui2/model/jobmodel.h"
+#include "gui2/model/modelutils.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/data1ditem.h"
diff --git a/gui2/source/darefl/model/jobitem.h b/gui2/model/jobitem.h
similarity index 98%
rename from gui2/source/darefl/model/jobitem.h
rename to gui2/model/jobitem.h
index 752f12ce2fdfd0e94067b67564a644df471a2452..8f1d7e74e34dba0812ad26866b7b9c65f86db888 100644
--- a/gui2/source/darefl/model/jobitem.h
+++ b/gui2/model/jobitem.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_MODEL_JOBITEM_H
 #define DAREFL_MODEL_JOBITEM_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/model/compounditem.h"
 #include "mvvm/standarditems/graphviewportitem.h"
 
diff --git a/gui2/source/darefl/model/jobmodel.cpp b/gui2/model/jobmodel.cpp
similarity index 93%
rename from gui2/source/darefl/model/jobmodel.cpp
rename to gui2/model/jobmodel.cpp
index 11772c4ea6ed5fa7eb1f140997c765bcc151f2b7..dfce378c068a8fa8445e35d1af263b2d8334a9f6 100644
--- a/gui2/source/darefl/model/jobmodel.cpp
+++ b/gui2/model/jobmodel.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <darefl/model/experimentaldataitems.h>
-#include <darefl/model/jobitem.h>
-#include <darefl/model/jobmodel.h>
-#include <darefl/quicksimeditor/quicksim_types.h>
+#include "gui2/model/experimentaldataitems.h"
+#include "gui2/model/jobitem.h"
+#include "gui2/model/jobmodel.h"
+#include "gui2/quicksimeditor/quicksim_types.h"
 #include "mvvm/model/itemcatalogue.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/standarditems/axisitems.h"
diff --git a/gui2/source/darefl/model/jobmodel.h b/gui2/model/jobmodel.h
similarity index 97%
rename from gui2/source/darefl/model/jobmodel.h
rename to gui2/model/jobmodel.h
index 1d6263cb4c43874aea4a5d1ea83c616d4a60232b..25086cc9c955e668f5dff95a3afdc421492bcf94 100644
--- a/gui2/source/darefl/model/jobmodel.h
+++ b/gui2/model/jobmodel.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_MODEL_JOBMODEL_H
 #define DAREFL_MODEL_JOBMODEL_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/model/sessionmodel.h"
 
 namespace ModelView {
diff --git a/gui2/source/darefl/model/materialitems.cpp b/gui2/model/materialitems.cpp
similarity index 96%
rename from gui2/source/darefl/model/materialitems.cpp
rename to gui2/model/materialitems.cpp
index 8873162bc21f8db988242a1be42082c8d9aba454..9c7ffb6b476fdf3f932a12761199c27bf3eed28c 100644
--- a/gui2/source/darefl/model/materialitems.cpp
+++ b/gui2/model/materialitems.cpp
@@ -8,8 +8,8 @@
 // ************************************************************************** //
 
 #include <QColor>
-#include <darefl/model/item_constants.h>
-#include <darefl/model/materialitems.h>
+#include "gui2/model/item_constants.h"
+#include "gui2/model/materialitems.h"
 #include "mvvm/model/externalproperty.h"
 
 using namespace ModelView;
diff --git a/gui2/source/darefl/model/materialitems.h b/gui2/model/materialitems.h
similarity index 98%
rename from gui2/source/darefl/model/materialitems.h
rename to gui2/model/materialitems.h
index 0c96caba1cb993016d4b1d678bf9b0b640a689ae..915d623ca646ab31172889939d24df455c25ab21 100644
--- a/gui2/source/darefl/model/materialitems.h
+++ b/gui2/model/materialitems.h
@@ -13,7 +13,7 @@
 //! materialitems.h
 //! Collection of materials to populate MaterialModel.
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/model/compounditem.h"
 
 namespace ModelView {
diff --git a/gui2/source/darefl/model/materialmodel.cpp b/gui2/model/materialmodel.cpp
similarity index 97%
rename from gui2/source/darefl/model/materialmodel.cpp
rename to gui2/model/materialmodel.cpp
index dacc2603854cf6e0b149e9fa9d953a1a612338a3..e1df14bad4982347349245a86211ad9b9d26fa29 100644
--- a/gui2/source/darefl/model/materialmodel.cpp
+++ b/gui2/model/materialmodel.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include <QColor>
-#include <darefl/model/item_constants.h>
-#include <darefl/model/materialitems.h>
-#include <darefl/model/materialmodel.h>
+#include "gui2/model/item_constants.h"
+#include "gui2/model/materialitems.h"
+#include "gui2/model/materialmodel.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/itemcatalogue.h"
 #include "mvvm/widgets/widgetutils.h"
diff --git a/gui2/source/darefl/model/materialmodel.h b/gui2/model/materialmodel.h
similarity index 97%
rename from gui2/source/darefl/model/materialmodel.h
rename to gui2/model/materialmodel.h
index 7c27f7b6ed62e5dbd40b07374515a2b612c4f70a..ea5bff26a64714da9627b787e108cdc64ac9437f 100644
--- a/gui2/source/darefl/model/materialmodel.h
+++ b/gui2/model/materialmodel.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_MODEL_MATERIALMODEL_H
 #define DAREFL_MODEL_MATERIALMODEL_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/model/tagrow.h"
 #include <vector>
diff --git a/gui2/source/darefl/model/materialpropertycontroller.cpp b/gui2/model/materialpropertycontroller.cpp
similarity index 89%
rename from gui2/source/darefl/model/materialpropertycontroller.cpp
rename to gui2/model/materialpropertycontroller.cpp
index 4d8ffad6b230c845e0891f905d686d62d9c975cd..42add71c636b506c11812db900cd8f5db782eadd 100644
--- a/gui2/source/darefl/model/materialpropertycontroller.cpp
+++ b/gui2/model/materialpropertycontroller.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <darefl/model/materialmodel.h>
-#include <darefl/model/materialpropertycontroller.h>
-#include <darefl/model/sampleitems.h>
-#include <darefl/model/samplemodel.h>
+#include "gui2/model/materialmodel.h"
+#include "gui2/model/materialpropertycontroller.h"
+#include "gui2/model/sampleitems.h"
+#include "gui2/model/samplemodel.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/modelutils.h"
 
diff --git a/gui2/source/darefl/model/materialpropertycontroller.h b/gui2/model/materialpropertycontroller.h
similarity index 96%
rename from gui2/source/darefl/model/materialpropertycontroller.h
rename to gui2/model/materialpropertycontroller.h
index 24ff10beafbed38fdee65ae72aacf79f1bfef9c7..ab3dee95d1ba806d604a8ac2fb9b9ae499ce6b32 100644
--- a/gui2/source/darefl/model/materialpropertycontroller.h
+++ b/gui2/model/materialpropertycontroller.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_MODEL_MATERIALPROPERTYCONTROLLER_H
 #define DAREFL_MODEL_MATERIALPROPERTYCONTROLLER_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/signals/modellistener.h"
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/model/modelutils.cpp b/gui2/model/modelutils.cpp
similarity index 96%
rename from gui2/source/darefl/model/modelutils.cpp
rename to gui2/model/modelutils.cpp
index f47857f2928118dbc91e7be9c0fa35ac7dc100a0..8d0d4e31e5edcedf2bf551d642ee14cd1101b469 100644
--- a/gui2/source/darefl/model/modelutils.cpp
+++ b/gui2/model/modelutils.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include <darefl/model/experimentaldatamodel.h>
-#include <darefl/model/modelutils.h>
+#include "gui2/model/experimentaldatamodel.h"
+#include "gui2/model/modelutils.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/standarditems/axisitems.h"
diff --git a/gui2/source/darefl/model/modelutils.h b/gui2/model/modelutils.h
similarity index 98%
rename from gui2/source/darefl/model/modelutils.h
rename to gui2/model/modelutils.h
index cbeefdd8c6d4621cbb282a6ef89ab73a65be165f..42098561bc739ec20dcc03f18a77df6b15d3a308 100644
--- a/gui2/source/darefl/model/modelutils.h
+++ b/gui2/model/modelutils.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_MODEL_MODELUTILS_H
 #define DAREFL_MODEL_MODELUTILS_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <string>
 #include <vector>
 
diff --git a/gui2/source/darefl/model/sampleitems.cpp b/gui2/model/sampleitems.cpp
similarity index 95%
rename from gui2/source/darefl/model/sampleitems.cpp
rename to gui2/model/sampleitems.cpp
index 51e52ab4c4e8529684d48bde10decb6fd4134766..0a30979c83d76f1cc037e6b1a03922e8e19b7494 100644
--- a/gui2/source/darefl/model/sampleitems.cpp
+++ b/gui2/model/sampleitems.cpp
@@ -8,10 +8,10 @@
 // ************************************************************************** //
 
 #include <QVariant>
-#include <darefl/model/item_constants.h>
-#include <darefl/model/materialitems.h>
-#include <darefl/model/materialmodel.h>
-#include <darefl/model/sampleitems.h>
+#include "gui2/model/item_constants.h"
+#include "gui2/model/materialitems.h"
+#include "gui2/model/materialmodel.h"
+#include "gui2/model/sampleitems.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/signals/itemmapper.h"
 
diff --git a/gui2/source/darefl/model/sampleitems.h b/gui2/model/sampleitems.h
similarity index 98%
rename from gui2/source/darefl/model/sampleitems.h
rename to gui2/model/sampleitems.h
index a0fa6f889f5a5a34fb6da77a999434197a7c87fb..6844079d853a7fbfa130eea63c4222d5130c2f94 100644
--- a/gui2/source/darefl/model/sampleitems.h
+++ b/gui2/model/sampleitems.h
@@ -13,7 +13,7 @@
 //! @file sampleitems.h
 //! Collection of layer and multi-layer items to populate SampleModel.
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/model/compounditem.h"
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/model/samplemodel.cpp b/gui2/model/samplemodel.cpp
similarity index 95%
rename from gui2/source/darefl/model/samplemodel.cpp
rename to gui2/model/samplemodel.cpp
index 0e0fd58df0191410c8d50396b98ff9d9f6e40f01..5f6372939daf3982657a22689b860a947cb735b7 100644
--- a/gui2/source/darefl/model/samplemodel.cpp
+++ b/gui2/model/samplemodel.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include <darefl/model/sampleitems.h>
-#include <darefl/model/samplemodel.h>
+#include "gui2/model/sampleitems.h"
+#include "gui2/model/samplemodel.h"
 #include "mvvm/model/itemcatalogue.h"
 
 using namespace ModelView;
diff --git a/gui2/source/darefl/model/samplemodel.h b/gui2/model/samplemodel.h
similarity index 95%
rename from gui2/source/darefl/model/samplemodel.h
rename to gui2/model/samplemodel.h
index 5b52e2901f18d18543fbbcb1300beec49f6754aa..772dc7b9562a5be282758d498850e516aacb0859 100644
--- a/gui2/source/darefl/model/samplemodel.h
+++ b/gui2/model/samplemodel.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_MODEL_SAMPLEMODEL_H
 #define DAREFL_MODEL_SAMPLEMODEL_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/model/sessionmodel.h"
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/quicksimeditor/CMakeLists.txt b/gui2/quicksimeditor/CMakeLists.txt
similarity index 100%
rename from gui2/source/darefl/quicksimeditor/CMakeLists.txt
rename to gui2/quicksimeditor/CMakeLists.txt
diff --git a/gui2/source/darefl/quicksimeditor/custombeampropertyeditorfactory.cpp b/gui2/quicksimeditor/custombeampropertyeditorfactory.cpp
similarity index 86%
rename from gui2/source/darefl/quicksimeditor/custombeampropertyeditorfactory.cpp
rename to gui2/quicksimeditor/custombeampropertyeditorfactory.cpp
index cb370df5e3fe555737f9366047282014d97b9cb9..3543c81a9fd5a9e9fd6d1fee3e5801a04cc0c65e 100644
--- a/gui2/source/darefl/quicksimeditor/custombeampropertyeditorfactory.cpp
+++ b/gui2/quicksimeditor/custombeampropertyeditorfactory.cpp
@@ -9,12 +9,12 @@
 
 #include <QModelIndex>
 #include <algorithm>
-#include <darefl/model/applicationmodels.h>
-#include <darefl/model/experimentaldataitems.h>
-#include <darefl/model/experimentaldatamodel.h>
-#include <darefl/model/materialmodel.h>
-#include <darefl/model/modelutils.h>
-#include <darefl/quicksimeditor/custombeampropertyeditorfactory.h>
+#include "gui2/model/applicationmodels.h"
+#include "gui2/model/experimentaldataitems.h"
+#include "gui2/model/experimentaldatamodel.h"
+#include "gui2/model/materialmodel.h"
+#include "gui2/model/modelutils.h"
+#include "gui2/quicksimeditor/custombeampropertyeditorfactory.h"
 #include "mvvm/editors/externalpropertycomboeditor.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/modelutils.h"
diff --git a/gui2/source/darefl/quicksimeditor/custombeampropertyeditorfactory.h b/gui2/quicksimeditor/custombeampropertyeditorfactory.h
similarity index 97%
rename from gui2/source/darefl/quicksimeditor/custombeampropertyeditorfactory.h
rename to gui2/quicksimeditor/custombeampropertyeditorfactory.h
index dbfa3343787e10f27c4ed85ae05efcb4a994efb6..6f886fa3457a8a46eec59823cfbc73f1d8bb8098 100644
--- a/gui2/source/darefl/quicksimeditor/custombeampropertyeditorfactory.h
+++ b/gui2/quicksimeditor/custombeampropertyeditorfactory.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_QUICKSIMEDITOR_CUSTOMBEAMPROPERTYEDITORFACTORY_H
 #define DAREFL_QUICKSIMEDITOR_CUSTOMBEAMPROPERTYEDITORFACTORY_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/editors/defaulteditorfactory.h"
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/quicksimeditor/instrumentpropertyeditor.cpp b/gui2/quicksimeditor/instrumentpropertyeditor.cpp
similarity index 84%
rename from gui2/source/darefl/quicksimeditor/instrumentpropertyeditor.cpp
rename to gui2/quicksimeditor/instrumentpropertyeditor.cpp
index 6fcf8e9dc36df0c0afcfa3cd5a83768fd38f5d6e..410bed5252305d5e7f09e2f8daf5dc7c3f473da8 100644
--- a/gui2/source/darefl/quicksimeditor/instrumentpropertyeditor.cpp
+++ b/gui2/quicksimeditor/instrumentpropertyeditor.cpp
@@ -9,12 +9,12 @@
 
 #include <QTreeView>
 #include <QVBoxLayout>
-#include <darefl/mainwindow/styleutils.h>
-#include <darefl/model/applicationmodels.h>
-#include <darefl/model/instrumentitems.h>
-#include <darefl/model/instrumentmodel.h>
-#include <darefl/quicksimeditor/custombeampropertyeditorfactory.h>
-#include <darefl/quicksimeditor/instrumentpropertyeditor.h>
+#include "gui2/mainwindow/styleutils.h"
+#include "gui2/model/applicationmodels.h"
+#include "gui2/model/instrumentitems.h"
+#include "gui2/model/instrumentmodel.h"
+#include "gui2/quicksimeditor/custombeampropertyeditorfactory.h"
+#include "gui2/quicksimeditor/instrumentpropertyeditor.h"
 #include "mvvm/viewmodel/viewmodeldelegate.h"
 #include "mvvm/widgets/propertytreeview.h"
 
diff --git a/gui2/source/darefl/quicksimeditor/instrumentpropertyeditor.h b/gui2/quicksimeditor/instrumentpropertyeditor.h
similarity index 97%
rename from gui2/source/darefl/quicksimeditor/instrumentpropertyeditor.h
rename to gui2/quicksimeditor/instrumentpropertyeditor.h
index 773c2920d40bf7fc146d2d50842607bcf741fe68..a0720cd240c9f6dba39ce9d7bc7277074e2dd35f 100644
--- a/gui2/source/darefl/quicksimeditor/instrumentpropertyeditor.h
+++ b/gui2/quicksimeditor/instrumentpropertyeditor.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_QUICKSIMEDITOR_INSTRUMENTPROPERTYEDITOR_H
 #define DAREFL_QUICKSIMEDITOR_INSTRUMENTPROPERTYEDITOR_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 namespace ModelView {
 class PropertyTreeView;
diff --git a/gui2/source/darefl/quicksimeditor/jobmanager.cpp b/gui2/quicksimeditor/jobmanager.cpp
similarity index 96%
rename from gui2/source/darefl/quicksimeditor/jobmanager.cpp
rename to gui2/quicksimeditor/jobmanager.cpp
index bda90a93ca75c4f114ec63c6d80dc80acadd83dd..8856d88ded1c2fd3e613e809d34fd66731804fa6 100644
--- a/gui2/source/darefl/quicksimeditor/jobmanager.cpp
+++ b/gui2/quicksimeditor/jobmanager.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include <darefl/quicksimeditor/jobmanager.h>
-#include <darefl/quicksimeditor/speculartoysimulation.h>
+#include "gui2/quicksimeditor/jobmanager.h"
+#include "gui2/quicksimeditor/speculartoysimulation.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/quicksimeditor/jobmanager.h b/gui2/quicksimeditor/jobmanager.h
similarity index 94%
rename from gui2/source/darefl/quicksimeditor/jobmanager.h
rename to gui2/quicksimeditor/jobmanager.h
index 313c448e055935e06c68bd43df0b0417bab29da0..9f214b45eaf1dcc1af0dc75f77035c4e27e8da70 100644
--- a/gui2/source/darefl/quicksimeditor/jobmanager.h
+++ b/gui2/quicksimeditor/jobmanager.h
@@ -11,8 +11,8 @@
 #define DAREFL_QUICKSIMEDITOR_JOBMANAGER_H
 
 #include <QObject>
-#include <darefl/darefl_export.h>
-#include <darefl/quicksimeditor/quicksim_types.h>
+#include "darefl_export.h"
+#include "gui2/quicksimeditor/quicksim_types.h"
 #include "mvvm/utils/threadsafestack.h"
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/quicksimeditor/materialprofile.cpp b/gui2/quicksimeditor/materialprofile.cpp
similarity index 90%
rename from gui2/source/darefl/quicksimeditor/materialprofile.cpp
rename to gui2/quicksimeditor/materialprofile.cpp
index 99d7dfb4391777a6dbf53e3cbb4a7f9a0c77ffc0..07717d00322d976a74f7127166c0d8a5ee5f1dc1 100644
--- a/gui2/source/darefl/quicksimeditor/materialprofile.cpp
+++ b/gui2/quicksimeditor/materialprofile.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include <Sample/Slice/Slice.h>
-#include <darefl/quicksimeditor/materialprofile.h>
-#include <darefl/quicksimeditor/profilehelper.h>
-#include <darefl/quicksimeditor/quicksimutils.h>
+#include "gui2/quicksimeditor/materialprofile.h"
+#include "gui2/quicksimeditor/profilehelper.h"
+#include "gui2/quicksimeditor/quicksimutils.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/quicksimeditor/materialprofile.h b/gui2/quicksimeditor/materialprofile.h
similarity index 93%
rename from gui2/source/darefl/quicksimeditor/materialprofile.h
rename to gui2/quicksimeditor/materialprofile.h
index 79497f3c56516a701e896b33fdd9c801fdebf741..d200c1c331fa207546627edaced518eca6da7a09 100644
--- a/gui2/source/darefl/quicksimeditor/materialprofile.h
+++ b/gui2/quicksimeditor/materialprofile.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_QUICKSIMEDITOR_MATERIALPROFILE_H
 #define DAREFL_QUICKSIMEDITOR_MATERIALPROFILE_H
 
-#include <darefl/darefl_export.h>
-#include <darefl/quicksimeditor/quicksim_types.h>
+#include "darefl_export.h"
+#include "gui2/quicksimeditor/quicksim_types.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/quicksimeditor/profilehelper.cpp b/gui2/quicksimeditor/profilehelper.cpp
similarity index 98%
rename from gui2/source/darefl/quicksimeditor/profilehelper.cpp
rename to gui2/quicksimeditor/profilehelper.cpp
index ddc49ac15d28e878de6bdc325cef1804d1f4c98f..c64e65b872ba8f7b0d7ef8cfe73130d4b162aa66 100644
--- a/gui2/source/darefl/quicksimeditor/profilehelper.cpp
+++ b/gui2/quicksimeditor/profilehelper.cpp
@@ -7,7 +7,7 @@
 //
 // ************************************************************************** //
 
-#include <darefl/quicksimeditor/profilehelper.h>
+#include "gui2/quicksimeditor/profilehelper.h"
 #include <Sample/Slice/LayerRoughness.h>
 #include <Sample/Slice/Slice.h>
 
diff --git a/gui2/source/darefl/quicksimeditor/profilehelper.h b/gui2/quicksimeditor/profilehelper.h
similarity index 96%
rename from gui2/source/darefl/quicksimeditor/profilehelper.h
rename to gui2/quicksimeditor/profilehelper.h
index 9448608296c1c383d15e5e36b6464aa1c1dc43af..b91c212554d40a15178254806c8a26765ad6358e 100644
--- a/gui2/source/darefl/quicksimeditor/profilehelper.h
+++ b/gui2/quicksimeditor/profilehelper.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_QUICKSIMEDITOR_PROFILEHELPER_H
 #define DAREFL_QUICKSIMEDITOR_PROFILEHELPER_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <Sample/Slice/Slice.h>
 #include <utility>
 #include <vector>
diff --git a/gui2/source/darefl/quicksimeditor/quicksim_types.h b/gui2/quicksimeditor/quicksim_types.h
similarity index 97%
rename from gui2/source/darefl/quicksimeditor/quicksim_types.h
rename to gui2/quicksimeditor/quicksim_types.h
index 15a21e9040ea016bbe0678c7fc02c2bdda0e8017..dc94e1cb2622b5360531ea598c3f6e63f26f12ab 100644
--- a/gui2/source/darefl/quicksimeditor/quicksim_types.h
+++ b/gui2/quicksimeditor/quicksim_types.h
@@ -11,7 +11,7 @@
 #define DAREFL_QUICKSIMEDITOR_QUICKSIM_TYPES_H
 
 #include <complex>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <vector>
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/quicksimeditor/quicksimcontroller.cpp b/gui2/quicksimeditor/quicksimcontroller.cpp
similarity index 88%
rename from gui2/source/darefl/quicksimeditor/quicksimcontroller.cpp
rename to gui2/quicksimeditor/quicksimcontroller.cpp
index 8b1bdee0ea4050ef845511b8a8457af83471dd8a..4b13c2bdbf6053008f946dd75fa676106b1b7fba 100644
--- a/gui2/source/darefl/quicksimeditor/quicksimcontroller.cpp
+++ b/gui2/quicksimeditor/quicksimcontroller.cpp
@@ -7,19 +7,19 @@
 //
 // ************************************************************************** //
 
-#include <darefl/core/app_constants.h>
-#include <darefl/model/applicationmodels.h>
-#include <darefl/model/instrumentitems.h>
-#include <darefl/model/instrumentmodel.h>
-#include <darefl/model/jobitem.h>
-#include <darefl/model/jobmodel.h>
-#include <darefl/model/materialmodel.h>
-#include <darefl/model/sampleitems.h>
-#include <darefl/model/samplemodel.h>
-#include <darefl/quicksimeditor/jobmanager.h>
-#include <darefl/quicksimeditor/quicksimcontroller.h>
-#include <darefl/quicksimeditor/quicksimutils.h>
-#include <darefl/quicksimeditor/speculartoysimulation.h>
+#include "gui2/core/app_constants.h"
+#include "gui2/model/applicationmodels.h"
+#include "gui2/model/instrumentitems.h"
+#include "gui2/model/instrumentmodel.h"
+#include "gui2/model/jobitem.h"
+#include "gui2/model/jobmodel.h"
+#include "gui2/model/materialmodel.h"
+#include "gui2/model/sampleitems.h"
+#include "gui2/model/samplemodel.h"
+#include "gui2/quicksimeditor/jobmanager.h"
+#include "gui2/quicksimeditor/quicksimcontroller.h"
+#include "gui2/quicksimeditor/quicksimutils.h"
+#include "gui2/quicksimeditor/speculartoysimulation.h"
 #include "mvvm/project/modelhaschangedcontroller.h"
 #include "mvvm/standarditems/axisitems.h"
 #include "mvvm/standarditems/data1ditem.h"
diff --git a/gui2/source/darefl/quicksimeditor/quicksimcontroller.h b/gui2/quicksimeditor/quicksimcontroller.h
similarity index 96%
rename from gui2/source/darefl/quicksimeditor/quicksimcontroller.h
rename to gui2/quicksimeditor/quicksimcontroller.h
index e7238a540d102c7fa6775969873e9365ab48e37d..f6133143c22e799c0f9c43395822b07bf808d450 100644
--- a/gui2/source/darefl/quicksimeditor/quicksimcontroller.h
+++ b/gui2/quicksimeditor/quicksimcontroller.h
@@ -11,8 +11,8 @@
 #define DAREFL_QUICKSIMEDITOR_QUICKSIMCONTROLLER_H
 
 #include <QObject>
-#include <darefl/darefl_export.h>
-#include <darefl/quicksimeditor/quicksim_types.h>
+#include "darefl_export.h"
+#include "gui2/quicksimeditor/quicksim_types.h"
 #include <memory>
 
 namespace ModelView {
diff --git a/gui2/source/darefl/quicksimeditor/quicksimeditor.cpp b/gui2/quicksimeditor/quicksimeditor.cpp
similarity index 87%
rename from gui2/source/darefl/quicksimeditor/quicksimeditor.cpp
rename to gui2/quicksimeditor/quicksimeditor.cpp
index 609dbce4d69788609919c531bff3cdbaa00b7fde..2403d1a0f8073f8ea1e981603a118b89644a88ef 100644
--- a/gui2/source/darefl/quicksimeditor/quicksimeditor.cpp
+++ b/gui2/quicksimeditor/quicksimeditor.cpp
@@ -9,15 +9,15 @@
 
 #include <QTabWidget>
 #include <QVBoxLayout>
-#include <darefl/mainwindow/styleutils.h>
-#include <darefl/model/applicationmodels.h>
-#include <darefl/model/experimentaldataitems.h>
-#include <darefl/model/jobmodel.h>
-#include <darefl/quicksimeditor/quicksimcontroller.h>
-#include <darefl/quicksimeditor/quicksimeditor.h>
-#include <darefl/quicksimeditor/quicksimeditortoolbar.h>
-#include <darefl/quicksimeditor/simplotcontroller.h>
-#include <darefl/quicksimeditor/simplotwidget.h>
+#include "gui2/mainwindow/styleutils.h"
+#include "gui2/model/applicationmodels.h"
+#include "gui2/model/experimentaldataitems.h"
+#include "gui2/model/jobmodel.h"
+#include "gui2/quicksimeditor/quicksimcontroller.h"
+#include "gui2/quicksimeditor/quicksimeditor.h"
+#include "gui2/quicksimeditor/quicksimeditortoolbar.h"
+#include "gui2/quicksimeditor/simplotcontroller.h"
+#include "gui2/quicksimeditor/simplotwidget.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/plotting/graphcanvas.h"
 #include "mvvm/standarditems/graphviewportitem.h"
diff --git a/gui2/source/darefl/quicksimeditor/quicksimeditor.h b/gui2/quicksimeditor/quicksimeditor.h
similarity index 97%
rename from gui2/source/darefl/quicksimeditor/quicksimeditor.h
rename to gui2/quicksimeditor/quicksimeditor.h
index 16eade9e867b1d0f19f1c668b8a16929a952fbbd..0fd4f2019f494b3689b20f03972a39b45b883b26 100644
--- a/gui2/source/darefl/quicksimeditor/quicksimeditor.h
+++ b/gui2/quicksimeditor/quicksimeditor.h
@@ -11,7 +11,7 @@
 #define DAREFL_QUICKSIMEDITOR_QUICKSIMEDITOR_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/quicksimeditor/quicksimeditortoolbar.cpp b/gui2/quicksimeditor/quicksimeditortoolbar.cpp
similarity index 97%
rename from gui2/source/darefl/quicksimeditor/quicksimeditortoolbar.cpp
rename to gui2/quicksimeditor/quicksimeditortoolbar.cpp
index b4bd9b5c8879bae40bd1d163fe6562df27e5dbb1..5ba6f38795e4ae6bf89404928e9b66e6312b4421 100644
--- a/gui2/source/darefl/quicksimeditor/quicksimeditortoolbar.cpp
+++ b/gui2/quicksimeditor/quicksimeditortoolbar.cpp
@@ -12,8 +12,8 @@
 #include <QLabel>
 #include <QProgressBar>
 #include <QVBoxLayout>
-#include <darefl/core/app_constants.h>
-#include <darefl/quicksimeditor/quicksimeditortoolbar.h>
+#include "gui2/core/app_constants.h"
+#include "gui2/quicksimeditor/quicksimeditortoolbar.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/quicksimeditor/quicksimeditortoolbar.h b/gui2/quicksimeditor/quicksimeditortoolbar.h
similarity index 97%
rename from gui2/source/darefl/quicksimeditor/quicksimeditortoolbar.h
rename to gui2/quicksimeditor/quicksimeditortoolbar.h
index 7bdd3c18a724e0fba8621a7992e70594b3d03269..1084a36516c06f5557afae36267e642b6dbd3633 100644
--- a/gui2/source/darefl/quicksimeditor/quicksimeditortoolbar.h
+++ b/gui2/quicksimeditor/quicksimeditortoolbar.h
@@ -11,7 +11,7 @@
 #define DAREFL_QUICKSIMEDITOR_QUICKSIMEDITORTOOLBAR_H
 
 #include <QToolBar>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 class QProgressBar;
 class QCheckBox;
diff --git a/gui2/source/darefl/quicksimeditor/quicksimutils.cpp b/gui2/quicksimeditor/quicksimutils.cpp
similarity index 94%
rename from gui2/source/darefl/quicksimeditor/quicksimutils.cpp
rename to gui2/quicksimeditor/quicksimutils.cpp
index 0985e2c4ba396c593be7420a5d48b0cdde4856d0..ba7bf733b18cc1e6d0222104aeba92e53887d15d 100644
--- a/gui2/source/darefl/quicksimeditor/quicksimutils.cpp
+++ b/gui2/quicksimeditor/quicksimutils.cpp
@@ -7,10 +7,10 @@
 //
 // ************************************************************************** //
 
-#include <darefl/model/item_constants.h>
-#include <darefl/model/materialitems.h>
-#include <darefl/model/sampleitems.h>
-#include <darefl/quicksimeditor/quicksimutils.h>
+#include "gui2/model/item_constants.h"
+#include "gui2/model/materialitems.h"
+#include "gui2/model/sampleitems.h"
+#include "gui2/quicksimeditor/quicksimutils.h"
 #include <Sample/Material/MaterialFactoryFuncs.h>
 #include <Sample/Slice/LayerRoughness.h>
 #include <Sample/Slice/Slice.h>
diff --git a/gui2/source/darefl/quicksimeditor/quicksimutils.h b/gui2/quicksimeditor/quicksimutils.h
similarity index 91%
rename from gui2/source/darefl/quicksimeditor/quicksimutils.h
rename to gui2/quicksimeditor/quicksimutils.h
index 7c32ee657c7c6810fc37612e09a6d1e0df34f207..0c73233e2820c989707652eebe89b8c447a31177 100644
--- a/gui2/source/darefl/quicksimeditor/quicksimutils.h
+++ b/gui2/quicksimeditor/quicksimutils.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_QUICKSIMEDITOR_QUICKSIMUTILS_H
 #define DAREFL_QUICKSIMEDITOR_QUICKSIMUTILS_H
 
-#include <darefl/darefl_export.h>
-#include <darefl/quicksimeditor/quicksim_types.h>
+#include "darefl_export.h"
+#include "gui2/quicksimeditor/quicksim_types.h"
 
 class MultiLayerItem;
 
diff --git a/gui2/source/darefl/quicksimeditor/simplotcontroller.cpp b/gui2/quicksimeditor/simplotcontroller.cpp
similarity index 81%
rename from gui2/source/darefl/quicksimeditor/simplotcontroller.cpp
rename to gui2/quicksimeditor/simplotcontroller.cpp
index 5d66627f5c9575e9bdd4d193366068d2562076a0..e59708e466a8f116ae663a7adf0509a5eaa8dec7 100644
--- a/gui2/source/darefl/quicksimeditor/simplotcontroller.cpp
+++ b/gui2/quicksimeditor/simplotcontroller.cpp
@@ -7,12 +7,12 @@
 //
 // ************************************************************************** //
 
-#include <darefl/model/applicationmodels.h>
-#include <darefl/model/instrumentitems.h>
-#include <darefl/model/instrumentmodel.h>
-#include <darefl/model/jobitem.h>
-#include <darefl/model/jobmodel.h>
-#include <darefl/quicksimeditor/simplotcontroller.h>
+#include "gui2/model/applicationmodels.h"
+#include "gui2/model/instrumentitems.h"
+#include "gui2/model/instrumentmodel.h"
+#include "gui2/model/jobitem.h"
+#include "gui2/model/jobmodel.h"
+#include "gui2/quicksimeditor/simplotcontroller.h"
 #include "mvvm/project/modelhaschangedcontroller.h"
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/quicksimeditor/simplotcontroller.h b/gui2/quicksimeditor/simplotcontroller.h
similarity index 96%
rename from gui2/source/darefl/quicksimeditor/simplotcontroller.h
rename to gui2/quicksimeditor/simplotcontroller.h
index 49bfd705e826fcd37f2a9384780c1f492aa3865c..17d9c44452970e875755aaf72766da301f93cc25 100644
--- a/gui2/source/darefl/quicksimeditor/simplotcontroller.h
+++ b/gui2/quicksimeditor/simplotcontroller.h
@@ -11,7 +11,7 @@
 #define DAREFL_QUICKSIMEDITOR_SIMPLOTCONTROLLER_H
 
 #include <QObject>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 
 namespace ModelView {
diff --git a/gui2/source/darefl/quicksimeditor/simplotwidget.cpp b/gui2/quicksimeditor/simplotwidget.cpp
similarity index 90%
rename from gui2/source/darefl/quicksimeditor/simplotwidget.cpp
rename to gui2/quicksimeditor/simplotwidget.cpp
index 4cb725b2a879aa661f650296ac21cb8d6bbe17e0..3340b7e8f05d3809642e71cd8182c87dbe7371c5 100644
--- a/gui2/source/darefl/quicksimeditor/simplotwidget.cpp
+++ b/gui2/quicksimeditor/simplotwidget.cpp
@@ -10,10 +10,10 @@
 #include <QList>
 #include <QSplitter>
 #include <QVBoxLayout>
-#include <darefl/model/applicationmodels.h>
-#include <darefl/model/experimentaldataitems.h>
-#include <darefl/model/jobmodel.h>
-#include <darefl/quicksimeditor/simplotwidget.h>
+#include "gui2/model/applicationmodels.h"
+#include "gui2/model/experimentaldataitems.h"
+#include "gui2/model/jobmodel.h"
+#include "gui2/quicksimeditor/simplotwidget.h"
 #include "mvvm/plotting/graphcanvas.h"
 #include "mvvm/standarditems/graphviewportitem.h"
 
diff --git a/gui2/source/darefl/quicksimeditor/simplotwidget.h b/gui2/quicksimeditor/simplotwidget.h
similarity index 97%
rename from gui2/source/darefl/quicksimeditor/simplotwidget.h
rename to gui2/quicksimeditor/simplotwidget.h
index 67bac28bce4a0aa5e9f83b785cb18739276084d4..6899848b02eb7f2fd4f6260976a6751394b5b9a7 100644
--- a/gui2/source/darefl/quicksimeditor/simplotwidget.h
+++ b/gui2/quicksimeditor/simplotwidget.h
@@ -11,7 +11,7 @@
 #define DAREFL_QUICKSIMEDITOR_SIMPLOTWIDGET_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 namespace ModelView {
 class GraphCanvas;
diff --git a/gui2/source/darefl/quicksimeditor/speculartoysimulation.cpp b/gui2/quicksimeditor/speculartoysimulation.cpp
similarity index 93%
rename from gui2/source/darefl/quicksimeditor/speculartoysimulation.cpp
rename to gui2/quicksimeditor/speculartoysimulation.cpp
index 7f19024a7d0c4b478a6d9804c35f5cd226d2c77a..7bab4e5efcbdec41d756455836f7cb6c2f524f99 100644
--- a/gui2/source/darefl/quicksimeditor/speculartoysimulation.cpp
+++ b/gui2/quicksimeditor/speculartoysimulation.cpp
@@ -8,9 +8,9 @@
 // ************************************************************************** //
 
 #include <algorithm>
-#include <darefl/quicksimeditor/materialprofile.h>
-#include <darefl/quicksimeditor/quicksimutils.h>
-#include <darefl/quicksimeditor/speculartoysimulation.h>
+#include "gui2/quicksimeditor/materialprofile.h"
+#include "gui2/quicksimeditor/quicksimutils.h"
+#include "gui2/quicksimeditor/speculartoysimulation.h"
 #include <Sample/Slice/Slice.h>
 #include <Sample/Slice/KzComputation.h>
 #include <Sample/Specular/SpecularScalarTanhStrategy.h>
diff --git a/gui2/source/darefl/quicksimeditor/speculartoysimulation.h b/gui2/quicksimeditor/speculartoysimulation.h
similarity index 94%
rename from gui2/source/darefl/quicksimeditor/speculartoysimulation.h
rename to gui2/quicksimeditor/speculartoysimulation.h
index e2e7bcec5939ce055264e427cd7f3f273da5230c..f40d4bdc98f00b07373c2e061567e897a6459994 100644
--- a/gui2/source/darefl/quicksimeditor/speculartoysimulation.h
+++ b/gui2/quicksimeditor/speculartoysimulation.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_QUICKSIMEDITOR_SPECULARTOYSIMULATION_H
 #define DAREFL_QUICKSIMEDITOR_SPECULARTOYSIMULATION_H
 
-#include <darefl/darefl_export.h>
-#include <darefl/quicksimeditor/quicksim_types.h>
+#include "darefl_export.h"
+#include "gui2/quicksimeditor/quicksim_types.h"
 #include <memory>
 #include "mvvm/utils/progresshandler.h"
 #include <vector>
diff --git a/gui2/source/darefl/resources/CMakeLists.txt b/gui2/resources/CMakeLists.txt
similarity index 100%
rename from gui2/source/darefl/resources/CMakeLists.txt
rename to gui2/resources/CMakeLists.txt
diff --git a/gui2/source/darefl/resources/icons.qrc b/gui2/resources/icons.qrc
similarity index 100%
rename from gui2/source/darefl/resources/icons.qrc
rename to gui2/resources/icons.qrc
diff --git a/gui2/source/darefl/resources/icons/F-letter_1000x.png b/gui2/resources/icons/F-letter_1000x.png
similarity index 100%
rename from gui2/source/darefl/resources/icons/F-letter_1000x.png
rename to gui2/resources/icons/F-letter_1000x.png
diff --git a/gui2/source/darefl/resources/icons/arrow-down-circle-outline.svg b/gui2/resources/icons/arrow-down-circle-outline.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/arrow-down-circle-outline.svg
rename to gui2/resources/icons/arrow-down-circle-outline.svg
diff --git a/gui2/source/darefl/resources/icons/arrow-up-circle-outline.svg b/gui2/resources/icons/arrow-up-circle-outline.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/arrow-up-circle-outline.svg
rename to gui2/resources/icons/arrow-up-circle-outline.svg
diff --git a/gui2/source/darefl/resources/icons/aspect-ratio.svg b/gui2/resources/icons/aspect-ratio.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/aspect-ratio.svg
rename to gui2/resources/icons/aspect-ratio.svg
diff --git a/gui2/source/darefl/resources/icons/beaker-remove-outline.svg b/gui2/resources/icons/beaker-remove-outline.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/beaker-remove-outline.svg
rename to gui2/resources/icons/beaker-remove-outline.svg
diff --git a/gui2/source/darefl/resources/icons/card-bulleted-outline.svg b/gui2/resources/icons/card-bulleted-outline.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/card-bulleted-outline.svg
rename to gui2/resources/icons/card-bulleted-outline.svg
diff --git a/gui2/source/darefl/resources/icons/close-circle-outline.svg b/gui2/resources/icons/close-circle-outline.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/close-circle-outline.svg
rename to gui2/resources/icons/close-circle-outline.svg
diff --git a/gui2/source/darefl/resources/icons/cog-outline.svg b/gui2/resources/icons/cog-outline.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/cog-outline.svg
rename to gui2/resources/icons/cog-outline.svg
diff --git a/gui2/source/darefl/resources/icons/dock-left.svg b/gui2/resources/icons/dock-left.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/dock-left.svg
rename to gui2/resources/icons/dock-left.svg
diff --git a/gui2/source/darefl/resources/icons/dock-right.svg b/gui2/resources/icons/dock-right.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/dock-right.svg
rename to gui2/resources/icons/dock-right.svg
diff --git a/gui2/source/darefl/resources/icons/export.svg b/gui2/resources/icons/export.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/export.svg
rename to gui2/resources/icons/export.svg
diff --git a/gui2/source/darefl/resources/icons/import.svg b/gui2/resources/icons/import.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/import.svg
rename to gui2/resources/icons/import.svg
diff --git a/gui2/source/darefl/resources/icons/layers-outline.svg b/gui2/resources/icons/layers-outline.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/layers-outline.svg
rename to gui2/resources/icons/layers-outline.svg
diff --git a/gui2/source/darefl/resources/icons/layers-triple-outline.svg b/gui2/resources/icons/layers-triple-outline.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/layers-triple-outline.svg
rename to gui2/resources/icons/layers-triple-outline.svg
diff --git a/gui2/source/darefl/resources/icons/play-circle-outline.svg b/gui2/resources/icons/play-circle-outline.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/play-circle-outline.svg
rename to gui2/resources/icons/play-circle-outline.svg
diff --git a/gui2/source/darefl/resources/icons/plus-box-multiple-outline.svg b/gui2/resources/icons/plus-box-multiple-outline.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/plus-box-multiple-outline.svg
rename to gui2/resources/icons/plus-box-multiple-outline.svg
diff --git a/gui2/source/darefl/resources/icons/plus-box-outline.svg b/gui2/resources/icons/plus-box-outline.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/plus-box-outline.svg
rename to gui2/resources/icons/plus-box-outline.svg
diff --git a/gui2/source/darefl/resources/icons/plus-circle-multiple-outline.svg b/gui2/resources/icons/plus-circle-multiple-outline.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/plus-circle-multiple-outline.svg
rename to gui2/resources/icons/plus-circle-multiple-outline.svg
diff --git a/gui2/source/darefl/resources/icons/plus-circle-outline.svg b/gui2/resources/icons/plus-circle-outline.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/plus-circle-outline.svg
rename to gui2/resources/icons/plus-circle-outline.svg
diff --git a/gui2/source/darefl/resources/icons/redo.svg b/gui2/resources/icons/redo.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/redo.svg
rename to gui2/resources/icons/redo.svg
diff --git a/gui2/source/darefl/resources/icons/set-merge.svg b/gui2/resources/icons/set-merge.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/set-merge.svg
rename to gui2/resources/icons/set-merge.svg
diff --git a/gui2/source/darefl/resources/icons/undo.svg b/gui2/resources/icons/undo.svg
similarity index 100%
rename from gui2/source/darefl/resources/icons/undo.svg
rename to gui2/resources/icons/undo.svg
diff --git a/gui2/source/darefl/resources/resources.h b/gui2/resources/resources.h
similarity index 100%
rename from gui2/source/darefl/resources/resources.h
rename to gui2/resources/resources.h
diff --git a/gui2/source/darefl/settingsview/CMakeLists.txt b/gui2/settingsview/CMakeLists.txt
similarity index 100%
rename from gui2/source/darefl/settingsview/CMakeLists.txt
rename to gui2/settingsview/CMakeLists.txt
diff --git a/gui2/source/darefl/settingsview/settingsview.cpp b/gui2/settingsview/settingsview.cpp
similarity index 96%
rename from gui2/source/darefl/settingsview/settingsview.cpp
rename to gui2/settingsview/settingsview.cpp
index c9060bb45a2784feea469e92be2cb5781fb020b3..f95b4f6a1475f7257bef963fbabf2bf61e56df7e 100644
--- a/gui2/source/darefl/settingsview/settingsview.cpp
+++ b/gui2/settingsview/settingsview.cpp
@@ -13,8 +13,8 @@
 #include <QStackedWidget>
 #include <QTabWidget>
 #include <QTreeView>
-#include <darefl/model/applicationmodels.h>
-#include <darefl/settingsview/settingsview.h>
+#include "gui2/model/applicationmodels.h"
+#include "gui2/settingsview/settingsview.h"
 #include "mvvm/model/sessionmodel.h"
 #include "mvvm/widgets/allitemstreeview.h"
 #include "mvvm/widgets/widgetutils.h"
diff --git a/gui2/source/darefl/settingsview/settingsview.h b/gui2/settingsview/settingsview.h
similarity index 97%
rename from gui2/source/darefl/settingsview/settingsview.h
rename to gui2/settingsview/settingsview.h
index d130d0f607292129ad26a6094184e980ea92968e..ebba0c5e650288575e7d95760114a45d120172b3 100644
--- a/gui2/source/darefl/settingsview/settingsview.h
+++ b/gui2/settingsview/settingsview.h
@@ -11,7 +11,7 @@
 #define DAREFL_SETTINGSVIEW_SETTINGSVIEW_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 class QTabWidget;
 class QStackedWidget;
diff --git a/gui2/source/darefl/sldeditor/CMakeLists.txt b/gui2/sldeditor/CMakeLists.txt
similarity index 100%
rename from gui2/source/darefl/sldeditor/CMakeLists.txt
rename to gui2/sldeditor/CMakeLists.txt
diff --git a/gui2/source/darefl/sldeditor/elementview.cpp b/gui2/sldeditor/elementview.cpp
similarity index 98%
rename from gui2/source/darefl/sldeditor/elementview.cpp
rename to gui2/sldeditor/elementview.cpp
index 3f9feb9ded5c5e402fb13003adef467561674472..ee6cc81dc076448b255d1971aacd9f919492a230 100644
--- a/gui2/source/darefl/sldeditor/elementview.cpp
+++ b/gui2/sldeditor/elementview.cpp
@@ -8,8 +8,8 @@
 // ************************************************************************** //
 
 #include "mvvm/plotting/sceneadapterinterface.h"
-#include <darefl/sldeditor/elementview.h>
-#include <darefl/sldeditor/graphicsscene.h>
+#include "gui2/sldeditor/elementview.h"
+#include "gui2/sldeditor/graphicsscene.h"
 
 #include <QCursor>
 #include <QPainter>
diff --git a/gui2/source/darefl/sldeditor/elementview.h b/gui2/sldeditor/elementview.h
similarity index 96%
rename from gui2/source/darefl/sldeditor/elementview.h
rename to gui2/sldeditor/elementview.h
index 11e68175fc843de2ddbbe6ab9787d3e04ad800a8..e4da5b745eec8ebe48ed05494a7388e35e22c0a0 100644
--- a/gui2/source/darefl/sldeditor/elementview.h
+++ b/gui2/sldeditor/elementview.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_SLDEDITOR_ELEMENTVIEW_H
 #define DAREFL_SLDEDITOR_ELEMENTVIEW_H
 
-#include <darefl/darefl_export.h>
-#include <darefl/sldeditor/graphicsscene.h>
+#include "darefl_export.h"
+#include "gui2/sldeditor/graphicsscene.h"
 
 #include <QGraphicsObject>
 
diff --git a/gui2/source/darefl/sldeditor/graphicsscene.cpp b/gui2/sldeditor/graphicsscene.cpp
similarity index 98%
rename from gui2/source/darefl/sldeditor/graphicsscene.cpp
rename to gui2/sldeditor/graphicsscene.cpp
index 1b238b052c2e788c0fc83d49786800f64a9f1dcf..1981f95a92da25de5c6456e199f6b14858932657 100644
--- a/gui2/source/darefl/sldeditor/graphicsscene.cpp
+++ b/gui2/sldeditor/graphicsscene.cpp
@@ -7,7 +7,7 @@
 //
 // ************************************************************************** //
 
-#include <darefl/sldeditor/graphicsscene.h>
+#include "gui2/sldeditor/graphicsscene.h"
 
 #include "mvvm/model/modelutils.h"
 #include "mvvm/plotting/customplotproxywidget.h"
diff --git a/gui2/source/darefl/sldeditor/graphicsscene.h b/gui2/sldeditor/graphicsscene.h
similarity index 97%
rename from gui2/source/darefl/sldeditor/graphicsscene.h
rename to gui2/sldeditor/graphicsscene.h
index d4576120bb83744fa6ebd9bbf02c6e6811757e6d..018fffd5bfb02c658f0bb2d1b9a105a06f486e4d 100644
--- a/gui2/source/darefl/sldeditor/graphicsscene.h
+++ b/gui2/sldeditor/graphicsscene.h
@@ -11,7 +11,7 @@
 #define DAREFL_SLDEDITOR_GRAPHICSSCENE_H
 
 #include <QGraphicsScene>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 
 namespace ModelView {
diff --git a/gui2/source/darefl/sldeditor/handleelementview.cpp b/gui2/sldeditor/handleelementview.cpp
similarity index 95%
rename from gui2/source/darefl/sldeditor/handleelementview.cpp
rename to gui2/sldeditor/handleelementview.cpp
index 4f78399dd783f98b153557635cd2cbefe2e1da89..d34dfb1fd0a3b305001a915131b994e0007655f4 100644
--- a/gui2/source/darefl/sldeditor/handleelementview.cpp
+++ b/gui2/sldeditor/handleelementview.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include <darefl/sldeditor/handleelementview.h>
-#include <darefl/sldeditor/layerelementcontroller.h>
+#include "gui2/sldeditor/handleelementview.h"
+#include "gui2/sldeditor/layerelementcontroller.h"
 
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
diff --git a/gui2/source/darefl/sldeditor/handleelementview.h b/gui2/sldeditor/handleelementview.h
similarity index 94%
rename from gui2/source/darefl/sldeditor/handleelementview.h
rename to gui2/sldeditor/handleelementview.h
index 72adc983a035e8730ad827dfb6b7ad8268cb77d7..055810a053c7fcb684c8d505830e713c935d4122 100644
--- a/gui2/source/darefl/sldeditor/handleelementview.h
+++ b/gui2/sldeditor/handleelementview.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_SLDEDITOR_HANDLEELEMENTVIEW_H
 #define DAREFL_SLDEDITOR_HANDLEELEMENTVIEW_H
 
-#include <darefl/darefl_export.h>
-#include <darefl/sldeditor/elementview.h>
+#include "darefl_export.h"
+#include "gui2/sldeditor/elementview.h"
 
 #include <QBrush>
 #include <QPen>
diff --git a/gui2/source/darefl/sldeditor/layerelementcontroller.cpp b/gui2/sldeditor/layerelementcontroller.cpp
similarity index 99%
rename from gui2/source/darefl/sldeditor/layerelementcontroller.cpp
rename to gui2/sldeditor/layerelementcontroller.cpp
index 0a1e8adb40e3616ff0d0e8ca3a44891181bdeec9..e0a21ef1d05f032667324cdd76ddf55b6e85f47e 100644
--- a/gui2/source/darefl/sldeditor/layerelementcontroller.cpp
+++ b/gui2/sldeditor/layerelementcontroller.cpp
@@ -7,13 +7,13 @@
 //
 // ************************************************************************** //
 
-#include <darefl/sldeditor/layerelementcontroller.h>
+#include "gui2/sldeditor/layerelementcontroller.h"
 
-#include <darefl/sldeditor/graphicsscene.h>
-#include <darefl/sldeditor/handleelementview.h>
-#include <darefl/sldeditor/layerelementitem.h>
-#include <darefl/sldeditor/roughnesselementview.h>
-#include <darefl/sldeditor/segmentelementview.h>
+#include "gui2/sldeditor/graphicsscene.h"
+#include "gui2/sldeditor/handleelementview.h"
+#include "gui2/sldeditor/layerelementitem.h"
+#include "gui2/sldeditor/roughnesselementview.h"
+#include "gui2/sldeditor/segmentelementview.h"
 
 #include "mvvm/signals/itemmapper.h"
 #include <stdexcept>
diff --git a/gui2/source/darefl/sldeditor/layerelementcontroller.h b/gui2/sldeditor/layerelementcontroller.h
similarity index 99%
rename from gui2/source/darefl/sldeditor/layerelementcontroller.h
rename to gui2/sldeditor/layerelementcontroller.h
index 9f26fb2e107a3c5461f347dd1f12d470faa1b12d..4c580142c5e4b6f32aaf10e033cb9c20746bb180 100644
--- a/gui2/source/darefl/sldeditor/layerelementcontroller.h
+++ b/gui2/sldeditor/layerelementcontroller.h
@@ -13,7 +13,7 @@
 #include "mvvm/plotting/sceneadapterinterface.h"
 #include <QObject>
 #include <QPainterPath>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <vector>
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/sldeditor/layerelementitem.cpp b/gui2/sldeditor/layerelementitem.cpp
similarity index 98%
rename from gui2/source/darefl/sldeditor/layerelementitem.cpp
rename to gui2/sldeditor/layerelementitem.cpp
index 568f54ab554f64d71d37fd4ee0dfc0a96fd8c5ea..e7a04912422a01a827a85a44e30a7637174cf538 100644
--- a/gui2/source/darefl/sldeditor/layerelementitem.cpp
+++ b/gui2/sldeditor/layerelementitem.cpp
@@ -7,7 +7,7 @@
 //
 // ************************************************************************** //
 
-#include <darefl/sldeditor/layerelementitem.h>
+#include "gui2/sldeditor/layerelementitem.h"
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/itemcatalogue.h"
 #include "mvvm/utils/numericutils.h"
diff --git a/gui2/source/darefl/sldeditor/layerelementitem.h b/gui2/sldeditor/layerelementitem.h
similarity index 98%
rename from gui2/source/darefl/sldeditor/layerelementitem.h
rename to gui2/sldeditor/layerelementitem.h
index 67a7dbdfea45d54ac49258d44e460a0f2f61df14..362a59f5e5e92ea27d3e78a0516666816384cf19 100644
--- a/gui2/source/darefl/sldeditor/layerelementitem.h
+++ b/gui2/sldeditor/layerelementitem.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_SLDEDITOR_LAYERELEMENTITEM_H
 #define DAREFL_SLDEDITOR_LAYERELEMENTITEM_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/model/compounditem.h"
 #include "mvvm/model/sessionmodel.h"
 
diff --git a/gui2/source/darefl/sldeditor/roughnesselementview.cpp b/gui2/sldeditor/roughnesselementview.cpp
similarity index 94%
rename from gui2/source/darefl/sldeditor/roughnesselementview.cpp
rename to gui2/sldeditor/roughnesselementview.cpp
index 4fb997d8a05738cc861ed2b7b5d9d0abf6c27fbc..0da9c1c78c198642a83cb3bbf14f7872d56e13f7 100644
--- a/gui2/source/darefl/sldeditor/roughnesselementview.cpp
+++ b/gui2/sldeditor/roughnesselementview.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include <darefl/sldeditor/layerelementcontroller.h>
-#include <darefl/sldeditor/roughnesselementview.h>
+#include "gui2/sldeditor/layerelementcontroller.h"
+#include "gui2/sldeditor/roughnesselementview.h"
 
 #include <QPainter>
 #include <QStyleOption>
diff --git a/gui2/source/darefl/sldeditor/roughnesselementview.h b/gui2/sldeditor/roughnesselementview.h
similarity index 93%
rename from gui2/source/darefl/sldeditor/roughnesselementview.h
rename to gui2/sldeditor/roughnesselementview.h
index e541446f50908ae124d4769b9067a1d36e7c07bf..598213f1e2efbce48a6de3c751733754047639ac 100644
--- a/gui2/source/darefl/sldeditor/roughnesselementview.h
+++ b/gui2/sldeditor/roughnesselementview.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_SLDEDITOR_ROUGHNESSELEMENTVIEW_H
 #define DAREFL_SLDEDITOR_ROUGHNESSELEMENTVIEW_H
 
-#include <darefl/darefl_export.h>
-#include <darefl/sldeditor/elementview.h>
+#include "darefl_export.h"
+#include "gui2/sldeditor/elementview.h"
 
 #include <QBrush>
 #include <QPainterPath>
diff --git a/gui2/source/darefl/sldeditor/segmentelementview.cpp b/gui2/sldeditor/segmentelementview.cpp
similarity index 95%
rename from gui2/source/darefl/sldeditor/segmentelementview.cpp
rename to gui2/sldeditor/segmentelementview.cpp
index 867ec9a7b26f7ea181afab5c58f829b8cfdee886..80cb6d1c5f9c94bd158dad22f41c158336d4b7a5 100644
--- a/gui2/source/darefl/sldeditor/segmentelementview.cpp
+++ b/gui2/sldeditor/segmentelementview.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include <darefl/sldeditor/layerelementcontroller.h>
-#include <darefl/sldeditor/segmentelementview.h>
+#include "gui2/sldeditor/layerelementcontroller.h"
+#include "gui2/sldeditor/segmentelementview.h"
 
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
diff --git a/gui2/source/darefl/sldeditor/segmentelementview.h b/gui2/sldeditor/segmentelementview.h
similarity index 94%
rename from gui2/source/darefl/sldeditor/segmentelementview.h
rename to gui2/sldeditor/segmentelementview.h
index 6ac1739f34caab93b6af0b41e101750af87c0885..54a21dc912d64d8f95e8dcfe369e1d71d327df1f 100644
--- a/gui2/source/darefl/sldeditor/segmentelementview.h
+++ b/gui2/sldeditor/segmentelementview.h
@@ -10,8 +10,8 @@
 #ifndef DAREFL_SLDEDITOR_SEGMENTELEMENTVIEW_H
 #define DAREFL_SLDEDITOR_SEGMENTELEMENTVIEW_H
 
-#include <darefl/darefl_export.h>
-#include <darefl/sldeditor/elementview.h>
+#include "darefl_export.h"
+#include "gui2/sldeditor/elementview.h"
 
 #include <QBrush>
 #include <QPen>
diff --git a/gui2/source/darefl/sldeditor/sldeditor.cpp b/gui2/sldeditor/sldeditor.cpp
similarity index 83%
rename from gui2/source/darefl/sldeditor/sldeditor.cpp
rename to gui2/sldeditor/sldeditor.cpp
index f3d5e56a820d6b517dfaaf51dd24ed619694a9ea..33a60a4dd7981b82069b22ed6ddf3400d2c27c3a 100644
--- a/gui2/source/darefl/sldeditor/sldeditor.cpp
+++ b/gui2/sldeditor/sldeditor.cpp
@@ -8,13 +8,13 @@
 // ************************************************************************** //
 
 #include <QVBoxLayout>
-#include <darefl/mainwindow/styleutils.h>
-#include <darefl/model/applicationmodels.h>
-#include <darefl/sldeditor/graphicsscene.h>
-#include <darefl/sldeditor/sldeditor.h>
-#include <darefl/sldeditor/sldeditoractions.h>
-#include <darefl/sldeditor/sldeditortoolbar.h>
-#include <darefl/sldeditor/sldviewwidget.h>
+#include "gui2/mainwindow/styleutils.h"
+#include "gui2/model/applicationmodels.h"
+#include "gui2/sldeditor/graphicsscene.h"
+#include "gui2/sldeditor/sldeditor.h"
+#include "gui2/sldeditor/sldeditoractions.h"
+#include "gui2/sldeditor/sldeditortoolbar.h"
+#include "gui2/sldeditor/sldviewwidget.h"
 #include "mvvm/plotting/graphcanvas.h"
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/sldeditor/sldeditor.h b/gui2/sldeditor/sldeditor.h
similarity index 96%
rename from gui2/source/darefl/sldeditor/sldeditor.h
rename to gui2/sldeditor/sldeditor.h
index 9cfbde38a0f645fa41ed53c143a77d9b65fd230a..730ca69460f2cbfad7338fec996b5dd447fe391c 100644
--- a/gui2/source/darefl/sldeditor/sldeditor.h
+++ b/gui2/sldeditor/sldeditor.h
@@ -11,7 +11,7 @@
 #define DAREFL_SLDEDITOR_SLDEDITOR_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 namespace DaRefl {
 class SLDEditorActions;
diff --git a/gui2/source/darefl/sldeditor/sldeditoractions.cpp b/gui2/sldeditor/sldeditoractions.cpp
similarity index 86%
rename from gui2/source/darefl/sldeditor/sldeditoractions.cpp
rename to gui2/sldeditor/sldeditoractions.cpp
index 032b08355e23fa1750476f84986a8559b5f9f535..02132317cb32a759b14e1654c23fdcfb73a9cc3a 100644
--- a/gui2/source/darefl/sldeditor/sldeditoractions.cpp
+++ b/gui2/sldeditor/sldeditoractions.cpp
@@ -7,9 +7,9 @@
 //
 // ************************************************************************** //
 
-#include <darefl/sldeditor/layerelementitem.h>
-#include <darefl/sldeditor/sldeditoractions.h>
-#include <darefl/sldeditor/sldelementmodel.h>
+#include "gui2/sldeditor/layerelementitem.h"
+#include "gui2/sldeditor/sldeditoractions.h"
+#include "gui2/sldeditor/sldelementmodel.h"
 #include "mvvm/model/modelutils.h"
 #include "mvvm/viewmodel/viewmodel.h"
 
diff --git a/gui2/source/darefl/sldeditor/sldeditoractions.h b/gui2/sldeditor/sldeditoractions.h
similarity index 96%
rename from gui2/source/darefl/sldeditor/sldeditoractions.h
rename to gui2/sldeditor/sldeditoractions.h
index 726f79fafe0358872586909eeb16bfcd15bcb5e5..58799546a9461160d06e391c06fd33713463b9c6 100644
--- a/gui2/source/darefl/sldeditor/sldeditoractions.h
+++ b/gui2/sldeditor/sldeditoractions.h
@@ -11,7 +11,7 @@
 #define DAREFL_SLDEDITOR_SLDEDITORACTIONS_H
 
 #include <QObject>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 
 namespace DaRefl {
diff --git a/gui2/source/darefl/sldeditor/sldeditortoolbar.cpp b/gui2/sldeditor/sldeditortoolbar.cpp
similarity index 82%
rename from gui2/source/darefl/sldeditor/sldeditortoolbar.cpp
rename to gui2/sldeditor/sldeditortoolbar.cpp
index 6248d019a93ec962cf2ded5ec3072221f9df3a1f..20a17629225d1939b369e0e4954c57d1b1f6ea54 100644
--- a/gui2/source/darefl/sldeditor/sldeditortoolbar.cpp
+++ b/gui2/sldeditor/sldeditortoolbar.cpp
@@ -9,10 +9,10 @@
 
 #include <QAction>
 #include <QToolButton>
-#include <darefl/mainwindow/styleutils.h>
-#include <darefl/resources/resources.h>
-#include <darefl/sldeditor/sldeditoractions.h>
-#include <darefl/sldeditor/sldeditortoolbar.h>
+#include "gui2/mainwindow/styleutils.h"
+#include "gui2/resources/resources.h"
+#include "gui2/sldeditor/sldeditoractions.h"
+#include "gui2/sldeditor/sldeditortoolbar.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/sldeditor/sldeditortoolbar.h b/gui2/sldeditor/sldeditortoolbar.h
similarity index 95%
rename from gui2/source/darefl/sldeditor/sldeditortoolbar.h
rename to gui2/sldeditor/sldeditortoolbar.h
index e6a29e8ea1754f0ffe3f81e4644d56513bc978cf..4e65cb179bf979b0650ce6215b2a2989321fd8cf 100644
--- a/gui2/source/darefl/sldeditor/sldeditortoolbar.h
+++ b/gui2/sldeditor/sldeditortoolbar.h
@@ -11,7 +11,7 @@
 #define DAREFL_SLDEDITOR_SLDEDITORTOOLBAR_H
 
 #include <QToolBar>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/sldeditor/sldelementcontroller.cpp b/gui2/sldeditor/sldelementcontroller.cpp
similarity index 96%
rename from gui2/source/darefl/sldeditor/sldelementcontroller.cpp
rename to gui2/sldeditor/sldelementcontroller.cpp
index ac82d96f6dd679e20e148c777e87218b9f9a8214..45e58cb0fcf5e7c9b896df8b8542be3925072284 100644
--- a/gui2/source/darefl/sldeditor/sldelementcontroller.cpp
+++ b/gui2/sldeditor/sldelementcontroller.cpp
@@ -7,16 +7,16 @@
 //
 // ************************************************************************** //
 
-#include <darefl/model/materialitems.h>
-#include <darefl/model/materialmodel.h>
-#include <darefl/model/sampleitems.h>
-#include <darefl/model/samplemodel.h>
-#include <darefl/sldeditor/graphicsscene.h>
-#include <darefl/sldeditor/layerelementcontroller.h>
-#include <darefl/sldeditor/layerelementitem.h>
-#include <darefl/sldeditor/segmentelementview.h>
-#include <darefl/sldeditor/sldelementcontroller.h>
-#include <darefl/sldeditor/sldelementmodel.h>
+#include "gui2/model/materialitems.h"
+#include "gui2/model/materialmodel.h"
+#include "gui2/model/sampleitems.h"
+#include "gui2/model/samplemodel.h"
+#include "gui2/sldeditor/graphicsscene.h"
+#include "gui2/sldeditor/layerelementcontroller.h"
+#include "gui2/sldeditor/layerelementitem.h"
+#include "gui2/sldeditor/segmentelementview.h"
+#include "gui2/sldeditor/sldelementcontroller.h"
+#include "gui2/sldeditor/sldelementmodel.h"
 #include <iostream>
 #include "mvvm/model/compounditem.h"
 #include "mvvm/model/externalproperty.h"
diff --git a/gui2/source/darefl/sldeditor/sldelementcontroller.h b/gui2/sldeditor/sldelementcontroller.h
similarity index 96%
rename from gui2/source/darefl/sldeditor/sldelementcontroller.h
rename to gui2/sldeditor/sldelementcontroller.h
index bb3ebc35bd3e2c0b6b8dc188ba333e2d796627e3..a6afd05701465d15ec95c7c01d8da3747145c058 100644
--- a/gui2/source/darefl/sldeditor/sldelementcontroller.h
+++ b/gui2/sldeditor/sldelementcontroller.h
@@ -11,8 +11,8 @@
 #define DAREFL_SLDEDITOR_SLDELEMENTCONTROLLER_H
 
 #include <QObject>
-#include <darefl/darefl_export.h>
-#include <darefl/sldeditor/layerelementcontroller.h>
+#include "darefl_export.h"
+#include "gui2/sldeditor/layerelementcontroller.h"
 #include "mvvm/model/sessionitem.h"
 #include "mvvm/model/sessionmodel.h"
 #include <vector>
diff --git a/gui2/source/darefl/sldeditor/sldelementmodel.cpp b/gui2/sldeditor/sldelementmodel.cpp
similarity index 91%
rename from gui2/source/darefl/sldeditor/sldelementmodel.cpp
rename to gui2/sldeditor/sldelementmodel.cpp
index 4bf9413efbead7847391f4f01f83b83acd5af700..0d76c8cab24f676bedbfef360a3d503c60390413 100644
--- a/gui2/source/darefl/sldeditor/sldelementmodel.cpp
+++ b/gui2/sldeditor/sldelementmodel.cpp
@@ -7,8 +7,8 @@
 //
 // ************************************************************************** //
 
-#include <darefl/sldeditor/layerelementitem.h>
-#include <darefl/sldeditor/sldelementmodel.h>
+#include "gui2/sldeditor/layerelementitem.h"
+#include "gui2/sldeditor/sldelementmodel.h"
 
 #include "mvvm/model/externalproperty.h"
 #include "mvvm/model/itemcatalogue.h"
diff --git a/gui2/source/darefl/sldeditor/sldelementmodel.h b/gui2/sldeditor/sldelementmodel.h
similarity index 96%
rename from gui2/source/darefl/sldeditor/sldelementmodel.h
rename to gui2/sldeditor/sldelementmodel.h
index 3f5e7552e1400fb032f57f04280430f63d04d9d8..1ac1cf8ca41f56fc54a1aa844d33b843902c8576 100644
--- a/gui2/source/darefl/sldeditor/sldelementmodel.h
+++ b/gui2/sldeditor/sldelementmodel.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_SLDEDITOR_SLDELEMENTMODEL_H
 #define DAREFL_SLDEDITOR_SLDELEMENTMODEL_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include "mvvm/model/sessionmodel.h"
 #include <vector>
 
diff --git a/gui2/source/darefl/sldeditor/sldviewwidget.cpp b/gui2/sldeditor/sldviewwidget.cpp
similarity index 87%
rename from gui2/source/darefl/sldeditor/sldviewwidget.cpp
rename to gui2/sldeditor/sldviewwidget.cpp
index a1e89b962af849d60d792ff3cf6ee953e86a9798..16aaf592bf298f7b5a976c9f48e720451bea163e 100644
--- a/gui2/source/darefl/sldeditor/sldviewwidget.cpp
+++ b/gui2/sldeditor/sldviewwidget.cpp
@@ -8,11 +8,11 @@
 // ************************************************************************** //
 
 #include <QResizeEvent>
-#include <darefl/model/applicationmodels.h>
-#include <darefl/model/jobmodel.h>
-#include <darefl/sldeditor/graphicsscene.h>
-#include <darefl/sldeditor/sldelementcontroller.h>
-#include <darefl/sldeditor/sldviewwidget.h>
+#include "gui2/model/applicationmodels.h"
+#include "gui2/model/jobmodel.h"
+#include "gui2/sldeditor/graphicsscene.h"
+#include "gui2/sldeditor/sldelementcontroller.h"
+#include "gui2/sldeditor/sldviewwidget.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/sldeditor/sldviewwidget.h b/gui2/sldeditor/sldviewwidget.h
similarity index 96%
rename from gui2/source/darefl/sldeditor/sldviewwidget.h
rename to gui2/sldeditor/sldviewwidget.h
index 79d1f8bf752aaef42de8a83b442b28a274d297c7..78f21b110cfd2b94ea64c20635865730866bd38c 100644
--- a/gui2/source/darefl/sldeditor/sldviewwidget.h
+++ b/gui2/sldeditor/sldviewwidget.h
@@ -11,7 +11,7 @@
 #define DAREFL_SLDEDITOR_SLDVIEWWIDGET_H
 
 #include <QGraphicsView>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 
 namespace DaRefl {
diff --git a/gui2/source/CMakeLists.txt b/gui2/source/CMakeLists.txt
deleted file mode 100644
index b955d9ddd50f595b12fa38cd3c3a201fbd4d4843..0000000000000000000000000000000000000000
--- a/gui2/source/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Executable: darefl
-set(executable_name darefl)
-
-add_subdirectory(darefl)
-
-add_executable(${executable_name} main.cpp)
-target_link_libraries(${executable_name} PRIVATE dareflcore)
diff --git a/gui2/source/darefl/CMakeLists.txt b/gui2/source/darefl/CMakeLists.txt
deleted file mode 100644
index 88b65542a84442947e16696c70d422703c7e2088..0000000000000000000000000000000000000000
--- a/gui2/source/darefl/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-set(library_name dareflcore)
-
-add_library(${library_name} SHARED "")
-
-# -- Generate header for export --
-
-set(export_filename ${DAREFL_AUTOGEN_DIR}/darefl/darefl_export.h)
-generate_export_header(${library_name} EXPORT_FILE_NAME ${export_filename})
-
-add_subdirectory(dataloader)
-add_subdirectory(importdataview)
-add_subdirectory(layereditor)
-add_subdirectory(mainwindow)
-add_subdirectory(materialeditor)
-add_subdirectory(model)
-add_subdirectory(quicksimeditor)
-add_subdirectory(resources)
-add_subdirectory(settingsview)
-add_subdirectory(sldeditor)
-add_subdirectory(welcomeview)
-
-target_link_libraries(${library_name} PUBLIC MVVM::View Qt5::Core Qt5::Gui Qt5::Widgets
-    ${BornAgainCore_LIBRARY})
-target_include_directories(${library_name} PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/..>
-    $<BUILD_INTERFACE:${DAREFL_AUTOGEN_DIR}>)
diff --git a/gui2/source/darefl/welcomeview/CMakeLists.txt b/gui2/welcomeview/CMakeLists.txt
similarity index 100%
rename from gui2/source/darefl/welcomeview/CMakeLists.txt
rename to gui2/welcomeview/CMakeLists.txt
diff --git a/gui2/source/darefl/welcomeview/openprojectwidget.cpp b/gui2/welcomeview/openprojectwidget.cpp
similarity index 95%
rename from gui2/source/darefl/welcomeview/openprojectwidget.cpp
rename to gui2/welcomeview/openprojectwidget.cpp
index a862a4383b082b186e1e634faf16eb75ace264a8..dc04bdd814218d103168eafc2f04bf082b25419e 100644
--- a/gui2/source/darefl/welcomeview/openprojectwidget.cpp
+++ b/gui2/welcomeview/openprojectwidget.cpp
@@ -11,9 +11,9 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QVBoxLayout>
-#include <darefl/core/version.h>
-#include <darefl/mainwindow/styleutils.h>
-#include <darefl/welcomeview/openprojectwidget.h>
+#include "gui2/core/version.h"
+#include "gui2/mainwindow/styleutils.h"
+#include "gui2/welcomeview/openprojectwidget.h"
 #include "mvvm/core/version.h"
 #include "mvvm/widgets/widgetutils.h"
 
diff --git a/gui2/source/darefl/welcomeview/openprojectwidget.h b/gui2/welcomeview/openprojectwidget.h
similarity index 97%
rename from gui2/source/darefl/welcomeview/openprojectwidget.h
rename to gui2/welcomeview/openprojectwidget.h
index c999c005928fe00798b5a3e19325640e7bed1b83..3ed640020581a862f491be805b1a6cb682fda73e 100644
--- a/gui2/source/darefl/welcomeview/openprojectwidget.h
+++ b/gui2/welcomeview/openprojectwidget.h
@@ -11,7 +11,7 @@
 #define DAREFL_WELCOMEVIEW_OPENPROJECTWIDGET_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 
 class QBoxLayout;
diff --git a/gui2/source/darefl/welcomeview/projecthandler.cpp b/gui2/welcomeview/projecthandler.cpp
similarity index 93%
rename from gui2/source/darefl/welcomeview/projecthandler.cpp
rename to gui2/welcomeview/projecthandler.cpp
index 98e6a4e0fd8a8a97c13217dd6d68501bf7a5a157..62c6ff8b9899d8b49ca3e854a3c749e12fe3490e 100644
--- a/gui2/source/darefl/welcomeview/projecthandler.cpp
+++ b/gui2/welcomeview/projecthandler.cpp
@@ -8,11 +8,11 @@
 // ************************************************************************** //
 
 #include <QMainWindow>
-#include <darefl/model/applicationmodels.h>
-#include <darefl/welcomeview/projecthandler.h>
-#include <darefl/welcomeview/recentprojectsettings.h>
-#include <darefl/welcomeview/recentprojectwidget.h>
-#include <darefl/welcomeview/userinteractor.h>
+#include "gui2/model/applicationmodels.h"
+#include "gui2/welcomeview/projecthandler.h"
+#include "gui2/welcomeview/recentprojectsettings.h"
+#include "gui2/welcomeview/recentprojectwidget.h"
+#include "gui2/welcomeview/userinteractor.h"
 #include "mvvm/factories/projectmanagerfactory.h"
 #include "mvvm/project/project_types.h"
 #include "mvvm/widgets/widgetutils.h"
diff --git a/gui2/source/darefl/welcomeview/projecthandler.h b/gui2/welcomeview/projecthandler.h
similarity index 98%
rename from gui2/source/darefl/welcomeview/projecthandler.h
rename to gui2/welcomeview/projecthandler.h
index a729fe9b47b46f22eafb9f214c081a7bde7757e7..97b3b3fa41d0b0e49b19ffc9ce119017c7cd2e5f 100644
--- a/gui2/source/darefl/welcomeview/projecthandler.h
+++ b/gui2/welcomeview/projecthandler.h
@@ -11,7 +11,7 @@
 #define DAREFL_WELCOMEVIEW_PROJECTHANDLER_H
 
 #include <QObject>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 #include <vector>
 
diff --git a/gui2/source/darefl/welcomeview/projectpanewidget.cpp b/gui2/welcomeview/projectpanewidget.cpp
similarity index 98%
rename from gui2/source/darefl/welcomeview/projectpanewidget.cpp
rename to gui2/welcomeview/projectpanewidget.cpp
index 73634c1be82125e4f1f817a880c75ceaea382c63..47846570d7b7d5d1b94ff8e652dd9c8790885155 100644
--- a/gui2/source/darefl/welcomeview/projectpanewidget.cpp
+++ b/gui2/welcomeview/projectpanewidget.cpp
@@ -11,7 +11,7 @@
 #include <QMouseEvent>
 #include <QPainter>
 #include <QVBoxLayout>
-#include <darefl/welcomeview/projectpanewidget.h>
+#include "gui2/welcomeview/projectpanewidget.h"
 #include "mvvm/widgets/widgetutils.h"
 
 namespace {
diff --git a/gui2/source/darefl/welcomeview/projectpanewidget.h b/gui2/welcomeview/projectpanewidget.h
similarity index 97%
rename from gui2/source/darefl/welcomeview/projectpanewidget.h
rename to gui2/welcomeview/projectpanewidget.h
index 097dc51e935ff5a1ef447309bf215f3892eedac8..7b1efaba407f1771212abbee380ebfa80e0cd1dd 100644
--- a/gui2/source/darefl/welcomeview/projectpanewidget.h
+++ b/gui2/welcomeview/projectpanewidget.h
@@ -11,7 +11,7 @@
 #define DAREFL_WELCOMEVIEW_PROJECTPANEWIDGET_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 class QLabel;
 
diff --git a/gui2/source/darefl/welcomeview/recentprojectsettings.cpp b/gui2/welcomeview/recentprojectsettings.cpp
similarity index 98%
rename from gui2/source/darefl/welcomeview/recentprojectsettings.cpp
rename to gui2/welcomeview/recentprojectsettings.cpp
index b259dc437e88148f7b4f681b9add95cf6df067f7..7197285675cbceb981f9476f41d6eaa403a0c54f 100644
--- a/gui2/source/darefl/welcomeview/recentprojectsettings.cpp
+++ b/gui2/welcomeview/recentprojectsettings.cpp
@@ -9,7 +9,7 @@
 
 #include <QDir>
 #include <QSettings>
-#include <darefl/welcomeview/recentprojectsettings.h>
+#include "gui2/welcomeview/recentprojectsettings.h"
 #include "mvvm/utils/fileutils.h"
 
 namespace {
diff --git a/gui2/source/darefl/welcomeview/recentprojectsettings.h b/gui2/welcomeview/recentprojectsettings.h
similarity index 97%
rename from gui2/source/darefl/welcomeview/recentprojectsettings.h
rename to gui2/welcomeview/recentprojectsettings.h
index 6959d4c046d25fb1825d0edc829f0be4229932d6..957937663e82f8b6afd2eae610db9a963c929b4d 100644
--- a/gui2/source/darefl/welcomeview/recentprojectsettings.h
+++ b/gui2/welcomeview/recentprojectsettings.h
@@ -11,7 +11,7 @@
 #define DAREFL_WELCOMEVIEW_RECENTPROJECTSETTINGS_H
 
 #include <QStringList>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 
 namespace DaRefl {
 
diff --git a/gui2/source/darefl/welcomeview/recentprojectwidget.cpp b/gui2/welcomeview/recentprojectwidget.cpp
similarity index 95%
rename from gui2/source/darefl/welcomeview/recentprojectwidget.cpp
rename to gui2/welcomeview/recentprojectwidget.cpp
index 16aa55415548305fb06751e3ad318484e141ee0e..0adb195071d567cbcf9f903e3b2ffde0f2630dc8 100644
--- a/gui2/source/darefl/welcomeview/recentprojectwidget.cpp
+++ b/gui2/welcomeview/recentprojectwidget.cpp
@@ -10,9 +10,9 @@
 #include <QLabel>
 #include <QScrollArea>
 #include <QVBoxLayout>
-#include <darefl/mainwindow/styleutils.h>
-#include <darefl/welcomeview/projectpanewidget.h>
-#include <darefl/welcomeview/recentprojectwidget.h>
+#include "gui2/mainwindow/styleutils.h"
+#include "gui2/welcomeview/projectpanewidget.h"
+#include "gui2/welcomeview/recentprojectwidget.h"
 #include "mvvm/widgets/adjustingscrollarea.h"
 #include "mvvm/widgets/widgetutils.h"
 
diff --git a/gui2/source/darefl/welcomeview/recentprojectwidget.h b/gui2/welcomeview/recentprojectwidget.h
similarity index 97%
rename from gui2/source/darefl/welcomeview/recentprojectwidget.h
rename to gui2/welcomeview/recentprojectwidget.h
index f7f6a9b128955c9b5cc20469153d1e22663b93a5..9a8a69b8a9645a62117889e8964305f4cdd873a6 100644
--- a/gui2/source/darefl/welcomeview/recentprojectwidget.h
+++ b/gui2/welcomeview/recentprojectwidget.h
@@ -11,7 +11,7 @@
 #define DAREFL_WELCOMEVIEW_RECENTPROJECTWIDGET_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 #include <vector>
 
diff --git a/gui2/source/darefl/welcomeview/userinteractor.cpp b/gui2/welcomeview/userinteractor.cpp
similarity index 96%
rename from gui2/source/darefl/welcomeview/userinteractor.cpp
rename to gui2/welcomeview/userinteractor.cpp
index 9e7dfeb9595b74cbb8f4d1a23fe7ec9bc1fda44c..bb94b42c87f068a4926bbeb682dce1252d86e017 100644
--- a/gui2/source/darefl/welcomeview/userinteractor.cpp
+++ b/gui2/welcomeview/userinteractor.cpp
@@ -9,8 +9,8 @@
 
 #include <QFileDialog>
 #include <QMessageBox>
-#include <darefl/welcomeview/recentprojectsettings.h>
-#include <darefl/welcomeview/userinteractor.h>
+#include "gui2/welcomeview/recentprojectsettings.h"
+#include "gui2/welcomeview/userinteractor.h"
 #include <map>
 #include "mvvm/project/project_types.h"
 #include "mvvm/project/projectutils.h"
diff --git a/gui2/source/darefl/welcomeview/userinteractor.h b/gui2/welcomeview/userinteractor.h
similarity index 97%
rename from gui2/source/darefl/welcomeview/userinteractor.h
rename to gui2/welcomeview/userinteractor.h
index 7ec176830caf846ca56e780daf0433f69a486464..01fa17fddb1e2417a133210a18ba7e5a025f1867 100644
--- a/gui2/source/darefl/welcomeview/userinteractor.h
+++ b/gui2/welcomeview/userinteractor.h
@@ -10,7 +10,7 @@
 #ifndef DAREFL_WELCOMEVIEW_USERINTERACTOR_H
 #define DAREFL_WELCOMEVIEW_USERINTERACTOR_H
 
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <string>
 
 class QWidget;
diff --git a/gui2/source/darefl/welcomeview/welcomeview.cpp b/gui2/welcomeview/welcomeview.cpp
similarity index 91%
rename from gui2/source/darefl/welcomeview/welcomeview.cpp
rename to gui2/welcomeview/welcomeview.cpp
index f51cf662d7481a7d42cd6267374465306cbdfcc1..de3f5a291968dcaf35e950a59b8ee065e469912d 100644
--- a/gui2/source/darefl/welcomeview/welcomeview.cpp
+++ b/gui2/welcomeview/welcomeview.cpp
@@ -10,12 +10,12 @@
 #include <QApplication>
 #include <QHBoxLayout>
 #include <QMainWindow>
-#include <darefl/model/applicationmodels.h>
-#include <darefl/welcomeview/openprojectwidget.h>
-#include <darefl/welcomeview/projecthandler.h>
-#include <darefl/welcomeview/recentprojectsettings.h>
-#include <darefl/welcomeview/recentprojectwidget.h>
-#include <darefl/welcomeview/welcomeview.h>
+#include "gui2/model/applicationmodels.h"
+#include "gui2/welcomeview/openprojectwidget.h"
+#include "gui2/welcomeview/projecthandler.h"
+#include "gui2/welcomeview/recentprojectsettings.h"
+#include "gui2/welcomeview/recentprojectwidget.h"
+#include "gui2/welcomeview/welcomeview.h"
 #include "mvvm/project/projectutils.h"
 #include "mvvm/widgets/widgetutils.h"
 
diff --git a/gui2/source/darefl/welcomeview/welcomeview.h b/gui2/welcomeview/welcomeview.h
similarity index 97%
rename from gui2/source/darefl/welcomeview/welcomeview.h
rename to gui2/welcomeview/welcomeview.h
index 5d2e5abff471add9f5005e3a3eb5135399cce37c..0a4fd33afbe4f521b8f72c524bf5c9dbeead4bd5 100644
--- a/gui2/source/darefl/welcomeview/welcomeview.h
+++ b/gui2/welcomeview/welcomeview.h
@@ -11,7 +11,7 @@
 #define DAREFL_WELCOMEVIEW_WELCOMEVIEW_H
 
 #include <QWidget>
-#include <darefl/darefl_export.h>
+#include "darefl_export.h"
 #include <memory>
 
 namespace DaRefl {