diff --git a/GUI/Model/G5/ItemCatalog.h b/GUI/Model/G5/ItemCatalog.h
index cbb8649570c75b4133368d0294afaa64d0966a55..c4eb82ad99b125ef89f46c7c7d454125068492ec 100644
--- a/GUI/Model/G5/ItemCatalog.h
+++ b/GUI/Model/G5/ItemCatalog.h
@@ -54,5 +54,4 @@ private:
     QMap<QString, UiInfo> m_uiInfos;
 };
 
-
 #endif // BORNAGAIN_GUI_MODEL_G5_ITEMCATALOG_H
diff --git a/GUI/Model/From/FromDomain.cpp b/GUI/View/FromDomain/FromDomain.cpp
similarity index 99%
rename from GUI/Model/From/FromDomain.cpp
rename to GUI/View/FromDomain/FromDomain.cpp
index 53a01ccf466bd4d2354374dd732f654378d8a118..b592b19f2324c9fd58370a75924a377b8d631938 100644
--- a/GUI/Model/From/FromDomain.cpp
+++ b/GUI/View/FromDomain/FromDomain.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/From/FromDomain.cpp
+//! @file      GUI/View/FromDomain/FromDomain.cpp
 //! @brief     Implements namespace TransformFromDomain
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/From/FromDomain.h"
+#include "GUI/View/FromDomain/FromDomain.h"
 #include "Base/Const/Units.h"
 #include "Core/Background/ConstantBackground.h"
 #include "Core/Background/PoissonNoiseBackground.h"
diff --git a/GUI/Model/From/FromDomain.h b/GUI/View/FromDomain/FromDomain.h
similarity index 95%
rename from GUI/Model/From/FromDomain.h
rename to GUI/View/FromDomain/FromDomain.h
index 884d69ce9749dee32068a3dcee8ca6eebcc4cf60..b61a3180734918a71c53fa5c18986c671ce1950f 100644
--- a/GUI/Model/From/FromDomain.h
+++ b/GUI/View/FromDomain/FromDomain.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/From/FromDomain.h
+//! @file      GUI/View/FromDomain/FromDomain.h
 //! @brief     Defines namespace GUI::Transform::FromDomain
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_FROM_FROMDOMAIN_H
-#define BORNAGAIN_GUI_MODEL_FROM_FROMDOMAIN_H
+#ifndef BORNAGAIN_GUI_VIEW_FROMDOMAIN_FROMDOMAIN_H
+#define BORNAGAIN_GUI_VIEW_FROMDOMAIN_FROMDOMAIN_H
 
 #include <QString>
 #include <variant>
@@ -132,4 +132,4 @@ void setFormFactor(std::variant<ParticleItem*, MesoCrystalItem*> parent,
 
 } // namespace GUI::Transform::FromDomain
 
-#endif // BORNAGAIN_GUI_MODEL_FROM_FROMDOMAIN_H
+#endif // BORNAGAIN_GUI_VIEW_FROMDOMAIN_FROMDOMAIN_H
diff --git a/GUI/Model/From/GUIExamplesFactory.cpp b/GUI/View/FromDomain/GUIExamplesFactory.cpp
similarity index 94%
rename from GUI/Model/From/GUIExamplesFactory.cpp
rename to GUI/View/FromDomain/GUIExamplesFactory.cpp
index ccb7bd9703cb121b325391534e762ad3c6fe8509..ad076cf91b30e6528360c64af95541a3695d9750 100644
--- a/GUI/Model/From/GUIExamplesFactory.cpp
+++ b/GUI/View/FromDomain/GUIExamplesFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/From/GUIExamplesFactory.cpp
+//! @file      GUI/View/FromDomain/GUIExamplesFactory.cpp
 //! @brief     Implements class GUI::ExamplesFactory
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,9 +12,9 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/From/GUIExamplesFactory.h"
+#include "GUI/View/FromDomain/GUIExamplesFactory.h"
 #include "Base/Util/Assert.h"
-#include "GUI/Model/From/GUIObjectBuilder.h"
+#include "GUI/View/FromDomain/GUIObjectBuilder.h"
 #include "Sample/Multilayer/MultiLayer.h"
 #include "Sample/StandardSamples/ExemplarySamples.h"
 #include <QMap>
diff --git a/GUI/Model/From/GUIExamplesFactory.h b/GUI/View/FromDomain/GUIExamplesFactory.h
similarity index 84%
rename from GUI/Model/From/GUIExamplesFactory.h
rename to GUI/View/FromDomain/GUIExamplesFactory.h
index 3ed5cc740ff12b67225cd0e770765d97e732019c..007a4cfded07323e482991c16fb47ed56836f839 100644
--- a/GUI/Model/From/GUIExamplesFactory.h
+++ b/GUI/View/FromDomain/GUIExamplesFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/From/GUIExamplesFactory.h
+//! @file      GUI/View/FromDomain/GUIExamplesFactory.h
 //! @brief     Defines class GUI::ExamplesFactory
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_FROM_GUIEXAMPLESFACTORY_H
-#define BORNAGAIN_GUI_MODEL_FROM_GUIEXAMPLESFACTORY_H
+#ifndef BORNAGAIN_GUI_VIEW_FROMDOMAIN_GUIEXAMPLESFACTORY_H
+#define BORNAGAIN_GUI_VIEW_FROMDOMAIN_GUIEXAMPLESFACTORY_H
 
 #include <QString>
 
@@ -39,4 +39,4 @@ std::tuple<QString, QString> exampleInfo(const QString& name);
 
 } // namespace GUI::ExamplesFactory
 
-#endif // BORNAGAIN_GUI_MODEL_FROM_GUIEXAMPLESFACTORY_H
+#endif // BORNAGAIN_GUI_VIEW_FROMDOMAIN_GUIEXAMPLESFACTORY_H
diff --git a/GUI/Model/From/GUIObjectBuilder.cpp b/GUI/View/FromDomain/GUIObjectBuilder.cpp
similarity index 96%
rename from GUI/Model/From/GUIObjectBuilder.cpp
rename to GUI/View/FromDomain/GUIObjectBuilder.cpp
index d058820cb50006168763a7057e890906d1a55ff3..67b563ed3647e749b23a869cbd9988f3f7d886fe 100644
--- a/GUI/Model/From/GUIObjectBuilder.cpp
+++ b/GUI/View/FromDomain/GUIObjectBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/From/GUIObjectBuilder.cpp
+//! @file      GUI/View/FromDomain/GUIObjectBuilder.cpp
 //! @brief     Implements GUI::Model::ObjectBuilder namespace
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,12 +12,12 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/From/GUIObjectBuilder.h"
+#include "GUI/View/FromDomain/GUIObjectBuilder.h"
 #include "Base/Const/Units.h"
 #include "Base/Util/Assert.h"
 #include "Core/Simulation/includeSimulations.h"
-#include "GUI/Model/From/FromDomain.h"
-#include "GUI/Model/From/GUISampleBuilder.h"
+#include "GUI/View/FromDomain/FromDomain.h"
+#include "GUI/View/FromDomain/GUISampleBuilder.h"
 #include "GUI/Model/Instrument/InstrumentItems.h"
 #include "GUI/Model/Instrument/InstrumentModel.h"
 #include "GUI/Support/Data/SimulationOptionsItem.h"
diff --git a/GUI/Model/From/GUIObjectBuilder.h b/GUI/View/FromDomain/GUIObjectBuilder.h
similarity index 86%
rename from GUI/Model/From/GUIObjectBuilder.h
rename to GUI/View/FromDomain/GUIObjectBuilder.h
index ecafa2c968c77dc7b8c516b3eda510fd16b2819c..5e1b5125414a46edcd4258afa2e1dfafa5bae76b 100644
--- a/GUI/Model/From/GUIObjectBuilder.h
+++ b/GUI/View/FromDomain/GUIObjectBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/From/GUIObjectBuilder.h
+//! @file      GUI/View/FromDomain/GUIObjectBuilder.h
 //! @brief     Defines namespace GUI::Model::ObjectBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_FROM_GUIOBJECTBUILDER_H
-#define BORNAGAIN_GUI_MODEL_FROM_GUIOBJECTBUILDER_H
+#ifndef BORNAGAIN_GUI_VIEW_FROMDOMAIN_GUIOBJECTBUILDER_H
+#define BORNAGAIN_GUI_VIEW_FROMDOMAIN_GUIOBJECTBUILDER_H
 
 #include <QString>
 
@@ -42,4 +42,4 @@ MultiLayerItem* createMultiLayerItem(MaterialModel* materialModel, const MultiLa
 
 } // namespace GUI::Transform::FromDomain
 
-#endif // BORNAGAIN_GUI_MODEL_FROM_GUIOBJECTBUILDER_H
+#endif // BORNAGAIN_GUI_VIEW_FROMDOMAIN_GUIOBJECTBUILDER_H
diff --git a/GUI/Model/From/GUISampleBuilder.cpp b/GUI/View/FromDomain/GUISampleBuilder.cpp
similarity index 98%
rename from GUI/Model/From/GUISampleBuilder.cpp
rename to GUI/View/FromDomain/GUISampleBuilder.cpp
index 10feb7147bee731fd995d37b22d7ca89d73542da..9efbe2c54f787fdd3aa3df562468e8b50a00b991 100644
--- a/GUI/Model/From/GUISampleBuilder.cpp
+++ b/GUI/View/FromDomain/GUISampleBuilder.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/From/GUISampleBuilder.cpp
+//! @file      GUI/View/FromDomain/GUISampleBuilder.cpp
 //! @brief     Implements class GUISampleBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/From/GUISampleBuilder.h"
-#include "GUI/Model/From/FromDomain.h"
+#include "GUI/View/FromDomain/GUISampleBuilder.h"
+#include "GUI/View/FromDomain/FromDomain.h"
 #include "GUI/Model/Material/MaterialItem.h"
 #include "GUI/Model/Material/MaterialModel.h"
 #include "GUI/Model/Sample/LayerItem.h"
diff --git a/GUI/Model/From/GUISampleBuilder.h b/GUI/View/FromDomain/GUISampleBuilder.h
similarity index 89%
rename from GUI/Model/From/GUISampleBuilder.h
rename to GUI/View/FromDomain/GUISampleBuilder.h
index f2d52cb5858bda242069dff57c99f0dc0679a256..eca337cf8aea6fa04b13ebe1cb3f230e329aac0c 100644
--- a/GUI/Model/From/GUISampleBuilder.h
+++ b/GUI/View/FromDomain/GUISampleBuilder.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/From/GUISampleBuilder.h
+//! @file      GUI/View/FromDomain/GUISampleBuilder.h
 //! @brief     Defines class GUISampleBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_FROM_GUISAMPLEBUILDER_H
-#define BORNAGAIN_GUI_MODEL_FROM_GUISAMPLEBUILDER_H
+#ifndef BORNAGAIN_GUI_VIEW_FROMDOMAIN_GUISAMPLEBUILDER_H
+#define BORNAGAIN_GUI_VIEW_FROMDOMAIN_GUISAMPLEBUILDER_H
 
 #include <QString>
 #include <functional>
@@ -63,4 +63,4 @@ private:
 
 } // namespace GUI::Transform::FromDomain
 
-#endif // BORNAGAIN_GUI_MODEL_FROM_GUISAMPLEBUILDER_H
+#endif // BORNAGAIN_GUI_VIEW_FROMDOMAIN_GUISAMPLEBUILDER_H
diff --git a/GUI/View/Project/PyImportAssistant.cpp b/GUI/View/Project/PyImportAssistant.cpp
index ddaaba4a093699cd5f76991ddd6b6556f441197b..e522f068eab42527a95172e9ed2a6e3c1d9d692d 100644
--- a/GUI/View/Project/PyImportAssistant.cpp
+++ b/GUI/View/Project/PyImportAssistant.cpp
@@ -19,8 +19,8 @@
 #include "Base/Util/Assert.h"
 #include "Base/Util/SysUtils.h"
 #include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Model/From/GUIObjectBuilder.h"
-#include "GUI/Model/From/GUISampleBuilder.h"
+#include "GUI/View/FromDomain/GUIObjectBuilder.h"
+#include "GUI/View/FromDomain/GUISampleBuilder.h"
 #include "GUI/Support/IO/ProjectUtils.h"
 #include "GUI/Util/Path.h"
 #include "GUI/Util/String.h"
diff --git a/GUI/View/SampleDesigner/SampleListModel.cpp b/GUI/View/SampleDesigner/SampleListModel.cpp
index 8927bae38b7753870a09c2c11d21223a5dd0eb37..952db6a02afc578ce961e44c3982dfd858ba0186 100644
--- a/GUI/View/SampleDesigner/SampleListModel.cpp
+++ b/GUI/View/SampleDesigner/SampleListModel.cpp
@@ -14,8 +14,8 @@
 
 #include "GUI/View/SampleDesigner/SampleListModel.h"
 #include "Base/Util/Assert.h"
-#include "GUI/Model/From/GUIExamplesFactory.h"
-#include "GUI/Model/From/GUISampleBuilder.h"
+#include "GUI/View/FromDomain/GUIExamplesFactory.h"
+#include "GUI/View/FromDomain/GUISampleBuilder.h"
 #include "GUI/Model/Sample/MultiLayerItem.h"
 #include "GUI/Model/Sample/SampleModel.h"
 #include "GUI/Util/String.h"
diff --git a/GUI/View/SampleDesigner/SampleListView.cpp b/GUI/View/SampleDesigner/SampleListView.cpp
index 3ae7e3f22f6973acfbadc921e115ad6687824a03..7360ebc843f7e5891128290767388113b060e7cc 100644
--- a/GUI/View/SampleDesigner/SampleListView.cpp
+++ b/GUI/View/SampleDesigner/SampleListView.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/SampleDesigner/SampleListView.h"
 #include "Base/Util/SysUtils.h"
 #include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Model/From/GUIExamplesFactory.h"
+#include "GUI/View/FromDomain/GUIExamplesFactory.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Model/Sample/MultiLayerItem.h"
 #include "GUI/Util/OSInfo.h"
diff --git a/Tests/Functional/GUI/Check.cpp b/Tests/Functional/GUI/Check.cpp
index 4674cf3d88f3ff1a4d2662dbd4fb68aa9d09dc99..09b42c6f7494c529eb73f2a50052573b8ea116c5 100644
--- a/Tests/Functional/GUI/Check.cpp
+++ b/Tests/Functional/GUI/Check.cpp
@@ -19,7 +19,7 @@
 #include "Device/Data/DataUtils.h"
 #include "Device/Histo/IntensityDataIOFactory.h"
 #include "Device/Histo/SimulationResult.h"
-#include "GUI/Model/From/GUIObjectBuilder.h"
+#include "GUI/View/FromDomain/GUIObjectBuilder.h"
 #include "GUI/Model/Instrument/InstrumentItems.h"
 #include "GUI/Model/Instrument/InstrumentModel.h"
 #include "GUI/Model/Material/MaterialModel.h"
diff --git a/Tests/Unit/GUI/TestAxesItems.cpp b/Tests/Unit/GUI/TestAxesItems.cpp
index 3df460f6d4688fde4b88413be4b8c223ed011f05..1004f8ab0b13541ca483e23397963e40c1cc898e 100644
--- a/Tests/Unit/GUI/TestAxesItems.cpp
+++ b/Tests/Unit/GUI/TestAxesItems.cpp
@@ -2,7 +2,7 @@
 #include "Base/Axis/VariableBinAxis.h"
 #include "Base/Const/Units.h"
 #include "GUI/Model/Ax/AxesItems.h"
-#include "GUI/Model/From/FromDomain.h"
+#include "GUI/View/FromDomain/FromDomain.h"
 #include "GUI/Support/Data/PropertyItem.h"
 #include "GUI/Util/Error.h"
 #include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestLayerRoughnessItems.cpp b/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
index 90dc42073f4d4e12ad9355191bb3e80c043c4fec..d3b62095864ed8ec8dfbb7e44c4efd59bb271a3f 100644
--- a/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
+++ b/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
@@ -1,4 +1,4 @@
-#include "GUI/Model/From/FromDomain.h"
+#include "GUI/View/FromDomain/FromDomain.h"
 #include "GUI/Model/Sample/LayerRoughnessItems.h"
 #include "GUI/Model/To/ToDomain.h"
 #include "GUI/Model/Types/DoubleDescriptor.h"
diff --git a/Tests/Unit/GUI/TestParaCrystalItems.cpp b/Tests/Unit/GUI/TestParaCrystalItems.cpp
index a82c4e8678b866292d8182ea05d739ffe7c43af0..bb5e523d7e7b7536f5636cc4bf60a1df47e262a7 100644
--- a/Tests/Unit/GUI/TestParaCrystalItems.cpp
+++ b/Tests/Unit/GUI/TestParaCrystalItems.cpp
@@ -1,5 +1,5 @@
 #include "Base/Const/Units.h"
-#include "GUI/Model/From/FromDomain.h"
+#include "GUI/View/FromDomain/FromDomain.h"
 #include "GUI/Model/Sample/FTDistributionItems.h"
 #include "GUI/Model/Sample/InterferenceItems.h"
 #include "GUI/Model/Sample/Lattice2DItems.h"