diff --git a/GUI/View/Common/DataAccessWidget.cpp b/GUI/View/Data/DataAccessWidget.cpp
similarity index 97%
rename from GUI/View/Common/DataAccessWidget.cpp
rename to GUI/View/Data/DataAccessWidget.cpp
index f3b5e6338a100ba873612f153a510b23c20e89b4..7f59f175319647a10ba04f4e9e6294950fdefcb2 100644
--- a/GUI/View/Common/DataAccessWidget.cpp
+++ b/GUI/View/Data/DataAccessWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Common/DataAccessWidget.cpp
+//! @file      GUI/View/Data/DataAccessWidget.cpp
 //! @brief     Defines class DataAccessWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/SpecularDataItem.h"
diff --git a/GUI/View/Common/DataAccessWidget.h b/GUI/View/Data/DataAccessWidget.h
similarity index 95%
rename from GUI/View/Common/DataAccessWidget.h
rename to GUI/View/Data/DataAccessWidget.h
index 9a8ed9f40f3331586862331ae70dc9389c844489..877a4bf963c5c84e8c620aa2d6b1e4b61cc06b31 100644
--- a/GUI/View/Common/DataAccessWidget.h
+++ b/GUI/View/Data/DataAccessWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Common/DataAccessWidget.h
+//! @file      GUI/View/Data/DataAccessWidget.h
 //! @brief     Defines class DataAccessWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_COMMON_DATAACCESSWIDGET_H
-#define BORNAGAIN_GUI_VIEW_COMMON_DATAACCESSWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_DATA_DATAACCESSWIDGET_H
+#define BORNAGAIN_GUI_VIEW_DATA_DATAACCESSWIDGET_H
 
 #include "GUI/Model/Device/RealItem.h"
 #include "GUI/Model/Job/JobItem.h"
@@ -175,4 +175,4 @@ QList<T*> DataAccessWidget::allDataItems() const
     return mainDataItems<T>() + diffDataItems<T>();
 }
 
-#endif // BORNAGAIN_GUI_VIEW_COMMON_DATAACCESSWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_DATA_DATAACCESSWIDGET_H
diff --git a/GUI/View/Common/DataPropertyWidget.cpp b/GUI/View/Data/DataPropertyWidget.cpp
similarity index 95%
rename from GUI/View/Common/DataPropertyWidget.cpp
rename to GUI/View/Data/DataPropertyWidget.cpp
index 8f70cb565ced4a8bd4ffc9287ee54dbbce7dafd3..83edb3c96fd783fd369faed3110364fe0d7d21a7 100644
--- a/GUI/View/Common/DataPropertyWidget.cpp
+++ b/GUI/View/Data/DataPropertyWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Common/DataPropertyWidget.cpp
+//! @file      GUI/View/Data/DataPropertyWidget.cpp
 //! @brief     Defines class DataPropertyWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Common/DataPropertyWidget.h"
+#include "GUI/View/Data/DataPropertyWidget.h"
 #include "Base/Axis/Frame.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Data/DataItem.h"
diff --git a/GUI/View/Common/DataPropertyWidget.h b/GUI/View/Data/DataPropertyWidget.h
similarity index 81%
rename from GUI/View/Common/DataPropertyWidget.h
rename to GUI/View/Data/DataPropertyWidget.h
index c9125ddad6653cfc53006d4a35254f95e9c0acfe..fd5eaee8541388e4f857ba0c6a5732859f4e2d82 100644
--- a/GUI/View/Common/DataPropertyWidget.h
+++ b/GUI/View/Data/DataPropertyWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Common/DataPropertyWidget.h
+//! @file      GUI/View/Data/DataPropertyWidget.h
 //! @brief     Defines class DataPropertyWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,10 +12,10 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_COMMON_DATAPROPERTYWIDGET_H
-#define BORNAGAIN_GUI_VIEW_COMMON_DATAPROPERTYWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_DATA_DATAPROPERTYWIDGET_H
+#define BORNAGAIN_GUI_VIEW_DATA_DATAPROPERTYWIDGET_H
 
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 
 class QFormLayout;
 
@@ -42,4 +42,4 @@ protected:
     QList<std::function<void()>> m_updaters;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_COMMON_DATAPROPERTYWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_DATA_DATAPROPERTYWIDGET_H
diff --git a/GUI/View/Common/IntensityDataPropertyWidget.cpp b/GUI/View/Data/IntensityDataPropertyWidget.cpp
similarity index 98%
rename from GUI/View/Common/IntensityDataPropertyWidget.cpp
rename to GUI/View/Data/IntensityDataPropertyWidget.cpp
index af841a8cf8ea7403a416b82b349158ea3f142db6..8176ca9392f65b687639f58ae983c95d0fb9643b 100644
--- a/GUI/View/Common/IntensityDataPropertyWidget.cpp
+++ b/GUI/View/Data/IntensityDataPropertyWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Common/IntensityDataPropertyWidget.cpp
+//! @file      GUI/View/Data/IntensityDataPropertyWidget.cpp
 //! @brief     Implements class IntensityDataPropertyWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Common/IntensityDataPropertyWidget.h"
+#include "GUI/View/Data/IntensityDataPropertyWidget.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Axis/AmplitudeAxisItem.h"
 #include "GUI/Model/Axis/BasicAxisItem.h"
diff --git a/GUI/View/Common/IntensityDataPropertyWidget.h b/GUI/View/Data/IntensityDataPropertyWidget.h
similarity index 75%
rename from GUI/View/Common/IntensityDataPropertyWidget.h
rename to GUI/View/Data/IntensityDataPropertyWidget.h
index ffb3dd50822831c66bc24c3666be3bde225c92e3..7d7e570ddb3f18e5f036635080179679b1a22ba5 100644
--- a/GUI/View/Common/IntensityDataPropertyWidget.h
+++ b/GUI/View/Data/IntensityDataPropertyWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Common/IntensityDataPropertyWidget.h
+//! @file      GUI/View/Data/IntensityDataPropertyWidget.h
 //! @brief     Defines class IntensityDataPropertyWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,10 +12,10 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_COMMON_INTENSITYDATAPROPERTYWIDGET_H
-#define BORNAGAIN_GUI_VIEW_COMMON_INTENSITYDATAPROPERTYWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_DATA_INTENSITYDATAPROPERTYWIDGET_H
+#define BORNAGAIN_GUI_VIEW_DATA_INTENSITYDATAPROPERTYWIDGET_H
 
-#include "GUI/View/Common/DataPropertyWidget.h"
+#include "GUI/View/Data/DataPropertyWidget.h"
 
 //! Widget to edit properties of an IntensityDataItem.
 
@@ -31,4 +31,4 @@ private:
     void createPanelElements() override;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_COMMON_INTENSITYDATAPROPERTYWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_DATA_INTENSITYDATAPROPERTYWIDGET_H
diff --git a/GUI/View/Fit/FitParameterWidget.h b/GUI/View/Fit/FitParameterWidget.h
index c803eea22caec3f9a90f372027c7bb94101e6a83..be872f1f34d86356271dbc685cfb3e407ed1b6e7 100644
--- a/GUI/View/Fit/FitParameterWidget.h
+++ b/GUI/View/Fit/FitParameterWidget.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERWIDGET_H
 #define BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERWIDGET_H
 
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 
 class ParameterTuningWidget;
 class QTreeView;
diff --git a/GUI/View/Fit/ParameterTuningWidget.h b/GUI/View/Fit/ParameterTuningWidget.h
index a7ba09092a8f43253a51741c68729a85b29a0fe9..4a3b70e2b2d8e619fda85fa912b48f94978bcfa9 100644
--- a/GUI/View/Fit/ParameterTuningWidget.h
+++ b/GUI/View/Fit/ParameterTuningWidget.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGWIDGET_H
 #define BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGWIDGET_H
 
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 
 class JobModel;
 class QItemSelectionModel;
diff --git a/GUI/View/Fit/RunFitControlWidget.h b/GUI/View/Fit/RunFitControlWidget.h
index 16c458b5bd98f1ea30aea47267bbb75872c5404e..5e8aa3d7d659dadf011d57fc0cb45d0b7a97a93e 100644
--- a/GUI/View/Fit/RunFitControlWidget.h
+++ b/GUI/View/Fit/RunFitControlWidget.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_FIT_RUNFITCONTROLWIDGET_H
 #define BORNAGAIN_GUI_VIEW_FIT_RUNFITCONTROLWIDGET_H
 
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 
 class QPushButton;
 class QSlider;
diff --git a/GUI/View/Fit/SliderSettingsWidget.h b/GUI/View/Fit/SliderSettingsWidget.h
index aa116612927148e5d3cbd55cb3083bc9c4431441..676b156d5be2e44353b077a33a787f44c8f251ed 100644
--- a/GUI/View/Fit/SliderSettingsWidget.h
+++ b/GUI/View/Fit/SliderSettingsWidget.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_FIT_SLIDERSETTINGSWIDGET_H
 #define BORNAGAIN_GUI_VIEW_FIT_SLIDERSETTINGSWIDGET_H
 
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 #include <QCheckBox>
 #include <QRadioButton>
 
diff --git a/GUI/View/Import/RealDataMaskWidget.h b/GUI/View/Import/RealDataMaskWidget.h
index 93671bb15fa783cc44df94dd0365179439234c4a..234ae0496caf6fb93028923c4c9d6b9cc0606a1d 100644
--- a/GUI/View/Import/RealDataMaskWidget.h
+++ b/GUI/View/Import/RealDataMaskWidget.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_IMPORT_REALDATAMASKWIDGET_H
 #define BORNAGAIN_GUI_VIEW_IMPORT_REALDATAMASKWIDGET_H
 
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 
 class MaskEditorActions;
 class MaskEditorCanvas;
diff --git a/GUI/View/Mask/MaskEditorPropertyPanel.cpp b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
index bad654a7e491327a18e4e71c6ae74d1407f08a75..4fa3cba80be0bb6eda13c435efc813edfe915151 100644
--- a/GUI/View/Mask/MaskEditorPropertyPanel.cpp
+++ b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Style/GroupBoxCollapser.h"
 #include "GUI/Support/Tool/LayoutUtil.h"
-#include "GUI/View/Common/IntensityDataPropertyWidget.h"
+#include "GUI/View/Data/IntensityDataPropertyWidget.h"
 #include "GUI/View/Numeric/DoubleSpinBox.h"
 #include "GUI/View/Numeric/NumberUtil.h"
 #include <QCheckBox>
diff --git a/GUI/View/Mask/MaskEditorPropertyPanel.h b/GUI/View/Mask/MaskEditorPropertyPanel.h
index 575c12c1a0a61717be2ea568c36b88bc1ac19dc9..ccc9d7d787ba40f9da49f626d9b3a88503ca4f1e 100644
--- a/GUI/View/Mask/MaskEditorPropertyPanel.h
+++ b/GUI/View/Mask/MaskEditorPropertyPanel.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_MASK_MASKEDITORPROPERTYPANEL_H
 #define BORNAGAIN_GUI_VIEW_MASK_MASKEDITORPROPERTYPANEL_H
 
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 #include "GUI/View/Mask/MaskEditorFlags.h"
 #include <QFormLayout>
 #include <QListView>
diff --git a/GUI/View/Plot2D/IntensityDataCanvas.h b/GUI/View/Plot2D/IntensityDataCanvas.h
index 07b6d8b9a95af29f1df86f89e4cbc8de6d082203..5b27a477d698c4e4b994af260cb58bcfc298cb76 100644
--- a/GUI/View/Plot2D/IntensityDataCanvas.h
+++ b/GUI/View/Plot2D/IntensityDataCanvas.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_PLOT2D_INTENSITYDATACANVAS_H
 #define BORNAGAIN_GUI_VIEW_PLOT2D_INTENSITYDATACANVAS_H
 
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 
 class ColorMapCanvas;
 class IntensityDataItem;
diff --git a/GUI/View/Plot2D/IntensityDataWidget.cpp b/GUI/View/Plot2D/IntensityDataWidget.cpp
index 334d80830245dc1f3ff6053647c15c249bac031c..a1a96824825432f6facc92d1e16694a6c989af1e 100644
--- a/GUI/View/Plot2D/IntensityDataWidget.cpp
+++ b/GUI/View/Plot2D/IntensityDataWidget.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Plot2D/IntensityDataWidget.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Support/Util/ActionFactory.h"
-#include "GUI/View/Common/IntensityDataPropertyWidget.h"
+#include "GUI/View/Data/IntensityDataPropertyWidget.h"
 #include "GUI/View/Plot2D/IntensityDataCanvas.h"
 #include "GUI/View/Plot2D/IntensityDataFFTPresenter.h"
 #include <QBoxLayout>
diff --git a/GUI/View/Plot2D/IntensityDataWidget.h b/GUI/View/Plot2D/IntensityDataWidget.h
index 10f8c383358c5baa36a3d939d8b5ee6027e535fb..1b6468cc3dd72805331494c0f3083a368adcd36f 100644
--- a/GUI/View/Plot2D/IntensityDataWidget.h
+++ b/GUI/View/Plot2D/IntensityDataWidget.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_PLOT2D_INTENSITYDATAWIDGET_H
 #define BORNAGAIN_GUI_VIEW_PLOT2D_INTENSITYDATAWIDGET_H
 
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 #include <QAction>
 
 class IntensityDataCanvas;
diff --git a/GUI/View/PlotComparison/FitComparisonWidget.cpp b/GUI/View/PlotComparison/FitComparisonWidget.cpp
index be5cfcad156c54556b2cfa0720fbb4b41bd0bb3f..aeb4b1c937f3284599b4a69af5b4463a64c6df0e 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget.cpp
@@ -22,7 +22,7 @@
 #include "GUI/Model/Job/FitSuiteItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Util/ActionFactory.h"
-#include "GUI/View/Common/IntensityDataPropertyWidget.h"
+#include "GUI/View/Data/IntensityDataPropertyWidget.h"
 #include "GUI/View/Plot2D/ColorMapCanvas.h"
 #include "GUI/View/PlotComparison/FitFlowWidget.h"
 #include "GUI/View/PlotUtil/ColorMap.h"
diff --git a/GUI/View/PlotComparison/FitComparisonWidget.h b/GUI/View/PlotComparison/FitComparisonWidget.h
index dd1797560ea20f63e608fd8d95e2bc67088e65ed..590e8279590b242b54dde9f8f51aac61f368151e 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget.h
+++ b/GUI/View/PlotComparison/FitComparisonWidget.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_FITCOMPARISONWIDGET_H
 #define BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_FITCOMPARISONWIDGET_H
 
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 
 class ColorMapCanvas;
 class FitFlowWidget;
diff --git a/GUI/View/PlotComparison/FitComparisonWidget1D.h b/GUI/View/PlotComparison/FitComparisonWidget1D.h
index 03e592ce94aa145bb71ce65ccdb35cd3072ab442..ffb3a395d59061426368cd4590f6dd5a80d70e5d 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget1D.h
+++ b/GUI/View/PlotComparison/FitComparisonWidget1D.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_FITCOMPARISONWIDGET1D_H
 #define BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_FITCOMPARISONWIDGET1D_H
 
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 
 class FitFlowWidget;
 class JobRealBase;
diff --git a/GUI/View/PlotComparison/FitFlowWidget.h b/GUI/View/PlotComparison/FitFlowWidget.h
index 25bdcd6dfd09125543074b8599cdbc3979a2d106..0e7739915a8f944c29b1c5d3f2824a31324d5c0a 100644
--- a/GUI/View/PlotComparison/FitFlowWidget.h
+++ b/GUI/View/PlotComparison/FitFlowWidget.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_FITFLOWWIDGET_H
 #define BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_FITFLOWWIDGET_H
 
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 
 class FitSuiteItem;
 class HistogramPlot;
diff --git a/GUI/View/PlotSpecular/SpecularDataCanvas.h b/GUI/View/PlotSpecular/SpecularDataCanvas.h
index dfbe2e82282678148b7110352ab7bbeacee7553c..674f9fbf99f4e24da3a0efe28d3d894880fd0786 100644
--- a/GUI/View/PlotSpecular/SpecularDataCanvas.h
+++ b/GUI/View/PlotSpecular/SpecularDataCanvas.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_PLOTSPECULAR_SPECULARDATACANVAS_H
 #define BORNAGAIN_GUI_VIEW_PLOTSPECULAR_SPECULARDATACANVAS_H
 
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 #include <QWidget>
 
 class SpecularDataItem;
diff --git a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.h b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.h
index 783344f7c2cf094d305144b8676c0228c48f90ed..6e89572f2382e9f6d5b3069567c53d525e0cecc8 100644
--- a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.h
+++ b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_PLOTSPECULAR_SPECULARDATAPROPERTYWIDGET_H
 #define BORNAGAIN_GUI_VIEW_PLOTSPECULAR_SPECULARDATAPROPERTYWIDGET_H
 
-#include "GUI/View/Common/DataPropertyWidget.h"
+#include "GUI/View/Data/DataPropertyWidget.h"
 
 //! Widget to edit properties of a SpecularDataItem.
 
diff --git a/GUI/View/PlotSpecular/SpecularDataWidget.h b/GUI/View/PlotSpecular/SpecularDataWidget.h
index 16d985738d5a58801e48719c80bc959f5f3b9df1..8bbe9ea97ade538a88702bb8d56edb2742e71af8 100644
--- a/GUI/View/PlotSpecular/SpecularDataWidget.h
+++ b/GUI/View/PlotSpecular/SpecularDataWidget.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_PLOTSPECULAR_SPECULARDATAWIDGET_H
 #define BORNAGAIN_GUI_VIEW_PLOTSPECULAR_SPECULARDATAWIDGET_H
 
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 
 class SpecularDataCanvas;
 class SpecularDataItem;
diff --git a/GUI/View/Projection/IntensityDataProjectionsWidget.cpp b/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
index c9c1daf2989ec39365dcaf6c7410b46bb83683a9..18925163f3e1c7eadb6c61a3dd26cac4f29e122c 100644
--- a/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
+++ b/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Projection/IntensityDataProjectionsWidget.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/ProjectionItems.h"
-#include "GUI/View/Common/IntensityDataPropertyWidget.h"
+#include "GUI/View/Data/IntensityDataPropertyWidget.h"
 #include "GUI/View/Projection/ProjectionsEditorActions.h"
 #include "GUI/View/Projection/ProjectionsEditorCanvas.h"
 #include "GUI/View/Projection/ProjectionsToolbar.h"
diff --git a/GUI/View/Projection/IntensityDataProjectionsWidget.h b/GUI/View/Projection/IntensityDataProjectionsWidget.h
index 1636eb4d24e045c05605f34db08a3f4b6cae9a06..b198440d0c9bfbd60bde091d328e0532e528d88f 100644
--- a/GUI/View/Projection/IntensityDataProjectionsWidget.h
+++ b/GUI/View/Projection/IntensityDataProjectionsWidget.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_PROJECTION_INTENSITYDATAPROJECTIONSWIDGET_H
 #define BORNAGAIN_GUI_VIEW_PROJECTION_INTENSITYDATAPROJECTIONSWIDGET_H
 
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 
 class IntensityDataPropertyWidget;
 class ProjectionsEditorActions;
diff --git a/GUI/View/Widget/ItemComboWidget.h b/GUI/View/Widget/ItemComboWidget.h
index a0d880f5e6d35302cbf2ff1e5acde509c6efd381..53a755eb21cd93b109662cea4796279b15df808a 100644
--- a/GUI/View/Widget/ItemComboWidget.h
+++ b/GUI/View/Widget/ItemComboWidget.h
@@ -16,7 +16,7 @@
 #define BORNAGAIN_GUI_VIEW_WIDGET_ITEMCOMBOWIDGET_H
 
 #include "Base/Util/IFactory.h"
-#include "GUI/View/Common/DataAccessWidget.h"
+#include "GUI/View/Data/DataAccessWidget.h"
 #include <QMap>
 #include <QStackedWidget>