diff --git a/GUI/View/Instrument/AlphaScanEditor.cpp b/GUI/View/Device/AlphaScanEditor.cpp
similarity index 93%
rename from GUI/View/Instrument/AlphaScanEditor.cpp
rename to GUI/View/Device/AlphaScanEditor.cpp
index 9cee01eb386eee93755a063dc0b95962b157ee06..f3f472c57a4b4f71a0ae41fd0d656ec3c8db53ad 100644
--- a/GUI/View/Instrument/AlphaScanEditor.cpp
+++ b/GUI/View/Device/AlphaScanEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/AlphaScanEditor.cpp
+//! @file      GUI/View/Device/AlphaScanEditor.cpp
 //! @brief     Defines class AlphaScanEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,12 +12,12 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Instrument/AlphaScanEditor.h"
+#include "GUI/View/Device/AlphaScanEditor.h"
 #include "GUI/Model/Beam/GrazingScanItem.h"
 #include "GUI/Model/Descriptor/DistributionItems.h"
+#include "GUI/View/Device/DistributionPlot.h"
+#include "GUI/View/Device/DistributionSelector.h"
 #include "GUI/View/Device/SphericalAxisForm.h"
-#include "GUI/View/Instrument/DistributionPlot.h"
-#include "GUI/View/Instrument/DistributionSelector.h"
 
 AlphaScanEditor::AlphaScanEditor(QWidget* parent, GrazingScanItem* item, bool allow_distr)
     : StaticGroupBox("Grazing angles (deg)", parent)
diff --git a/GUI/View/Instrument/AlphaScanEditor.h b/GUI/View/Device/AlphaScanEditor.h
similarity index 84%
rename from GUI/View/Instrument/AlphaScanEditor.h
rename to GUI/View/Device/AlphaScanEditor.h
index 4d1980a0f05d6e702bb448961bad3206c807ffe3..9bca3ff237d9a158a1b06fdf9e24063143ebf566 100644
--- a/GUI/View/Instrument/AlphaScanEditor.h
+++ b/GUI/View/Device/AlphaScanEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/AlphaScanEditor.h
+//! @file      GUI/View/Device/AlphaScanEditor.h
 //! @brief     Defines class AlphaScanEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_ALPHASCANEDITOR_H
-#define BORNAGAIN_GUI_VIEW_INSTRUMENT_ALPHASCANEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_DEVICE_ALPHASCANEDITOR_H
+#define BORNAGAIN_GUI_VIEW_DEVICE_ALPHASCANEDITOR_H
 
 #include "GUI/View/Widget/GroupBoxes.h"
 
@@ -45,4 +45,4 @@ private:
     DistributionPlot* m_plot;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_ALPHASCANEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_DEVICE_ALPHASCANEDITOR_H
diff --git a/GUI/View/Instrument/DepthprobeInstrumentEditor.cpp b/GUI/View/Device/DepthprobeInstrumentEditor.cpp
similarity index 89%
rename from GUI/View/Instrument/DepthprobeInstrumentEditor.cpp
rename to GUI/View/Device/DepthprobeInstrumentEditor.cpp
index 2eba3dc9b0af355ccd0a4d3602c79861dca34da5..76185658f64a9af5a99148dbb42dd9271684b1da 100644
--- a/GUI/View/Instrument/DepthprobeInstrumentEditor.cpp
+++ b/GUI/View/Device/DepthprobeInstrumentEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/DepthprobeInstrumentEditor.cpp
+//! @file      GUI/View/Device/DepthprobeInstrumentEditor.cpp
 //! @brief     Implements class DepthprobeInstrumentEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Instrument/DepthprobeInstrumentEditor.h"
+#include "GUI/View/Device/DepthprobeInstrumentEditor.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/View/Device/AxisPropertyForm.h"
-#include "GUI/View/Instrument/ScanEditor.h"
+#include "GUI/View/Device/ScanEditor.h"
 #include <QVBoxLayout>
 
 DepthprobeInstrumentEditor::DepthprobeInstrumentEditor(DepthprobeInstrumentItem* instrument)
diff --git a/GUI/View/Instrument/DepthprobeInstrumentEditor.h b/GUI/View/Device/DepthprobeInstrumentEditor.h
similarity index 76%
rename from GUI/View/Instrument/DepthprobeInstrumentEditor.h
rename to GUI/View/Device/DepthprobeInstrumentEditor.h
index a8f9e1590c4dcf29c908db9913460d80d4d3e856..1ed410c5624e1753ea581534081cb6bcd37e93e3 100644
--- a/GUI/View/Instrument/DepthprobeInstrumentEditor.h
+++ b/GUI/View/Device/DepthprobeInstrumentEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/DepthprobeInstrumentEditor.h
+//! @file      GUI/View/Device/DepthprobeInstrumentEditor.h
 //! @brief     Defines class DepthprobeInstrumentEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_DEPTHPROBEINSTRUMENTEDITOR_H
-#define BORNAGAIN_GUI_VIEW_INSTRUMENT_DEPTHPROBEINSTRUMENTEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_DEVICE_DEPTHPROBEINSTRUMENTEDITOR_H
+#define BORNAGAIN_GUI_VIEW_DEVICE_DEPTHPROBEINSTRUMENTEDITOR_H
 
 #include "GUI/View/Widget/IComponentEditor.h"
 
@@ -27,4 +27,4 @@ public:
     DepthprobeInstrumentEditor(DepthprobeInstrumentItem* instrument);
 };
 
-#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_DEPTHPROBEINSTRUMENTEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_DEVICE_DEPTHPROBEINSTRUMENTEDITOR_H
diff --git a/GUI/View/Instrument/DetectorEditor.cpp b/GUI/View/Device/DetectorEditor.cpp
similarity index 96%
rename from GUI/View/Instrument/DetectorEditor.cpp
rename to GUI/View/Device/DetectorEditor.cpp
index 96bfad71429013007d701714907ab159aa142c94..4579dbcac9cdf559af9b299533555757fc4668f5 100644
--- a/GUI/View/Instrument/DetectorEditor.cpp
+++ b/GUI/View/Device/DetectorEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/DetectorEditor.cpp
+//! @file      GUI/View/Device/DetectorEditor.cpp
 //! @brief     Implements class DetectorEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Instrument/DetectorEditor.h"
+#include "GUI/View/Device/DetectorEditor.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Detector/DetectorItem.h"
 #include "GUI/Model/Detector/ResolutionFunctionItems.h"
diff --git a/GUI/View/Instrument/DetectorEditor.h b/GUI/View/Device/DetectorEditor.h
similarity index 79%
rename from GUI/View/Instrument/DetectorEditor.h
rename to GUI/View/Device/DetectorEditor.h
index da2e4b8c8266383c51f1e56ef2acc372144a6d90..8b1bbeb8b3ff6fc016553e43c82fa6df3dd05fef 100644
--- a/GUI/View/Instrument/DetectorEditor.h
+++ b/GUI/View/Device/DetectorEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/DetectorEditor.h
+//! @file      GUI/View/Device/DetectorEditor.h
 //! @brief     Defines class DetectorEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_DETECTOREDITOR_H
-#define BORNAGAIN_GUI_VIEW_INSTRUMENT_DETECTOREDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_DEVICE_DETECTOREDITOR_H
+#define BORNAGAIN_GUI_VIEW_DEVICE_DETECTOREDITOR_H
 
 #include "GUI/View/Widget/GroupBoxes.h"
 
@@ -30,4 +30,4 @@ signals:
     void dataChanged();
 };
 
-#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_DETECTOREDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_DEVICE_DETECTOREDITOR_H
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Device/DistributionEditor.cpp
similarity index 92%
rename from GUI/View/Instrument/DistributionEditor.cpp
rename to GUI/View/Device/DistributionEditor.cpp
index f9f361a5db633e3ba51785e93fa5bda81afb70ed..bb2b23ac7b625d5ad0f3cac4f7104f550efc4436 100644
--- a/GUI/View/Instrument/DistributionEditor.cpp
+++ b/GUI/View/Device/DistributionEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/DistributionEditor.cpp
+//! @file      GUI/View/Device/DistributionEditor.cpp
 //! @brief     Implements class DistributionEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,10 +12,10 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Instrument/DistributionEditor.h"
+#include "GUI/View/Device/DistributionEditor.h"
 #include "GUI/Model/Beam/BeamDistributionItem.h"
 #include "GUI/Model/Descriptor/DistributionItems.h"
-#include "GUI/View/Instrument/DistributionPlot.h"
+#include "GUI/View/Device/DistributionPlot.h"
 
 DistributionEditor::DistributionEditor(const QString& title,
                                        const std::optional<MeanConfig>& mean_config,
diff --git a/GUI/View/Instrument/DistributionEditor.h b/GUI/View/Device/DistributionEditor.h
similarity index 81%
rename from GUI/View/Instrument/DistributionEditor.h
rename to GUI/View/Device/DistributionEditor.h
index 3083023ace62774a4d33108ab223dde80a555211..f01e628ce01d084560a1471579f4f871ae904619 100644
--- a/GUI/View/Instrument/DistributionEditor.h
+++ b/GUI/View/Device/DistributionEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/DistributionEditor.h
+//! @file      GUI/View/Device/DistributionEditor.h
 //! @brief     Defines class DistributionEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_DISTRIBUTIONEDITOR_H
-#define BORNAGAIN_GUI_VIEW_INSTRUMENT_DISTRIBUTIONEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_DEVICE_DISTRIBUTIONEDITOR_H
+#define BORNAGAIN_GUI_VIEW_DEVICE_DISTRIBUTIONEDITOR_H
 
 #include "GUI/Support/Data/ID.h"
-#include "GUI/View/Instrument/DistributionSelector.h" // MeanConfig
+#include "GUI/View/Device/DistributionSelector.h" // MeanConfig
 #include "GUI/View/Widget/GroupBoxes.h"
 #include <optional>
 
@@ -46,4 +46,4 @@ private:
     DistributionPlot* m_plot;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_DISTRIBUTIONEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_DEVICE_DISTRIBUTIONEDITOR_H
diff --git a/GUI/View/Instrument/DistributionPlot.cpp b/GUI/View/Device/DistributionPlot.cpp
similarity index 98%
rename from GUI/View/Instrument/DistributionPlot.cpp
rename to GUI/View/Device/DistributionPlot.cpp
index 3dc50930f8e4eb1985f69bb6f6819c53a4d2a78f..3fb88903eae00bfc2b765848cb05fe1e12417896 100644
--- a/GUI/View/Instrument/DistributionPlot.cpp
+++ b/GUI/View/Device/DistributionPlot.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/DistributionPlot.cpp
+//! @file      GUI/View/Device/DistributionPlot.cpp
 //! @brief     Implements class DistributionPlot.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Instrument/DistributionPlot.h"
+#include "GUI/View/Device/DistributionPlot.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Descriptor/DistributionItems.h"
 #include "GUI/View/Info/CautionSign.h"
diff --git a/GUI/View/Instrument/DistributionPlot.h b/GUI/View/Device/DistributionPlot.h
similarity index 88%
rename from GUI/View/Instrument/DistributionPlot.h
rename to GUI/View/Device/DistributionPlot.h
index 50bb8e1006aa6c97c7580966b3d42c3cb914fccc..a315ff38f3ac543d1efb2946bbb3a41c9eb0cc09 100644
--- a/GUI/View/Instrument/DistributionPlot.h
+++ b/GUI/View/Device/DistributionPlot.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/DistributionPlot.h
+//! @file      GUI/View/Device/DistributionPlot.h
 //! @brief     Defines class DistributionPlot.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_DISTRIBUTIONPLOT_H
-#define BORNAGAIN_GUI_VIEW_INSTRUMENT_DISTRIBUTIONPLOT_H
+#ifndef BORNAGAIN_GUI_VIEW_DEVICE_DISTRIBUTIONPLOT_H
+#define BORNAGAIN_GUI_VIEW_DEVICE_DISTRIBUTIONPLOT_H
 
 #include <QAction>
 #include <QLabel>
@@ -60,4 +60,4 @@ private:
     CautionSign* m_caution_sign;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_DISTRIBUTIONPLOT_H
+#endif // BORNAGAIN_GUI_VIEW_DEVICE_DISTRIBUTIONPLOT_H
diff --git a/GUI/View/Instrument/DistributionSelector.cpp b/GUI/View/Device/DistributionSelector.cpp
similarity index 97%
rename from GUI/View/Instrument/DistributionSelector.cpp
rename to GUI/View/Device/DistributionSelector.cpp
index 090562fd317752c5817c75fa2a764013f202a770..9dc2c8ddf45062ddc3a983cc6965247668a25982 100644
--- a/GUI/View/Instrument/DistributionSelector.cpp
+++ b/GUI/View/Device/DistributionSelector.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/DistributionSelector.cpp
+//! @file      GUI/View/Device/DistributionSelector.cpp
 //! @brief     Implements class DistributionSelector.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Instrument/DistributionSelector.h"
+#include "GUI/View/Device/DistributionSelector.h"
 #include "GUI/Model/Beam/BeamDistributionItem.h"
 #include "GUI/Model/Descriptor/DistributionItems.h"
 #include "GUI/Support/XML/Backup.h"
-#include "GUI/View/Instrument/DistributionPlot.h"
+#include "GUI/View/Device/DistributionPlot.h"
 #include "GUI/View/Numeric/ComboUtil.h"
 #include "GUI/View/Numeric/DoubleSpinBox.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
diff --git a/GUI/View/Instrument/DistributionSelector.h b/GUI/View/Device/DistributionSelector.h
similarity index 91%
rename from GUI/View/Instrument/DistributionSelector.h
rename to GUI/View/Device/DistributionSelector.h
index fda3f222ba4623d078cecf935a4e0bc8b98ec311..6a61fbfc3fce8bc03313eb653b4dfc8eb780fa28 100644
--- a/GUI/View/Instrument/DistributionSelector.h
+++ b/GUI/View/Device/DistributionSelector.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/DistributionSelector.h
+//! @file      GUI/View/Device/DistributionSelector.h
 //! @brief     Defines struct MeanConfig and class DistributionSelector.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_DISTRIBUTIONSELECTOR_H
-#define BORNAGAIN_GUI_VIEW_INSTRUMENT_DISTRIBUTIONSELECTOR_H
+#ifndef BORNAGAIN_GUI_VIEW_DEVICE_DISTRIBUTIONSELECTOR_H
+#define BORNAGAIN_GUI_VIEW_DEVICE_DISTRIBUTIONSELECTOR_H
 
 #include "GUI/Support/Data/ID.h"
 #include <QComboBox>
@@ -67,4 +67,4 @@ private:
     QComboBox* m_distribution_combo;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_DISTRIBUTIONSELECTOR_H
+#endif // BORNAGAIN_GUI_VIEW_DEVICE_DISTRIBUTIONSELECTOR_H
diff --git a/GUI/View/Instrument/GISASBeamEditor.cpp b/GUI/View/Device/GISASBeamEditor.cpp
similarity index 94%
rename from GUI/View/Instrument/GISASBeamEditor.cpp
rename to GUI/View/Device/GISASBeamEditor.cpp
index ae68c38d825c3149e7bc1d5aebed148113393b63..97df4aa6aebfe1baff0e255b47228a67540034af 100644
--- a/GUI/View/Instrument/GISASBeamEditor.cpp
+++ b/GUI/View/Device/GISASBeamEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/GISASBeamEditor.cpp
+//! @file      GUI/View/Device/GISASBeamEditor.cpp
 //! @brief     Implements class GISASBeamEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,13 +12,13 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Instrument/GISASBeamEditor.h"
+#include "GUI/View/Device/GISASBeamEditor.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Beam/BeamAngleItems.h"
 #include "GUI/Model/Beam/BeamWavelengthItem.h"
 #include "GUI/Model/Beam/SourceItems.h"
+#include "GUI/View/Device/DistributionEditor.h"
 #include "GUI/View/Device/FootprintForm.h"
-#include "GUI/View/Instrument/DistributionEditor.h"
 #include "GUI/View/Numeric/DoubleSpinBox.h"
 #include <QFormLayout>
 #include <QLineEdit>
diff --git a/GUI/View/Instrument/GISASBeamEditor.h b/GUI/View/Device/GISASBeamEditor.h
similarity index 79%
rename from GUI/View/Instrument/GISASBeamEditor.h
rename to GUI/View/Device/GISASBeamEditor.h
index 133d13c9ca15ecf598bbc7570c645241ec924017..9badf25b1fccdeea5eb6f426ac329884f5dbd22d 100644
--- a/GUI/View/Instrument/GISASBeamEditor.h
+++ b/GUI/View/Device/GISASBeamEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/GISASBeamEditor.h
+//! @file      GUI/View/Device/GISASBeamEditor.h
 //! @brief     Defines class GISASBeamEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_GISASBEAMEDITOR_H
-#define BORNAGAIN_GUI_VIEW_INSTRUMENT_GISASBEAMEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_DEVICE_GISASBEAMEDITOR_H
+#define BORNAGAIN_GUI_VIEW_DEVICE_GISASBEAMEDITOR_H
 
 #include "GUI/View/Widget/GroupBoxes.h"
 
@@ -30,4 +30,4 @@ signals:
     void dataChanged();
 };
 
-#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_GISASBEAMEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_DEVICE_GISASBEAMEDITOR_H
diff --git a/GUI/View/Instrument/GISASInstrumentEditor.cpp b/GUI/View/Device/GISASInstrumentEditor.cpp
similarity index 86%
rename from GUI/View/Instrument/GISASInstrumentEditor.cpp
rename to GUI/View/Device/GISASInstrumentEditor.cpp
index 87ab326c10df4ba0451d08844f083f77db0132d7..98224ef48f93cefe81e6ee88d1356b90d13a5182 100644
--- a/GUI/View/Instrument/GISASInstrumentEditor.cpp
+++ b/GUI/View/Device/GISASInstrumentEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/GISASInstrumentEditor.cpp
+//! @file      GUI/View/Device/GISASInstrumentEditor.cpp
 //! @brief     Implements class GISASInstrumentEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,13 +12,13 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Instrument/GISASInstrumentEditor.h"
+#include "GUI/View/Device/GISASInstrumentEditor.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/View/Device/BackgroundForm.h"
-#include "GUI/View/Instrument/DetectorEditor.h"
-#include "GUI/View/Instrument/GISASBeamEditor.h"
-#include "GUI/View/Instrument/PolarizationAnalysisEditor.h"
+#include "GUI/View/Device/DetectorEditor.h"
+#include "GUI/View/Device/GISASBeamEditor.h"
+#include "GUI/View/Device/PolarizationAnalysisEditor.h"
 
 GISASInstrumentEditor::GISASInstrumentEditor(GISASInstrumentItem* instrument)
 {
diff --git a/GUI/View/Instrument/GISASInstrumentEditor.h b/GUI/View/Device/GISASInstrumentEditor.h
similarity index 77%
rename from GUI/View/Instrument/GISASInstrumentEditor.h
rename to GUI/View/Device/GISASInstrumentEditor.h
index e9797f949eda4700e9aa0da11019a813425a12de..d8f0970470d50464751e128c868cbd5460486a7e 100644
--- a/GUI/View/Instrument/GISASInstrumentEditor.h
+++ b/GUI/View/Device/GISASInstrumentEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/GISASInstrumentEditor.h
+//! @file      GUI/View/Device/GISASInstrumentEditor.h
 //! @brief     Defines class GISASInstrumentEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_GISASINSTRUMENTEDITOR_H
-#define BORNAGAIN_GUI_VIEW_INSTRUMENT_GISASINSTRUMENTEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_DEVICE_GISASINSTRUMENTEDITOR_H
+#define BORNAGAIN_GUI_VIEW_DEVICE_GISASINSTRUMENTEDITOR_H
 
 #include "GUI/View/Widget/IComponentEditor.h"
 
@@ -27,4 +27,4 @@ public:
     GISASInstrumentEditor(GISASInstrumentItem* instrument);
 };
 
-#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_GISASINSTRUMENTEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_DEVICE_GISASINSTRUMENTEDITOR_H
diff --git a/GUI/View/Instrument/OffspecDetectorEditor.cpp b/GUI/View/Device/OffspecDetectorEditor.cpp
similarity index 94%
rename from GUI/View/Instrument/OffspecDetectorEditor.cpp
rename to GUI/View/Device/OffspecDetectorEditor.cpp
index 4891469a8ec5a90a8b4e313c09a5226da8c5a62c..4164b8b660e0c530d52873763451ad9303684071 100644
--- a/GUI/View/Instrument/OffspecDetectorEditor.cpp
+++ b/GUI/View/Device/OffspecDetectorEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/OffspecDetectorEditor.cpp
+//! @file      GUI/View/Device/OffspecDetectorEditor.cpp
 //! @brief     Implements class OffspecDetectorEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Instrument/OffspecDetectorEditor.h"
+#include "GUI/View/Device/OffspecDetectorEditor.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Detector/OffspecDetectorItem.h"
 #include "GUI/Model/Device/InstrumentItems.h"
diff --git a/GUI/View/Instrument/OffspecDetectorEditor.h b/GUI/View/Device/OffspecDetectorEditor.h
similarity index 79%
rename from GUI/View/Instrument/OffspecDetectorEditor.h
rename to GUI/View/Device/OffspecDetectorEditor.h
index 33a56a5de7fb711fcb7cc574a0f73e56b8f77001..695a94e835ca6b1c2d4907210aab6e8cc3bcdf02 100644
--- a/GUI/View/Instrument/OffspecDetectorEditor.h
+++ b/GUI/View/Device/OffspecDetectorEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/OffspecDetectorEditor.h
+//! @file      GUI/View/Device/OffspecDetectorEditor.h
 //! @brief     Defines class OffspecDetectorEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_OFFSPECDETECTOREDITOR_H
-#define BORNAGAIN_GUI_VIEW_INSTRUMENT_OFFSPECDETECTOREDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_DEVICE_OFFSPECDETECTOREDITOR_H
+#define BORNAGAIN_GUI_VIEW_DEVICE_OFFSPECDETECTOREDITOR_H
 
 #include "GUI/View/Widget/GroupBoxes.h"
 #include <QFormLayout>
@@ -33,4 +33,4 @@ private:
     QFormLayout* m_form_layout;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_OFFSPECDETECTOREDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_DEVICE_OFFSPECDETECTOREDITOR_H
diff --git a/GUI/View/Instrument/OffspecInstrumentEditor.cpp b/GUI/View/Device/OffspecInstrumentEditor.cpp
similarity index 85%
rename from GUI/View/Instrument/OffspecInstrumentEditor.cpp
rename to GUI/View/Device/OffspecInstrumentEditor.cpp
index b884fc75737b5cd39d771f3e0f212e9c1ebdb671..36cc7a56d4de44fa2cc8c13cfc99c8e9721dc478 100644
--- a/GUI/View/Instrument/OffspecInstrumentEditor.cpp
+++ b/GUI/View/Device/OffspecInstrumentEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/OffspecInstrumentEditor.cpp
+//! @file      GUI/View/Device/OffspecInstrumentEditor.cpp
 //! @brief     Implements class OffspecInstrumentEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,12 +12,12 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Instrument/OffspecInstrumentEditor.h"
+#include "GUI/View/Device/OffspecInstrumentEditor.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/View/Instrument/OffspecDetectorEditor.h"
-#include "GUI/View/Instrument/PolarizationAnalysisEditor.h"
-#include "GUI/View/Instrument/ScanEditor.h"
+#include "GUI/View/Device/OffspecDetectorEditor.h"
+#include "GUI/View/Device/PolarizationAnalysisEditor.h"
+#include "GUI/View/Device/ScanEditor.h"
 
 OffspecInstrumentEditor::OffspecInstrumentEditor(OffspecInstrumentItem* instrument)
 {
diff --git a/GUI/View/Instrument/OffspecInstrumentEditor.h b/GUI/View/Device/OffspecInstrumentEditor.h
similarity index 77%
rename from GUI/View/Instrument/OffspecInstrumentEditor.h
rename to GUI/View/Device/OffspecInstrumentEditor.h
index c8802a1c4b0cf400179308925fe6e05d01b8c43b..c48141437ba7ae9568ba2aaf0eefb64ccc492d74 100644
--- a/GUI/View/Instrument/OffspecInstrumentEditor.h
+++ b/GUI/View/Device/OffspecInstrumentEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/OffspecInstrumentEditor.h
+//! @file      GUI/View/Device/OffspecInstrumentEditor.h
 //! @brief     Defines class OffspecInstrumentEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_OFFSPECINSTRUMENTEDITOR_H
-#define BORNAGAIN_GUI_VIEW_INSTRUMENT_OFFSPECINSTRUMENTEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_DEVICE_OFFSPECINSTRUMENTEDITOR_H
+#define BORNAGAIN_GUI_VIEW_DEVICE_OFFSPECINSTRUMENTEDITOR_H
 
 #include "GUI/View/Widget/IComponentEditor.h"
 
@@ -27,4 +27,4 @@ public:
     OffspecInstrumentEditor(OffspecInstrumentItem* instrument);
 };
 
-#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_OFFSPECINSTRUMENTEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_DEVICE_OFFSPECINSTRUMENTEDITOR_H
diff --git a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp b/GUI/View/Device/PolarizationAnalysisEditor.cpp
similarity index 96%
rename from GUI/View/Instrument/PolarizationAnalysisEditor.cpp
rename to GUI/View/Device/PolarizationAnalysisEditor.cpp
index a72499cde696c27be2648f0f13051a1e0c0a3f61..2eeb5c3f4cebce54eb1c119b8e6a9934b4803756 100644
--- a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
+++ b/GUI/View/Device/PolarizationAnalysisEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/PolarizationAnalysisEditor.cpp
+//! @file      GUI/View/Device/PolarizationAnalysisEditor.cpp
 //! @brief     Implements class PolarizationAnalysisEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Instrument/PolarizationAnalysisEditor.h"
+#include "GUI/View/Device/PolarizationAnalysisEditor.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/View/Numeric/DoubleSpinBox.h"
diff --git a/GUI/View/Instrument/PolarizationAnalysisEditor.h b/GUI/View/Device/PolarizationAnalysisEditor.h
similarity index 82%
rename from GUI/View/Instrument/PolarizationAnalysisEditor.h
rename to GUI/View/Device/PolarizationAnalysisEditor.h
index 944cf1439919967e8d807b7ed9f0fa1fab4b5d68..8d1023b49c12035d88179c243922fc85778ab773 100644
--- a/GUI/View/Instrument/PolarizationAnalysisEditor.h
+++ b/GUI/View/Device/PolarizationAnalysisEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/PolarizationAnalysisEditor.h
+//! @file      GUI/View/Device/PolarizationAnalysisEditor.h
 //! @brief     Defines class PolarizationAnalysisEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_POLARIZATIONANALYSISEDITOR_H
-#define BORNAGAIN_GUI_VIEW_INSTRUMENT_POLARIZATIONANALYSISEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_DEVICE_POLARIZATIONANALYSISEDITOR_H
+#define BORNAGAIN_GUI_VIEW_DEVICE_POLARIZATIONANALYSISEDITOR_H
 
 #include "GUI/View/Widget/GroupBoxes.h"
 #include <QFormLayout>
@@ -41,4 +41,4 @@ private:
     InstrumentItem* m_instrument;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_POLARIZATIONANALYSISEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_DEVICE_POLARIZATIONANALYSISEDITOR_H
diff --git a/GUI/View/Instrument/ScanEditor.cpp b/GUI/View/Device/ScanEditor.cpp
similarity index 94%
rename from GUI/View/Instrument/ScanEditor.cpp
rename to GUI/View/Device/ScanEditor.cpp
index 700af365ab92753991fcff32492717902f0217cc..f4cdda6c43a10520a3d64e546f858c6ed118dbb6 100644
--- a/GUI/View/Instrument/ScanEditor.cpp
+++ b/GUI/View/Device/ScanEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/ScanEditor.cpp
+//! @file      GUI/View/Device/ScanEditor.cpp
 //! @brief     Defines class ScanEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Instrument/ScanEditor.h"
+#include "GUI/View/Device/ScanEditor.h"
 #include "Base/Axis/Frame.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Axis/PointwiseAxisItem.h"
@@ -21,9 +21,9 @@
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/Model/Device/InstrumentsSet.h"
 #include "GUI/Model/Project/ProjectDocument.h"
+#include "GUI/View/Device/AlphaScanEditor.h"
+#include "GUI/View/Device/DistributionEditor.h"
 #include "GUI/View/Device/FootprintForm.h"
-#include "GUI/View/Instrument/AlphaScanEditor.h"
-#include "GUI/View/Instrument/DistributionEditor.h"
 #include "GUI/View/Numeric/DoubleSpinBox.h"
 #include <QFormLayout>
 #include <QLineEdit>
diff --git a/GUI/View/Instrument/ScanEditor.h b/GUI/View/Device/ScanEditor.h
similarity index 81%
rename from GUI/View/Instrument/ScanEditor.h
rename to GUI/View/Device/ScanEditor.h
index 102d169b642351e7bd7e10e2cdf9fc045deae4ef..5e71b5c72ce011766cf791245e45dc66baa6be7f 100644
--- a/GUI/View/Instrument/ScanEditor.h
+++ b/GUI/View/Device/ScanEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/ScanEditor.h
+//! @file      GUI/View/Device/ScanEditor.h
 //! @brief     Defines class ScanEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_SCANEDITOR_H
-#define BORNAGAIN_GUI_VIEW_INSTRUMENT_SCANEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_DEVICE_SCANEDITOR_H
+#define BORNAGAIN_GUI_VIEW_DEVICE_SCANEDITOR_H
 
 #include "GUI/View/Widget/GroupBoxes.h"
 
@@ -32,4 +32,4 @@ signals:
     void dataChanged();
 };
 
-#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_SCANEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_DEVICE_SCANEDITOR_H
diff --git a/GUI/View/Instrument/SpecularInstrumentEditor.cpp b/GUI/View/Device/SpecularInstrumentEditor.cpp
similarity index 87%
rename from GUI/View/Instrument/SpecularInstrumentEditor.cpp
rename to GUI/View/Device/SpecularInstrumentEditor.cpp
index 4e77a8fd7bfef7383b19f323083613c40c53dc3a..26cf8dd4d5e86d4ee201f6453a77a304908bb16c 100644
--- a/GUI/View/Instrument/SpecularInstrumentEditor.cpp
+++ b/GUI/View/Device/SpecularInstrumentEditor.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/SpecularInstrumentEditor.cpp
+//! @file      GUI/View/Device/SpecularInstrumentEditor.cpp
 //! @brief     Implements class SpecularInstrumentEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,12 +12,12 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Instrument/SpecularInstrumentEditor.h"
+#include "GUI/View/Device/SpecularInstrumentEditor.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/View/Device/BackgroundForm.h"
-#include "GUI/View/Instrument/PolarizationAnalysisEditor.h"
-#include "GUI/View/Instrument/ScanEditor.h"
+#include "GUI/View/Device/PolarizationAnalysisEditor.h"
+#include "GUI/View/Device/ScanEditor.h"
 
 SpecularInstrumentEditor::SpecularInstrumentEditor(SpecularInstrumentItem* instrument)
 {
diff --git a/GUI/View/Instrument/SpecularInstrumentEditor.h b/GUI/View/Device/SpecularInstrumentEditor.h
similarity index 77%
rename from GUI/View/Instrument/SpecularInstrumentEditor.h
rename to GUI/View/Device/SpecularInstrumentEditor.h
index 5604f361d513e959d07f8accf51d1cec0a983cf0..0303657b16c685073bc90bb3308ca9a519b89db6 100644
--- a/GUI/View/Instrument/SpecularInstrumentEditor.h
+++ b/GUI/View/Device/SpecularInstrumentEditor.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/SpecularInstrumentEditor.h
+//! @file      GUI/View/Device/SpecularInstrumentEditor.h
 //! @brief     Defines class SpecularInstrumentEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_SPECULARINSTRUMENTEDITOR_H
-#define BORNAGAIN_GUI_VIEW_INSTRUMENT_SPECULARINSTRUMENTEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_DEVICE_SPECULARINSTRUMENTEDITOR_H
+#define BORNAGAIN_GUI_VIEW_DEVICE_SPECULARINSTRUMENTEDITOR_H
 
 #include "GUI/View/Widget/IComponentEditor.h"
 
@@ -27,4 +27,4 @@ public:
     SpecularInstrumentEditor(SpecularInstrumentItem* instrument);
 };
 
-#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_SPECULARINSTRUMENTEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_DEVICE_SPECULARINSTRUMENTEDITOR_H
diff --git a/GUI/View/Views/InstrumentView.cpp b/GUI/View/Views/InstrumentView.cpp
index ee652cc19273cff295253ec2d5122b658fe322ec..d43a08fbb3edd312f3030e40d6253c893d3f7fbc 100644
--- a/GUI/View/Views/InstrumentView.cpp
+++ b/GUI/View/Views/InstrumentView.cpp
@@ -17,10 +17,10 @@
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/Model/Device/InstrumentsSet.h"
 #include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/View/Instrument/DepthprobeInstrumentEditor.h"
-#include "GUI/View/Instrument/GISASInstrumentEditor.h"
-#include "GUI/View/Instrument/OffspecInstrumentEditor.h"
-#include "GUI/View/Instrument/SpecularInstrumentEditor.h"
+#include "GUI/View/Device/DepthprobeInstrumentEditor.h"
+#include "GUI/View/Device/GISASInstrumentEditor.h"
+#include "GUI/View/Device/OffspecInstrumentEditor.h"
+#include "GUI/View/Device/SpecularInstrumentEditor.h"
 #include "GUI/View/Layout/ApplicationSettings.h"
 #include "GUI/View/List/InstrumentsQListView.h"
 #include "GUI/View/Setup/FrameActions.h"