diff --git a/Modules/SegmentationUI/Qmitk/QmitkNewSegmentationDialog.cpp b/Modules/SegmentationUI/Qmitk/QmitkNewSegmentationDialog.cpp
deleted file mode 100644
index 505e1f4059..0000000000
--- a/Modules/SegmentationUI/Qmitk/QmitkNewSegmentationDialog.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*============================================================================
-
-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 "QmitkNewSegmentationDialog.h"
-#include <QmitkSegmentationOrganNamesHandling.h>
-
-#include <ui_QmitkNewSegmentationDialog.h>
-
-#include <QColorDialog>
-#include <QCompleter>
-#include <QPushButton>
-#include <QStringListModel>
-
-QmitkNewSegmentationDialog::QmitkNewSegmentationDialog(QWidget *parent, Mode mode)
-  : QDialog(parent),
-    m_Ui(new Ui::QmitkNewSegmentationDialog),
-    m_Color(Qt::red)
-{
-  m_Ui->setupUi(this);
-
-  if (RenameLabel == mode)
-  {
-    this->setWindowTitle("Rename Label");
-    m_Ui->label->setText("New name and color of the label");
-    m_Ui->buttonBox->button(QDialogButtonBox::Ok)->setText("Rename label");
-  }
-  else
-  {
-    m_Ui->buttonBox->button(QDialogButtonBox::Ok)->setText("Create label");
-  }
-
-  auto* completer = new QCompleter(QStringList());
-  completer->setCaseSensitivity(Qt::CaseInsensitive);
-
-  m_Ui->nameLineEdit->setCompleter(completer);
-  m_Ui->nameLineEdit->setFocus();
-
-  connect(completer, qOverload<const QString&>(&QCompleter::activated), this, qOverload<const QString&>(&QmitkNewSegmentationDialog::OnSuggestionSelected));
-  connect(m_Ui->colorButton, &QToolButton::clicked, this, &QmitkNewSegmentationDialog::OnColorButtonClicked);
-  connect(m_Ui->buttonBox, &QDialogButtonBox::accepted, this, &QmitkNewSegmentationDialog::OnAccept);
-
-  this->UpdateColorButtonBackground();
-  this->SetSuggestionList(mitk::OrganNamesHandling::GetDefaultOrganColorString());
-}
-
-QmitkNewSegmentationDialog::~QmitkNewSegmentationDialog()
-{
-}
-
-void QmitkNewSegmentationDialog::UpdateColorButtonBackground()
-{
-  m_Ui->colorButton->setStyleSheet("background-color:" + m_Color.name());
-}
-
-QString QmitkNewSegmentationDialog::GetName() const
-{
-  return m_Name;
-}
-
-mitk::Color QmitkNewSegmentationDialog::GetColor() const
-{
-  mitk::Color color;
-
-  if (m_Color.isValid())
-  {
-    color.SetRed(m_Color.redF());
-    color.SetGreen(m_Color.greenF());
-    color.SetBlue(m_Color.blueF());
-  }
-  else
-  {
-    color.Set(1.0f, 0.0f, 0.0f);
-  }
-
-  return color;
-}
-
-void QmitkNewSegmentationDialog::SetName(const QString& name)
-{
-  m_Ui->nameLineEdit->setText(name);
-}
-
-void QmitkNewSegmentationDialog::SetColor(const mitk::Color& color)
-{
-  m_Color.setRgbF(color.GetRed(), color.GetGreen(), color.GetBlue());
-  this->UpdateColorButtonBackground();
-}
-
-void QmitkNewSegmentationDialog::SetSuggestionList(const QStringList& suggestionList)
-{
-  for (const auto& suggestion : suggestionList)
-  {
-    m_NameSuggestions.push_back(suggestion.left(suggestion.length() - 7));
-    m_ColorSuggestions.push_back(suggestion.right(7));
-  }
-
-  auto* completerModel = static_cast<QStringListModel*>(m_Ui->nameLineEdit->completer()->model());
-  completerModel->setStringList(m_NameSuggestions);
-}
-
-void QmitkNewSegmentationDialog::OnAccept()
-{
-  m_Name = m_Ui->nameLineEdit->text();
-  this->accept();
-}
-
-void QmitkNewSegmentationDialog::OnColorButtonClicked()
-{
-  auto color = QColorDialog::getColor(m_Color);
-
-  if (color.isValid())
-  {
-    m_Color = color;
-    this->UpdateColorButtonBackground();
-  }
-}
-
-void QmitkNewSegmentationDialog::OnSuggestionSelected(const QString &name)
-{
-  auto i = m_NameSuggestions.indexOf(name);
-
-  if (-1 != i)
-  {
-    m_Color = m_ColorSuggestions[i];
-    this->UpdateColorButtonBackground();
-  }
-}
diff --git a/Modules/SegmentationUI/Qmitk/QmitkSegmentationOrganNamesHandling.cpp b/Modules/SegmentationUI/Qmitk/QmitkSegmentationOrganNamesHandling.cpp
deleted file mode 100644
index 143b6b5b43..0000000000
--- a/Modules/SegmentationUI/Qmitk/QmitkSegmentationOrganNamesHandling.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*============================================================================
-
-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 "QmitkSegmentationOrganNamesHandling.h"
-
-#include <mitkAnatomicalStructureColorPresets.h>
-#include <vtkSmartPointer.h>
-
-namespace mitk
-{
-  namespace OrganNamesHandling
-  {
-    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;
-    }
-
-    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();
-      }
-    }
-
-    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
deleted file mode 100644
index 00e3dc7c07..0000000000
--- a/Modules/SegmentationUI/Qmitk/QmitkSegmentationOrganNamesHandling.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*============================================================================
-
-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 f18406bb58..54b348aa7c 100644
--- a/Modules/SegmentationUI/files.cmake
+++ b/Modules/SegmentationUI/files.cmake
@@ -1,89 +1,79 @@
 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
-Qmitk/QmitkNewSegmentationDialog.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
 )
diff --git a/Plugins/org.mitk.gui.qt.multilabelsegmentation/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.multilabelsegmentation/manifest_headers.cmake
index 54eb90ad33..97ba4ee1c4 100644
--- a/Plugins/org.mitk.gui.qt.multilabelsegmentation/manifest_headers.cmake
+++ b/Plugins/org.mitk.gui.qt.multilabelsegmentation/manifest_headers.cmake
@@ -1,5 +1,5 @@
 set(Plugin-Name "MITK MultiLabelSegmentation")
 set(Plugin-Version "1.0.0")
 set(Plugin-Vendor "German Cancer Research Center (DKFZ)")
 set(Plugin-ContactAddress "http://www.mitk.org")
-set(Require-Plugin org.mitk.gui.qt.common org.mitk.gui.qt.datamanager)
+set(Require-Plugin org.mitk.gui.qt.common org.mitk.gui.qt.datamanager org.mitk.gui.qt.segmentation)
diff --git a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/SegmentationUtilities/ImageMasking/QmitkImageMaskingWidgetControls.ui b/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/SegmentationUtilities/ImageMasking/QmitkImageMaskingWidgetControls.ui
index 1f2ad71121..2d8cf565c5 100644
--- a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/SegmentationUtilities/ImageMasking/QmitkImageMaskingWidgetControls.ui
+++ b/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/SegmentationUtilities/ImageMasking/QmitkImageMaskingWidgetControls.ui
@@ -1,274 +1,274 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkImageMaskingWidgetControls</class>
  <widget class="QWidget" name="QmitkImageMaskingWidgetControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>179</width>
     <height>296</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>2</number>
    </property>
    <property name="margin">
     <number>4</number>
    </property>
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="m_tbMasks">
       <attribute name="title">
        <string>Masks</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <property name="spacing">
         <number>3</number>
        </property>
        <property name="margin">
         <number>4</number>
        </property>
        <item>
         <widget class="QmitkDataSelectionWidget" name="dataSelectionWidget" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
           <string>Masking Mode</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
            <widget class="QRadioButton" name="rbMaskImage">
             <property name="text">
              <string>Image Masking</string>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QRadioButton" name="rbMaskSurface">
             <property name="text">
              <string>Surface Masking</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="btnMaskImage">
          <property name="text">
           <string>Mask</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="m_chkMakeOutputBinary">
          <property name="text">
           <string>make output binary</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="m_chkOverwriteForeground">
          <property name="text">
           <string>overwrite foreground</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="m_chkOverwriteBackground">
          <property name="text">
           <string>overwrite background</string>
          </property>
         </widget>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
           <widget class="QLabel" name="label_2">
            <property name="text">
             <string>Background Value: </string>
            </property>
           </widget>
          </item>
          <item>
           <spacer name="horizontalSpacer_2">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <widget class="QLineEdit" name="m_leBackgroundValue">
            <property name="minimumSize">
             <size>
              <width>50</width>
              <height>0</height>
             </size>
            </property>
            <property name="maximumSize">
             <size>
              <width>50</width>
              <height>16777215</height>
             </size>
            </property>
            <property name="text">
             <string>0.0</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
           <widget class="QLabel" name="label">
            <property name="text">
             <string>Foreground Value: </string>
            </property>
           </widget>
          </item>
          <item>
           <spacer name="horizontalSpacer">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <widget class="QLineEdit" name="m_leForegroundValue">
            <property name="minimumSize">
             <size>
              <width>50</width>
              <height>0</height>
             </size>
            </property>
            <property name="maximumSize">
             <size>
              <width>50</width>
              <height>16777215</height>
             </size>
            </property>
            <property name="text">
             <string>1.0</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="m_tbLabels">
       <attribute name="title">
        <string>Labels</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <property name="margin">
         <number>4</number>
        </property>
        <item>
         <widget class="QmitkLabelSetWidget" name="m_LabelSetWidget" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>0</width>
            <height>50</height>
           </size>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QmitkMaskStampWidget" name="m_MaskStampWidget" native="true"/>
        </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>QmitkDataSelectionWidget</class>
    <extends>QWidget</extends>
    <header>internal/Common/QmitkDataSelectionWidget.h</header>
   </customwidget>
   <customwidget>
    <class>QmitkLabelSetWidget</class>
    <extends>QWidget</extends>
-   <header location="global">Qmitk/QmitkLabelSetWidget.h</header>
+   <header location="global">QmitkLabelSetWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkMaskStampWidget</class>
    <extends>QWidget</extends>
    <header>QmitkMaskStampWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/SegmentationUtilities/MorphologicalOperations/QmitkMorphologicalOperationsWidgetControls.ui b/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/SegmentationUtilities/MorphologicalOperations/QmitkMorphologicalOperationsWidgetControls.ui
index 976fffbdc3..0e8a3c92b5 100644
--- a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/SegmentationUtilities/MorphologicalOperations/QmitkMorphologicalOperationsWidgetControls.ui
+++ b/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/SegmentationUtilities/MorphologicalOperations/QmitkMorphologicalOperationsWidgetControls.ui
@@ -1,427 +1,427 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkMorphologicalOperationsWidgetControls</class>
  <widget class="QWidget" name="QmitkMorphologicalOperationsWidgetControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>155</width>
     <height>414</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="m_tbMasks">
       <attribute name="title">
        <string>Masks</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <property name="spacing">
         <number>3</number>
        </property>
        <property name="margin">
         <number>4</number>
        </property>
        <item>
         <widget class="QmitkDataSelectionWidget" name="m_DataSelectionWidget" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
           <string>Structuring Element</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
            <widget class="QRadioButton" name="radioButtonMorphoBall">
             <property name="text">
              <string>Ball</string>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QRadioButton" name="radioButtonMorphoCross">
             <property name="text">
              <string>Cross</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
           <widget class="QLabel" name="label">
            <property name="text">
             <string>Radius</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QSlider" name="sliderMorphFactor">
            <property name="minimum">
             <number>1</number>
            </property>
            <property name="maximum">
             <number>20</number>
            </property>
            <property name="pageStep">
             <number>1</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QSpinBox" name="spinBoxMorphFactor">
            <property name="minimum">
             <number>1</number>
            </property>
            <property name="maximum">
             <number>20</number>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QGridLayout" name="gridLayout">
          <item row="0" column="0">
           <widget class="QToolButton" name="btnDilatation">
            <property name="enabled">
             <bool>false</bool>
            </property>
            <property name="sizePolicy">
             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
             <string>Dilatation</string>
            </property>
            <property name="icon">
             <iconset resource="../../../../resources/MorphologicalOperationsWidget.qrc">
              <normaloff>:/SegmentationUtilities/MorphologicalOperations/Dilate_48x48.png</normaloff>:/SegmentationUtilities/MorphologicalOperations/Dilate_48x48.png</iconset>
            </property>
            <property name="iconSize">
             <size>
              <width>32</width>
              <height>32</height>
             </size>
            </property>
            <property name="toolButtonStyle">
             <enum>Qt::ToolButtonTextUnderIcon</enum>
            </property>
           </widget>
          </item>
          <item row="2" column="0">
           <widget class="QToolButton" name="btnFillHoles">
            <property name="enabled">
             <bool>false</bool>
            </property>
            <property name="sizePolicy">
             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="toolTip">
             <string>Globally fills holes in segmentation (radius not required)</string>
            </property>
            <property name="text">
             <string>Fill Holes</string>
            </property>
            <property name="icon">
             <iconset resource="../../../../resources/MorphologicalOperationsWidget.qrc">
              <normaloff>:/SegmentationUtilities/MorphologicalOperations/FillHoles_48x48.png</normaloff>:/SegmentationUtilities/MorphologicalOperations/FillHoles_48x48.png</iconset>
            </property>
            <property name="iconSize">
             <size>
              <width>32</width>
              <height>32</height>
             </size>
            </property>
            <property name="toolButtonStyle">
             <enum>Qt::ToolButtonTextUnderIcon</enum>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="QToolButton" name="btnErosion">
            <property name="enabled">
             <bool>false</bool>
            </property>
            <property name="sizePolicy">
             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
             <string>Erosion</string>
            </property>
            <property name="icon">
             <iconset resource="../../../../resources/MorphologicalOperationsWidget.qrc">
              <normaloff>:/SegmentationUtilities/MorphologicalOperations/Erode_48x48.png</normaloff>:/SegmentationUtilities/MorphologicalOperations/Erode_48x48.png</iconset>
            </property>
            <property name="iconSize">
             <size>
              <width>32</width>
              <height>32</height>
             </size>
            </property>
            <property name="toolButtonStyle">
             <enum>Qt::ToolButtonTextUnderIcon</enum>
            </property>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QToolButton" name="btnClosing">
            <property name="enabled">
             <bool>false</bool>
            </property>
            <property name="sizePolicy">
             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
             <string>Closing</string>
            </property>
            <property name="icon">
             <iconset resource="../../../../resources/MorphologicalOperationsWidget.qrc">
              <normaloff>:/SegmentationUtilities/MorphologicalOperations/Closing_48x48.png</normaloff>:/SegmentationUtilities/MorphologicalOperations/Closing_48x48.png</iconset>
            </property>
            <property name="iconSize">
             <size>
              <width>32</width>
              <height>32</height>
             </size>
            </property>
            <property name="toolButtonStyle">
             <enum>Qt::ToolButtonTextUnderIcon</enum>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="QToolButton" name="btnOpening">
            <property name="enabled">
             <bool>false</bool>
            </property>
            <property name="sizePolicy">
             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
             <string>Opening</string>
            </property>
            <property name="icon">
             <iconset resource="../../../../resources/MorphologicalOperationsWidget.qrc">
              <normaloff>:/SegmentationUtilities/MorphologicalOperations/Opening_48x48.png</normaloff>:/SegmentationUtilities/MorphologicalOperations/Opening_48x48.png</iconset>
            </property>
            <property name="iconSize">
             <size>
              <width>32</width>
              <height>32</height>
             </size>
            </property>
            <property name="toolButtonStyle">
             <enum>Qt::ToolButtonTextUnderIcon</enum>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="m_tbLabels">
       <attribute name="title">
        <string>Labels</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <property name="spacing">
         <number>3</number>
        </property>
        <property name="margin">
         <number>4</number>
        </property>
        <item>
         <widget class="QmitkLabelSetWidget" name="m_LabelSetWidget" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>0</width>
            <height>50</height>
           </size>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QmitkToolGUIArea" name="m_ToolGUIContainer" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>15</width>
            <height>0</height>
           </size>
          </property>
          <property name="font">
           <font>
            <weight>50</weight>
            <bold>false</bold>
           </font>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QmitkToolSelectionBox" name="m_ToolSelectionBox" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>0</width>
            <height>15</height>
           </size>
          </property>
          <property name="font">
           <font>
            <weight>50</weight>
            <bold>false</bold>
           </font>
          </property>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>QmitkDataSelectionWidget</class>
    <extends>QWidget</extends>
    <header>internal/Common/QmitkDataSelectionWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkToolSelectionBox</class>
    <extends>QWidget</extends>
    <header location="global">QmitkToolSelectionBox.h</header>
   </customwidget>
   <customwidget>
    <class>QmitkToolGUIArea</class>
    <extends>QWidget</extends>
    <header location="global">QmitkToolGUIArea.h</header>
   </customwidget>
   <customwidget>
    <class>QmitkLabelSetWidget</class>
    <extends>QWidget</extends>
-   <header location="global">Qmitk/QmitkLabelSetWidget.h</header>
+   <header location="global">QmitkLabelSetWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources>
   <include location="../../../../resources/MorphologicalOperationsWidget.qrc"/>
  </resources>
  <connections>
   <connection>
    <sender>sliderMorphFactor</sender>
    <signal>valueChanged(int)</signal>
    <receiver>spinBoxMorphFactor</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>240</x>
      <y>27</y>
     </hint>
     <hint type="destinationlabel">
      <x>766</x>
      <y>36</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>spinBoxMorphFactor</sender>
    <signal>valueChanged(int)</signal>
    <receiver>sliderMorphFactor</receiver>
    <slot>setValue(int)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>784</x>
      <y>38</y>
     </hint>
     <hint type="destinationlabel">
      <x>657</x>
      <y>38</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidgetControls.ui b/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidgetControls.ui
index 511fcc381f..52b7fc86e4 100644
--- a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidgetControls.ui
+++ b/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidgetControls.ui
@@ -1,252 +1,252 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkSurfaceToImageWidgetControls</class>
  <widget class="QWidget" name="QmitkSurfaceToImageWidgetControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>179</width>
     <height>183</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>3</number>
    </property>
    <property name="margin">
     <number>4</number>
    </property>
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="m_tbMasks">
       <attribute name="title">
        <string>Masks</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <property name="spacing">
         <number>3</number>
        </property>
        <property name="margin">
         <number>4</number>
        </property>
        <item>
         <widget class="QmitkDataSelectionWidget" name="m_DataSelectionWidget" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="m_chkMakeOutputBinary">
          <property name="text">
           <string>make output binary</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="m_chkOverwriteBackground">
          <property name="text">
           <string>overwrite background</string>
          </property>
         </widget>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
           <widget class="QLabel" name="label_2">
            <property name="text">
             <string>Background Value: </string>
            </property>
           </widget>
          </item>
          <item>
           <spacer name="horizontalSpacer_2">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <widget class="QLineEdit" name="m_leBackgroundValue">
            <property name="minimumSize">
             <size>
              <width>50</width>
              <height>0</height>
             </size>
            </property>
            <property name="maximumSize">
             <size>
              <width>50</width>
              <height>16777215</height>
             </size>
            </property>
            <property name="text">
             <string>0.0</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
           <widget class="QLabel" name="label">
            <property name="text">
             <string>Foreground Value: </string>
            </property>
           </widget>
          </item>
          <item>
           <spacer name="horizontalSpacer">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <widget class="QLineEdit" name="m_leForegroundValue">
            <property name="minimumSize">
             <size>
              <width>50</width>
              <height>0</height>
             </size>
            </property>
            <property name="maximumSize">
             <size>
              <width>50</width>
              <height>16777215</height>
             </size>
            </property>
            <property name="text">
             <string>1.0</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <widget class="QPushButton" name="btnSurface2Image">
          <property name="text">
           <string>Convert</string>
          </property>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="m_tbLabels">
       <attribute name="title">
        <string>Labels</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <property name="spacing">
         <number>2</number>
        </property>
        <property name="margin">
         <number>2</number>
        </property>
        <item>
         <widget class="QmitkLabelSetWidget" name="m_LabelSetWidget" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimumSize">
           <size>
            <width>0</width>
            <height>50</height>
           </size>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QmitkSurfaceStampWidget" name="m_SurfaceStampWidget" native="true">
          <property name="minimumSize">
           <size>
            <width>0</width>
            <height>20</height>
           </size>
          </property>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>QmitkDataSelectionWidget</class>
    <extends>QWidget</extends>
    <header>internal/Common/QmitkDataSelectionWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkLabelSetWidget</class>
    <extends>QWidget</extends>
-   <header location="global">Qmitk/QmitkLabelSetWidget.h</header>
+   <header location="global">QmitkLabelSetWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkSurfaceStampWidget</class>
    <extends>QWidget</extends>
    <header>QmitkSurfaceStampWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.segmentation/files.cmake b/Plugins/org.mitk.gui.qt.segmentation/files.cmake
index bb27b67836..584a0cf103 100644
--- a/Plugins/org.mitk.gui.qt.segmentation/files.cmake
+++ b/Plugins/org.mitk.gui.qt.segmentation/files.cmake
@@ -1,81 +1,87 @@
 set(SRC_CPP_FILES
   QmitkSegmentationPreferencePage.cpp
+  QmitkNewSegmentationDialog.cpp
+  QmitkLabelSetWidget.cpp
 )
 
 set(INTERNAL_CPP_FILES
   mitkPluginActivator.cpp
   QmitkSegmentationView.cpp
   QmitkAutocropAction.cpp
   QmitkAutocropLabelSetImageAction.cpp
   QmitkCreatePolygonModelAction.cpp
   QmitkLoadMultiLabelPresetAction.cpp
   QmitkSaveMultiLabelPresetAction.cpp
   Common/QmitkDataSelectionWidget.cpp
   Common/QmitkLabelsWidget.cpp
   Common/QmitkLayersWidget.cpp
   SegmentationUtilities/QmitkSegmentationUtilitiesView.cpp
   SegmentationUtilities/QmitkSegmentationUtilityWidget.cpp
   SegmentationUtilities/BooleanOperations/QmitkBooleanOperationsWidget.cpp
   SegmentationUtilities/ImageMasking/QmitkImageMaskingWidget.cpp
   SegmentationUtilities/ContourModelToImage/QmitkContourModelToImageWidget.cpp
   SegmentationUtilities/MorphologicalOperations/QmitkMorphologicalOperationsWidget.cpp
   SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidget.cpp
 )
 
 set(UI_FILES
   src/QmitkSegmentationPreferencePageControls.ui
+  src/QmitkNewSegmentationDialog.ui
+  src/QmitkLabelSetWidgetControls.ui
   src/internal/QmitkSegmentationViewControls.ui
   src/internal/Common/QmitkDataSelectionWidgetControls.ui
   src/internal/Common/QmitkLabelsWidgetControls.ui
   src/internal/Common/QmitkLayersWidgetControls.ui
   src/internal/SegmentationUtilities/QmitkSegmentationUtilitiesViewControls.ui
   src/internal/SegmentationUtilities/BooleanOperations/QmitkBooleanOperationsWidgetControls.ui
   src/internal/SegmentationUtilities/ImageMasking/QmitkImageMaskingWidgetControls.ui
   src/internal/SegmentationUtilities/ContourModelToImage/QmitkContourModelToImageWidgetControls.ui
   src/internal/SegmentationUtilities/MorphologicalOperations/QmitkMorphologicalOperationsWidgetControls.ui
   src/internal/SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidgetControls.ui
 )
 
 set(MOC_H_FILES
   src/QmitkSegmentationPreferencePage.h
+  src/QmitkNewSegmentationDialog.h
+  src/QmitkLabelSetWidget.h
   src/internal/mitkPluginActivator.h
   src/internal/QmitkSegmentationView.h
   src/internal/QmitkAutocropAction.h
   src/internal/QmitkAutocropLabelSetImageAction.h
   src/internal/QmitkCreatePolygonModelAction.h
   src/internal/QmitkLoadMultiLabelPresetAction.h
   src/internal/QmitkSaveMultiLabelPresetAction.h
   src/internal/Common/QmitkDataSelectionWidget.h
   src/internal/Common/QmitkLabelsWidget.h
   src/internal/Common/QmitkLayersWidget.h
   src/internal/SegmentationUtilities/QmitkSegmentationUtilitiesView.h
   src/internal/SegmentationUtilities/QmitkSegmentationUtilityWidget.h
   src/internal/SegmentationUtilities/BooleanOperations/QmitkBooleanOperationsWidget.h
   src/internal/SegmentationUtilities/ImageMasking/QmitkImageMaskingWidget.h
   src/internal/SegmentationUtilities/ContourModelToImage/QmitkContourModelToImageWidget.h
   src/internal/SegmentationUtilities/MorphologicalOperations/QmitkMorphologicalOperationsWidget.h
   src/internal/SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidget.h
 )
 
 set(CACHED_RESOURCE_FILES
   resources/segmentation.svg
   resources/segmentation_utilities.svg
   plugin.xml
 )
 
 set(QRC_FILES
   resources/segmentation.qrc
   resources/SegmentationUtilities.qrc
   resources/BooleanOperationsWidget.qrc
   resources/MorphologicalOperationsWidget.qrc
 )
 
 set(CPP_FILES)
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/Modules/SegmentationUI/Qmitk/QmitkLabelSetWidget.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/QmitkLabelSetWidget.cpp
similarity index 100%
rename from Modules/SegmentationUI/Qmitk/QmitkLabelSetWidget.cpp
rename to Plugins/org.mitk.gui.qt.segmentation/src/QmitkLabelSetWidget.cpp
diff --git a/Modules/SegmentationUI/Qmitk/QmitkLabelSetWidget.h b/Plugins/org.mitk.gui.qt.segmentation/src/QmitkLabelSetWidget.h
similarity index 95%
rename from Modules/SegmentationUI/Qmitk/QmitkLabelSetWidget.h
rename to Plugins/org.mitk.gui.qt.segmentation/src/QmitkLabelSetWidget.h
index 727e02f34a..9fb7a1c0e8 100644
--- a/Modules/SegmentationUI/Qmitk/QmitkLabelSetWidget.h
+++ b/Plugins/org.mitk.gui.qt.segmentation/src/QmitkLabelSetWidget.h
@@ -1,165 +1,165 @@
 /*============================================================================
 
 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 QmitkLabelSetWidget_h
 #define QmitkLabelSetWidget_h
 
-#include "MitkSegmentationUIExports.h"
+#include <org_mitk_gui_qt_segmentation_Export.h>
 
-#include "mitkColorSequenceRainbow.h"
-#include "mitkLabel.h"
-#include "mitkNumericTypes.h"
+#include <mitkColorSequenceRainbow.h>
+#include <mitkLabel.h>
+#include <mitkNumericTypes.h>
 #include <ui_QmitkLabelSetWidgetControls.h>
 
 class QmitkDataStorageComboBox;
 class QCompleter;
 
 namespace mitk
 {
   class LabelSetImage;
   class LabelSet;
   class Label;
   class DataStorage;
   class ToolManager;
   class DataNode;
 }
 
-class MITKSEGMENTATIONUI_EXPORT QmitkLabelSetWidget : public QWidget
+class MITK_QT_SEGMENTATION QmitkLabelSetWidget : public QWidget
 {
   Q_OBJECT
 
 public:
   explicit QmitkLabelSetWidget(QWidget *parent = nullptr);
   ~QmitkLabelSetWidget() override;
 
   void SetDataStorage(mitk::DataStorage *storage);
 
   void UpdateControls();
 
   virtual void setEnabled(bool enabled);
 
   QStringList &GetLabelStringList();
 
 signals:
 
   /// \brief Send a signal when it was requested to go to a label.
   void goToLabel(const mitk::Point3D &);
   void LabelSetWidgetReset();
 
 public slots:
 
   /**
   * @brief Updates the current labels in the label set widget table. For each label (widget item) the 'UpdateTableWidgetItem' is called.
   *
   *   Updating means setting the color box of the table, setting the column with and fill it with the label name.
   *   Furthermore the two push buttons for locking and showing/hiding the layer are checked/unchecked.
   *   This functions only changes the appearance of the table widget and no render window update is necessary.
   */
   void UpdateAllTableWidgetItems();
   /**
   * @brief Resets the current labels in the label set widget table. For each label a widget item is inserted into the table.
   *
   *   Resetting means removing all rows of the widget table and inserting new rows (labels) from the active label set (= layer) of the current working node.
   *   The currently active label is selected and 'Number of labels' is set.
   *   As this function is typically used after one label has been removed or the reference node has been changed (e.g.) the render windows have to be updated.
   */
   void ResetAllTableWidgetItems();
   void SelectLabelByPixelValue(mitk::Label::PixelType pixelValue);
 
 private slots:
 
   // LabelSet dependent
   void OnOpacityChanged(int);
   void OnUnlockAllLabels(bool);
   void OnLockAllLabels(bool);
   void OnSetAllLabelsVisible(bool);
   void OnSetAllLabelsInvisible(bool);
   void OnSetOnlyActiveLabelVisible(bool);
   void OnRandomColor(bool);
   void OnRemoveLabel(bool);
   void OnRemoveLabels(bool);
   void OnRenameLabel(bool);
   void OnLockedButtonClicked();
   void OnVisibleButtonClicked();
   void OnColorButtonClicked();
   void OnItemClicked(QTableWidgetItem *item);
   void OnItemDoubleClicked(QTableWidgetItem *item);
   void OnTableViewContextMenuRequested(const QPoint &);
   void InsertTableWidgetItem(mitk::Label *label);
   void UpdateTableWidgetItem(QTableWidgetItem *item);
   // reaction to "returnPressed" signal from ...
   void OnSearchLabel();
   // reaction to the button "Change Label"
   void OnActiveLabelChanged(int pixelValue);
 
   // LabelSetImage Dependet
   void OnCreateDetailedSurface(bool);
   void OnCreateSmoothedSurface(bool);
   // reaction to the signal "createMask" from QmitkLabelSetTableWidget
   void OnCreateMask(bool);
   void OnCreateMasks(bool);
   // reaction to the signal "createCroppedMask" from QmitkLabelSetTableWidget
   void OnCreateCroppedMask(bool);
   void OnCombineAndCreateMask(bool);
   void OnCombineAndCreateSurface(bool);
   void OnEraseLabel(bool);
   void OnEraseLabels(bool);
   void OnMergeLabels(bool);
 
   // reaction to signal "labelListModified" from QmitkLabelSetTableWidget
   void OnLabelListModified(const QStringList &list);
   // reaction to the signal "toggleOutline" from QmitkLabelSetTableWidget
   void OnToggleOutline(bool);
 
 private:
   enum TableColumns
   {
     NAME_COL = 0,
     LOCKED_COL,
     COLOR_COL,
     VISIBLE_COL
   };
 
   void WaitCursorOn();
 
   void WaitCursorOff();
 
   void RestoreOverrideCursor();
 
   void OnThreadedCalculationDone();
 
   void InitializeTableWidget();
 
   int GetPixelValueOfSelectedItem();
 
   mitk::LabelSetImage *GetWorkingImage();
 
   mitk::DataNode *GetWorkingNode();
 
   Ui::QmitkLabelSetWidgetControls m_Controls;
 
   mitk::ColorSequenceRainbow m_ColorSequenceRainbow;
 
   mitk::DataStorage *m_DataStorage;
 
   QCompleter *m_Completer;
 
   mitk::ToolManager *m_ToolManager;
 
   QStringList m_OrganColors;
 
   QStringList m_LabelStringList;
 
   bool m_ProcessingManualSelection;
 };
 
 #endif
diff --git a/Modules/SegmentationUI/Qmitk/QmitkLabelSetWidgetControls.ui b/Plugins/org.mitk.gui.qt.segmentation/src/QmitkLabelSetWidgetControls.ui
similarity index 100%
rename from Modules/SegmentationUI/Qmitk/QmitkLabelSetWidgetControls.ui
rename to Plugins/org.mitk.gui.qt.segmentation/src/QmitkLabelSetWidgetControls.ui
diff --git a/Plugins/org.mitk.gui.qt.segmentation/src/QmitkNewSegmentationDialog.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/QmitkNewSegmentationDialog.cpp
new file mode 100644
index 0000000000..4b88755b47
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.segmentation/src/QmitkNewSegmentationDialog.cpp
@@ -0,0 +1,276 @@
+/*============================================================================
+
+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 "QmitkNewSegmentationDialog.h"
+#include <ui_QmitkNewSegmentationDialog.h>
+
+#include <mitkAnatomicalStructureColorPresets.h>
+#include <mitkBaseApplication.h>
+
+#include <berryIPreferences.h>
+#include <berryIPreferencesService.h>
+#include <berryPlatform.h>
+
+#include <initializer_list>
+
+#include <vtkNew.h>
+
+#include <QByteArray>
+#include <QColorDialog>
+#include <QCompleter>
+#include <QFile>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QPushButton>
+#include <QStringListModel>
+
+namespace
+{
+  // Get standard label name and color suggestions from embedded XML preset file for anatomical structures.
+  std::map<QString, QColor> GetStandardSuggestions()
+  {
+    std::map<QString, QColor> standardSuggestions;
+
+    vtkNew<mitk::AnatomicalStructureColorPresets> presets;
+    presets->LoadPreset();
+
+    for (const auto& preset : presets->GetColorPresets())
+    {
+      auto name = QString::fromStdString(preset.first);
+      auto color = QColor::fromRgbF(preset.second.GetRed(), preset.second.GetGreen(), preset.second.GetBlue());
+      standardSuggestions.emplace(name, color);
+    }
+
+    return standardSuggestions;
+  }
+
+  // Parse label name and color suggestions from a JSON file. An array of objects is expected, each consisting
+  // of a "name" string and an optional "color" string. If present, the "color" string must follow the conventions
+  // of QColor::setNamedColor(), i.e., #rrggbb or any SVG color keyword name like CornflowerBlue. Everything else
+  // in the JSON file is simply ignored. In case of any error, an empty map is returned.
+  std::map<QString, QColor> ParseSuggestions(const QString& filename)
+  {
+    std::map<QString, QColor> parsedSuggestions;
+    QFile file(filename);
+
+    if (!file.open(QIODevice::ReadOnly))
+    {
+      MITK_ERROR << "Could not open \"" << filename.toStdString() << "\"!";
+      return parsedSuggestions;
+    }
+
+    auto json = file.readAll();
+    auto doc = QJsonDocument::fromJson(json);
+
+    if (doc.isNull() || !doc.isArray())
+    {
+      MITK_ERROR << "Could not parse \"" << filename.toStdString() << "\" as JSON array!";
+      return parsedSuggestions;
+    }
+
+    auto array = doc.array();
+
+    for (auto valueRef : array)
+    {
+      if (valueRef.isObject())
+      {
+        auto object = valueRef.toObject();
+
+        if (object.contains("name") && object["name"].isString())
+        {
+          auto name = object["name"].toString();
+          auto color = object.contains("color") && object["color"].isString()
+            ? QColor(object["color"].toString())
+            : QColor(QColor::Invalid);
+
+          parsedSuggestions.emplace(name, color);
+        }
+      }
+    }
+
+    if (parsedSuggestions.empty())
+      MITK_WARN << "Could not parse any suggestions from \"" << filename.toStdString() << "\"!";
+
+    return parsedSuggestions;
+  }
+
+  struct Preferences
+  {
+    QString labelSuggestions;
+    bool replaceStandardSuggestions;
+    bool suggestOnce;
+  };
+
+  Preferences GetPreferences()
+  {
+    auto nodePrefs = berry::Platform::GetPreferencesService()->GetSystemPreferences()->Node("/org.mitk.views.segmentation");
+
+    Preferences prefs;
+    
+    prefs.labelSuggestions = QString::fromStdString(mitk::BaseApplication::instance().config().getString(mitk::BaseApplication::ARG_SEGMENTATION_LABEL_SUGGESTIONS.toStdString(), ""));
+
+    if (prefs.labelSuggestions.isEmpty())
+      prefs.labelSuggestions = nodePrefs->Get("label suggestions", "");
+
+    prefs.replaceStandardSuggestions = nodePrefs->GetBool("replace standard suggestions", true);
+    prefs.suggestOnce = nodePrefs->GetBool("suggest once", true);
+
+    return prefs;
+  }
+}
+
+QmitkNewSegmentationDialog::QmitkNewSegmentationDialog(QWidget *parent, Mode mode)
+  : QDialog(parent),
+    m_Ui(new Ui::QmitkNewSegmentationDialog),
+    m_SuggestOnce(true),
+    m_Color(Qt::red)
+{
+  m_Ui->setupUi(this);
+
+  if (RenameLabel == mode)
+  {
+    this->setWindowTitle("Rename Label");
+    m_Ui->label->setText("New name and color of the label");
+    m_Ui->buttonBox->button(QDialogButtonBox::Ok)->setText("Rename label");
+  }
+  else
+  {
+    m_Ui->buttonBox->button(QDialogButtonBox::Ok)->setText("Create label");
+  }
+
+  auto* completer = new QCompleter(QStringList());
+  completer->setCaseSensitivity(Qt::CaseInsensitive);
+
+  m_Ui->nameLineEdit->setCompleter(completer);
+  m_Ui->nameLineEdit->setFocus();
+
+  connect(completer, qOverload<const QString&>(&QCompleter::activated), this, qOverload<const QString&>(&QmitkNewSegmentationDialog::OnSuggestionSelected));
+  connect(m_Ui->colorButton, &QToolButton::clicked, this, &QmitkNewSegmentationDialog::OnColorButtonClicked);
+  connect(m_Ui->buttonBox, &QDialogButtonBox::accepted, this, &QmitkNewSegmentationDialog::OnAccept);
+
+  this->UpdateColorButtonBackground();
+
+  auto prefs = GetPreferences();
+
+  if (!prefs.labelSuggestions.isEmpty())
+  {
+    auto suggestions = ParseSuggestions(prefs.labelSuggestions);
+    this->SetSuggestions(suggestions, prefs.replaceStandardSuggestions && !suggestions.empty());
+  }
+  else
+  {
+    this->SetSuggestions(GetStandardSuggestions(), true);
+  }
+
+  if (prefs.suggestOnce)
+  {
+    // TODO: Remove suggestions for label names that are already preset in the label set image
+  }
+}
+
+QmitkNewSegmentationDialog::~QmitkNewSegmentationDialog()
+{
+}
+
+void QmitkNewSegmentationDialog::UpdateColorButtonBackground()
+{
+  m_Ui->colorButton->setStyleSheet("background-color:" + m_Color.name());
+}
+
+QString QmitkNewSegmentationDialog::GetName() const
+{
+  return m_Name;
+}
+
+mitk::Color QmitkNewSegmentationDialog::GetColor() const
+{
+  mitk::Color color;
+
+  if (m_Color.isValid())
+  {
+    color.SetRed(m_Color.redF());
+    color.SetGreen(m_Color.greenF());
+    color.SetBlue(m_Color.blueF());
+  }
+  else
+  {
+    color.Set(1.0f, 0.0f, 0.0f);
+  }
+
+  return color;
+}
+
+void QmitkNewSegmentationDialog::SetName(const QString& name)
+{
+  m_Ui->nameLineEdit->setText(name);
+}
+
+void QmitkNewSegmentationDialog::SetColor(const mitk::Color& color)
+{
+  m_Color.setRgbF(color.GetRed(), color.GetGreen(), color.GetBlue());
+  this->UpdateColorButtonBackground();
+}
+
+void QmitkNewSegmentationDialog::SetSuggestions(const std::map<QString, QColor> suggestions, bool replaceStandardSuggestions)
+{
+  if (replaceStandardSuggestions)
+  {
+    m_Suggestions = suggestions;
+  }
+  else
+  {
+    m_Suggestions = GetStandardSuggestions();
+
+    for (const auto& [name, color] : suggestions)
+    {
+      if (m_Suggestions.end() == m_Suggestions.find(name))
+        m_Suggestions[name] = color;
+    }
+  }
+
+  QStringList names;
+
+  for (const auto& [name, color] : m_Suggestions)
+    names << name;
+
+  auto* completerModel = static_cast<QStringListModel*>(m_Ui->nameLineEdit->completer()->model());
+  completerModel->setStringList(names);
+}
+
+void QmitkNewSegmentationDialog::OnAccept()
+{
+  m_Name = m_Ui->nameLineEdit->text();
+  this->accept();
+}
+
+void QmitkNewSegmentationDialog::OnColorButtonClicked()
+{
+  auto color = QColorDialog::getColor(m_Color);
+
+  if (color.isValid())
+  {
+    m_Color = color;
+    this->UpdateColorButtonBackground();
+  }
+}
+
+void QmitkNewSegmentationDialog::OnSuggestionSelected(const QString &name)
+{
+  auto color = m_Suggestions[name];
+
+  if (color.isValid())
+  {
+    m_Color = color;
+    this->UpdateColorButtonBackground();
+  }
+}
diff --git a/Modules/SegmentationUI/Qmitk/QmitkNewSegmentationDialog.h b/Plugins/org.mitk.gui.qt.segmentation/src/QmitkNewSegmentationDialog.h
similarity index 72%
rename from Modules/SegmentationUI/Qmitk/QmitkNewSegmentationDialog.h
rename to Plugins/org.mitk.gui.qt.segmentation/src/QmitkNewSegmentationDialog.h
index 3b9f4bc4a3..4a612ff313 100644
--- a/Modules/SegmentationUI/Qmitk/QmitkNewSegmentationDialog.h
+++ b/Plugins/org.mitk.gui.qt.segmentation/src/QmitkNewSegmentationDialog.h
@@ -1,68 +1,72 @@
 /*============================================================================
 
 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 QmitkNewSegmentationDialog_h_Included
-#define QmitkNewSegmentationDialog_h_Included
+#ifndef QmitkNewSegmentationDialog_h
+#define QmitkNewSegmentationDialog_h
+
+#include <org_mitk_gui_qt_segmentation_Export.h>
 
 #include <mitkColorProperty.h>
-#include <mitkCommon.h>
 
-#include <MitkSegmentationUIExports.h>
+#include <map>
 
+#include <QColor>
 #include <QDialog>
+#include <QString>
 
 namespace Ui
 {
   class QmitkNewSegmentationDialog;
 }
 
 /**
   \brief Dialog for naming labels.
 */
-class MITKSEGMENTATIONUI_EXPORT QmitkNewSegmentationDialog : public QDialog
+class MITK_QT_SEGMENTATION QmitkNewSegmentationDialog : public QDialog
 {
   Q_OBJECT
 
 public:
   enum Mode
   {
     NewLabel,
     RenameLabel
   };
 
   explicit QmitkNewSegmentationDialog(QWidget *parent = nullptr, Mode mode = NewLabel);
   ~QmitkNewSegmentationDialog() override;
 
   QString GetName() const;
   mitk::Color GetColor() const;
 
   void SetName(const QString& name);
   void SetColor(const mitk::Color& color);
-  void SetSuggestionList(const QStringList& suggestionList);
 
 private:
   void OnAccept();
   void OnSuggestionSelected(const QString& name);
   void OnColorButtonClicked();
 
+  void SetSuggestions(const std::map<QString, QColor> suggestions, bool replaceStandardSuggestions = false);
   void UpdateColorButtonBackground();
 
   Ui::QmitkNewSegmentationDialog* m_Ui;
 
+  bool m_SuggestOnce;
+
   QString m_Name;
   QColor m_Color;
 
-  QStringList m_NameSuggestions;
-  QList<QColor> m_ColorSuggestions;
+  std::map<QString, QColor> m_Suggestions;
 };
 
 #endif
diff --git a/Modules/SegmentationUI/Qmitk/QmitkNewSegmentationDialog.ui b/Plugins/org.mitk.gui.qt.segmentation/src/QmitkNewSegmentationDialog.ui
similarity index 100%
rename from Modules/SegmentationUI/Qmitk/QmitkNewSegmentationDialog.ui
rename to Plugins/org.mitk.gui.qt.segmentation/src/QmitkNewSegmentationDialog.ui
diff --git a/Plugins/org.mitk.gui.qt.semanticrelations/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.semanticrelations/manifest_headers.cmake
index 9da36a3fbc..a413decc69 100644
--- a/Plugins/org.mitk.gui.qt.semanticrelations/manifest_headers.cmake
+++ b/Plugins/org.mitk.gui.qt.semanticrelations/manifest_headers.cmake
@@ -1,5 +1,5 @@
 set(Plugin-Name "MITK Semantic relations")
 set(Plugin-Version "0.1")
 set(Plugin-Vendor "DKFZ")
 set(Plugin-ContactAddress "http://www.mitk.org")
-set(Require-Plugin org.mitk.gui.qt.common org.mitk.gui.qt.application)
+set(Require-Plugin org.mitk.gui.qt.common org.mitk.gui.qt.application org.mitk.gui.qt.segmentation)