diff --git a/GUI/Models/Varia/DistributionItems.cpp b/GUI/Models/Group/DistributionItems.cpp
similarity index 99%
rename from GUI/Models/Varia/DistributionItems.cpp
rename to GUI/Models/Group/DistributionItems.cpp
index 056e4ecaf194365065e5d36fd5f5dcfd63abff8c..8784d46e21d812acf2159f7cfc2875e2423b6329 100644
--- a/GUI/Models/Varia/DistributionItems.cpp
+++ b/GUI/Models/Group/DistributionItems.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Varia/DistributionItems.cpp
+//! @file      GUI/Models/Group/DistributionItems.cpp
 //! @brief     Implements class DistributionItem and several subclasses
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/Varia/DistributionItems.h"
+#include "GUI/Models/Group/DistributionItems.h"
 #include "GUI/Models/Group/GroupInfo.h"
 #include "GUI/Models/Varia/RealLimitsItems.h"
 #include "Param/Distrib/Distributions.h"
diff --git a/GUI/Models/Varia/DistributionItems.h b/GUI/Models/Group/DistributionItems.h
similarity index 96%
rename from GUI/Models/Varia/DistributionItems.h
rename to GUI/Models/Group/DistributionItems.h
index db16b14d0a01944f8577a0c8a296051361080746..a4734847bbabe2bfecfcb5726032c30a39570492 100644
--- a/GUI/Models/Varia/DistributionItems.h
+++ b/GUI/Models/Group/DistributionItems.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Varia/DistributionItems.h
+//! @file      GUI/Models/Group/DistributionItems.h
 //! @brief     Defines class DistributionItem and several subclasses
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_VARIA_DISTRIBUTIONITEMS_H
-#define BORNAGAIN_GUI_MODELS_VARIA_DISTRIBUTIONITEMS_H
+#ifndef BORNAGAIN_GUI_MODELS_GROUP_DISTRIBUTIONITEMS_H
+#define BORNAGAIN_GUI_MODELS_GROUP_DISTRIBUTIONITEMS_H
 
 #include "GUI/Models/Session/SessionItem.h"
 
@@ -208,4 +208,4 @@ public:
     void setRightWidth(double right_width);
 };
 
-#endif // BORNAGAIN_GUI_MODELS_VARIA_DISTRIBUTIONITEMS_H
+#endif // BORNAGAIN_GUI_MODELS_GROUP_DISTRIBUTIONITEMS_H
diff --git a/GUI/Models/Group/GroupInfo.h b/GUI/Models/Group/GroupInfo.h
index 5966333b3f82f728874e311a8e02c970c1fb0e81..a700e07629b350bcc62c9ce9a708d9ada52da2be 100644
--- a/GUI/Models/Group/GroupInfo.h
+++ b/GUI/Models/Group/GroupInfo.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODELS_GROUP_GROUPINFO_H
 #define BORNAGAIN_GUI_MODELS_GROUP_GROUPINFO_H
 
-#include "GUI/Models/Varia/ItemCatalog.h"
+#include "GUI/Models/Group/ItemCatalog.h"
 #include <QString>
 #include <QStringList>
 #include <QVector>
diff --git a/GUI/Models/Group/GroupItemController.cpp b/GUI/Models/Group/GroupItemController.cpp
index be94c0d17bfd4b776249685fd5600ee9a30b3a42..132ef94fabfde6740a5290afda8a2fc95833cab1 100644
--- a/GUI/Models/Group/GroupItemController.cpp
+++ b/GUI/Models/Group/GroupItemController.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Models/Group/GroupItemController.h"
 #include "GUI/Models/Group/ComboProperty.h"
 #include "GUI/Models/Session/SessionItem.h"
-#include "GUI/Models/Varia/ItemFactory.h"
+#include "GUI/Models/Group/ItemFactory.h"
 
 GroupItemController::GroupItemController(SessionItem* groupItem, GroupInfo groupInfo)
     : m_groupItem(groupItem), m_groupInfo(groupInfo)
diff --git a/GUI/Models/Varia/ItemCatalog.cpp b/GUI/Models/Group/ItemCatalog.cpp
similarity index 99%
rename from GUI/Models/Varia/ItemCatalog.cpp
rename to GUI/Models/Group/ItemCatalog.cpp
index cc82c8aabbc6803dfde4b5c20266d45b2cc2521b..b08d03c70206f521e777ae94082a172fea56d8e1 100644
--- a/GUI/Models/Varia/ItemCatalog.cpp
+++ b/GUI/Models/Group/ItemCatalog.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Varia/ItemCatalog.cpp
+//! @file      GUI/Models/Group/ItemCatalog.cpp
 //! @brief     Implements class ItemCatalog
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/Varia/ItemCatalog.h"
+#include "GUI/Models/Group/ItemCatalog.h"
 #include "Base/Utils/Assert.h"
 #include "GUI/Models/Data/Data1DViewItem.h"
 #include "GUI/Models/Data/DataProperties.h"
diff --git a/GUI/Models/Varia/ItemCatalog.h b/GUI/Models/Group/ItemCatalog.h
similarity index 90%
rename from GUI/Models/Varia/ItemCatalog.h
rename to GUI/Models/Group/ItemCatalog.h
index d0b57d2c4c4a133598feb1aa8f2a0854e2377526..964a1a0f455e20934f0febd10091da956fc1b402 100644
--- a/GUI/Models/Varia/ItemCatalog.h
+++ b/GUI/Models/Group/ItemCatalog.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Varia/ItemCatalog.h
+//! @file      GUI/Models/Group/ItemCatalog.h
 //! @brief     Defines class ItemCatalog
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_VARIA_ITEMCATALOG_H
-#define BORNAGAIN_GUI_MODELS_VARIA_ITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODELS_GROUP_ITEMCATALOG_H
+#define BORNAGAIN_GUI_MODELS_GROUP_ITEMCATALOG_H
 
 #include "Base/Utils/IFactory.h"
 #include <QMap>
@@ -64,4 +64,4 @@ private:
 };
 
 
-#endif // BORNAGAIN_GUI_MODELS_VARIA_ITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODELS_GROUP_ITEMCATALOG_H
diff --git a/GUI/Models/Varia/ItemFactory.cpp b/GUI/Models/Group/ItemFactory.cpp
similarity index 88%
rename from GUI/Models/Varia/ItemFactory.cpp
rename to GUI/Models/Group/ItemFactory.cpp
index 947d47da6f9dd2745f3576f441e1e808e54037df..1ae12723d55adfd104cc0562a469551f5faca967 100644
--- a/GUI/Models/Varia/ItemFactory.cpp
+++ b/GUI/Models/Group/ItemFactory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Varia/ItemFactory.cpp
+//! @file      GUI/Models/Group/ItemFactory.cpp
 //! @brief     Implements class ItemFactory
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,9 +12,9 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/Varia/ItemFactory.h"
+#include "GUI/Models/Group/ItemFactory.h"
 #include "GUI/Models/Session/SessionItem.h"
-#include "GUI/Models/Varia/ItemCatalog.h"
+#include "GUI/Models/Group/ItemCatalog.h"
 
 SessionItem* GUI::Model::ItemFactory::CreateItem(const QString& model_name, SessionItem* parent)
 {
diff --git a/GUI/Models/Varia/ItemFactory.h b/GUI/Models/Group/ItemFactory.h
similarity index 86%
rename from GUI/Models/Varia/ItemFactory.h
rename to GUI/Models/Group/ItemFactory.h
index 7f610cb4ad16e261ad162c43ae07046f91f65d79..61cf6ab8bb4ea37d0bdaa1436a1df54dca2cf813 100644
--- a/GUI/Models/Varia/ItemFactory.h
+++ b/GUI/Models/Group/ItemFactory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Varia/ItemFactory.h
+//! @file      GUI/Models/Group/ItemFactory.h
 //! @brief     Defines namespace GUI::Model::ItemFactory
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_VARIA_ITEMFACTORY_H
-#define BORNAGAIN_GUI_MODELS_VARIA_ITEMFACTORY_H
+#ifndef BORNAGAIN_GUI_MODELS_GROUP_ITEMFACTORY_H
+#define BORNAGAIN_GUI_MODELS_GROUP_ITEMFACTORY_H
 
 #include <QString>
 
@@ -39,4 +39,4 @@ template <typename ItemType> ItemType* CreateItem(SessionItem* parent)
 
 }; // namespace GUI::Model::ItemFactory
 
-#endif // BORNAGAIN_GUI_MODELS_VARIA_ITEMFACTORY_H
+#endif // BORNAGAIN_GUI_MODELS_GROUP_ITEMFACTORY_H
diff --git a/GUI/Models/Instrument/BeamDistributionItem.h b/GUI/Models/Instrument/BeamDistributionItem.h
index 27cac4d81949a4c4d41fc366b62706fd10022dd9..5afd96d19e20d16f0d125b7db92659c1a4e9d822 100644
--- a/GUI/Models/Instrument/BeamDistributionItem.h
+++ b/GUI/Models/Instrument/BeamDistributionItem.h
@@ -15,8 +15,8 @@
 #ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMDISTRIBUTIONITEM_H
 #define BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMDISTRIBUTIONITEM_H
 
-#include "GUI/Models/Varia/DistributionItems.h"
-#include "GUI/Models/Varia/ItemWithDistribution.h"
+#include "GUI/Models/Group/DistributionItems.h"
+#include "GUI/Models/Types/ItemWithDistribution.h"
 #include "Param/Distrib/ParameterDistribution.h"
 
 //! The BeamDistributionItem handles wavelength, inclination and azimuthal parameter
diff --git a/GUI/Models/Job/JobModelFunctions.cpp b/GUI/Models/Job/JobModelFunctions.cpp
index 110cdb959c1b5fe8a231290668f4211e5d828094..6176b81340e0885056d4159b3d054cb844263ad4 100644
--- a/GUI/Models/Job/JobModelFunctions.cpp
+++ b/GUI/Models/Job/JobModelFunctions.cpp
@@ -31,7 +31,7 @@
 #include "GUI/Models/Material/MaterialItemContainer.h"
 #include "GUI/Models/Material/MaterialItemUtils.h"
 #include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Models/Varia/ItemWithMaterial.h"
+#include "GUI/Models/Sample/ItemWithMaterial.h"
 #include "GUI/utils/Error.h"
 #include "GUI/utils/Helpers.h"
 #include "GUI/utils/ItemFileNameUtils.h"
diff --git a/GUI/Models/Varia/ItemWithMaterial.cpp b/GUI/Models/Sample/ItemWithMaterial.cpp
similarity index 95%
rename from GUI/Models/Varia/ItemWithMaterial.cpp
rename to GUI/Models/Sample/ItemWithMaterial.cpp
index 817fd3bafeba299b2547975248610c432909f140..31c4726e151564efe10150040163b25af7746f00 100644
--- a/GUI/Models/Varia/ItemWithMaterial.cpp
+++ b/GUI/Models/Sample/ItemWithMaterial.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Varia/ItemWithMaterial.cpp
+//! @file      GUI/Models/Sample/ItemWithMaterial.cpp
 //! @brief     Implements class ItemWithMaterial
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/Varia/ItemWithMaterial.h"
+#include "GUI/Models/Sample/ItemWithMaterial.h"
 #include "GUI/Models/Job/JobItem.h"
 #include "GUI/Models/Job/JobModelFunctions.h"
 #include "GUI/Models/Material/MaterialItemContainer.h"
diff --git a/GUI/Models/Varia/ItemWithMaterial.h b/GUI/Models/Sample/ItemWithMaterial.h
similarity index 86%
rename from GUI/Models/Varia/ItemWithMaterial.h
rename to GUI/Models/Sample/ItemWithMaterial.h
index 8b3bec7bae6bf1708621f0f7d47b05133e33bcac..63fe344c95758eb4b2f1c2ccbb27582815619d96 100644
--- a/GUI/Models/Varia/ItemWithMaterial.h
+++ b/GUI/Models/Sample/ItemWithMaterial.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Varia/ItemWithMaterial.h
+//! @file      GUI/Models/Sample/ItemWithMaterial.h
 //! @brief     Defines abstract item with a material property
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_VARIA_ITEMWITHMATERIAL_H
-#define BORNAGAIN_GUI_MODELS_VARIA_ITEMWITHMATERIAL_H
+#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_ITEMWITHMATERIAL_H
+#define BORNAGAIN_GUI_MODELS_SAMPLE_ITEMWITHMATERIAL_H
 
 #include "GUI/Models/Session/SessionGraphicsItem.h"
 
@@ -45,4 +45,4 @@ protected:
     ItemWithMaterial(const QString& model_type);
 };
 
-#endif // BORNAGAIN_GUI_MODELS_VARIA_ITEMWITHMATERIAL_H
+#endif // BORNAGAIN_GUI_MODELS_SAMPLE_ITEMWITHMATERIAL_H
diff --git a/GUI/Models/Sample/LayerItem.h b/GUI/Models/Sample/LayerItem.h
index 6f5b9f5f2f883ea75a9b88e2b182940bbdda1d10..80cd481f7531827ac1aa09176a63547ead806ec7 100644
--- a/GUI/Models/Sample/LayerItem.h
+++ b/GUI/Models/Sample/LayerItem.h
@@ -16,7 +16,7 @@
 #define BORNAGAIN_GUI_MODELS_SAMPLE_LAYERITEM_H
 
 #include "GUI/Models/Group/SelectionDescriptor.h"
-#include "GUI/Models/Varia/ItemWithMaterial.h"
+#include "GUI/Models/Sample/ItemWithMaterial.h"
 #include <variant>
 
 class LayerZeroRoughnessItem;
diff --git a/GUI/Models/Sample/ParticleItem.h b/GUI/Models/Sample/ParticleItem.h
index 6585bdc43650b7430abe6309a925c0371fdb0c3a..f70ccd01151638ab22f2daca7f2b0d88703d24c5 100644
--- a/GUI/Models/Sample/ParticleItem.h
+++ b/GUI/Models/Sample/ParticleItem.h
@@ -16,7 +16,7 @@
 #define BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLEITEM_H
 
 #include "GUI/Models/Sample/ItemWithParticles.h"
-#include "GUI/Models/Varia/ItemWithMaterial.h"
+#include "GUI/Models/Sample/ItemWithMaterial.h"
 
 class FormFactorItem;
 class GroupItem;
diff --git a/GUI/Models/Sample/ParticleLayoutItem.cpp b/GUI/Models/Sample/ParticleLayoutItem.cpp
index 7721b838fc0060366aadaf307ac2cf9ec0371de0..46936758a649f24f99aa204a9473ac238c9534fc 100644
--- a/GUI/Models/Sample/ParticleLayoutItem.cpp
+++ b/GUI/Models/Sample/ParticleLayoutItem.cpp
@@ -21,7 +21,7 @@
 #include "GUI/Models/Sample/ParticleItem.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include "GUI/Models/Types/DoubleDescriptor.h"
-#include "GUI/Models/Varia/ItemCatalog.h"
+#include "GUI/Models/Group/ItemCatalog.h"
 
 namespace {
 
diff --git a/GUI/Models/Sample/SampleModel.cpp b/GUI/Models/Sample/SampleModel.cpp
index a83999d596318d31caa9a3ebd5bd82f82bd8a8d2..b2ec19334e3df50cd80e3a84f269523af2ccd118 100644
--- a/GUI/Models/Sample/SampleModel.cpp
+++ b/GUI/Models/Sample/SampleModel.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Models/Material/MaterialItemUtils.h"
 #include "GUI/Models/Parameter/PropertyItem.h"
 #include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Models/Varia/ItemWithMaterial.h"
+#include "GUI/Models/Sample/ItemWithMaterial.h"
 #include <QApplication>
 #include <QFontMetrics>
 #include <QPixmap>
diff --git a/GUI/Models/Session/SessionItem.cpp b/GUI/Models/Session/SessionItem.cpp
index 90cbdd28f8514316d667da445efe1c0b6d688c9f..19d74e4db76aea765086a1bfc554f807dda5231b 100644
--- a/GUI/Models/Session/SessionItem.cpp
+++ b/GUI/Models/Session/SessionItem.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Models/Session/SessionItemTags.h"
 #include "GUI/Models/Session/SessionItemUtils.h"
 #include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Varia/ItemFactory.h"
+#include "GUI/Models/Group/ItemFactory.h"
 
 //! Constructs new item with given model type. The type must be defined.
 SessionItem::SessionItem(const QString& modelType)
diff --git a/GUI/Models/Session/SessionModel.cpp b/GUI/Models/Session/SessionModel.cpp
index 77d3c170c63abf6e26150a3ea6f2cd53ca091ee9..0a8059ba2466f771e5b3840be35a726dc80786f2 100644
--- a/GUI/Models/Session/SessionModel.cpp
+++ b/GUI/Models/Session/SessionModel.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Models/Session/SessionModel.h"
 #include "GUI/Models/Session/SessionItemTags.h"
 #include "GUI/Models/Session/SessionItemUtils.h"
-#include "GUI/Models/Varia/ItemFactory.h"
+#include "GUI/Models/Group/ItemFactory.h"
 #include "GUI/utils/Error.h"
 #include "GUI/utils/Helpers.h"
 #include <QFile>
diff --git a/GUI/Models/Varia/ItemWithDistribution.h b/GUI/Models/Types/ItemWithDistribution.h
similarity index 80%
rename from GUI/Models/Varia/ItemWithDistribution.h
rename to GUI/Models/Types/ItemWithDistribution.h
index a82914a8848f99269e670182e3330f4d4b42b146..3496b96b3ddffe52dc5f87d9f77732678c3f4c26 100644
--- a/GUI/Models/Varia/ItemWithDistribution.h
+++ b/GUI/Models/Types/ItemWithDistribution.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Varia/ItemWithDistribution.h
+//! @file      GUI/Models/Types/ItemWithDistribution.h
 //! @brief     Defines abstract item with a distribution
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_VARIA_ITEMWITHDISTRIBUTION_H
-#define BORNAGAIN_GUI_MODELS_VARIA_ITEMWITHDISTRIBUTION_H
+#ifndef BORNAGAIN_GUI_MODELS_TYPES_ITEMWITHDISTRIBUTION_H
+#define BORNAGAIN_GUI_MODELS_TYPES_ITEMWITHDISTRIBUTION_H
 
 #include "Wrap/WinDllMacros.h"
 
@@ -33,4 +33,4 @@ public:
     virtual ~ItemWithDistribution() = default;
 };
 
-#endif // BORNAGAIN_GUI_MODELS_VARIA_ITEMWITHDISTRIBUTION_H
+#endif // BORNAGAIN_GUI_MODELS_TYPES_ITEMWITHDISTRIBUTION_H
diff --git a/GUI/Views/InstrumentWidgets/DistributionEditor.cpp b/GUI/Views/InstrumentWidgets/DistributionEditor.cpp
index 222eafca6ec81678587cca2fddee0c09ff943991..488953c681b9657234d55efe4e21fae64f1a7467 100644
--- a/GUI/Views/InstrumentWidgets/DistributionEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionEditor.cpp
@@ -14,8 +14,8 @@
 
 #include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
 #include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Varia/DistributionItems.h"
-#include "GUI/Models/Varia/ItemWithDistribution.h"
+#include "GUI/Models/Group/DistributionItems.h"
+#include "GUI/Models/Types/ItemWithDistribution.h"
 #include "GUI/Views/InstrumentWidgets/DistributionForms.h"
 #include "GUI/Views/InstrumentWidgets/EditDistributionDialog.h"
 #include "GUI/Views/PropertyEditor/GroupInfoBox.h"
diff --git a/GUI/Views/InstrumentWidgets/DistributionForms.cpp b/GUI/Views/InstrumentWidgets/DistributionForms.cpp
index 99fa6f673d0a86b462e812abf2aaaa41d60879a6..d35eb802aab7ce916df890dfdab5eefc05036b85 100644
--- a/GUI/Views/InstrumentWidgets/DistributionForms.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionForms.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/InstrumentWidgets/DistributionForms.h"
-#include "GUI/Models/Varia/DistributionItems.h"
-#include "GUI/Models/Varia/ItemWithDistribution.h"
+#include "GUI/Models/Group/DistributionItems.h"
+#include "GUI/Models/Types/ItemWithDistribution.h"
 #include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
 #include "GUI/Widgets/Common/ScientificSpinBox.h"
 
diff --git a/GUI/Views/InstrumentWidgets/DistributionPlot.cpp b/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
index 8840b990cfe4522141c65fafc51db4550cd5551c..8d7b9a27182160bd7346c0554383c71908c14b8a 100644
--- a/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/InstrumentWidgets/DistributionPlot.h"
-#include "GUI/Models/Varia/DistributionItems.h"
+#include "GUI/Models/Group/DistributionItems.h"
 #include "GUI/Models/Varia/RealLimitsItems.h"
 #include "GUI/Widgets/Info/CautionSign.h"
 #include "Param/Distrib/Distributions.h"
diff --git a/GUI/Views/InstrumentWidgets/EditDistributionDialog.cpp b/GUI/Views/InstrumentWidgets/EditDistributionDialog.cpp
index f6b489ae3085cd721e840f8b7a5a23c35074fca1..acc0ce7e9f0389049d054b0973f88f1e2d40a816 100644
--- a/GUI/Views/InstrumentWidgets/EditDistributionDialog.cpp
+++ b/GUI/Views/InstrumentWidgets/EditDistributionDialog.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/InstrumentWidgets/EditDistributionDialog.h"
-#include "GUI/Models/Varia/ItemWithDistribution.h"
+#include "GUI/Models/Types/ItemWithDistribution.h"
 #include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
 #include "GUI/Views/InstrumentWidgets/DistributionPlot.h"
 
diff --git a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
index 54445d9eac0dffa798a1b1ecad10dc3c5d2334bb..cd6238e4ea4d6d0cdf37cd4a23d040e02301c737 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -20,7 +20,7 @@
 #include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/ItemWithMaterial.h"
+#include "GUI/Models/Sample/ItemWithMaterial.h"
 #include "GUI/Views/Main/MainWindow.h"
 #include "GUI/Views/MaterialEditor/MaterialEditorModel.h"
 #include "GUI/Widgets/Common/StyleUtils.h"
diff --git a/GUI/Views/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
index 62f946409c401bc51fed6019d4ae13043a0ac8bc..d750f5ac0ac4f7a8d347881d8ada86816f0e5311 100644
--- a/GUI/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/Views/SampleDesigner/DesignerScene.cpp
@@ -24,7 +24,7 @@
 #include "GUI/Models/Sample/ParticleLayoutItem.h"
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Models/Trafo/RotationItems.h"
-#include "GUI/Models/Varia/ItemFactory.h"
+#include "GUI/Models/Group/ItemFactory.h"
 #include "GUI/Views/SampleDesigner/DesignerMimeData.h"
 #include "GUI/Views/SampleDesigner/LayerView.h"
 #include "GUI/Views/SampleDesigner/MultiLayerView.h"
diff --git a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
index 93cb312c508847ade1e4ccbe396638353a7170b7..5ff6b989a019cdc44a8775fd4de7b737079d2d24 100644
--- a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Models/Session/ModelPath.h"
 #include "GUI/Models/Types/DoubleDescriptor.h"
 #include "GUI/Models/Types/VectorDescriptor.h"
-#include "GUI/Models/Varia/ItemWithMaterial.h"
+#include "GUI/Models/Sample/ItemWithMaterial.h"
 #include "GUI/Models/State/SessionData.h"
 #include "GUI/Views/Edit/DoubleLineEdit.h"
 #include "GUI/Views/Edit/DoubleSpinBox.h"
diff --git a/GUI/Views/SampleDesigner/SampleToolBox.cpp b/GUI/Views/SampleDesigner/SampleToolBox.cpp
index e270578ec54826eb58fc7d11644ebe6d0cbb29d5..1ed4be293dd81840dbe2865487cc275284b7cffa 100644
--- a/GUI/Views/SampleDesigner/SampleToolBox.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBox.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Models/Sample/MultiLayerItem.h"
 #include "GUI/Models/Sample/ParticleLayoutItem.h"
 #include "GUI/Models/Trafo/TransformationItem.h"
-#include "GUI/Models/Varia/ItemCatalog.h"
+#include "GUI/Models/Group/ItemCatalog.h"
 #include "GUI/Views/SampleDesigner/DesignerMimeData.h"
 #include "GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.h"
 #include <QApplication>
diff --git a/GUI/Views/SampleDesigner/SampleTreeWidget.cpp b/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
index 7384ab6f16d0094065fa87e4f1ca97a850d42b8d..908c8738d66ff4b1411f9e7a1dc13c1cf65fc527 100644
--- a/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
+++ b/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Views/SampleDesigner/SampleTreeWidget.h"
 #include "GUI/Models/Parameter/FilterPropertyProxy.h"
 #include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Models/Varia/ItemCatalog.h"
+#include "GUI/Models/Group/ItemCatalog.h"
 #include "GUI/Views/SampleDesigner/ItemTreeView.h"
 #include <QAction>
 #include <QMenu>
diff --git a/Tests/Unit/GUI/TestGroupItem.cpp b/Tests/Unit/GUI/TestGroupItem.cpp
index 5dcd7aa34241d92609d2b7d919c39c1918b434f0..02e2852ad898274d4832646a60be7861a4e1f82e 100644
--- a/Tests/Unit/GUI/TestGroupItem.cpp
+++ b/Tests/Unit/GUI/TestGroupItem.cpp
@@ -3,7 +3,7 @@
 #include "GUI/Models/Sample/FormFactorItems.h"
 #include "GUI/Models/Session/SessionItemUtils.h"
 #include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Varia/DistributionItems.h"
+#include "GUI/Models/Group/DistributionItems.h"
 #include "GUI/utils/Error.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include "Tests/Unit/GUI/Utils.h"