diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67b1bbd1beb59de762be8d33a6dc505368ab6ae3..3a5d36b7fa33cbf299f0a949223e3a846f8fce01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,6 +168,9 @@ if(BORNAGAIN_GUI)
     add_subdirectory(Tests/UnitTests/GUI)
     add_subdirectory(Tests/Performance/GUI)
 endif()
+if(BORNAGAIN_NEWREFL)
+    add_subdirectory(gui2)
+endif()
 
 # TODO: split Core / GUI
 add_subdirectory(Tests/Functional)
diff --git a/GUI/CMakeLists.txt b/GUI/CMakeLists.txt
index 99c6b98604cc09103fcb8efcf6761b6c6be6c7b6..4ee5af350fa996912a9bfef1b763991f35d06e35 100644
--- a/GUI/CMakeLists.txt
+++ b/GUI/CMakeLists.txt
@@ -6,9 +6,6 @@ message(STATUS "Configuring BornAgain GUI")
 
 set(CMAKE_AUTOMOC ON)
 
-if(BORNAGAIN_NEWREFL)
-    add_subdirectory(refl)
-endif()
 add_subdirectory(ba3d)
 add_subdirectory(coregui)
 add_subdirectory(main)
diff --git a/GUI/refl/CMakeLists.txt b/gui2/CMakeLists.txt
similarity index 100%
rename from GUI/refl/CMakeLists.txt
rename to gui2/CMakeLists.txt
diff --git a/GUI/refl/cmake/modules/ClangFormat.cmake b/gui2/cmake/modules/ClangFormat.cmake
similarity index 100%
rename from GUI/refl/cmake/modules/ClangFormat.cmake
rename to gui2/cmake/modules/ClangFormat.cmake
diff --git a/GUI/refl/cmake/modules/CodeTools.cmake b/gui2/cmake/modules/CodeTools.cmake
similarity index 100%
rename from GUI/refl/cmake/modules/CodeTools.cmake
rename to gui2/cmake/modules/CodeTools.cmake
diff --git a/GUI/refl/cmake/modules/configuration.cmake b/gui2/cmake/modules/configuration.cmake
similarity index 100%
rename from GUI/refl/cmake/modules/configuration.cmake
rename to gui2/cmake/modules/configuration.cmake
diff --git a/GUI/refl/cmake/scripts/darefl_version.h.in b/gui2/cmake/scripts/darefl_version.h.in
similarity index 100%
rename from GUI/refl/cmake/scripts/darefl_version.h.in
rename to gui2/cmake/scripts/darefl_version.h.in
diff --git a/GUI/refl/cmake/scripts/testconfig.h.in b/gui2/cmake/scripts/testconfig.h.in
similarity index 100%
rename from GUI/refl/cmake/scripts/testconfig.h.in
rename to gui2/cmake/scripts/testconfig.h.in
diff --git a/GUI/refl/source/CMakeLists.txt b/gui2/source/CMakeLists.txt
similarity index 100%
rename from GUI/refl/source/CMakeLists.txt
rename to gui2/source/CMakeLists.txt
diff --git a/GUI/refl/source/darefl/CMakeLists.txt b/gui2/source/darefl/CMakeLists.txt
similarity index 100%
rename from GUI/refl/source/darefl/CMakeLists.txt
rename to gui2/source/darefl/CMakeLists.txt
diff --git a/GUI/refl/source/darefl/core/CMakeLists.txt b/gui2/source/darefl/core/CMakeLists.txt
similarity index 100%
rename from GUI/refl/source/darefl/core/CMakeLists.txt
rename to gui2/source/darefl/core/CMakeLists.txt
diff --git a/GUI/refl/source/darefl/core/app_constants.h b/gui2/source/darefl/core/app_constants.h
similarity index 100%
rename from GUI/refl/source/darefl/core/app_constants.h
rename to gui2/source/darefl/core/app_constants.h
diff --git a/GUI/refl/source/darefl/core/version.h b/gui2/source/darefl/core/version.h
similarity index 100%
rename from GUI/refl/source/darefl/core/version.h
rename to gui2/source/darefl/core/version.h
diff --git a/GUI/refl/source/darefl/dataloader/CMakeLists.txt b/gui2/source/darefl/dataloader/CMakeLists.txt
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/CMakeLists.txt
rename to gui2/source/darefl/dataloader/CMakeLists.txt
diff --git a/GUI/refl/source/darefl/dataloader/datahandler.cpp b/gui2/source/darefl/dataloader/datahandler.cpp
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/datahandler.cpp
rename to gui2/source/darefl/dataloader/datahandler.cpp
diff --git a/GUI/refl/source/darefl/dataloader/datahandler.h b/gui2/source/darefl/dataloader/datahandler.h
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/datahandler.h
rename to gui2/source/darefl/dataloader/datahandler.h
diff --git a/GUI/refl/source/darefl/dataloader/dataloader_constants.h b/gui2/source/darefl/dataloader/dataloader_constants.h
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/dataloader_constants.h
rename to gui2/source/darefl/dataloader/dataloader_constants.h
diff --git a/GUI/refl/source/darefl/dataloader/dataloader_types.h b/gui2/source/darefl/dataloader/dataloader_types.h
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/dataloader_types.h
rename to gui2/source/darefl/dataloader/dataloader_types.h
diff --git a/GUI/refl/source/darefl/dataloader/dataloader_utils.cpp b/gui2/source/darefl/dataloader/dataloader_utils.cpp
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/dataloader_utils.cpp
rename to gui2/source/darefl/dataloader/dataloader_utils.cpp
diff --git a/GUI/refl/source/darefl/dataloader/dataloader_utils.h b/gui2/source/darefl/dataloader/dataloader_utils.h
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/dataloader_utils.h
rename to gui2/source/darefl/dataloader/dataloader_utils.h
diff --git a/GUI/refl/source/darefl/dataloader/dataloaderdialog.cpp b/gui2/source/darefl/dataloader/dataloaderdialog.cpp
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/dataloaderdialog.cpp
rename to gui2/source/darefl/dataloader/dataloaderdialog.cpp
diff --git a/GUI/refl/source/darefl/dataloader/dataloaderdialog.h b/gui2/source/darefl/dataloader/dataloaderdialog.h
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/dataloaderdialog.h
rename to gui2/source/darefl/dataloader/dataloaderdialog.h
diff --git a/GUI/refl/source/darefl/dataloader/dataloadertoolbar.cpp b/gui2/source/darefl/dataloader/dataloadertoolbar.cpp
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/dataloadertoolbar.cpp
rename to gui2/source/darefl/dataloader/dataloadertoolbar.cpp
diff --git a/GUI/refl/source/darefl/dataloader/dataloadertoolbar.h b/gui2/source/darefl/dataloader/dataloadertoolbar.h
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/dataloadertoolbar.h
rename to gui2/source/darefl/dataloader/dataloadertoolbar.h
diff --git a/GUI/refl/source/darefl/dataloader/defaultparser.cpp b/gui2/source/darefl/dataloader/defaultparser.cpp
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/defaultparser.cpp
rename to gui2/source/darefl/dataloader/defaultparser.cpp
diff --git a/GUI/refl/source/darefl/dataloader/defaultparser.h b/gui2/source/darefl/dataloader/defaultparser.h
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/defaultparser.h
rename to gui2/source/darefl/dataloader/defaultparser.h
diff --git a/GUI/refl/source/darefl/dataloader/importfilewidget.cpp b/gui2/source/darefl/dataloader/importfilewidget.cpp
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/importfilewidget.cpp
rename to gui2/source/darefl/dataloader/importfilewidget.cpp
diff --git a/GUI/refl/source/darefl/dataloader/importfilewidget.h b/gui2/source/darefl/dataloader/importfilewidget.h
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/importfilewidget.h
rename to gui2/source/darefl/dataloader/importfilewidget.h
diff --git a/GUI/refl/source/darefl/dataloader/importtableheader.cpp b/gui2/source/darefl/dataloader/importtableheader.cpp
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/importtableheader.cpp
rename to gui2/source/darefl/dataloader/importtableheader.cpp
diff --git a/GUI/refl/source/darefl/dataloader/importtableheader.h b/gui2/source/darefl/dataloader/importtableheader.h
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/importtableheader.h
rename to gui2/source/darefl/dataloader/importtableheader.h
diff --git a/GUI/refl/source/darefl/dataloader/importtablemodel.cpp b/gui2/source/darefl/dataloader/importtablemodel.cpp
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/importtablemodel.cpp
rename to gui2/source/darefl/dataloader/importtablemodel.cpp
diff --git a/GUI/refl/source/darefl/dataloader/importtablemodel.h b/gui2/source/darefl/dataloader/importtablemodel.h
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/importtablemodel.h
rename to gui2/source/darefl/dataloader/importtablemodel.h
diff --git a/GUI/refl/source/darefl/dataloader/importtablewidget.cpp b/gui2/source/darefl/dataloader/importtablewidget.cpp
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/importtablewidget.cpp
rename to gui2/source/darefl/dataloader/importtablewidget.cpp
diff --git a/GUI/refl/source/darefl/dataloader/importtablewidget.h b/gui2/source/darefl/dataloader/importtablewidget.h
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/importtablewidget.h
rename to gui2/source/darefl/dataloader/importtablewidget.h
diff --git a/GUI/refl/source/darefl/dataloader/importtextview.cpp b/gui2/source/darefl/dataloader/importtextview.cpp
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/importtextview.cpp
rename to gui2/source/darefl/dataloader/importtextview.cpp
diff --git a/GUI/refl/source/darefl/dataloader/importtextview.h b/gui2/source/darefl/dataloader/importtextview.h
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/importtextview.h
rename to gui2/source/darefl/dataloader/importtextview.h
diff --git a/GUI/refl/source/darefl/dataloader/loaderpreviewpanel.cpp b/gui2/source/darefl/dataloader/loaderpreviewpanel.cpp
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/loaderpreviewpanel.cpp
rename to gui2/source/darefl/dataloader/loaderpreviewpanel.cpp
diff --git a/GUI/refl/source/darefl/dataloader/loaderpreviewpanel.h b/gui2/source/darefl/dataloader/loaderpreviewpanel.h
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/loaderpreviewpanel.h
rename to gui2/source/darefl/dataloader/loaderpreviewpanel.h
diff --git a/GUI/refl/source/darefl/dataloader/loaderselectorpanel.cpp b/gui2/source/darefl/dataloader/loaderselectorpanel.cpp
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/loaderselectorpanel.cpp
rename to gui2/source/darefl/dataloader/loaderselectorpanel.cpp
diff --git a/GUI/refl/source/darefl/dataloader/loaderselectorpanel.h b/gui2/source/darefl/dataloader/loaderselectorpanel.h
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/loaderselectorpanel.h
rename to gui2/source/darefl/dataloader/loaderselectorpanel.h
diff --git a/GUI/refl/source/darefl/dataloader/parserinterface.h b/gui2/source/darefl/dataloader/parserinterface.h
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/parserinterface.h
rename to gui2/source/darefl/dataloader/parserinterface.h
diff --git a/GUI/refl/source/darefl/dataloader/parserpropertywidget.cpp b/gui2/source/darefl/dataloader/parserpropertywidget.cpp
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/parserpropertywidget.cpp
rename to gui2/source/darefl/dataloader/parserpropertywidget.cpp
diff --git a/GUI/refl/source/darefl/dataloader/parserpropertywidget.h b/gui2/source/darefl/dataloader/parserpropertywidget.h
similarity index 100%
rename from GUI/refl/source/darefl/dataloader/parserpropertywidget.h
rename to gui2/source/darefl/dataloader/parserpropertywidget.h
diff --git a/GUI/refl/source/darefl/importdataview/CMakeLists.txt b/gui2/source/darefl/importdataview/CMakeLists.txt
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/CMakeLists.txt
rename to gui2/source/darefl/importdataview/CMakeLists.txt
diff --git a/GUI/refl/source/darefl/importdataview/dataselectionmodel.cpp b/gui2/source/darefl/importdataview/dataselectionmodel.cpp
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/dataselectionmodel.cpp
rename to gui2/source/darefl/importdataview/dataselectionmodel.cpp
diff --git a/GUI/refl/source/darefl/importdataview/dataselectionmodel.h b/gui2/source/darefl/importdataview/dataselectionmodel.h
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/dataselectionmodel.h
rename to gui2/source/darefl/importdataview/dataselectionmodel.h
diff --git a/GUI/refl/source/darefl/importdataview/dataselectorwidget.cpp b/gui2/source/darefl/importdataview/dataselectorwidget.cpp
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/dataselectorwidget.cpp
rename to gui2/source/darefl/importdataview/dataselectorwidget.cpp
diff --git a/GUI/refl/source/darefl/importdataview/dataselectorwidget.h b/gui2/source/darefl/importdataview/dataselectorwidget.h
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/dataselectorwidget.h
rename to gui2/source/darefl/importdataview/dataselectorwidget.h
diff --git a/GUI/refl/source/darefl/importdataview/dataviewmodel.cpp b/gui2/source/darefl/importdataview/dataviewmodel.cpp
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/dataviewmodel.cpp
rename to gui2/source/darefl/importdataview/dataviewmodel.cpp
diff --git a/GUI/refl/source/darefl/importdataview/dataviewmodel.h b/gui2/source/darefl/importdataview/dataviewmodel.h
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/dataviewmodel.h
rename to gui2/source/darefl/importdataview/dataviewmodel.h
diff --git a/GUI/refl/source/darefl/importdataview/graphcanvaswidget.cpp b/gui2/source/darefl/importdataview/graphcanvaswidget.cpp
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/graphcanvaswidget.cpp
rename to gui2/source/darefl/importdataview/graphcanvaswidget.cpp
diff --git a/GUI/refl/source/darefl/importdataview/graphcanvaswidget.h b/gui2/source/darefl/importdataview/graphcanvaswidget.h
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/graphcanvaswidget.h
rename to gui2/source/darefl/importdataview/graphcanvaswidget.h
diff --git a/GUI/refl/source/darefl/importdataview/graphimportdata.h b/gui2/source/darefl/importdataview/graphimportdata.h
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/graphimportdata.h
rename to gui2/source/darefl/importdataview/graphimportdata.h
diff --git a/GUI/refl/source/darefl/importdataview/importdataeditor.cpp b/gui2/source/darefl/importdataview/importdataeditor.cpp
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/importdataeditor.cpp
rename to gui2/source/darefl/importdataview/importdataeditor.cpp
diff --git a/GUI/refl/source/darefl/importdataview/importdataeditor.h b/gui2/source/darefl/importdataview/importdataeditor.h
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/importdataeditor.h
rename to gui2/source/darefl/importdataview/importdataeditor.h
diff --git a/GUI/refl/source/darefl/importdataview/importdataeditoractions.cpp b/gui2/source/darefl/importdataview/importdataeditoractions.cpp
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/importdataeditoractions.cpp
rename to gui2/source/darefl/importdataview/importdataeditoractions.cpp
diff --git a/GUI/refl/source/darefl/importdataview/importdataeditoractions.h b/gui2/source/darefl/importdataview/importdataeditoractions.h
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/importdataeditoractions.h
rename to gui2/source/darefl/importdataview/importdataeditoractions.h
diff --git a/GUI/refl/source/darefl/importdataview/importdataeditortoolbal.cpp b/gui2/source/darefl/importdataview/importdataeditortoolbal.cpp
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/importdataeditortoolbal.cpp
rename to gui2/source/darefl/importdataview/importdataeditortoolbal.cpp
diff --git a/GUI/refl/source/darefl/importdataview/importdataeditortoolbal.h b/gui2/source/darefl/importdataview/importdataeditortoolbal.h
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/importdataeditortoolbal.h
rename to gui2/source/darefl/importdataview/importdataeditortoolbal.h
diff --git a/GUI/refl/source/darefl/importdataview/importdataview.cpp b/gui2/source/darefl/importdataview/importdataview.cpp
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/importdataview.cpp
rename to gui2/source/darefl/importdataview/importdataview.cpp
diff --git a/GUI/refl/source/darefl/importdataview/importdataview.h b/gui2/source/darefl/importdataview/importdataview.h
similarity index 100%
rename from GUI/refl/source/darefl/importdataview/importdataview.h
rename to gui2/source/darefl/importdataview/importdataview.h
diff --git a/GUI/refl/source/darefl/layereditor/CMakeLists.txt b/gui2/source/darefl/layereditor/CMakeLists.txt
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/CMakeLists.txt
rename to gui2/source/darefl/layereditor/CMakeLists.txt
diff --git a/GUI/refl/source/darefl/layereditor/customlayertreeeditorfactory.cpp b/gui2/source/darefl/layereditor/customlayertreeeditorfactory.cpp
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/customlayertreeeditorfactory.cpp
rename to gui2/source/darefl/layereditor/customlayertreeeditorfactory.cpp
diff --git a/GUI/refl/source/darefl/layereditor/customlayertreeeditorfactory.h b/gui2/source/darefl/layereditor/customlayertreeeditorfactory.h
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/customlayertreeeditorfactory.h
rename to gui2/source/darefl/layereditor/customlayertreeeditorfactory.h
diff --git a/GUI/refl/source/darefl/layereditor/layereditor.cpp b/gui2/source/darefl/layereditor/layereditor.cpp
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/layereditor.cpp
rename to gui2/source/darefl/layereditor/layereditor.cpp
diff --git a/GUI/refl/source/darefl/layereditor/layereditor.h b/gui2/source/darefl/layereditor/layereditor.h
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/layereditor.h
rename to gui2/source/darefl/layereditor/layereditor.h
diff --git a/GUI/refl/source/darefl/layereditor/layereditoractions.cpp b/gui2/source/darefl/layereditor/layereditoractions.cpp
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/layereditoractions.cpp
rename to gui2/source/darefl/layereditor/layereditoractions.cpp
diff --git a/GUI/refl/source/darefl/layereditor/layereditoractions.h b/gui2/source/darefl/layereditor/layereditoractions.h
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/layereditoractions.h
rename to gui2/source/darefl/layereditor/layereditoractions.h
diff --git a/GUI/refl/source/darefl/layereditor/layereditortoolbar.cpp b/gui2/source/darefl/layereditor/layereditortoolbar.cpp
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/layereditortoolbar.cpp
rename to gui2/source/darefl/layereditor/layereditortoolbar.cpp
diff --git a/GUI/refl/source/darefl/layereditor/layereditortoolbar.h b/gui2/source/darefl/layereditor/layereditortoolbar.h
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/layereditortoolbar.h
rename to gui2/source/darefl/layereditor/layereditortoolbar.h
diff --git a/GUI/refl/source/darefl/layereditor/layereditorwidget.cpp b/gui2/source/darefl/layereditor/layereditorwidget.cpp
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/layereditorwidget.cpp
rename to gui2/source/darefl/layereditor/layereditorwidget.cpp
diff --git a/GUI/refl/source/darefl/layereditor/layereditorwidget.h b/gui2/source/darefl/layereditor/layereditorwidget.h
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/layereditorwidget.h
rename to gui2/source/darefl/layereditor/layereditorwidget.h
diff --git a/GUI/refl/source/darefl/layereditor/layerselectionmodel.cpp b/gui2/source/darefl/layereditor/layerselectionmodel.cpp
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/layerselectionmodel.cpp
rename to gui2/source/darefl/layereditor/layerselectionmodel.cpp
diff --git a/GUI/refl/source/darefl/layereditor/layerselectionmodel.h b/gui2/source/darefl/layereditor/layerselectionmodel.h
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/layerselectionmodel.h
rename to gui2/source/darefl/layereditor/layerselectionmodel.h
diff --git a/GUI/refl/source/darefl/layereditor/layertreeview.cpp b/gui2/source/darefl/layereditor/layertreeview.cpp
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/layertreeview.cpp
rename to gui2/source/darefl/layereditor/layertreeview.cpp
diff --git a/GUI/refl/source/darefl/layereditor/layertreeview.h b/gui2/source/darefl/layereditor/layertreeview.h
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/layertreeview.h
rename to gui2/source/darefl/layereditor/layertreeview.h
diff --git a/GUI/refl/source/darefl/layereditor/layerviewmodel.cpp b/gui2/source/darefl/layereditor/layerviewmodel.cpp
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/layerviewmodel.cpp
rename to gui2/source/darefl/layereditor/layerviewmodel.cpp
diff --git a/GUI/refl/source/darefl/layereditor/layerviewmodel.h b/gui2/source/darefl/layereditor/layerviewmodel.h
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/layerviewmodel.h
rename to gui2/source/darefl/layereditor/layerviewmodel.h
diff --git a/GUI/refl/source/darefl/layereditor/layerviewmodelcontroller.cpp b/gui2/source/darefl/layereditor/layerviewmodelcontroller.cpp
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/layerviewmodelcontroller.cpp
rename to gui2/source/darefl/layereditor/layerviewmodelcontroller.cpp
diff --git a/GUI/refl/source/darefl/layereditor/layerviewmodelcontroller.h b/gui2/source/darefl/layereditor/layerviewmodelcontroller.h
similarity index 100%
rename from GUI/refl/source/darefl/layereditor/layerviewmodelcontroller.h
rename to gui2/source/darefl/layereditor/layerviewmodelcontroller.h
diff --git a/GUI/refl/source/darefl/mainwindow/CMakeLists.txt b/gui2/source/darefl/mainwindow/CMakeLists.txt
similarity index 100%
rename from GUI/refl/source/darefl/mainwindow/CMakeLists.txt
rename to gui2/source/darefl/mainwindow/CMakeLists.txt
diff --git a/GUI/refl/source/darefl/mainwindow/actionmanager.cpp b/gui2/source/darefl/mainwindow/actionmanager.cpp
similarity index 100%
rename from GUI/refl/source/darefl/mainwindow/actionmanager.cpp
rename to gui2/source/darefl/mainwindow/actionmanager.cpp
diff --git a/GUI/refl/source/darefl/mainwindow/actionmanager.h b/gui2/source/darefl/mainwindow/actionmanager.h
similarity index 100%
rename from GUI/refl/source/darefl/mainwindow/actionmanager.h
rename to gui2/source/darefl/mainwindow/actionmanager.h
diff --git a/GUI/refl/source/darefl/mainwindow/fancytab.cpp b/gui2/source/darefl/mainwindow/fancytab.cpp
similarity index 100%
rename from GUI/refl/source/darefl/mainwindow/fancytab.cpp
rename to gui2/source/darefl/mainwindow/fancytab.cpp
diff --git a/GUI/refl/source/darefl/mainwindow/fancytab.h b/gui2/source/darefl/mainwindow/fancytab.h
similarity index 100%
rename from GUI/refl/source/darefl/mainwindow/fancytab.h
rename to gui2/source/darefl/mainwindow/fancytab.h
diff --git a/GUI/refl/source/darefl/mainwindow/mainbarwidget.cpp b/gui2/source/darefl/mainwindow/mainbarwidget.cpp
similarity index 100%
rename from GUI/refl/source/darefl/mainwindow/mainbarwidget.cpp
rename to gui2/source/darefl/mainwindow/mainbarwidget.cpp
diff --git a/GUI/refl/source/darefl/mainwindow/mainbarwidget.h b/gui2/source/darefl/mainwindow/mainbarwidget.h
similarity index 100%
rename from GUI/refl/source/darefl/mainwindow/mainbarwidget.h
rename to gui2/source/darefl/mainwindow/mainbarwidget.h
diff --git a/GUI/refl/source/darefl/mainwindow/mainwindow.cpp b/gui2/source/darefl/mainwindow/mainwindow.cpp
similarity index 100%
rename from GUI/refl/source/darefl/mainwindow/mainwindow.cpp
rename to gui2/source/darefl/mainwindow/mainwindow.cpp
diff --git a/GUI/refl/source/darefl/mainwindow/mainwindow.h b/gui2/source/darefl/mainwindow/mainwindow.h
similarity index 100%
rename from GUI/refl/source/darefl/mainwindow/mainwindow.h
rename to gui2/source/darefl/mainwindow/mainwindow.h
diff --git a/GUI/refl/source/darefl/mainwindow/simulationview.cpp b/gui2/source/darefl/mainwindow/simulationview.cpp
similarity index 100%
rename from GUI/refl/source/darefl/mainwindow/simulationview.cpp
rename to gui2/source/darefl/mainwindow/simulationview.cpp
diff --git a/GUI/refl/source/darefl/mainwindow/simulationview.h b/gui2/source/darefl/mainwindow/simulationview.h
similarity index 100%
rename from GUI/refl/source/darefl/mainwindow/simulationview.h
rename to gui2/source/darefl/mainwindow/simulationview.h
diff --git a/GUI/refl/source/darefl/mainwindow/styleutils.cpp b/gui2/source/darefl/mainwindow/styleutils.cpp
similarity index 100%
rename from GUI/refl/source/darefl/mainwindow/styleutils.cpp
rename to gui2/source/darefl/mainwindow/styleutils.cpp
diff --git a/GUI/refl/source/darefl/mainwindow/styleutils.h b/gui2/source/darefl/mainwindow/styleutils.h
similarity index 100%
rename from GUI/refl/source/darefl/mainwindow/styleutils.h
rename to gui2/source/darefl/mainwindow/styleutils.h
diff --git a/GUI/refl/source/darefl/materialeditor/CMakeLists.txt b/gui2/source/darefl/materialeditor/CMakeLists.txt
similarity index 100%
rename from GUI/refl/source/darefl/materialeditor/CMakeLists.txt
rename to gui2/source/darefl/materialeditor/CMakeLists.txt
diff --git a/GUI/refl/source/darefl/materialeditor/materialeditor.cpp b/gui2/source/darefl/materialeditor/materialeditor.cpp
similarity index 100%
rename from GUI/refl/source/darefl/materialeditor/materialeditor.cpp
rename to gui2/source/darefl/materialeditor/materialeditor.cpp
diff --git a/GUI/refl/source/darefl/materialeditor/materialeditor.h b/gui2/source/darefl/materialeditor/materialeditor.h
similarity index 100%
rename from GUI/refl/source/darefl/materialeditor/materialeditor.h
rename to gui2/source/darefl/materialeditor/materialeditor.h
diff --git a/GUI/refl/source/darefl/materialeditor/materialeditoractions.cpp b/gui2/source/darefl/materialeditor/materialeditoractions.cpp
similarity index 100%
rename from GUI/refl/source/darefl/materialeditor/materialeditoractions.cpp
rename to gui2/source/darefl/materialeditor/materialeditoractions.cpp
diff --git a/GUI/refl/source/darefl/materialeditor/materialeditoractions.h b/gui2/source/darefl/materialeditor/materialeditoractions.h
similarity index 100%
rename from GUI/refl/source/darefl/materialeditor/materialeditoractions.h
rename to gui2/source/darefl/materialeditor/materialeditoractions.h
diff --git a/GUI/refl/source/darefl/materialeditor/materialeditortoolbar.cpp b/gui2/source/darefl/materialeditor/materialeditortoolbar.cpp
similarity index 100%
rename from GUI/refl/source/darefl/materialeditor/materialeditortoolbar.cpp
rename to gui2/source/darefl/materialeditor/materialeditortoolbar.cpp
diff --git a/GUI/refl/source/darefl/materialeditor/materialeditortoolbar.h b/gui2/source/darefl/materialeditor/materialeditortoolbar.h
similarity index 100%
rename from GUI/refl/source/darefl/materialeditor/materialeditortoolbar.h
rename to gui2/source/darefl/materialeditor/materialeditortoolbar.h
diff --git a/GUI/refl/source/darefl/materialeditor/materialeditorwidget.cpp b/gui2/source/darefl/materialeditor/materialeditorwidget.cpp
similarity index 100%
rename from GUI/refl/source/darefl/materialeditor/materialeditorwidget.cpp
rename to gui2/source/darefl/materialeditor/materialeditorwidget.cpp
diff --git a/GUI/refl/source/darefl/materialeditor/materialeditorwidget.h b/gui2/source/darefl/materialeditor/materialeditorwidget.h
similarity index 100%
rename from GUI/refl/source/darefl/materialeditor/materialeditorwidget.h
rename to gui2/source/darefl/materialeditor/materialeditorwidget.h
diff --git a/GUI/refl/source/darefl/materialeditor/materialselectionmodel.cpp b/gui2/source/darefl/materialeditor/materialselectionmodel.cpp
similarity index 100%
rename from GUI/refl/source/darefl/materialeditor/materialselectionmodel.cpp
rename to gui2/source/darefl/materialeditor/materialselectionmodel.cpp
diff --git a/GUI/refl/source/darefl/materialeditor/materialselectionmodel.h b/gui2/source/darefl/materialeditor/materialselectionmodel.h
similarity index 100%
rename from GUI/refl/source/darefl/materialeditor/materialselectionmodel.h
rename to gui2/source/darefl/materialeditor/materialselectionmodel.h
diff --git a/GUI/refl/source/darefl/materialeditor/materialtableview.cpp b/gui2/source/darefl/materialeditor/materialtableview.cpp
similarity index 100%
rename from GUI/refl/source/darefl/materialeditor/materialtableview.cpp
rename to gui2/source/darefl/materialeditor/materialtableview.cpp
diff --git a/GUI/refl/source/darefl/materialeditor/materialtableview.h b/gui2/source/darefl/materialeditor/materialtableview.h
similarity index 100%
rename from GUI/refl/source/darefl/materialeditor/materialtableview.h
rename to gui2/source/darefl/materialeditor/materialtableview.h
diff --git a/GUI/refl/source/darefl/materialeditor/materialtreeview.cpp b/gui2/source/darefl/materialeditor/materialtreeview.cpp
similarity index 100%
rename from GUI/refl/source/darefl/materialeditor/materialtreeview.cpp
rename to gui2/source/darefl/materialeditor/materialtreeview.cpp
diff --git a/GUI/refl/source/darefl/materialeditor/materialtreeview.h b/gui2/source/darefl/materialeditor/materialtreeview.h
similarity index 100%
rename from GUI/refl/source/darefl/materialeditor/materialtreeview.h
rename to gui2/source/darefl/materialeditor/materialtreeview.h
diff --git a/GUI/refl/source/darefl/model/CMakeLists.txt b/gui2/source/darefl/model/CMakeLists.txt
similarity index 100%
rename from GUI/refl/source/darefl/model/CMakeLists.txt
rename to gui2/source/darefl/model/CMakeLists.txt
diff --git a/GUI/refl/source/darefl/model/applicationmodels.cpp b/gui2/source/darefl/model/applicationmodels.cpp
similarity index 100%
rename from GUI/refl/source/darefl/model/applicationmodels.cpp
rename to gui2/source/darefl/model/applicationmodels.cpp
diff --git a/GUI/refl/source/darefl/model/applicationmodels.h b/gui2/source/darefl/model/applicationmodels.h
similarity index 100%
rename from GUI/refl/source/darefl/model/applicationmodels.h
rename to gui2/source/darefl/model/applicationmodels.h
diff --git a/GUI/refl/source/darefl/model/experimentaldatacontroller.cpp b/gui2/source/darefl/model/experimentaldatacontroller.cpp
similarity index 100%
rename from GUI/refl/source/darefl/model/experimentaldatacontroller.cpp
rename to gui2/source/darefl/model/experimentaldatacontroller.cpp
diff --git a/GUI/refl/source/darefl/model/experimentaldatacontroller.h b/gui2/source/darefl/model/experimentaldatacontroller.h
similarity index 100%
rename from GUI/refl/source/darefl/model/experimentaldatacontroller.h
rename to gui2/source/darefl/model/experimentaldatacontroller.h
diff --git a/GUI/refl/source/darefl/model/experimentaldataitems.cpp b/gui2/source/darefl/model/experimentaldataitems.cpp
similarity index 100%
rename from GUI/refl/source/darefl/model/experimentaldataitems.cpp
rename to gui2/source/darefl/model/experimentaldataitems.cpp
diff --git a/GUI/refl/source/darefl/model/experimentaldataitems.h b/gui2/source/darefl/model/experimentaldataitems.h
similarity index 100%
rename from GUI/refl/source/darefl/model/experimentaldataitems.h
rename to gui2/source/darefl/model/experimentaldataitems.h
diff --git a/GUI/refl/source/darefl/model/experimentaldatamodel.cpp b/gui2/source/darefl/model/experimentaldatamodel.cpp
similarity index 100%
rename from GUI/refl/source/darefl/model/experimentaldatamodel.cpp
rename to gui2/source/darefl/model/experimentaldatamodel.cpp
diff --git a/GUI/refl/source/darefl/model/experimentaldatamodel.h b/gui2/source/darefl/model/experimentaldatamodel.h
similarity index 100%
rename from GUI/refl/source/darefl/model/experimentaldatamodel.h
rename to gui2/source/darefl/model/experimentaldatamodel.h
diff --git a/GUI/refl/source/darefl/model/instrumentitems.cpp b/gui2/source/darefl/model/instrumentitems.cpp
similarity index 100%
rename from GUI/refl/source/darefl/model/instrumentitems.cpp
rename to gui2/source/darefl/model/instrumentitems.cpp
diff --git a/GUI/refl/source/darefl/model/instrumentitems.h b/gui2/source/darefl/model/instrumentitems.h
similarity index 100%
rename from GUI/refl/source/darefl/model/instrumentitems.h
rename to gui2/source/darefl/model/instrumentitems.h
diff --git a/GUI/refl/source/darefl/model/instrumentmodel.cpp b/gui2/source/darefl/model/instrumentmodel.cpp
similarity index 100%
rename from GUI/refl/source/darefl/model/instrumentmodel.cpp
rename to gui2/source/darefl/model/instrumentmodel.cpp
diff --git a/GUI/refl/source/darefl/model/instrumentmodel.h b/gui2/source/darefl/model/instrumentmodel.h
similarity index 100%
rename from GUI/refl/source/darefl/model/instrumentmodel.h
rename to gui2/source/darefl/model/instrumentmodel.h
diff --git a/GUI/refl/source/darefl/model/item_constants.h b/gui2/source/darefl/model/item_constants.h
similarity index 100%
rename from GUI/refl/source/darefl/model/item_constants.h
rename to gui2/source/darefl/model/item_constants.h
diff --git a/GUI/refl/source/darefl/model/jobitem.cpp b/gui2/source/darefl/model/jobitem.cpp
similarity index 100%
rename from GUI/refl/source/darefl/model/jobitem.cpp
rename to gui2/source/darefl/model/jobitem.cpp
diff --git a/GUI/refl/source/darefl/model/jobitem.h b/gui2/source/darefl/model/jobitem.h
similarity index 100%
rename from GUI/refl/source/darefl/model/jobitem.h
rename to gui2/source/darefl/model/jobitem.h
diff --git a/GUI/refl/source/darefl/model/jobmodel.cpp b/gui2/source/darefl/model/jobmodel.cpp
similarity index 100%
rename from GUI/refl/source/darefl/model/jobmodel.cpp
rename to gui2/source/darefl/model/jobmodel.cpp
diff --git a/GUI/refl/source/darefl/model/jobmodel.h b/gui2/source/darefl/model/jobmodel.h
similarity index 100%
rename from GUI/refl/source/darefl/model/jobmodel.h
rename to gui2/source/darefl/model/jobmodel.h
diff --git a/GUI/refl/source/darefl/model/materialitems.cpp b/gui2/source/darefl/model/materialitems.cpp
similarity index 100%
rename from GUI/refl/source/darefl/model/materialitems.cpp
rename to gui2/source/darefl/model/materialitems.cpp
diff --git a/GUI/refl/source/darefl/model/materialitems.h b/gui2/source/darefl/model/materialitems.h
similarity index 100%
rename from GUI/refl/source/darefl/model/materialitems.h
rename to gui2/source/darefl/model/materialitems.h
diff --git a/GUI/refl/source/darefl/model/materialmodel.cpp b/gui2/source/darefl/model/materialmodel.cpp
similarity index 100%
rename from GUI/refl/source/darefl/model/materialmodel.cpp
rename to gui2/source/darefl/model/materialmodel.cpp
diff --git a/GUI/refl/source/darefl/model/materialmodel.h b/gui2/source/darefl/model/materialmodel.h
similarity index 100%
rename from GUI/refl/source/darefl/model/materialmodel.h
rename to gui2/source/darefl/model/materialmodel.h
diff --git a/GUI/refl/source/darefl/model/materialpropertycontroller.cpp b/gui2/source/darefl/model/materialpropertycontroller.cpp
similarity index 100%
rename from GUI/refl/source/darefl/model/materialpropertycontroller.cpp
rename to gui2/source/darefl/model/materialpropertycontroller.cpp
diff --git a/GUI/refl/source/darefl/model/materialpropertycontroller.h b/gui2/source/darefl/model/materialpropertycontroller.h
similarity index 100%
rename from GUI/refl/source/darefl/model/materialpropertycontroller.h
rename to gui2/source/darefl/model/materialpropertycontroller.h
diff --git a/GUI/refl/source/darefl/model/modelutils.cpp b/gui2/source/darefl/model/modelutils.cpp
similarity index 100%
rename from GUI/refl/source/darefl/model/modelutils.cpp
rename to gui2/source/darefl/model/modelutils.cpp
diff --git a/GUI/refl/source/darefl/model/modelutils.h b/gui2/source/darefl/model/modelutils.h
similarity index 100%
rename from GUI/refl/source/darefl/model/modelutils.h
rename to gui2/source/darefl/model/modelutils.h
diff --git a/GUI/refl/source/darefl/model/sampleitems.cpp b/gui2/source/darefl/model/sampleitems.cpp
similarity index 100%
rename from GUI/refl/source/darefl/model/sampleitems.cpp
rename to gui2/source/darefl/model/sampleitems.cpp
diff --git a/GUI/refl/source/darefl/model/sampleitems.h b/gui2/source/darefl/model/sampleitems.h
similarity index 100%
rename from GUI/refl/source/darefl/model/sampleitems.h
rename to gui2/source/darefl/model/sampleitems.h
diff --git a/GUI/refl/source/darefl/model/samplemodel.cpp b/gui2/source/darefl/model/samplemodel.cpp
similarity index 100%
rename from GUI/refl/source/darefl/model/samplemodel.cpp
rename to gui2/source/darefl/model/samplemodel.cpp
diff --git a/GUI/refl/source/darefl/model/samplemodel.h b/gui2/source/darefl/model/samplemodel.h
similarity index 100%
rename from GUI/refl/source/darefl/model/samplemodel.h
rename to gui2/source/darefl/model/samplemodel.h
diff --git a/GUI/refl/source/darefl/quicksimeditor/CMakeLists.txt b/gui2/source/darefl/quicksimeditor/CMakeLists.txt
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/CMakeLists.txt
rename to gui2/source/darefl/quicksimeditor/CMakeLists.txt
diff --git a/GUI/refl/source/darefl/quicksimeditor/custombeampropertyeditorfactory.cpp b/gui2/source/darefl/quicksimeditor/custombeampropertyeditorfactory.cpp
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/custombeampropertyeditorfactory.cpp
rename to gui2/source/darefl/quicksimeditor/custombeampropertyeditorfactory.cpp
diff --git a/GUI/refl/source/darefl/quicksimeditor/custombeampropertyeditorfactory.h b/gui2/source/darefl/quicksimeditor/custombeampropertyeditorfactory.h
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/custombeampropertyeditorfactory.h
rename to gui2/source/darefl/quicksimeditor/custombeampropertyeditorfactory.h
diff --git a/GUI/refl/source/darefl/quicksimeditor/instrumentpropertyeditor.cpp b/gui2/source/darefl/quicksimeditor/instrumentpropertyeditor.cpp
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/instrumentpropertyeditor.cpp
rename to gui2/source/darefl/quicksimeditor/instrumentpropertyeditor.cpp
diff --git a/GUI/refl/source/darefl/quicksimeditor/instrumentpropertyeditor.h b/gui2/source/darefl/quicksimeditor/instrumentpropertyeditor.h
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/instrumentpropertyeditor.h
rename to gui2/source/darefl/quicksimeditor/instrumentpropertyeditor.h
diff --git a/GUI/refl/source/darefl/quicksimeditor/jobmanager.cpp b/gui2/source/darefl/quicksimeditor/jobmanager.cpp
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/jobmanager.cpp
rename to gui2/source/darefl/quicksimeditor/jobmanager.cpp
diff --git a/GUI/refl/source/darefl/quicksimeditor/jobmanager.h b/gui2/source/darefl/quicksimeditor/jobmanager.h
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/jobmanager.h
rename to gui2/source/darefl/quicksimeditor/jobmanager.h
diff --git a/GUI/refl/source/darefl/quicksimeditor/materialprofile.cpp b/gui2/source/darefl/quicksimeditor/materialprofile.cpp
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/materialprofile.cpp
rename to gui2/source/darefl/quicksimeditor/materialprofile.cpp
diff --git a/GUI/refl/source/darefl/quicksimeditor/materialprofile.h b/gui2/source/darefl/quicksimeditor/materialprofile.h
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/materialprofile.h
rename to gui2/source/darefl/quicksimeditor/materialprofile.h
diff --git a/GUI/refl/source/darefl/quicksimeditor/profilehelper.cpp b/gui2/source/darefl/quicksimeditor/profilehelper.cpp
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/profilehelper.cpp
rename to gui2/source/darefl/quicksimeditor/profilehelper.cpp
diff --git a/GUI/refl/source/darefl/quicksimeditor/profilehelper.h b/gui2/source/darefl/quicksimeditor/profilehelper.h
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/profilehelper.h
rename to gui2/source/darefl/quicksimeditor/profilehelper.h
diff --git a/GUI/refl/source/darefl/quicksimeditor/quicksim_types.h b/gui2/source/darefl/quicksimeditor/quicksim_types.h
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/quicksim_types.h
rename to gui2/source/darefl/quicksimeditor/quicksim_types.h
diff --git a/GUI/refl/source/darefl/quicksimeditor/quicksimcontroller.cpp b/gui2/source/darefl/quicksimeditor/quicksimcontroller.cpp
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/quicksimcontroller.cpp
rename to gui2/source/darefl/quicksimeditor/quicksimcontroller.cpp
diff --git a/GUI/refl/source/darefl/quicksimeditor/quicksimcontroller.h b/gui2/source/darefl/quicksimeditor/quicksimcontroller.h
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/quicksimcontroller.h
rename to gui2/source/darefl/quicksimeditor/quicksimcontroller.h
diff --git a/GUI/refl/source/darefl/quicksimeditor/quicksimeditor.cpp b/gui2/source/darefl/quicksimeditor/quicksimeditor.cpp
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/quicksimeditor.cpp
rename to gui2/source/darefl/quicksimeditor/quicksimeditor.cpp
diff --git a/GUI/refl/source/darefl/quicksimeditor/quicksimeditor.h b/gui2/source/darefl/quicksimeditor/quicksimeditor.h
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/quicksimeditor.h
rename to gui2/source/darefl/quicksimeditor/quicksimeditor.h
diff --git a/GUI/refl/source/darefl/quicksimeditor/quicksimeditortoolbar.cpp b/gui2/source/darefl/quicksimeditor/quicksimeditortoolbar.cpp
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/quicksimeditortoolbar.cpp
rename to gui2/source/darefl/quicksimeditor/quicksimeditortoolbar.cpp
diff --git a/GUI/refl/source/darefl/quicksimeditor/quicksimeditortoolbar.h b/gui2/source/darefl/quicksimeditor/quicksimeditortoolbar.h
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/quicksimeditortoolbar.h
rename to gui2/source/darefl/quicksimeditor/quicksimeditortoolbar.h
diff --git a/GUI/refl/source/darefl/quicksimeditor/quicksimutils.cpp b/gui2/source/darefl/quicksimeditor/quicksimutils.cpp
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/quicksimutils.cpp
rename to gui2/source/darefl/quicksimeditor/quicksimutils.cpp
diff --git a/GUI/refl/source/darefl/quicksimeditor/quicksimutils.h b/gui2/source/darefl/quicksimeditor/quicksimutils.h
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/quicksimutils.h
rename to gui2/source/darefl/quicksimeditor/quicksimutils.h
diff --git a/GUI/refl/source/darefl/quicksimeditor/simplotcontroller.cpp b/gui2/source/darefl/quicksimeditor/simplotcontroller.cpp
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/simplotcontroller.cpp
rename to gui2/source/darefl/quicksimeditor/simplotcontroller.cpp
diff --git a/GUI/refl/source/darefl/quicksimeditor/simplotcontroller.h b/gui2/source/darefl/quicksimeditor/simplotcontroller.h
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/simplotcontroller.h
rename to gui2/source/darefl/quicksimeditor/simplotcontroller.h
diff --git a/GUI/refl/source/darefl/quicksimeditor/simplotwidget.cpp b/gui2/source/darefl/quicksimeditor/simplotwidget.cpp
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/simplotwidget.cpp
rename to gui2/source/darefl/quicksimeditor/simplotwidget.cpp
diff --git a/GUI/refl/source/darefl/quicksimeditor/simplotwidget.h b/gui2/source/darefl/quicksimeditor/simplotwidget.h
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/simplotwidget.h
rename to gui2/source/darefl/quicksimeditor/simplotwidget.h
diff --git a/GUI/refl/source/darefl/quicksimeditor/speculartoysimulation.cpp b/gui2/source/darefl/quicksimeditor/speculartoysimulation.cpp
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/speculartoysimulation.cpp
rename to gui2/source/darefl/quicksimeditor/speculartoysimulation.cpp
diff --git a/GUI/refl/source/darefl/quicksimeditor/speculartoysimulation.h b/gui2/source/darefl/quicksimeditor/speculartoysimulation.h
similarity index 100%
rename from GUI/refl/source/darefl/quicksimeditor/speculartoysimulation.h
rename to gui2/source/darefl/quicksimeditor/speculartoysimulation.h
diff --git a/GUI/refl/source/darefl/resources/CMakeLists.txt b/gui2/source/darefl/resources/CMakeLists.txt
similarity index 100%
rename from GUI/refl/source/darefl/resources/CMakeLists.txt
rename to gui2/source/darefl/resources/CMakeLists.txt
diff --git a/GUI/refl/source/darefl/resources/icons.qrc b/gui2/source/darefl/resources/icons.qrc
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons.qrc
rename to gui2/source/darefl/resources/icons.qrc
diff --git a/GUI/refl/source/darefl/resources/icons/F-letter_1000x.png b/gui2/source/darefl/resources/icons/F-letter_1000x.png
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/F-letter_1000x.png
rename to gui2/source/darefl/resources/icons/F-letter_1000x.png
diff --git a/GUI/refl/source/darefl/resources/icons/arrow-down-circle-outline.svg b/gui2/source/darefl/resources/icons/arrow-down-circle-outline.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/arrow-down-circle-outline.svg
rename to gui2/source/darefl/resources/icons/arrow-down-circle-outline.svg
diff --git a/GUI/refl/source/darefl/resources/icons/arrow-up-circle-outline.svg b/gui2/source/darefl/resources/icons/arrow-up-circle-outline.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/arrow-up-circle-outline.svg
rename to gui2/source/darefl/resources/icons/arrow-up-circle-outline.svg
diff --git a/GUI/refl/source/darefl/resources/icons/aspect-ratio.svg b/gui2/source/darefl/resources/icons/aspect-ratio.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/aspect-ratio.svg
rename to gui2/source/darefl/resources/icons/aspect-ratio.svg
diff --git a/GUI/refl/source/darefl/resources/icons/beaker-remove-outline.svg b/gui2/source/darefl/resources/icons/beaker-remove-outline.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/beaker-remove-outline.svg
rename to gui2/source/darefl/resources/icons/beaker-remove-outline.svg
diff --git a/GUI/refl/source/darefl/resources/icons/card-bulleted-outline.svg b/gui2/source/darefl/resources/icons/card-bulleted-outline.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/card-bulleted-outline.svg
rename to gui2/source/darefl/resources/icons/card-bulleted-outline.svg
diff --git a/GUI/refl/source/darefl/resources/icons/close-circle-outline.svg b/gui2/source/darefl/resources/icons/close-circle-outline.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/close-circle-outline.svg
rename to gui2/source/darefl/resources/icons/close-circle-outline.svg
diff --git a/GUI/refl/source/darefl/resources/icons/cog-outline.svg b/gui2/source/darefl/resources/icons/cog-outline.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/cog-outline.svg
rename to gui2/source/darefl/resources/icons/cog-outline.svg
diff --git a/GUI/refl/source/darefl/resources/icons/dock-left.svg b/gui2/source/darefl/resources/icons/dock-left.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/dock-left.svg
rename to gui2/source/darefl/resources/icons/dock-left.svg
diff --git a/GUI/refl/source/darefl/resources/icons/dock-right.svg b/gui2/source/darefl/resources/icons/dock-right.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/dock-right.svg
rename to gui2/source/darefl/resources/icons/dock-right.svg
diff --git a/GUI/refl/source/darefl/resources/icons/export.svg b/gui2/source/darefl/resources/icons/export.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/export.svg
rename to gui2/source/darefl/resources/icons/export.svg
diff --git a/GUI/refl/source/darefl/resources/icons/import.svg b/gui2/source/darefl/resources/icons/import.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/import.svg
rename to gui2/source/darefl/resources/icons/import.svg
diff --git a/GUI/refl/source/darefl/resources/icons/layers-outline.svg b/gui2/source/darefl/resources/icons/layers-outline.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/layers-outline.svg
rename to gui2/source/darefl/resources/icons/layers-outline.svg
diff --git a/GUI/refl/source/darefl/resources/icons/layers-triple-outline.svg b/gui2/source/darefl/resources/icons/layers-triple-outline.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/layers-triple-outline.svg
rename to gui2/source/darefl/resources/icons/layers-triple-outline.svg
diff --git a/GUI/refl/source/darefl/resources/icons/play-circle-outline.svg b/gui2/source/darefl/resources/icons/play-circle-outline.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/play-circle-outline.svg
rename to gui2/source/darefl/resources/icons/play-circle-outline.svg
diff --git a/GUI/refl/source/darefl/resources/icons/plus-box-multiple-outline.svg b/gui2/source/darefl/resources/icons/plus-box-multiple-outline.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/plus-box-multiple-outline.svg
rename to gui2/source/darefl/resources/icons/plus-box-multiple-outline.svg
diff --git a/GUI/refl/source/darefl/resources/icons/plus-box-outline.svg b/gui2/source/darefl/resources/icons/plus-box-outline.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/plus-box-outline.svg
rename to gui2/source/darefl/resources/icons/plus-box-outline.svg
diff --git a/GUI/refl/source/darefl/resources/icons/plus-circle-multiple-outline.svg b/gui2/source/darefl/resources/icons/plus-circle-multiple-outline.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/plus-circle-multiple-outline.svg
rename to gui2/source/darefl/resources/icons/plus-circle-multiple-outline.svg
diff --git a/GUI/refl/source/darefl/resources/icons/plus-circle-outline.svg b/gui2/source/darefl/resources/icons/plus-circle-outline.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/plus-circle-outline.svg
rename to gui2/source/darefl/resources/icons/plus-circle-outline.svg
diff --git a/GUI/refl/source/darefl/resources/icons/redo.svg b/gui2/source/darefl/resources/icons/redo.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/redo.svg
rename to gui2/source/darefl/resources/icons/redo.svg
diff --git a/GUI/refl/source/darefl/resources/icons/set-merge.svg b/gui2/source/darefl/resources/icons/set-merge.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/set-merge.svg
rename to gui2/source/darefl/resources/icons/set-merge.svg
diff --git a/GUI/refl/source/darefl/resources/icons/undo.svg b/gui2/source/darefl/resources/icons/undo.svg
similarity index 100%
rename from GUI/refl/source/darefl/resources/icons/undo.svg
rename to gui2/source/darefl/resources/icons/undo.svg
diff --git a/GUI/refl/source/darefl/resources/resources.h b/gui2/source/darefl/resources/resources.h
similarity index 100%
rename from GUI/refl/source/darefl/resources/resources.h
rename to gui2/source/darefl/resources/resources.h
diff --git a/GUI/refl/source/darefl/settingsview/CMakeLists.txt b/gui2/source/darefl/settingsview/CMakeLists.txt
similarity index 100%
rename from GUI/refl/source/darefl/settingsview/CMakeLists.txt
rename to gui2/source/darefl/settingsview/CMakeLists.txt
diff --git a/GUI/refl/source/darefl/settingsview/settingsview.cpp b/gui2/source/darefl/settingsview/settingsview.cpp
similarity index 100%
rename from GUI/refl/source/darefl/settingsview/settingsview.cpp
rename to gui2/source/darefl/settingsview/settingsview.cpp
diff --git a/GUI/refl/source/darefl/settingsview/settingsview.h b/gui2/source/darefl/settingsview/settingsview.h
similarity index 100%
rename from GUI/refl/source/darefl/settingsview/settingsview.h
rename to gui2/source/darefl/settingsview/settingsview.h
diff --git a/GUI/refl/source/darefl/sldeditor/CMakeLists.txt b/gui2/source/darefl/sldeditor/CMakeLists.txt
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/CMakeLists.txt
rename to gui2/source/darefl/sldeditor/CMakeLists.txt
diff --git a/GUI/refl/source/darefl/sldeditor/elementview.cpp b/gui2/source/darefl/sldeditor/elementview.cpp
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/elementview.cpp
rename to gui2/source/darefl/sldeditor/elementview.cpp
diff --git a/GUI/refl/source/darefl/sldeditor/elementview.h b/gui2/source/darefl/sldeditor/elementview.h
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/elementview.h
rename to gui2/source/darefl/sldeditor/elementview.h
diff --git a/GUI/refl/source/darefl/sldeditor/graphicsscene.cpp b/gui2/source/darefl/sldeditor/graphicsscene.cpp
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/graphicsscene.cpp
rename to gui2/source/darefl/sldeditor/graphicsscene.cpp
diff --git a/GUI/refl/source/darefl/sldeditor/graphicsscene.h b/gui2/source/darefl/sldeditor/graphicsscene.h
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/graphicsscene.h
rename to gui2/source/darefl/sldeditor/graphicsscene.h
diff --git a/GUI/refl/source/darefl/sldeditor/handleelementview.cpp b/gui2/source/darefl/sldeditor/handleelementview.cpp
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/handleelementview.cpp
rename to gui2/source/darefl/sldeditor/handleelementview.cpp
diff --git a/GUI/refl/source/darefl/sldeditor/handleelementview.h b/gui2/source/darefl/sldeditor/handleelementview.h
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/handleelementview.h
rename to gui2/source/darefl/sldeditor/handleelementview.h
diff --git a/GUI/refl/source/darefl/sldeditor/layerelementcontroller.cpp b/gui2/source/darefl/sldeditor/layerelementcontroller.cpp
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/layerelementcontroller.cpp
rename to gui2/source/darefl/sldeditor/layerelementcontroller.cpp
diff --git a/GUI/refl/source/darefl/sldeditor/layerelementcontroller.h b/gui2/source/darefl/sldeditor/layerelementcontroller.h
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/layerelementcontroller.h
rename to gui2/source/darefl/sldeditor/layerelementcontroller.h
diff --git a/GUI/refl/source/darefl/sldeditor/layerelementitem.cpp b/gui2/source/darefl/sldeditor/layerelementitem.cpp
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/layerelementitem.cpp
rename to gui2/source/darefl/sldeditor/layerelementitem.cpp
diff --git a/GUI/refl/source/darefl/sldeditor/layerelementitem.h b/gui2/source/darefl/sldeditor/layerelementitem.h
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/layerelementitem.h
rename to gui2/source/darefl/sldeditor/layerelementitem.h
diff --git a/GUI/refl/source/darefl/sldeditor/roughnesselementview.cpp b/gui2/source/darefl/sldeditor/roughnesselementview.cpp
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/roughnesselementview.cpp
rename to gui2/source/darefl/sldeditor/roughnesselementview.cpp
diff --git a/GUI/refl/source/darefl/sldeditor/roughnesselementview.h b/gui2/source/darefl/sldeditor/roughnesselementview.h
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/roughnesselementview.h
rename to gui2/source/darefl/sldeditor/roughnesselementview.h
diff --git a/GUI/refl/source/darefl/sldeditor/segmentelementview.cpp b/gui2/source/darefl/sldeditor/segmentelementview.cpp
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/segmentelementview.cpp
rename to gui2/source/darefl/sldeditor/segmentelementview.cpp
diff --git a/GUI/refl/source/darefl/sldeditor/segmentelementview.h b/gui2/source/darefl/sldeditor/segmentelementview.h
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/segmentelementview.h
rename to gui2/source/darefl/sldeditor/segmentelementview.h
diff --git a/GUI/refl/source/darefl/sldeditor/sldeditor.cpp b/gui2/source/darefl/sldeditor/sldeditor.cpp
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/sldeditor.cpp
rename to gui2/source/darefl/sldeditor/sldeditor.cpp
diff --git a/GUI/refl/source/darefl/sldeditor/sldeditor.h b/gui2/source/darefl/sldeditor/sldeditor.h
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/sldeditor.h
rename to gui2/source/darefl/sldeditor/sldeditor.h
diff --git a/GUI/refl/source/darefl/sldeditor/sldeditoractions.cpp b/gui2/source/darefl/sldeditor/sldeditoractions.cpp
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/sldeditoractions.cpp
rename to gui2/source/darefl/sldeditor/sldeditoractions.cpp
diff --git a/GUI/refl/source/darefl/sldeditor/sldeditoractions.h b/gui2/source/darefl/sldeditor/sldeditoractions.h
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/sldeditoractions.h
rename to gui2/source/darefl/sldeditor/sldeditoractions.h
diff --git a/GUI/refl/source/darefl/sldeditor/sldeditortoolbar.cpp b/gui2/source/darefl/sldeditor/sldeditortoolbar.cpp
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/sldeditortoolbar.cpp
rename to gui2/source/darefl/sldeditor/sldeditortoolbar.cpp
diff --git a/GUI/refl/source/darefl/sldeditor/sldeditortoolbar.h b/gui2/source/darefl/sldeditor/sldeditortoolbar.h
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/sldeditortoolbar.h
rename to gui2/source/darefl/sldeditor/sldeditortoolbar.h
diff --git a/GUI/refl/source/darefl/sldeditor/sldelementcontroller.cpp b/gui2/source/darefl/sldeditor/sldelementcontroller.cpp
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/sldelementcontroller.cpp
rename to gui2/source/darefl/sldeditor/sldelementcontroller.cpp
diff --git a/GUI/refl/source/darefl/sldeditor/sldelementcontroller.h b/gui2/source/darefl/sldeditor/sldelementcontroller.h
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/sldelementcontroller.h
rename to gui2/source/darefl/sldeditor/sldelementcontroller.h
diff --git a/GUI/refl/source/darefl/sldeditor/sldelementmodel.cpp b/gui2/source/darefl/sldeditor/sldelementmodel.cpp
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/sldelementmodel.cpp
rename to gui2/source/darefl/sldeditor/sldelementmodel.cpp
diff --git a/GUI/refl/source/darefl/sldeditor/sldelementmodel.h b/gui2/source/darefl/sldeditor/sldelementmodel.h
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/sldelementmodel.h
rename to gui2/source/darefl/sldeditor/sldelementmodel.h
diff --git a/GUI/refl/source/darefl/sldeditor/sldviewwidget.cpp b/gui2/source/darefl/sldeditor/sldviewwidget.cpp
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/sldviewwidget.cpp
rename to gui2/source/darefl/sldeditor/sldviewwidget.cpp
diff --git a/GUI/refl/source/darefl/sldeditor/sldviewwidget.h b/gui2/source/darefl/sldeditor/sldviewwidget.h
similarity index 100%
rename from GUI/refl/source/darefl/sldeditor/sldviewwidget.h
rename to gui2/source/darefl/sldeditor/sldviewwidget.h
diff --git a/GUI/refl/source/darefl/welcomeview/CMakeLists.txt b/gui2/source/darefl/welcomeview/CMakeLists.txt
similarity index 100%
rename from GUI/refl/source/darefl/welcomeview/CMakeLists.txt
rename to gui2/source/darefl/welcomeview/CMakeLists.txt
diff --git a/GUI/refl/source/darefl/welcomeview/openprojectwidget.cpp b/gui2/source/darefl/welcomeview/openprojectwidget.cpp
similarity index 100%
rename from GUI/refl/source/darefl/welcomeview/openprojectwidget.cpp
rename to gui2/source/darefl/welcomeview/openprojectwidget.cpp
diff --git a/GUI/refl/source/darefl/welcomeview/openprojectwidget.h b/gui2/source/darefl/welcomeview/openprojectwidget.h
similarity index 100%
rename from GUI/refl/source/darefl/welcomeview/openprojectwidget.h
rename to gui2/source/darefl/welcomeview/openprojectwidget.h
diff --git a/GUI/refl/source/darefl/welcomeview/projecthandler.cpp b/gui2/source/darefl/welcomeview/projecthandler.cpp
similarity index 100%
rename from GUI/refl/source/darefl/welcomeview/projecthandler.cpp
rename to gui2/source/darefl/welcomeview/projecthandler.cpp
diff --git a/GUI/refl/source/darefl/welcomeview/projecthandler.h b/gui2/source/darefl/welcomeview/projecthandler.h
similarity index 100%
rename from GUI/refl/source/darefl/welcomeview/projecthandler.h
rename to gui2/source/darefl/welcomeview/projecthandler.h
diff --git a/GUI/refl/source/darefl/welcomeview/projectpanewidget.cpp b/gui2/source/darefl/welcomeview/projectpanewidget.cpp
similarity index 100%
rename from GUI/refl/source/darefl/welcomeview/projectpanewidget.cpp
rename to gui2/source/darefl/welcomeview/projectpanewidget.cpp
diff --git a/GUI/refl/source/darefl/welcomeview/projectpanewidget.h b/gui2/source/darefl/welcomeview/projectpanewidget.h
similarity index 100%
rename from GUI/refl/source/darefl/welcomeview/projectpanewidget.h
rename to gui2/source/darefl/welcomeview/projectpanewidget.h
diff --git a/GUI/refl/source/darefl/welcomeview/recentprojectsettings.cpp b/gui2/source/darefl/welcomeview/recentprojectsettings.cpp
similarity index 100%
rename from GUI/refl/source/darefl/welcomeview/recentprojectsettings.cpp
rename to gui2/source/darefl/welcomeview/recentprojectsettings.cpp
diff --git a/GUI/refl/source/darefl/welcomeview/recentprojectsettings.h b/gui2/source/darefl/welcomeview/recentprojectsettings.h
similarity index 100%
rename from GUI/refl/source/darefl/welcomeview/recentprojectsettings.h
rename to gui2/source/darefl/welcomeview/recentprojectsettings.h
diff --git a/GUI/refl/source/darefl/welcomeview/recentprojectwidget.cpp b/gui2/source/darefl/welcomeview/recentprojectwidget.cpp
similarity index 100%
rename from GUI/refl/source/darefl/welcomeview/recentprojectwidget.cpp
rename to gui2/source/darefl/welcomeview/recentprojectwidget.cpp
diff --git a/GUI/refl/source/darefl/welcomeview/recentprojectwidget.h b/gui2/source/darefl/welcomeview/recentprojectwidget.h
similarity index 100%
rename from GUI/refl/source/darefl/welcomeview/recentprojectwidget.h
rename to gui2/source/darefl/welcomeview/recentprojectwidget.h
diff --git a/GUI/refl/source/darefl/welcomeview/userinteractor.cpp b/gui2/source/darefl/welcomeview/userinteractor.cpp
similarity index 100%
rename from GUI/refl/source/darefl/welcomeview/userinteractor.cpp
rename to gui2/source/darefl/welcomeview/userinteractor.cpp
diff --git a/GUI/refl/source/darefl/welcomeview/userinteractor.h b/gui2/source/darefl/welcomeview/userinteractor.h
similarity index 100%
rename from GUI/refl/source/darefl/welcomeview/userinteractor.h
rename to gui2/source/darefl/welcomeview/userinteractor.h
diff --git a/GUI/refl/source/darefl/welcomeview/welcomeview.cpp b/gui2/source/darefl/welcomeview/welcomeview.cpp
similarity index 100%
rename from GUI/refl/source/darefl/welcomeview/welcomeview.cpp
rename to gui2/source/darefl/welcomeview/welcomeview.cpp
diff --git a/GUI/refl/source/darefl/welcomeview/welcomeview.h b/gui2/source/darefl/welcomeview/welcomeview.h
similarity index 100%
rename from GUI/refl/source/darefl/welcomeview/welcomeview.h
rename to gui2/source/darefl/welcomeview/welcomeview.h
diff --git a/GUI/refl/source/main.cpp b/gui2/source/main.cpp
similarity index 100%
rename from GUI/refl/source/main.cpp
rename to gui2/source/main.cpp
diff --git a/GUI/refl/tests/CMakeLists.txt b/gui2/tests/CMakeLists.txt
similarity index 100%
rename from GUI/refl/tests/CMakeLists.txt
rename to gui2/tests/CMakeLists.txt
diff --git a/GUI/refl/tests/data/Untitled 1.csv b/gui2/tests/data/Untitled 1.csv
similarity index 100%
rename from GUI/refl/tests/data/Untitled 1.csv
rename to gui2/tests/data/Untitled 1.csv
diff --git a/GUI/refl/tests/data/bilayer1.txt b/gui2/tests/data/bilayer1.txt
similarity index 100%
rename from GUI/refl/tests/data/bilayer1.txt
rename to gui2/tests/data/bilayer1.txt
diff --git a/GUI/refl/tests/data/bilayer2.txt b/gui2/tests/data/bilayer2.txt
similarity index 100%
rename from GUI/refl/tests/data/bilayer2.txt
rename to gui2/tests/data/bilayer2.txt
diff --git a/GUI/refl/tests/data/bilayer3a.txt b/gui2/tests/data/bilayer3a.txt
similarity index 100%
rename from GUI/refl/tests/data/bilayer3a.txt
rename to gui2/tests/data/bilayer3a.txt
diff --git a/GUI/refl/tests/data/bilayer3b.txt b/gui2/tests/data/bilayer3b.txt
similarity index 100%
rename from GUI/refl/tests/data/bilayer3b.txt
rename to gui2/tests/data/bilayer3b.txt
diff --git a/GUI/refl/tests/data/p15320_00017128_report.csv b/gui2/tests/data/p15320_00017128_report.csv
similarity index 100%
rename from GUI/refl/tests/data/p15320_00017128_report.csv
rename to gui2/tests/data/p15320_00017128_report.csv
diff --git a/GUI/refl/tests/libtestmachinery/CMakeLists.txt b/gui2/tests/libtestmachinery/CMakeLists.txt
similarity index 100%
rename from GUI/refl/tests/libtestmachinery/CMakeLists.txt
rename to gui2/tests/libtestmachinery/CMakeLists.txt
diff --git a/GUI/refl/tests/libtestmachinery/folderbasedtest.cpp b/gui2/tests/libtestmachinery/folderbasedtest.cpp
similarity index 100%
rename from GUI/refl/tests/libtestmachinery/folderbasedtest.cpp
rename to gui2/tests/libtestmachinery/folderbasedtest.cpp
diff --git a/GUI/refl/tests/libtestmachinery/folderbasedtest.h b/gui2/tests/libtestmachinery/folderbasedtest.h
similarity index 100%
rename from GUI/refl/tests/libtestmachinery/folderbasedtest.h
rename to gui2/tests/libtestmachinery/folderbasedtest.h
diff --git a/GUI/refl/tests/libtestmachinery/google_test.h b/gui2/tests/libtestmachinery/google_test.h
similarity index 100%
rename from GUI/refl/tests/libtestmachinery/google_test.h
rename to gui2/tests/libtestmachinery/google_test.h
diff --git a/GUI/refl/tests/libtestmachinery/test_utils.cpp b/gui2/tests/libtestmachinery/test_utils.cpp
similarity index 100%
rename from GUI/refl/tests/libtestmachinery/test_utils.cpp
rename to gui2/tests/libtestmachinery/test_utils.cpp
diff --git a/GUI/refl/tests/libtestmachinery/test_utils.h b/gui2/tests/libtestmachinery/test_utils.h
similarity index 100%
rename from GUI/refl/tests/libtestmachinery/test_utils.h
rename to gui2/tests/libtestmachinery/test_utils.h
diff --git a/GUI/refl/tests/libtestmachinery/widgetbasedtest.cpp b/gui2/tests/libtestmachinery/widgetbasedtest.cpp
similarity index 100%
rename from GUI/refl/tests/libtestmachinery/widgetbasedtest.cpp
rename to gui2/tests/libtestmachinery/widgetbasedtest.cpp
diff --git a/GUI/refl/tests/libtestmachinery/widgetbasedtest.h b/gui2/tests/libtestmachinery/widgetbasedtest.h
similarity index 100%
rename from GUI/refl/tests/libtestmachinery/widgetbasedtest.h
rename to gui2/tests/libtestmachinery/widgetbasedtest.h
diff --git a/GUI/refl/tests/testdareflcore/CMakeLists.txt b/gui2/tests/testdareflcore/CMakeLists.txt
similarity index 100%
rename from GUI/refl/tests/testdareflcore/CMakeLists.txt
rename to gui2/tests/testdareflcore/CMakeLists.txt
diff --git a/GUI/refl/tests/testdareflcore/TestAll.cpp b/gui2/tests/testdareflcore/TestAll.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/TestAll.cpp
rename to gui2/tests/testdareflcore/TestAll.cpp
diff --git a/GUI/refl/tests/testdareflcore/applicationmodels.test.cpp b/gui2/tests/testdareflcore/applicationmodels.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/applicationmodels.test.cpp
rename to gui2/tests/testdareflcore/applicationmodels.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/datahandler.test.cpp b/gui2/tests/testdareflcore/datahandler.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/datahandler.test.cpp
rename to gui2/tests/testdareflcore/datahandler.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/dataloader_utils.test.cpp b/gui2/tests/testdareflcore/dataloader_utils.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/dataloader_utils.test.cpp
rename to gui2/tests/testdareflcore/dataloader_utils.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/dataselectionmodel.test.cpp b/gui2/tests/testdareflcore/dataselectionmodel.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/dataselectionmodel.test.cpp
rename to gui2/tests/testdareflcore/dataselectionmodel.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/defaultparser.test.cpp b/gui2/tests/testdareflcore/defaultparser.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/defaultparser.test.cpp
rename to gui2/tests/testdareflcore/defaultparser.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/experimentaldatamodel.test.cpp b/gui2/tests/testdareflcore/experimentaldatamodel.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/experimentaldatamodel.test.cpp
rename to gui2/tests/testdareflcore/experimentaldatamodel.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/importdataeditoractions.test.cpp b/gui2/tests/testdareflcore/importdataeditoractions.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/importdataeditoractions.test.cpp
rename to gui2/tests/testdareflcore/importdataeditoractions.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/importtableheader.test.cpp b/gui2/tests/testdareflcore/importtableheader.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/importtableheader.test.cpp
rename to gui2/tests/testdareflcore/importtableheader.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/instrumentitems.test.cpp b/gui2/tests/testdareflcore/instrumentitems.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/instrumentitems.test.cpp
rename to gui2/tests/testdareflcore/instrumentitems.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/layereditoractions.test.cpp b/gui2/tests/testdareflcore/layereditoractions.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/layereditoractions.test.cpp
rename to gui2/tests/testdareflcore/layereditoractions.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/layerelements.test.cpp b/gui2/tests/testdareflcore/layerelements.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/layerelements.test.cpp
rename to gui2/tests/testdareflcore/layerelements.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/layeritems.test.cpp b/gui2/tests/testdareflcore/layeritems.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/layeritems.test.cpp
rename to gui2/tests/testdareflcore/layeritems.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/layerselectionmodel.test.cpp b/gui2/tests/testdareflcore/layerselectionmodel.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/layerselectionmodel.test.cpp
rename to gui2/tests/testdareflcore/layerselectionmodel.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/layerviewmodel.test.cpp b/gui2/tests/testdareflcore/layerviewmodel.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/layerviewmodel.test.cpp
rename to gui2/tests/testdareflcore/layerviewmodel.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/materialprofile.test.cpp b/gui2/tests/testdareflcore/materialprofile.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/materialprofile.test.cpp
rename to gui2/tests/testdareflcore/materialprofile.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/modelutils.test.cpp b/gui2/tests/testdareflcore/modelutils.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/modelutils.test.cpp
rename to gui2/tests/testdareflcore/modelutils.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/quicksimutils.test.cpp b/gui2/tests/testdareflcore/quicksimutils.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/quicksimutils.test.cpp
rename to gui2/tests/testdareflcore/quicksimutils.test.cpp
diff --git a/GUI/refl/tests/testdareflcore/sldelementcontroller.test.cpp b/gui2/tests/testdareflcore/sldelementcontroller.test.cpp
similarity index 100%
rename from GUI/refl/tests/testdareflcore/sldelementcontroller.test.cpp
rename to gui2/tests/testdareflcore/sldelementcontroller.test.cpp