diff --git a/GUI/Model/Mini/MinimizerItemCatalog.h b/GUI/Model/Mini/MinimizerItemCatalog.h
index f214f75b94c6c70f5728805adf505ea758449154..780578aa9b931db9d878cdeb5bc41f1726b75bb2 100644
--- a/GUI/Model/Mini/MinimizerItemCatalog.h
+++ b/GUI/Model/Mini/MinimizerItemCatalog.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODEL_MINI_MINIMIZERITEMCATALOG_H
 #define BORNAGAIN_GUI_MODEL_MINI_MINIMIZERITEMCATALOG_H
 
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
 
 //! The MinimizerItemCatalog class is a static class to provide MinimizerItem
 //! with the list of available minimizers/algorithms.
diff --git a/GUI/Model/Mini/MinimizerItems.h b/GUI/Model/Mini/MinimizerItems.h
index dd4c758cd64dafa0c799596a620aaa0b4ff0d6cf..614a8e151d5a224c872feeede361359f3d00ab73 100644
--- a/GUI/Model/Mini/MinimizerItems.h
+++ b/GUI/Model/Mini/MinimizerItems.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODEL_MINI_MINIMIZERITEMS_H
 #define BORNAGAIN_GUI_MODEL_MINI_MINIMIZERITEMS_H
 
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
 
 class GSLLMAMinimizerItem;
 class GSLMultiMinimizerItem;
diff --git a/GUI/Model/Tune/FitParameterItem.h b/GUI/Model/Tune/FitParameterItem.h
index ee0a91822f30745a315a1a01e5b615d986c06717..297d9da01fb9274fb79b011b1c945ee14f98be3b 100644
--- a/GUI/Model/Tune/FitParameterItem.h
+++ b/GUI/Model/Tune/FitParameterItem.h
@@ -17,7 +17,7 @@
 
 #include "Base/Type/OwningVector.h"
 #include "Fit/Param/AttLimits.h"
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
 
 class FitParameterLinkItem;
 
diff --git a/GUI/Support/Data/ComboProperty.cpp b/GUI/Model/Type/ComboProperty.cpp
similarity index 98%
rename from GUI/Support/Data/ComboProperty.cpp
rename to GUI/Model/Type/ComboProperty.cpp
index ec69c2b54678cea703ab3afe5d9ebe5a72099a91..2c235ec460c5d5da60ea31b32fd8570895b324e7 100644
--- a/GUI/Support/Data/ComboProperty.cpp
+++ b/GUI/Model/Type/ComboProperty.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Support/Data/ComboProperty.cpp
+//! @file      GUI/Model/Type/ComboProperty.cpp
 //! @brief     Implements class ComboProperty.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Support/XML/UtilXML.h"
 
diff --git a/GUI/Support/Data/ComboProperty.h b/GUI/Model/Type/ComboProperty.h
similarity index 92%
rename from GUI/Support/Data/ComboProperty.h
rename to GUI/Model/Type/ComboProperty.h
index 78740edf24e42e7e10613f39b342b2c54203abbb..30a36aff4e2dac49efb91408c4d90ceff630adce 100644
--- a/GUI/Support/Data/ComboProperty.h
+++ b/GUI/Model/Type/ComboProperty.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Support/Data/ComboProperty.h
+//! @file      GUI/Model/Type/ComboProperty.h
 //! @brief     Defines class ComboProperty.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_SUPPORT_DATA_COMBOPROPERTY_H
-#define BORNAGAIN_GUI_SUPPORT_DATA_COMBOPROPERTY_H
+#ifndef BORNAGAIN_GUI_MODEL_TYPE_COMBOPROPERTY_H
+#define BORNAGAIN_GUI_MODEL_TYPE_COMBOPROPERTY_H
 
 #include <QStringList>
 #include <QVariant>
@@ -78,4 +78,4 @@ private:
 
 Q_DECLARE_METATYPE(ComboProperty)
 
-#endif // BORNAGAIN_GUI_SUPPORT_DATA_COMBOPROPERTY_H
+#endif // BORNAGAIN_GUI_MODEL_TYPE_COMBOPROPERTY_H
diff --git a/GUI/View/Base/AppConfig.cpp b/GUI/View/Base/AppConfig.cpp
index 17bb1d5efc4d7f651350d5bbe33744653eef9132..a9c464921a1f0330a9f43bf2b36b14caeef2d548 100644
--- a/GUI/View/Base/AppConfig.cpp
+++ b/GUI/View/Base/AppConfig.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Base/AppConfig.h"
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
 #include "GUI/View/Base/ColorGradient.h"
 #include <QDir>
 #include <QSettings>
diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp
index 2597b0bf3612018a78e45402e19a2811b2090a4e..db536c954fd18f130eebd5dc3f307b1f104394a0 100644
--- a/GUI/View/Main/ActionManager.cpp
+++ b/GUI/View/Main/ActionManager.cpp
@@ -16,7 +16,7 @@
 #include "Base/Util/Assert.h"
 #include "Base/Util/SysUtil.h"
 #include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
 #include "GUI/Support/Util/Path.h"
 #include "GUI/View/Base/AppConfig.h"
 #include "GUI/View/Base/mainwindow_constants.h"
diff --git a/GUI/View/Numeric/ComboUtil.cpp b/GUI/View/Numeric/ComboUtil.cpp
index cf043c7649ecc9eae69a3afb87708b3d10aa6c62..673ce44418d06bd2c64c20f70fb58d02dd40bf7b 100644
--- a/GUI/View/Numeric/ComboUtil.cpp
+++ b/GUI/View/Numeric/ComboUtil.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Numeric/ComboUtil.h"
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
 
 QComboBox* GUI::Util::createComboBox(std::function<ComboProperty()> comboFunction,
diff --git a/GUI/View/ParEdit/CustomEditors.cpp b/GUI/View/ParEdit/CustomEditors.cpp
index 03a7ecc5fec8d2474ab15c0342e6353df509d0f7..fc3f52b2b85553b290002db36ca8ad4567b872ed 100644
--- a/GUI/View/ParEdit/CustomEditors.cpp
+++ b/GUI/View/ParEdit/CustomEditors.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/ParEdit/CustomEditors.h"
 #include "Base/Util/Assert.h"
 #include "Fit/Param/RealLimits.h"
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
 #include "GUI/View/Base/CustomEventFilters.h"
 #include "GUI/View/Numeric/ScientificSpinBox.h"
 #include <QBoxLayout>
diff --git a/GUI/View/ParEdit/FitParameterDelegate.cpp b/GUI/View/ParEdit/FitParameterDelegate.cpp
index d0732b0e93dbf13acd62bd3a075eacf8bb3859d9..b8cf2938dba7c5171f9ef11755620de57f3c7434 100644
--- a/GUI/View/ParEdit/FitParameterDelegate.cpp
+++ b/GUI/View/ParEdit/FitParameterDelegate.cpp
@@ -16,7 +16,7 @@
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Model/Tune/FitParameterItem.h"
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
 #include "GUI/View/Base/CustomEventFilters.h"
 #include "GUI/View/Numeric/ScientificSpinBox.h"
 #include "GUI/View/ParEdit/CustomEditors.h"
diff --git a/GUI/View/Setup/AxisPanel.cpp b/GUI/View/Setup/AxisPanel.cpp
index 68fa1fb633d8398b5d19682135bd97bfb728acd6..55a85a1605aae6fd497db03ae936fc3dbe799bd9 100644
--- a/GUI/View/Setup/AxisPanel.cpp
+++ b/GUI/View/Setup/AxisPanel.cpp
@@ -23,7 +23,7 @@
 #include "GUI/Model/File/DatafilesSet.h"
 #include "GUI/Model/Job/DataSource.h"
 #include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
 #include "GUI/View/Base/LayoutUtil.h"
 #include "GUI/View/Numeric/DoubleSpinBox.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
diff --git a/Tests/Unit/GUI/Comparators.cpp b/Tests/Unit/GUI/Comparators.cpp
index 9348d3605c3f3391c793ae348967c068141412a3..5afe2ffc7d94bbef3800f80cf2fbaf6515eb711c 100644
--- a/Tests/Unit/GUI/Comparators.cpp
+++ b/Tests/Unit/GUI/Comparators.cpp
@@ -1,6 +1,6 @@
 #include "Tests/Unit/GUI/Comparators.h"
 
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
 #include <QMetaType>
 
 bool Comparators::m_is_registered = false;
diff --git a/Tests/Unit/GUI/TestComboProperty.cpp b/Tests/Unit/GUI/TestComboProperty.cpp
index a4360d8c07722149b3ea1f5284a69a2c7520dc47..137dd873cdb38e7879f6615bc8eced0203d0821f 100644
--- a/Tests/Unit/GUI/TestComboProperty.cpp
+++ b/Tests/Unit/GUI/TestComboProperty.cpp
@@ -1,4 +1,4 @@
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include "Tests/Unit/GUI/Comparators.h"
 #include "Tests/Unit/GUI/Utils.h"