diff --git a/Modules/SegmentationUI/Qmitk/QmitkSegmentationOrganNamesHandling.cpp b/Modules/SegmentationUI/Qmitk/QmitkSegmentationOrganNamesHandling.cpp
index c027481f2b..143b6b5b43 100644
--- a/Modules/SegmentationUI/Qmitk/QmitkSegmentationOrganNamesHandling.cpp
+++ b/Modules/SegmentationUI/Qmitk/QmitkSegmentationOrganNamesHandling.cpp
@@ -1,62 +1,63 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
-#include <QStringList>
+#include "QmitkSegmentationOrganNamesHandling.h"
+
 #include <mitkAnatomicalStructureColorPresets.h>
 #include <vtkSmartPointer.h>
 
 namespace mitk
 {
-  struct OrganNamesHandling
+  namespace OrganNamesHandling
   {
-    static QStringList GetDefaultOrganColorString()
+    QStringList GetDefaultOrganColorString()
     {
       QStringList organColors;
 
       auto presets = vtkSmartPointer<AnatomicalStructureColorPresets>::New();
       presets->LoadPreset();
 
       for (const auto& preset : presets->GetColorPresets())
       {
         auto organName = preset.first.c_str();
         auto color = QColor(preset.second.GetRed(), preset.second.GetGreen(), preset.second.GetBlue());
 
         AppendToOrganList(organColors, organName, color);
       }
       return organColors;
     }
 
-    static void UpdateOrganList(QStringList& organColors, const QString& organname, mitk::Color color)
+    void UpdateOrganList(QStringList& organColors, const QString& organname, mitk::Color color)
     {
       QString listElement(organname + QColor(color.GetRed() * 255, color.GetGreen() * 255, color.GetBlue() * 255).name());
 
       // remove previous definition if necessary
       int oldIndex = organColors.indexOf(QRegExp(QRegExp::escape(organname) + "#......", Qt::CaseInsensitive));
       if (oldIndex < 0 || organColors.at(oldIndex) != listElement)
       {
         if (oldIndex >= 0)
         {
           organColors.removeAt(oldIndex);
         }
 
         // add colored organ name AND sort list
         organColors.append(listElement);
         organColors.sort();
       }
     }
 
-    static void AppendToOrganList(QStringList& organColors, const QString& organname, const QColor& color)
+    void AppendToOrganList(QStringList& organColors, const QString& organname, const QColor& color)
     {
       organColors.append(organname + color.name());
     }
-  };
+  }
 }
diff --git a/Modules/SegmentationUI/Qmitk/QmitkSegmentationOrganNamesHandling.h b/Modules/SegmentationUI/Qmitk/QmitkSegmentationOrganNamesHandling.h
new file mode 100644
index 0000000000..00e3dc7c07
--- /dev/null
+++ b/Modules/SegmentationUI/Qmitk/QmitkSegmentationOrganNamesHandling.h
@@ -0,0 +1,34 @@
+/*============================================================================
+
+The Medical Imaging Interaction Toolkit (MITK)
+
+Copyright (c) German Cancer Research Center (DKFZ)
+All rights reserved.
+
+Use of this source code is governed by a 3-clause BSD license that can be
+found in the LICENSE file.
+
+============================================================================*/
+
+#ifndef QmitkSegmentationOrganNamesHandling_h
+#define QmitkSegmentationOrganNamesHandling_h
+
+#include <mitkColorProperty.h>
+
+#include <MitkSegmentationUIExports.h>
+
+#include <QColor>
+#include <QString>
+#include <QStringList>
+
+namespace mitk
+{
+  namespace OrganNamesHandling
+  {
+    MITKSEGMENTATIONUI_EXPORT QStringList GetDefaultOrganColorString();
+    MITKSEGMENTATIONUI_EXPORT void UpdateOrganList(QStringList& organColors, const QString& organname, Color color);
+    MITKSEGMENTATIONUI_EXPORT void AppendToOrganList(QStringList& organColors, const QString& organname, const QColor& color);
+  };
+}
+
+#endif
diff --git a/Modules/SegmentationUI/files.cmake b/Modules/SegmentationUI/files.cmake
index 36584cbe80..ba605c292d 100644
--- a/Modules/SegmentationUI/files.cmake
+++ b/Modules/SegmentationUI/files.cmake
@@ -1,87 +1,88 @@
 set( CPP_FILES
 Qmitk/QmitkAdaptiveRegionGrowingToolGUI.cpp
 Qmitk/QmitkAutoSegmentationToolGUIBase.cpp
 Qmitk/QmitkAutoMLSegmentationToolGUIBase.cpp
 Qmitk/QmitkBinaryThresholdToolGUIBase.cpp
 Qmitk/QmitkBinaryThresholdToolGUI.cpp
 Qmitk/QmitkBinaryThresholdULToolGUI.cpp
 Qmitk/QmitkCalculateGrayValueStatisticsToolGUI.cpp
 Qmitk/QmitkConfirmSegmentationDialog.cpp
 Qmitk/QmitkCopyToClipBoardDialog.cpp
 Qmitk/QmitkDrawPaintbrushToolGUI.cpp
 Qmitk/QmitkErasePaintbrushToolGUI.cpp
 Qmitk/QmitkLiveWireTool2DGUI.cpp
 Qmitk/QmitkNewSegmentationDialog.cpp
 Qmitk/QmitkOtsuTool3DGUI.cpp
 Qmitk/QmitkPaintbrushToolGUI.cpp
 Qmitk/QmitkPickingToolGUI.cpp
 Qmitk/QmitkPixelManipulationToolGUI.cpp
 Qmitk/QmitkSlicesInterpolator.cpp
 Qmitk/QmitkToolGUI.cpp
 Qmitk/QmitkToolGUIArea.cpp
 Qmitk/QmitkToolSelectionBox.cpp
 Qmitk/QmitknnUNetToolGUI.cpp
 Qmitk/QmitknnUNetToolSlots.cpp
+Qmitk/QmitkSegmentationOrganNamesHandling.cpp
 #Added from ML
 Qmitk/QmitkLabelSetWidget.cpp
 Qmitk/QmitkSurfaceStampWidget.cpp
 Qmitk/QmitkMaskStampWidget.cpp
 Qmitk/QmitkSliceBasedInterpolatorWidget.cpp
 Qmitk/QmitkStaticDynamicSegmentationDialog.cpp
 Qmitk/QmitkSurfaceBasedInterpolatorWidget.cpp
 Qmitk/QmitkSimpleLabelSetListWidget.cpp
 )
 
 set(MOC_H_FILES
 Qmitk/QmitkAdaptiveRegionGrowingToolGUI.h
 Qmitk/QmitkAutoSegmentationToolGUIBase.h
 Qmitk/QmitkAutoMLSegmentationToolGUIBase.h
 Qmitk/QmitkBinaryThresholdToolGUIBase.h
 Qmitk/QmitkBinaryThresholdToolGUI.h
 Qmitk/QmitkBinaryThresholdULToolGUI.h
 Qmitk/QmitkCalculateGrayValueStatisticsToolGUI.h
 Qmitk/QmitkConfirmSegmentationDialog.h
 Qmitk/QmitkCopyToClipBoardDialog.h
 Qmitk/QmitkDrawPaintbrushToolGUI.h
 Qmitk/QmitkErasePaintbrushToolGUI.h
 Qmitk/QmitkLiveWireTool2DGUI.h
 Qmitk/QmitkNewSegmentationDialog.h
 Qmitk/QmitkOtsuTool3DGUI.h
 Qmitk/QmitkPaintbrushToolGUI.h
 Qmitk/QmitkPickingToolGUI.h
 Qmitk/QmitkPixelManipulationToolGUI.h
 Qmitk/QmitkSlicesInterpolator.h
 Qmitk/QmitkToolGUI.h
 Qmitk/QmitkToolGUIArea.h
 Qmitk/QmitkToolSelectionBox.h
 Qmitk/QmitknnUNetToolGUI.h
 Qmitk/QmitknnUNetGPU.h
 Qmitk/QmitknnUNetEnsembleLayout.h
 Qmitk/QmitknnUNetFolderParser.h
 #Added from ML
 Qmitk/QmitkLabelSetWidget.h
 Qmitk/QmitkSurfaceStampWidget.h
 Qmitk/QmitkMaskStampWidget.h
 Qmitk/QmitkSliceBasedInterpolatorWidget.h
 Qmitk/QmitkStaticDynamicSegmentationDialog.h
 Qmitk/QmitkSurfaceBasedInterpolatorWidget.h
 Qmitk/QmitkSimpleLabelSetListWidget.h
 )
 
 set(UI_FILES
 Qmitk/QmitkAdaptiveRegionGrowingToolGUIControls.ui
 Qmitk/QmitkConfirmSegmentationDialog.ui
 Qmitk/QmitkOtsuToolWidgetControls.ui
 Qmitk/QmitkLiveWireTool2DGUIControls.ui
 #Added from ML
 Qmitk/QmitkLabelSetWidgetControls.ui
 Qmitk/QmitkSurfaceStampWidgetGUIControls.ui
 Qmitk/QmitkMaskStampWidgetGUIControls.ui
 Qmitk/QmitkSliceBasedInterpolatorWidgetGUIControls.ui
 Qmitk/QmitkSurfaceBasedInterpolatorWidgetGUIControls.ui
 Qmitk/QmitknnUNetToolGUIControls.ui
 )
 
 set(QRC_FILES
   resources/SegmentationUI.qrc
 )