diff --git a/GUI/View/Data/ItemComboToolbar.cpp b/GUI/View/Combo/ItemComboToolbar.cpp
similarity index 97%
rename from GUI/View/Data/ItemComboToolbar.cpp
rename to GUI/View/Combo/ItemComboToolbar.cpp
index 75e01e1918b62152a5292860fd92227fd4cb3111..6b2c05b00770179b1487b729f9f0e109ab8887bf 100644
--- a/GUI/View/Data/ItemComboToolbar.cpp
+++ b/GUI/View/Combo/ItemComboToolbar.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Data/ItemComboToolbar.cpp
+//! @file      GUI/View/Combo/ItemComboToolbar.cpp
 //! @brief     Implements class ItemComboToolbar
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Data/ItemComboToolbar.h"
+#include "GUI/View/Combo/ItemComboToolbar.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include <QComboBox>
diff --git a/GUI/View/Data/ItemComboToolbar.h b/GUI/View/Combo/ItemComboToolbar.h
similarity index 88%
rename from GUI/View/Data/ItemComboToolbar.h
rename to GUI/View/Combo/ItemComboToolbar.h
index 508641445f2da5cefd7873789a123e915a4dcfea..7b0c4a5290c12feae211205248d79935574e34a3 100644
--- a/GUI/View/Data/ItemComboToolbar.h
+++ b/GUI/View/Combo/ItemComboToolbar.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Data/ItemComboToolbar.h
+//! @file      GUI/View/Combo/ItemComboToolbar.h
 //! @brief     Defines class ItemComboToolbar
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_DATA_ITEMCOMBOTOOLBAR_H
-#define BORNAGAIN_GUI_VIEW_DATA_ITEMCOMBOTOOLBAR_H
+#ifndef BORNAGAIN_GUI_VIEW_COMBO_ITEMCOMBOTOOLBAR_H
+#define BORNAGAIN_GUI_VIEW_COMBO_ITEMCOMBOTOOLBAR_H
 
 #include "GUI/View/Widget/StyledToolbar.h"
 #include <QList>
@@ -51,4 +51,4 @@ private:
     QAction* m_comboBoxAction;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_DATA_ITEMCOMBOTOOLBAR_H
+#endif // BORNAGAIN_GUI_VIEW_COMBO_ITEMCOMBOTOOLBAR_H
diff --git a/GUI/View/Data/ItemComboWidget.cpp b/GUI/View/Combo/ItemComboWidget.cpp
similarity index 97%
rename from GUI/View/Data/ItemComboWidget.cpp
rename to GUI/View/Combo/ItemComboWidget.cpp
index 030d2a3181c2252a33625e730aafeb60dc723212..d20b78aa45943ab938e6f04a77074184b6e15c29 100644
--- a/GUI/View/Data/ItemComboWidget.cpp
+++ b/GUI/View/Combo/ItemComboWidget.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Data/ItemComboWidget.cpp
+//! @file      GUI/View/Combo/ItemComboWidget.cpp
 //! @brief     Implements class ItemComboWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,12 +12,12 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Data/ItemComboWidget.h"
+#include "GUI/View/Combo/ItemComboWidget.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Device/RealItem.h"
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/View/Data/DataAccessWidget.h"
-#include "GUI/View/Data/ItemComboToolbar.h"
+#include "GUI/View/Combo/ItemComboToolbar.h"
 #include <QVBoxLayout>
 
 ItemComboWidget::ItemComboWidget(QWidget* parent)
diff --git a/GUI/View/Data/ItemComboWidget.h b/GUI/View/Combo/ItemComboWidget.h
similarity index 92%
rename from GUI/View/Data/ItemComboWidget.h
rename to GUI/View/Combo/ItemComboWidget.h
index bfad59b08cffa9faa6ce2aed13b9c34477eebe4f..62efada54acce040e3120f5c8b7050d324d0244c 100644
--- a/GUI/View/Data/ItemComboWidget.h
+++ b/GUI/View/Combo/ItemComboWidget.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Data/ItemComboWidget.h
+//! @file      GUI/View/Combo/ItemComboWidget.h
 //! @brief     Defines class ItemComboWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_DATA_ITEMCOMBOWIDGET_H
-#define BORNAGAIN_GUI_VIEW_DATA_ITEMCOMBOWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_COMBO_ITEMCOMBOWIDGET_H
+#define BORNAGAIN_GUI_VIEW_COMBO_ITEMCOMBOWIDGET_H
 
 #include "Base/Util/IFactory.h"
 #include <QMap>
@@ -73,4 +73,4 @@ private:
     QObject* m_item;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_DATA_ITEMCOMBOWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_COMBO_ITEMCOMBOWIDGET_H
diff --git a/GUI/View/Import/RealDataPresenter.h b/GUI/View/Import/RealDataPresenter.h
index b1bd533aaa8af2d068bd3cded5ad5a2c921fe6e1..f97b4cb1978853f386f4df0f9dd6a034fadf2585 100644
--- a/GUI/View/Import/RealDataPresenter.h
+++ b/GUI/View/Import/RealDataPresenter.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_IMPORT_REALDATAPRESENTER_H
 #define BORNAGAIN_GUI_VIEW_IMPORT_REALDATAPRESENTER_H
 
-#include "GUI/View/Data/ItemComboWidget.h"
+#include "GUI/View/Combo/ItemComboWidget.h"
 
 //! Presents imported data (RealItem) using stack of different widgets and combo box in the
 //! right top corner of ImportDataView, to switch between widgets.
diff --git a/GUI/View/Job/JobResultsPresenter.h b/GUI/View/Job/JobResultsPresenter.h
index 7591b554928fa042d6a7b84c178ce95f6b0574c7..134492dc325c5a36ab9b8403ad25198dbceea4eb 100644
--- a/GUI/View/Job/JobResultsPresenter.h
+++ b/GUI/View/Job/JobResultsPresenter.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_JOB_JOBRESULTSPRESENTER_H
 #define BORNAGAIN_GUI_VIEW_JOB_JOBRESULTSPRESENTER_H
 
-#include "GUI/View/Data/ItemComboWidget.h"
+#include "GUI/View/Combo/ItemComboWidget.h"
 
 class InstrumentItem;
 enum class JobViewActivity;