From bf4f7b7c04afa4b8d6ae66b4f5bb191d6511be9c Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 16 Dec 2020 20:58:57 +0100
Subject: [PATCH] rm source/darefl from gui2 paths
---
.../testdareflcore/applicationmodels.test.cpp | 2 +-
.../gui2/testdareflcore/datahandler.test.cpp | 2 +-
.../testdareflcore/dataloader_utils.test.cpp | 6 ++--
.../dataselectionmodel.test.cpp | 8 ++---
.../testdareflcore/defaultparser.test.cpp | 4 +--
.../experimentaldatamodel.test.cpp | 8 ++---
.../importdataeditoractions.test.cpp | 12 +++----
.../testdareflcore/importtableheader.test.cpp | 6 ++--
.../testdareflcore/instrumentitems.test.cpp | 6 ++--
.../layereditoractions.test.cpp | 12 +++----
.../testdareflcore/layerelements.test.cpp | 18 +++++-----
.../gui2/testdareflcore/layeritems.test.cpp | 4 +--
.../layerselectionmodel.test.cpp | 8 ++---
.../testdareflcore/layerviewmodel.test.cpp | 6 ++--
.../testdareflcore/materialprofile.test.cpp | 2 +-
.../gui2/testdareflcore/modelutils.test.cpp | 2 +-
.../testdareflcore/quicksimutils.test.cpp | 10 +++---
.../sldelementcontroller.test.cpp | 14 ++++----
gui2/CMakeLists.txt | 31 +++++++++++++++++-
gui2/{source/darefl => }/core/CMakeLists.txt | 0
gui2/{source/darefl => }/core/app_constants.h | 0
gui2/{source/darefl => }/core/version.h | 0
.../darefl => }/dataloader/CMakeLists.txt | 0
.../darefl => }/dataloader/datahandler.cpp | 4 +--
.../darefl => }/dataloader/datahandler.h | 2 +-
.../dataloader/dataloader_constants.h | 0
.../darefl => }/dataloader/dataloader_types.h | 2 +-
.../dataloader/dataloader_utils.cpp | 6 ++--
.../darefl => }/dataloader/dataloader_utils.h | 2 +-
.../dataloader/dataloaderdialog.cpp | 18 +++++-----
.../darefl => }/dataloader/dataloaderdialog.h | 4 +--
.../dataloader/dataloadertoolbar.cpp | 4 +--
.../dataloader/dataloadertoolbar.h | 2 +-
.../darefl => }/dataloader/defaultparser.cpp | 4 +--
.../darefl => }/dataloader/defaultparser.h | 6 ++--
.../dataloader/importfilewidget.cpp | 4 +--
.../darefl => }/dataloader/importfilewidget.h | 2 +-
.../dataloader/importtableheader.cpp | 6 ++--
.../dataloader/importtableheader.h | 2 +-
.../dataloader/importtablemodel.cpp | 6 ++--
.../darefl => }/dataloader/importtablemodel.h | 2 +-
.../dataloader/importtablewidget.cpp | 6 ++--
.../dataloader/importtablewidget.h | 2 +-
.../darefl => }/dataloader/importtextview.cpp | 2 +-
.../darefl => }/dataloader/importtextview.h | 2 +-
.../dataloader/loaderpreviewpanel.cpp | 10 +++---
.../dataloader/loaderpreviewpanel.h | 2 +-
.../dataloader/loaderselectorpanel.cpp | 8 ++---
.../dataloader/loaderselectorpanel.h | 2 +-
.../darefl => }/dataloader/parserinterface.h | 2 +-
.../dataloader/parserpropertywidget.cpp | 6 ++--
.../dataloader/parserpropertywidget.h | 4 +--
.../darefl => }/importdataview/CMakeLists.txt | 0
.../importdataview/dataselectionmodel.cpp | 6 ++--
.../importdataview/dataselectionmodel.h | 2 +-
.../importdataview/dataselectorwidget.cpp | 8 ++---
.../importdataview/dataselectorwidget.h | 2 +-
.../importdataview/dataviewmodel.cpp | 6 ++--
.../importdataview/dataviewmodel.h | 2 +-
.../importdataview/graphcanvaswidget.cpp | 4 +--
.../importdataview/graphcanvaswidget.h | 2 +-
.../importdataview/graphimportdata.h | 2 +-
.../importdataview/importdataeditor.cpp | 20 +++++------
.../importdataview/importdataeditor.h | 2 +-
.../importdataeditoractions.cpp | 10 +++---
.../importdataview/importdataeditoractions.h | 2 +-
.../importdataeditortoolbal.cpp | 6 ++--
.../importdataview/importdataeditortoolbal.h | 2 +-
.../importdataview/importdataview.cpp | 6 ++--
.../importdataview/importdataview.h | 2 +-
.../darefl => }/layereditor/CMakeLists.txt | 0
.../customlayertreeeditorfactory.cpp | 6 ++--
.../customlayertreeeditorfactory.h | 2 +-
.../darefl => }/layereditor/layereditor.cpp | 14 ++++----
.../darefl => }/layereditor/layereditor.h | 2 +-
.../layereditor/layereditoractions.cpp | 10 +++---
.../layereditor/layereditoractions.h | 2 +-
.../layereditor/layereditortoolbar.cpp | 6 ++--
.../layereditor/layereditortoolbar.h | 2 +-
.../layereditor/layereditorwidget.cpp | 16 ++++-----
.../layereditor/layereditorwidget.h | 2 +-
.../layereditor/layerselectionmodel.cpp | 4 +--
.../layereditor/layerselectionmodel.h | 2 +-
.../darefl => }/layereditor/layertreeview.cpp | 2 +-
.../darefl => }/layereditor/layertreeview.h | 2 +-
.../layereditor/layerviewmodel.cpp | 4 +--
.../darefl => }/layereditor/layerviewmodel.h | 2 +-
.../layereditor/layerviewmodelcontroller.cpp | 4 +--
.../layereditor/layerviewmodelcontroller.h | 2 +-
gui2/{source => }/main.cpp | 2 +-
.../darefl => }/mainwindow/CMakeLists.txt | 0
.../darefl => }/mainwindow/actionmanager.cpp | 2 +-
.../darefl => }/mainwindow/actionmanager.h | 2 +-
.../darefl => }/mainwindow/fancytab.cpp | 2 +-
.../{source/darefl => }/mainwindow/fancytab.h | 2 +-
.../darefl => }/mainwindow/mainbarwidget.cpp | 4 +--
.../darefl => }/mainwindow/mainbarwidget.h | 2 +-
.../darefl => }/mainwindow/mainwindow.cpp | 16 ++++-----
.../darefl => }/mainwindow/mainwindow.h | 2 +-
.../darefl => }/mainwindow/simulationview.cpp | 12 +++----
.../darefl => }/mainwindow/simulationview.h | 2 +-
.../darefl => }/mainwindow/styleutils.cpp | 4 +--
.../darefl => }/mainwindow/styleutils.h | 2 +-
.../darefl => }/materialeditor/CMakeLists.txt | 0
.../materialeditor/materialeditor.cpp | 14 ++++----
.../materialeditor/materialeditor.h | 2 +-
.../materialeditor/materialeditoractions.cpp | 8 ++---
.../materialeditor/materialeditoractions.h | 2 +-
.../materialeditor/materialeditortoolbar.cpp | 6 ++--
.../materialeditor/materialeditortoolbar.h | 2 +-
.../materialeditor/materialeditorwidget.cpp | 14 ++++----
.../materialeditor/materialeditorwidget.h | 2 +-
.../materialeditor/materialselectionmodel.cpp | 4 +--
.../materialeditor/materialselectionmodel.h | 2 +-
.../materialeditor/materialtableview.cpp | 2 +-
.../materialeditor/materialtableview.h | 2 +-
.../materialeditor/materialtreeview.cpp | 2 +-
.../materialeditor/materialtreeview.h | 2 +-
gui2/{source/darefl => }/model/CMakeLists.txt | 0
.../darefl => }/model/applicationmodels.cpp | 20 +++++------
.../darefl => }/model/applicationmodels.h | 2 +-
.../model/experimentaldatacontroller.cpp | 12 +++----
.../model/experimentaldatacontroller.h | 2 +-
.../model/experimentaldataitems.cpp | 4 +--
.../darefl => }/model/experimentaldataitems.h | 2 +-
.../model/experimentaldatamodel.cpp | 6 ++--
.../darefl => }/model/experimentaldatamodel.h | 2 +-
.../darefl => }/model/instrumentitems.cpp | 6 ++--
.../darefl => }/model/instrumentitems.h | 2 +-
.../darefl => }/model/instrumentmodel.cpp | 4 +--
.../darefl => }/model/instrumentmodel.h | 2 +-
.../darefl => }/model/item_constants.h | 0
gui2/{source/darefl => }/model/jobitem.cpp | 10 +++---
gui2/{source/darefl => }/model/jobitem.h | 2 +-
gui2/{source/darefl => }/model/jobmodel.cpp | 8 ++---
gui2/{source/darefl => }/model/jobmodel.h | 2 +-
.../darefl => }/model/materialitems.cpp | 4 +--
.../{source/darefl => }/model/materialitems.h | 2 +-
.../darefl => }/model/materialmodel.cpp | 6 ++--
.../{source/darefl => }/model/materialmodel.h | 2 +-
.../model/materialpropertycontroller.cpp | 8 ++---
.../model/materialpropertycontroller.h | 2 +-
gui2/{source/darefl => }/model/modelutils.cpp | 4 +--
gui2/{source/darefl => }/model/modelutils.h | 2 +-
.../{source/darefl => }/model/sampleitems.cpp | 8 ++---
gui2/{source/darefl => }/model/sampleitems.h | 2 +-
.../{source/darefl => }/model/samplemodel.cpp | 4 +--
gui2/{source/darefl => }/model/samplemodel.h | 2 +-
.../darefl => }/quicksimeditor/CMakeLists.txt | 0
.../custombeampropertyeditorfactory.cpp | 12 +++----
.../custombeampropertyeditorfactory.h | 2 +-
.../instrumentpropertyeditor.cpp | 12 +++----
.../quicksimeditor/instrumentpropertyeditor.h | 2 +-
.../darefl => }/quicksimeditor/jobmanager.cpp | 4 +--
.../darefl => }/quicksimeditor/jobmanager.h | 4 +--
.../quicksimeditor/materialprofile.cpp | 6 ++--
.../quicksimeditor/materialprofile.h | 4 +--
.../quicksimeditor/profilehelper.cpp | 2 +-
.../quicksimeditor/profilehelper.h | 2 +-
.../quicksimeditor/quicksim_types.h | 2 +-
.../quicksimeditor/quicksimcontroller.cpp | 26 +++++++--------
.../quicksimeditor/quicksimcontroller.h | 4 +--
.../quicksimeditor/quicksimeditor.cpp | 18 +++++-----
.../quicksimeditor/quicksimeditor.h | 2 +-
.../quicksimeditor/quicksimeditortoolbar.cpp | 4 +--
.../quicksimeditor/quicksimeditortoolbar.h | 2 +-
.../quicksimeditor/quicksimutils.cpp | 8 ++---
.../quicksimeditor/quicksimutils.h | 4 +--
.../quicksimeditor/simplotcontroller.cpp | 12 +++----
.../quicksimeditor/simplotcontroller.h | 2 +-
.../quicksimeditor/simplotwidget.cpp | 8 ++---
.../quicksimeditor/simplotwidget.h | 2 +-
.../quicksimeditor/speculartoysimulation.cpp | 6 ++--
.../quicksimeditor/speculartoysimulation.h | 4 +--
.../darefl => }/resources/CMakeLists.txt | 0
gui2/{source/darefl => }/resources/icons.qrc | 0
.../resources/icons/F-letter_1000x.png | Bin
.../icons/arrow-down-circle-outline.svg | 0
.../icons/arrow-up-circle-outline.svg | 0
.../resources/icons/aspect-ratio.svg | 0
.../resources/icons/beaker-remove-outline.svg | 0
.../resources/icons/card-bulleted-outline.svg | 0
.../resources/icons/close-circle-outline.svg | 0
.../resources/icons/cog-outline.svg | 0
.../darefl => }/resources/icons/dock-left.svg | 0
.../resources/icons/dock-right.svg | 0
.../darefl => }/resources/icons/export.svg | 0
.../darefl => }/resources/icons/import.svg | 0
.../resources/icons/layers-outline.svg | 0
.../resources/icons/layers-triple-outline.svg | 0
.../resources/icons/play-circle-outline.svg | 0
.../icons/plus-box-multiple-outline.svg | 0
.../resources/icons/plus-box-outline.svg | 0
.../icons/plus-circle-multiple-outline.svg | 0
.../resources/icons/plus-circle-outline.svg | 0
.../darefl => }/resources/icons/redo.svg | 0
.../darefl => }/resources/icons/set-merge.svg | 0
.../darefl => }/resources/icons/undo.svg | 0
.../{source/darefl => }/resources/resources.h | 0
.../darefl => }/settingsview/CMakeLists.txt | 0
.../darefl => }/settingsview/settingsview.cpp | 4 +--
.../darefl => }/settingsview/settingsview.h | 2 +-
.../darefl => }/sldeditor/CMakeLists.txt | 0
.../darefl => }/sldeditor/elementview.cpp | 4 +--
.../darefl => }/sldeditor/elementview.h | 4 +--
.../darefl => }/sldeditor/graphicsscene.cpp | 2 +-
.../darefl => }/sldeditor/graphicsscene.h | 2 +-
.../sldeditor/handleelementview.cpp | 4 +--
.../darefl => }/sldeditor/handleelementview.h | 4 +--
.../sldeditor/layerelementcontroller.cpp | 12 +++----
.../sldeditor/layerelementcontroller.h | 2 +-
.../sldeditor/layerelementitem.cpp | 2 +-
.../darefl => }/sldeditor/layerelementitem.h | 2 +-
.../sldeditor/roughnesselementview.cpp | 4 +--
.../sldeditor/roughnesselementview.h | 4 +--
.../sldeditor/segmentelementview.cpp | 4 +--
.../sldeditor/segmentelementview.h | 4 +--
.../darefl => }/sldeditor/sldeditor.cpp | 14 ++++----
.../{source/darefl => }/sldeditor/sldeditor.h | 2 +-
.../sldeditor/sldeditoractions.cpp | 6 ++--
.../darefl => }/sldeditor/sldeditoractions.h | 2 +-
.../sldeditor/sldeditortoolbar.cpp | 8 ++---
.../darefl => }/sldeditor/sldeditortoolbar.h | 2 +-
.../sldeditor/sldelementcontroller.cpp | 20 +++++------
.../sldeditor/sldelementcontroller.h | 4 +--
.../darefl => }/sldeditor/sldelementmodel.cpp | 4 +--
.../darefl => }/sldeditor/sldelementmodel.h | 2 +-
.../darefl => }/sldeditor/sldviewwidget.cpp | 10 +++---
.../darefl => }/sldeditor/sldviewwidget.h | 2 +-
gui2/source/CMakeLists.txt | 7 ----
gui2/source/darefl/CMakeLists.txt | 26 ---------------
.../darefl => }/welcomeview/CMakeLists.txt | 0
.../welcomeview/openprojectwidget.cpp | 6 ++--
.../welcomeview/openprojectwidget.h | 2 +-
.../welcomeview/projecthandler.cpp | 10 +++---
.../darefl => }/welcomeview/projecthandler.h | 2 +-
.../welcomeview/projectpanewidget.cpp | 2 +-
.../welcomeview/projectpanewidget.h | 2 +-
.../welcomeview/recentprojectsettings.cpp | 2 +-
.../welcomeview/recentprojectsettings.h | 2 +-
.../welcomeview/recentprojectwidget.cpp | 6 ++--
.../welcomeview/recentprojectwidget.h | 2 +-
.../welcomeview/userinteractor.cpp | 4 +--
.../darefl => }/welcomeview/userinteractor.h | 2 +-
.../darefl => }/welcomeview/welcomeview.cpp | 12 +++----
.../darefl => }/welcomeview/welcomeview.h | 2 +-
246 files changed, 538 insertions(+), 542 deletions(-)
rename gui2/{source/darefl => }/core/CMakeLists.txt (100%)
rename gui2/{source/darefl => }/core/app_constants.h (100%)
rename gui2/{source/darefl => }/core/version.h (100%)
rename gui2/{source/darefl => }/dataloader/CMakeLists.txt (100%)
rename gui2/{source/darefl => }/dataloader/datahandler.cpp (94%)
rename gui2/{source/darefl => }/dataloader/datahandler.h (97%)
rename gui2/{source/darefl => }/dataloader/dataloader_constants.h (100%)
rename gui2/{source/darefl => }/dataloader/dataloader_types.h (97%)
rename gui2/{source/darefl => }/dataloader/dataloader_utils.cpp (98%)
rename gui2/{source/darefl => }/dataloader/dataloader_utils.h (98%)
rename gui2/{source/darefl => }/dataloader/dataloaderdialog.cpp (95%)
rename gui2/{source/darefl => }/dataloader/dataloaderdialog.h (95%)
rename gui2/{source/darefl => }/dataloader/dataloadertoolbar.cpp (92%)
rename gui2/{source/darefl => }/dataloader/dataloadertoolbar.h (95%)
rename gui2/{source/darefl => }/dataloader/defaultparser.cpp (95%)
rename gui2/{source/darefl => }/dataloader/defaultparser.h (92%)
rename gui2/{source/darefl => }/dataloader/importfilewidget.cpp (98%)
rename gui2/{source/darefl => }/dataloader/importfilewidget.h (97%)
rename gui2/{source/darefl => }/dataloader/importtableheader.cpp (95%)
rename gui2/{source/darefl => }/dataloader/importtableheader.h (97%)
rename gui2/{source/darefl => }/dataloader/importtablemodel.cpp (96%)
rename gui2/{source/darefl => }/dataloader/importtablemodel.h (98%)
rename gui2/{source/darefl => }/dataloader/importtablewidget.cpp (89%)
rename gui2/{source/darefl => }/dataloader/importtablewidget.h (97%)
rename gui2/{source/darefl => }/dataloader/importtextview.cpp (98%)
rename gui2/{source/darefl => }/dataloader/importtextview.h (97%)
rename gui2/{source/darefl => }/dataloader/loaderpreviewpanel.cpp (87%)
rename gui2/{source/darefl => }/dataloader/loaderpreviewpanel.h (97%)
rename gui2/{source/darefl => }/dataloader/loaderselectorpanel.cpp (92%)
rename gui2/{source/darefl => }/dataloader/loaderselectorpanel.h (97%)
rename gui2/{source/darefl => }/dataloader/parserinterface.h (97%)
rename gui2/{source/darefl => }/dataloader/parserpropertywidget.cpp (98%)
rename gui2/{source/darefl => }/dataloader/parserpropertywidget.h (96%)
rename gui2/{source/darefl => }/importdataview/CMakeLists.txt (100%)
rename gui2/{source/darefl => }/importdataview/dataselectionmodel.cpp (95%)
rename gui2/{source/darefl => }/importdataview/dataselectionmodel.h (97%)
rename gui2/{source/darefl => }/importdataview/dataselectorwidget.cpp (91%)
rename gui2/{source/darefl => }/importdataview/dataselectorwidget.h (97%)
rename gui2/{source/darefl => }/importdataview/dataviewmodel.cpp (96%)
rename gui2/{source/darefl => }/importdataview/dataviewmodel.h (97%)
rename gui2/{source/darefl => }/importdataview/graphcanvaswidget.cpp (89%)
rename gui2/{source/darefl => }/importdataview/graphcanvaswidget.h (96%)
rename gui2/{source/darefl => }/importdataview/graphimportdata.h (95%)
rename gui2/{source/darefl => }/importdataview/importdataeditor.cpp (87%)
rename gui2/{source/darefl => }/importdataview/importdataeditor.h (97%)
rename gui2/{source/darefl => }/importdataview/importdataeditoractions.cpp (93%)
rename gui2/{source/darefl => }/importdataview/importdataeditoractions.h (97%)
rename gui2/{source/darefl => }/importdataview/importdataeditortoolbal.cpp (95%)
rename gui2/{source/darefl => }/importdataview/importdataeditortoolbal.h (96%)
rename gui2/{source/darefl => }/importdataview/importdataview.cpp (81%)
rename gui2/{source/darefl => }/importdataview/importdataview.h (95%)
rename gui2/{source/darefl => }/layereditor/CMakeLists.txt (100%)
rename gui2/{source/darefl => }/layereditor/customlayertreeeditorfactory.cpp (92%)
rename gui2/{source/darefl => }/layereditor/customlayertreeeditorfactory.h (97%)
rename gui2/{source/darefl => }/layereditor/layereditor.cpp (83%)
rename gui2/{source/darefl => }/layereditor/layereditor.h (97%)
rename gui2/{source/darefl => }/layereditor/layereditoractions.cpp (94%)
rename gui2/{source/darefl => }/layereditor/layereditoractions.h (97%)
rename gui2/{source/darefl => }/layereditor/layereditortoolbar.cpp (97%)
rename gui2/{source/darefl => }/layereditor/layereditortoolbar.h (96%)
rename gui2/{source/darefl => }/layereditor/layereditorwidget.cpp (79%)
rename gui2/{source/darefl => }/layereditor/layereditorwidget.h (97%)
rename gui2/{source/darefl => }/layereditor/layerselectionmodel.cpp (96%)
rename gui2/{source/darefl => }/layereditor/layerselectionmodel.h (97%)
rename gui2/{source/darefl => }/layereditor/layertreeview.cpp (95%)
rename gui2/{source/darefl => }/layereditor/layertreeview.h (95%)
rename gui2/{source/darefl => }/layereditor/layerviewmodel.cpp (83%)
rename gui2/{source/darefl => }/layereditor/layerviewmodel.h (96%)
rename gui2/{source/darefl => }/layereditor/layerviewmodelcontroller.cpp (97%)
rename gui2/{source/darefl => }/layereditor/layerviewmodelcontroller.h (96%)
rename gui2/{source => }/main.cpp (94%)
rename gui2/{source/darefl => }/mainwindow/CMakeLists.txt (100%)
rename gui2/{source/darefl => }/mainwindow/actionmanager.cpp (98%)
rename gui2/{source/darefl => }/mainwindow/actionmanager.h (98%)
rename gui2/{source/darefl => }/mainwindow/fancytab.cpp (97%)
rename gui2/{source/darefl => }/mainwindow/fancytab.h (96%)
rename gui2/{source/darefl => }/mainwindow/mainbarwidget.cpp (94%)
rename gui2/{source/darefl => }/mainwindow/mainbarwidget.h (97%)
rename gui2/{source/darefl => }/mainwindow/mainwindow.cpp (90%)
rename gui2/{source/darefl => }/mainwindow/mainwindow.h (97%)
rename gui2/{source/darefl => }/mainwindow/simulationview.cpp (85%)
rename gui2/{source/darefl => }/mainwindow/simulationview.h (96%)
rename gui2/{source/darefl => }/mainwindow/styleutils.cpp (91%)
rename gui2/{source/darefl => }/mainwindow/styleutils.h (96%)
rename gui2/{source/darefl => }/materialeditor/CMakeLists.txt (100%)
rename gui2/{source/darefl => }/materialeditor/materialeditor.cpp (79%)
rename gui2/{source/darefl => }/materialeditor/materialeditor.h (96%)
rename gui2/{source/darefl => }/materialeditor/materialeditoractions.cpp (96%)
rename gui2/{source/darefl => }/materialeditor/materialeditoractions.h (97%)
rename gui2/{source/darefl => }/materialeditor/materialeditortoolbar.cpp (94%)
rename gui2/{source/darefl => }/materialeditor/materialeditortoolbar.h (96%)
rename gui2/{source/darefl => }/materialeditor/materialeditorwidget.cpp (81%)
rename gui2/{source/darefl => }/materialeditor/materialeditorwidget.h (97%)
rename gui2/{source/darefl => }/materialeditor/materialselectionmodel.cpp (95%)
rename gui2/{source/darefl => }/materialeditor/materialselectionmodel.h (97%)
rename gui2/{source/darefl => }/materialeditor/materialtableview.cpp (97%)
rename gui2/{source/darefl => }/materialeditor/materialtableview.h (97%)
rename gui2/{source/darefl => }/materialeditor/materialtreeview.cpp (97%)
rename gui2/{source/darefl => }/materialeditor/materialtreeview.h (97%)
rename gui2/{source/darefl => }/model/CMakeLists.txt (100%)
rename gui2/{source/darefl => }/model/applicationmodels.cpp (90%)
rename gui2/{source/darefl => }/model/applicationmodels.h (97%)
rename gui2/{source/darefl => }/model/experimentaldatacontroller.cpp (85%)
rename gui2/{source/darefl => }/model/experimentaldatacontroller.h (97%)
rename gui2/{source/darefl => }/model/experimentaldataitems.cpp (93%)
rename gui2/{source/darefl => }/model/experimentaldataitems.h (98%)
rename gui2/{source/darefl => }/model/experimentaldatamodel.cpp (96%)
rename gui2/{source/darefl => }/model/experimentaldatamodel.h (97%)
rename gui2/{source/darefl => }/model/instrumentitems.cpp (96%)
rename gui2/{source/darefl => }/model/instrumentitems.h (98%)
rename gui2/{source/darefl => }/model/instrumentmodel.cpp (92%)
rename gui2/{source/darefl => }/model/instrumentmodel.h (95%)
rename gui2/{source/darefl => }/model/item_constants.h (100%)
rename gui2/{source/darefl => }/model/jobitem.cpp (97%)
rename gui2/{source/darefl => }/model/jobitem.h (98%)
rename gui2/{source/darefl => }/model/jobmodel.cpp (93%)
rename gui2/{source/darefl => }/model/jobmodel.h (97%)
rename gui2/{source/darefl => }/model/materialitems.cpp (96%)
rename gui2/{source/darefl => }/model/materialitems.h (98%)
rename gui2/{source/darefl => }/model/materialmodel.cpp (97%)
rename gui2/{source/darefl => }/model/materialmodel.h (97%)
rename gui2/{source/darefl => }/model/materialpropertycontroller.cpp (89%)
rename gui2/{source/darefl => }/model/materialpropertycontroller.h (96%)
rename gui2/{source/darefl => }/model/modelutils.cpp (96%)
rename gui2/{source/darefl => }/model/modelutils.h (98%)
rename gui2/{source/darefl => }/model/sampleitems.cpp (95%)
rename gui2/{source/darefl => }/model/sampleitems.h (98%)
rename gui2/{source/darefl => }/model/samplemodel.cpp (95%)
rename gui2/{source/darefl => }/model/samplemodel.h (95%)
rename gui2/{source/darefl => }/quicksimeditor/CMakeLists.txt (100%)
rename gui2/{source/darefl => }/quicksimeditor/custombeampropertyeditorfactory.cpp (86%)
rename gui2/{source/darefl => }/quicksimeditor/custombeampropertyeditorfactory.h (97%)
rename gui2/{source/darefl => }/quicksimeditor/instrumentpropertyeditor.cpp (84%)
rename gui2/{source/darefl => }/quicksimeditor/instrumentpropertyeditor.h (97%)
rename gui2/{source/darefl => }/quicksimeditor/jobmanager.cpp (96%)
rename gui2/{source/darefl => }/quicksimeditor/jobmanager.h (94%)
rename gui2/{source/darefl => }/quicksimeditor/materialprofile.cpp (90%)
rename gui2/{source/darefl => }/quicksimeditor/materialprofile.h (93%)
rename gui2/{source/darefl => }/quicksimeditor/profilehelper.cpp (98%)
rename gui2/{source/darefl => }/quicksimeditor/profilehelper.h (96%)
rename gui2/{source/darefl => }/quicksimeditor/quicksim_types.h (97%)
rename gui2/{source/darefl => }/quicksimeditor/quicksimcontroller.cpp (88%)
rename gui2/{source/darefl => }/quicksimeditor/quicksimcontroller.h (96%)
rename gui2/{source/darefl => }/quicksimeditor/quicksimeditor.cpp (87%)
rename gui2/{source/darefl => }/quicksimeditor/quicksimeditor.h (97%)
rename gui2/{source/darefl => }/quicksimeditor/quicksimeditortoolbar.cpp (97%)
rename gui2/{source/darefl => }/quicksimeditor/quicksimeditortoolbar.h (97%)
rename gui2/{source/darefl => }/quicksimeditor/quicksimutils.cpp (94%)
rename gui2/{source/darefl => }/quicksimeditor/quicksimutils.h (91%)
rename gui2/{source/darefl => }/quicksimeditor/simplotcontroller.cpp (81%)
rename gui2/{source/darefl => }/quicksimeditor/simplotcontroller.h (96%)
rename gui2/{source/darefl => }/quicksimeditor/simplotwidget.cpp (90%)
rename gui2/{source/darefl => }/quicksimeditor/simplotwidget.h (97%)
rename gui2/{source/darefl => }/quicksimeditor/speculartoysimulation.cpp (93%)
rename gui2/{source/darefl => }/quicksimeditor/speculartoysimulation.h (94%)
rename gui2/{source/darefl => }/resources/CMakeLists.txt (100%)
rename gui2/{source/darefl => }/resources/icons.qrc (100%)
rename gui2/{source/darefl => }/resources/icons/F-letter_1000x.png (100%)
rename gui2/{source/darefl => }/resources/icons/arrow-down-circle-outline.svg (100%)
rename gui2/{source/darefl => }/resources/icons/arrow-up-circle-outline.svg (100%)
rename gui2/{source/darefl => }/resources/icons/aspect-ratio.svg (100%)
rename gui2/{source/darefl => }/resources/icons/beaker-remove-outline.svg (100%)
rename gui2/{source/darefl => }/resources/icons/card-bulleted-outline.svg (100%)
rename gui2/{source/darefl => }/resources/icons/close-circle-outline.svg (100%)
rename gui2/{source/darefl => }/resources/icons/cog-outline.svg (100%)
rename gui2/{source/darefl => }/resources/icons/dock-left.svg (100%)
rename gui2/{source/darefl => }/resources/icons/dock-right.svg (100%)
rename gui2/{source/darefl => }/resources/icons/export.svg (100%)
rename gui2/{source/darefl => }/resources/icons/import.svg (100%)
rename gui2/{source/darefl => }/resources/icons/layers-outline.svg (100%)
rename gui2/{source/darefl => }/resources/icons/layers-triple-outline.svg (100%)
rename gui2/{source/darefl => }/resources/icons/play-circle-outline.svg (100%)
rename gui2/{source/darefl => }/resources/icons/plus-box-multiple-outline.svg (100%)
rename gui2/{source/darefl => }/resources/icons/plus-box-outline.svg (100%)
rename gui2/{source/darefl => }/resources/icons/plus-circle-multiple-outline.svg (100%)
rename gui2/{source/darefl => }/resources/icons/plus-circle-outline.svg (100%)
rename gui2/{source/darefl => }/resources/icons/redo.svg (100%)
rename gui2/{source/darefl => }/resources/icons/set-merge.svg (100%)
rename gui2/{source/darefl => }/resources/icons/undo.svg (100%)
rename gui2/{source/darefl => }/resources/resources.h (100%)
rename gui2/{source/darefl => }/settingsview/CMakeLists.txt (100%)
rename gui2/{source/darefl => }/settingsview/settingsview.cpp (96%)
rename gui2/{source/darefl => }/settingsview/settingsview.h (97%)
rename gui2/{source/darefl => }/sldeditor/CMakeLists.txt (100%)
rename gui2/{source/darefl => }/sldeditor/elementview.cpp (98%)
rename gui2/{source/darefl => }/sldeditor/elementview.h (96%)
rename gui2/{source/darefl => }/sldeditor/graphicsscene.cpp (98%)
rename gui2/{source/darefl => }/sldeditor/graphicsscene.h (97%)
rename gui2/{source/darefl => }/sldeditor/handleelementview.cpp (95%)
rename gui2/{source/darefl => }/sldeditor/handleelementview.h (94%)
rename gui2/{source/darefl => }/sldeditor/layerelementcontroller.cpp (99%)
rename gui2/{source/darefl => }/sldeditor/layerelementcontroller.h (99%)
rename gui2/{source/darefl => }/sldeditor/layerelementitem.cpp (98%)
rename gui2/{source/darefl => }/sldeditor/layerelementitem.h (98%)
rename gui2/{source/darefl => }/sldeditor/roughnesselementview.cpp (94%)
rename gui2/{source/darefl => }/sldeditor/roughnesselementview.h (93%)
rename gui2/{source/darefl => }/sldeditor/segmentelementview.cpp (95%)
rename gui2/{source/darefl => }/sldeditor/segmentelementview.h (94%)
rename gui2/{source/darefl => }/sldeditor/sldeditor.cpp (83%)
rename gui2/{source/darefl => }/sldeditor/sldeditor.h (96%)
rename gui2/{source/darefl => }/sldeditor/sldeditoractions.cpp (86%)
rename gui2/{source/darefl => }/sldeditor/sldeditoractions.h (96%)
rename gui2/{source/darefl => }/sldeditor/sldeditortoolbar.cpp (82%)
rename gui2/{source/darefl => }/sldeditor/sldeditortoolbar.h (95%)
rename gui2/{source/darefl => }/sldeditor/sldelementcontroller.cpp (96%)
rename gui2/{source/darefl => }/sldeditor/sldelementcontroller.h (96%)
rename gui2/{source/darefl => }/sldeditor/sldelementmodel.cpp (91%)
rename gui2/{source/darefl => }/sldeditor/sldelementmodel.h (96%)
rename gui2/{source/darefl => }/sldeditor/sldviewwidget.cpp (87%)
rename gui2/{source/darefl => }/sldeditor/sldviewwidget.h (96%)
delete mode 100644 gui2/source/CMakeLists.txt
delete mode 100644 gui2/source/darefl/CMakeLists.txt
rename gui2/{source/darefl => }/welcomeview/CMakeLists.txt (100%)
rename gui2/{source/darefl => }/welcomeview/openprojectwidget.cpp (95%)
rename gui2/{source/darefl => }/welcomeview/openprojectwidget.h (97%)
rename gui2/{source/darefl => }/welcomeview/projecthandler.cpp (93%)
rename gui2/{source/darefl => }/welcomeview/projecthandler.h (98%)
rename gui2/{source/darefl => }/welcomeview/projectpanewidget.cpp (98%)
rename gui2/{source/darefl => }/welcomeview/projectpanewidget.h (97%)
rename gui2/{source/darefl => }/welcomeview/recentprojectsettings.cpp (98%)
rename gui2/{source/darefl => }/welcomeview/recentprojectsettings.h (97%)
rename gui2/{source/darefl => }/welcomeview/recentprojectwidget.cpp (95%)
rename gui2/{source/darefl => }/welcomeview/recentprojectwidget.h (97%)
rename gui2/{source/darefl => }/welcomeview/userinteractor.cpp (96%)
rename gui2/{source/darefl => }/welcomeview/userinteractor.h (97%)
rename gui2/{source/darefl => }/welcomeview/welcomeview.cpp (91%)
rename gui2/{source/darefl => }/welcomeview/welcomeview.h (97%)
diff --git a/Tests/UnitTests/gui2/testdareflcore/applicationmodels.test.cpp b/Tests/UnitTests/gui2/testdareflcore/applicationmodels.test.cpp
index 673d7734d46..006e9a8ca8d 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 778ad61a87e..55bc755ef76 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 dc736ffe207..c3ee09bb9e3 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 e76ecd6970b..9d5a3e3b823 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 3798925eebf..b4a77c2e9e3 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 e24e8ad1878..844669af02d 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 78c384c65d6..36b6e7b8b7f 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 e852be46b1e..4931c593678 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 d85a5a525b0..eac5cd6d042 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 87db9a48df3..1caff388ff8 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 8cf80abb2e4..eaaa037b9b2 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 fb8c3a95a00..ac46cbedd6e 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 fabf45e768d..7c69289b980 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 2bbdec0a7f2..e207c9a9dae 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 8f804eca662..7c8a4ac860c 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 031adcf5188..27f8b3d37b5 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 92b3d9e0eb9..c4558635b30 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 f3a4af55887..20669c61cfa 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 45442546cfd..42fb7a6d115 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 3acbb725633..777fb9e31a8 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 b4d14e47351..b97b03c1766 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 cb49bbb2b11..d7cfe354a6c 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 c160cd162e9..fc26a6a4160 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 e24ce162c99..e0efa4edefc 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 6aeece4d7f1..1fffbc3e866 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 a26a2b5bb61..69d7f0922ab 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 1c668d8c911..1ed5586d62b 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 96a5e6665bb..4dfb09ee7f0 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 bc1346d2588..663ef622f7d 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 c0cac56b438..1a4f743e0a8 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 0174b8b30eb..1eef932064f 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 c7ebcb6844e..f2262d68cb1 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 c4c098e55a9..f00a96d47b7 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 a939c955574..5b28dff197e 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 ff8f0e5cf94..d37717ff29c 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 95be45f3740..0e32f5d335b 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 a985562ebaf..b9368f7555a 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 a9d7e1f6fc5..6c7a5993cc3 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 e221c482e94..bdee0806be7 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 8e7e190669d..49d551bf58e 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 711ee94c822..ffaaf994411 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 f79c4d8e555..bad8798cc81 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 7b523b231b8..b4d3b18e57a 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 611fcc517f1..856db89edd7 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 731ba49fef1..104f87f8fa4 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 1e5e958d023..1cb718885b7 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 53d11f4a1e9..1189752047b 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 1c06c2735fe..653c38aaab4 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 1b460fea6b2..451a4e76ab7 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 3123b2592a8..4634b74b59c 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 9b057fc2c92..c7f0df1e7fa 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 707663725ca..4d45bd864bb 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 ffdfa6072a0..ba1ad6252bd 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 9fb987f8812..c3a96fe0f73 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 aa3f45920e0..6fd60d2f4ab 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 bcd952fef9d..51ba1ca9f15 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 39f885276d9..9c70b1f6e0d 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 35cb7ef38f4..89125eeeeb5 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 80c8c523e4e..3de9ddc3560 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 4f9a599ae8a..b5ac96e83f7 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 dfa6bdd81b7..96234ae5440 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 5161371f8e5..54ca32dd1f0 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 15dc7afeea0..1c44c22dbcb 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 1f90ec8db38..0a892ce8e40 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 2f7304b1511..176b5bc437d 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 9488be89fb7..6a3e3eef41b 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 a1423026800..63c3941e6ff 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 feba1e9d050..89edd266781 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 89a03858e38..554d583bbbc 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 64ce141a67f..a5c480296a1 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 eaf9ec12f4e..5b3a243f239 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 0b667c31dd9..a7e064f491d 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 ec60c91b947..4cce0932c49 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 b951a27675d..8c4e73de179 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 e3855e1e93a..7d4954a4508 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 03d2e4ea5ab..a4ede1a8d38 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 d920eece2f5..39189e2f21d 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 1a5d0c0dcfc..241b4459768 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 654fdd4b0dc..cfaf2ae8f01 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 44112599b08..7c3696acc2a 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 1162853ba78..ccbce17347a 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 10c7dae3851..10cf1afc2e7 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 d2585e66640..3ede179c9f5 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 0e80cb4c36e..6610da2d99a 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 ee93fe11226..e6f45e00fa9 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 4c641cc2f31..d9a56b09767 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 a412830d728..f4be33a601b 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 3860cfad98c..a56f7feb97e 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 48b202bd2dd..9c67284528b 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 7085b03230b..9966a199735 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 e8dfe7d0134..6fc3790c1b3 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 29a0006cf3c..83dc300d512 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 43fd06c42b0..2d968b9ab02 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 63272b11169..f1275ae4e24 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 c7d3a7fb067..75caa61e2fa 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 3e15b5515b7..25c09d91d0b 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 07f744306ec..42affc20ac6 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 9fcfaf2a9a0..168e17f6804 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 ca0ccb823ab..c5eef6387ec 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 a0a39cdcc3b..f9b8f67cb15 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 1abea9aca02..a20fb979d40 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 0347a633191..b3527dc64d1 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 e0d86c97ed1..5fe93093d31 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 1d070fbf206..2c5f318d572 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 52c354a64e1..7e40053f474 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 cacb6db72a6..7990fbe6580 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 5dbb4e3806e..e5c663bc54f 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 788db1fe978..cc1323d859b 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 1e1db806ecc..7be584d5d37 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 16b134524a2..3bd5e0675e7 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 aa039a84de6..29e9cfa2192 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 c4cc81f4ba0..4a8acca8a8b 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 e0c3b1f0c01..f0718fbe94f 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 410ba76c0d5..7a1e4259c7e 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 c15fa15067e..fbaa726127e 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 0e2e05b5c89..73ce0e08870 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 4385e9ad36f..faced09f7b6 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 e1138660f11..e1552e4212c 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 e11fe5ff48f..3b931698c43 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 af1f3b89f2f..5c2be3f4153 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 f100885222c..ca89fe9fc84 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 628a4cc2754..1fc1280235a 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 752f12ce2fd..8f1d7e74e34 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 11772c4ea6e..dfce378c068 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 1d6263cb4c4..25086cc9c95 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 8873162bc21..9c7ffb6b476 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 0c96caba1cb..915d623ca64 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 dacc2603854..e1df14bad49 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 7c27f7b6ed6..ea5bff26a64 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 4d8ffad6b23..42add71c636 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 24ff10beafb..ab3dee95d1b 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 f47857f2928..8d0d4e31e5e 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 cbeefdd8c6d..42098561bc7 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 51e52ab4c4e..0a30979c83d 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 a0fa6f889f5..6844079d853 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 0e0fd58df01..5f6372939da 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 5b52e2901f1..772dc7b9562 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 cb370df5e3f..3543c81a9fd 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 dbfa3343787..6f886fa3457 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 6fcf8e9dc36..410bed52523 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 773c2920d40..a0720cd240c 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 bda90a93ca7..8856d88ded1 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 313c448e055..9f214b45eaf 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 99d7dfb4391..07717d00322 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 79497f3c565..d200c1c331f 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 ddc49ac15d2..c64e65b872b 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 9448608296c..b91c212554d 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 15a21e9040e..dc94e1cb262 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 8b1bdee0ea4..4b13c2bdbf6 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 e7238a540d1..f6133143c22 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 609dbce4d69..2403d1a0f80 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 16eade9e867..0fd4f2019f4 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 b4bd9b5c887..5ba6f38795e 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 7bdd3c18a72..1084a36516c 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 0985e2c4ba3..ba7bf733b18 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 7c32ee657c7..0c73233e282 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 5d66627f5c9..e59708e466a 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 49bfd705e82..17d9c444529 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 4cb725b2a87..3340b7e8f05 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 67bac28bce4..6899848b02e 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 7f19024a7d0..7bab4e5efcb 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 e2e7bcec593..f40d4bdc98f 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 c9060bb45a2..f95b4f6a147 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 d130d0f6072..ebba0c5e650 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 3f9feb9ded5..ee6cc81dc07 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 11e68175fc8..e4da5b745ee 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 1b238b052c2..1981f95a92d 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 d4576120bb8..018fffd5bfb 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 4f78399dd78..d34dfb1fd0a 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 72adc983a03..055810a053c 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 0a1e8adb40e..e0a21ef1d05 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 9f26fb2e107..4c580142c5e 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 568f54ab554..e7a04912422 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 67a7dbdfea4..362a59f5e5e 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 4fb997d8a05..0da9c1c78c1 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 e541446f509..598213f1e2e 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 867ec9a7b26..80cb6d1c5f9 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 6ac1739f34c..54a21dc912d 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 f3d5e56a820..33a60a4dd79 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 9cfbde38a0f..730ca69460f 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 032b08355e2..02132317cb3 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 726f79fafe0..58799546a94 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 6248d019a93..20a17629225 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 e6a29e8ea17..4e65cb179bf 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 ac82d96f6dd..45e58cb0fcf 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 bb3ebc35bd3..a6afd057014 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 4bf9413efbe..0d76c8cab24 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 3f5e7552e14..1ac1cf8ca41 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 a1e89b962af..16aaf592bf2 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 79d1f8bf752..78f21b110cf 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 b955d9ddd50..00000000000
--- 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 88b65542a84..00000000000
--- 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 a862a4383b0..dc04bdd8142 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 c999c005928..3ed64002058 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 98e6a4e0fd8..62c6ff8b989 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 a729fe9b47b..97b3b3fa41d 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 73634c1be82..47846570d7b 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 097dc51e935..7b1efaba407 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 b259dc437e8..7197285675c 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 6959d4c046d..957937663e8 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 16aa5541554..0adb195071d 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 f7f6a9b1289..9a8a69b8a96 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 9e7dfeb9595..bb94b42c87f 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 7ec176830ca..01fa17fddb1 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 f51cf662d74..de3f5a29196 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 5d2e5abff47..0a4fd33afbe 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 {
--
GitLab