diff --git a/bec_widgets/examples/jupyter_console/jupyter_console_window.py b/bec_widgets/examples/jupyter_console/jupyter_console_window.py
index ba4ae408..62591a9e 100644
--- a/bec_widgets/examples/jupyter_console/jupyter_console_window.py
+++ b/bec_widgets/examples/jupyter_console/jupyter_console_window.py
@@ -19,12 +19,12 @@ from bec_widgets.utils.widget_io import WidgetHierarchy as wh
 from bec_widgets.widgets.containers.dock import BECDockArea
 from bec_widgets.widgets.containers.layout_manager.layout_manager import LayoutManagerWidget
 from bec_widgets.widgets.editors.jupyter_console.jupyter_console import BECJupyterConsole
-from bec_widgets.widgets.plots_next_gen.image.image import Image
-from bec_widgets.widgets.plots_next_gen.motor_map.motor_map import MotorMap
-from bec_widgets.widgets.plots_next_gen.multi_waveform.multi_waveform import MultiWaveform
-from bec_widgets.widgets.plots_next_gen.plot_base import PlotBase
-from bec_widgets.widgets.plots_next_gen.scatter_waveform.scatter_waveform import ScatterWaveform
-from bec_widgets.widgets.plots_next_gen.waveform.waveform import Waveform
+from bec_widgets.widgets.plots.image.image import Image
+from bec_widgets.widgets.plots.motor_map.motor_map import MotorMap
+from bec_widgets.widgets.plots.multi_waveform.multi_waveform import MultiWaveform
+from bec_widgets.widgets.plots.plot_base import PlotBase
+from bec_widgets.widgets.plots.scatter_waveform.scatter_waveform import ScatterWaveform
+from bec_widgets.widgets.plots.waveform.waveform import Waveform
 
 
 class JupyterConsoleWindow(QWidget):  # pragma: no cover:
diff --git a/bec_widgets/qt_utils/side_panel.py b/bec_widgets/qt_utils/side_panel.py
index 623fe4a8..a7cf6ec1 100644
--- a/bec_widgets/qt_utils/side_panel.py
+++ b/bec_widgets/qt_utils/side_panel.py
@@ -325,7 +325,7 @@ class ExampleApp(QMainWindow):  # pragma: no cover
         self.side_panel = SidePanel(self, orientation="left", panel_max_width=250)
         self.layout.addWidget(self.side_panel)
 
-        from bec_widgets.widgets.plots_next_gen.waveform.waveform import Waveform
+        from bec_widgets.widgets.plots.waveform.waveform import Waveform
 
         self.plot = Waveform()
         self.layout.addWidget(self.plot)
diff --git a/bec_widgets/widgets/containers/dock/dock_area.py b/bec_widgets/widgets/containers/dock/dock_area.py
index 97f31fc6..d74451e1 100644
--- a/bec_widgets/widgets/containers/dock/dock_area.py
+++ b/bec_widgets/widgets/containers/dock/dock_area.py
@@ -25,11 +25,11 @@ from bec_widgets.widgets.containers.dock.dock import BECDock, DockConfig
 from bec_widgets.widgets.control.device_control.positioner_box import PositionerBox
 from bec_widgets.widgets.control.scan_control.scan_control import ScanControl
 from bec_widgets.widgets.editors.vscode.vscode import VSCodeEditor
-from bec_widgets.widgets.plots_next_gen.image.image import Image
-from bec_widgets.widgets.plots_next_gen.motor_map.motor_map import MotorMap
-from bec_widgets.widgets.plots_next_gen.multi_waveform.multi_waveform import MultiWaveform
-from bec_widgets.widgets.plots_next_gen.scatter_waveform.scatter_waveform import ScatterWaveform
-from bec_widgets.widgets.plots_next_gen.waveform.waveform import Waveform
+from bec_widgets.widgets.plots.image.image import Image
+from bec_widgets.widgets.plots.motor_map.motor_map import MotorMap
+from bec_widgets.widgets.plots.multi_waveform.multi_waveform import MultiWaveform
+from bec_widgets.widgets.plots.scatter_waveform.scatter_waveform import ScatterWaveform
+from bec_widgets.widgets.plots.waveform.waveform import Waveform
 from bec_widgets.widgets.progress.ring_progress_bar.ring_progress_bar import RingProgressBar
 from bec_widgets.widgets.services.bec_queue.bec_queue import BECQueue
 from bec_widgets.widgets.services.bec_status_box.bec_status_box import BECStatusBox
diff --git a/bec_widgets/widgets/plots_next_gen/__init__.py b/bec_widgets/widgets/plots/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/__init__.py
rename to bec_widgets/widgets/plots/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/image/__init__.py b/bec_widgets/widgets/plots/image/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/image/__init__.py
rename to bec_widgets/widgets/plots/image/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/image/image.py b/bec_widgets/widgets/plots/image/image.py
similarity index 98%
rename from bec_widgets/widgets/plots_next_gen/image/image.py
rename to bec_widgets/widgets/plots/image/image.py
index edebe6a3..2e337ff7 100644
--- a/bec_widgets/widgets/plots_next_gen/image/image.py
+++ b/bec_widgets/widgets/plots/image/image.py
@@ -14,14 +14,12 @@ from bec_widgets.qt_utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.qt_utils.toolbar import MaterialIconAction, SwitchableToolBarAction
 from bec_widgets.utils import ConnectionConfig
 from bec_widgets.utils.colors import Colors
-from bec_widgets.widgets.plots_next_gen.image.image_item import ImageItem
-from bec_widgets.widgets.plots_next_gen.image.toolbar_bundles.image_selection import (
+from bec_widgets.widgets.plots.image.image_item import ImageItem
+from bec_widgets.widgets.plots.image.toolbar_bundles.image_selection import (
     MonitorSelectionToolbarBundle,
 )
-from bec_widgets.widgets.plots_next_gen.image.toolbar_bundles.processing import (
-    ImageProcessingToolbarBundle,
-)
-from bec_widgets.widgets.plots_next_gen.plot_base import PlotBase
+from bec_widgets.widgets.plots.image.toolbar_bundles.processing import ImageProcessingToolbarBundle
+from bec_widgets.widgets.plots.plot_base import PlotBase
 
 logger = bec_logger.logger
 
diff --git a/bec_widgets/widgets/plots_next_gen/image/image.pyproject b/bec_widgets/widgets/plots/image/image.pyproject
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/image/image.pyproject
rename to bec_widgets/widgets/plots/image/image.pyproject
diff --git a/bec_widgets/widgets/plots_next_gen/image/image_item.py b/bec_widgets/widgets/plots/image/image_item.py
similarity index 99%
rename from bec_widgets/widgets/plots_next_gen/image/image_item.py
rename to bec_widgets/widgets/plots/image/image_item.py
index a5518fbf..7ea9cf92 100644
--- a/bec_widgets/widgets/plots_next_gen/image/image_item.py
+++ b/bec_widgets/widgets/plots/image/image_item.py
@@ -9,7 +9,7 @@ from pydantic import Field, ValidationError, field_validator
 from qtpy.QtCore import Signal
 
 from bec_widgets.utils import BECConnector, Colors, ConnectionConfig
-from bec_widgets.widgets.plots_next_gen.image.image_processor import (
+from bec_widgets.widgets.plots.image.image_processor import (
     ImageProcessor,
     ImageStats,
     ProcessingConfig,
diff --git a/bec_widgets/widgets/plots_next_gen/image/image_plugin.py b/bec_widgets/widgets/plots/image/image_plugin.py
similarity index 91%
rename from bec_widgets/widgets/plots_next_gen/image/image_plugin.py
rename to bec_widgets/widgets/plots/image/image_plugin.py
index e15a9458..e29e6fb2 100644
--- a/bec_widgets/widgets/plots_next_gen/image/image_plugin.py
+++ b/bec_widgets/widgets/plots/image/image_plugin.py
@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.plots_next_gen.image.image import Image
+from bec_widgets.widgets.plots.image.image import Image
 
 DOM_XML = """
 <ui language='c++'>
@@ -27,7 +27,7 @@ class ImagePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "Plot Widgets Next Gen"
+        return "Plot Widgets"
 
     def icon(self):
         return designer_material_icon(Image.ICON_NAME)
diff --git a/bec_widgets/widgets/plots_next_gen/image/image_processor.py b/bec_widgets/widgets/plots/image/image_processor.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/image/image_processor.py
rename to bec_widgets/widgets/plots/image/image_processor.py
diff --git a/bec_widgets/widgets/plots_next_gen/image/register_image.py b/bec_widgets/widgets/plots/image/register_image.py
similarity index 82%
rename from bec_widgets/widgets/plots_next_gen/image/register_image.py
rename to bec_widgets/widgets/plots/image/register_image.py
index a155fb50..364788d8 100644
--- a/bec_widgets/widgets/plots_next_gen/image/register_image.py
+++ b/bec_widgets/widgets/plots/image/register_image.py
@@ -6,7 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.plots_next_gen.image.image_plugin import ImagePlugin
+    from bec_widgets.widgets.plots.image.image_plugin import ImagePlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(ImagePlugin())
 
diff --git a/bec_widgets/widgets/plots_next_gen/image/toolbar_bundles/__init__.py b/bec_widgets/widgets/plots/image/toolbar_bundles/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/image/toolbar_bundles/__init__.py
rename to bec_widgets/widgets/plots/image/toolbar_bundles/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/image/toolbar_bundles/image_selection.py b/bec_widgets/widgets/plots/image/toolbar_bundles/image_selection.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/image/toolbar_bundles/image_selection.py
rename to bec_widgets/widgets/plots/image/toolbar_bundles/image_selection.py
diff --git a/bec_widgets/widgets/plots_next_gen/image/toolbar_bundles/processing.py b/bec_widgets/widgets/plots/image/toolbar_bundles/processing.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/image/toolbar_bundles/processing.py
rename to bec_widgets/widgets/plots/image/toolbar_bundles/processing.py
diff --git a/bec_widgets/widgets/plots_next_gen/motor_map/__init__.py b/bec_widgets/widgets/plots/motor_map/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/motor_map/__init__.py
rename to bec_widgets/widgets/plots/motor_map/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/motor_map/motor_map.py b/bec_widgets/widgets/plots/motor_map/motor_map.py
similarity index 99%
rename from bec_widgets/widgets/plots_next_gen/motor_map/motor_map.py
rename to bec_widgets/widgets/plots/motor_map/motor_map.py
index d4ec1933..a005375c 100644
--- a/bec_widgets/widgets/plots_next_gen/motor_map/motor_map.py
+++ b/bec_widgets/widgets/plots/motor_map/motor_map.py
@@ -16,13 +16,11 @@ from bec_widgets.qt_utils.settings_dialog import SettingsDialog
 from bec_widgets.qt_utils.toolbar import MaterialIconAction
 from bec_widgets.utils import Colors, ConnectionConfig
 from bec_widgets.utils.colors import set_theme
-from bec_widgets.widgets.plots_next_gen.motor_map.settings.motor_map_settings import (
-    MotorMapSettings,
-)
-from bec_widgets.widgets.plots_next_gen.motor_map.toolbar_bundles.motor_selection import (
+from bec_widgets.widgets.plots.motor_map.settings.motor_map_settings import MotorMapSettings
+from bec_widgets.widgets.plots.motor_map.toolbar_bundles.motor_selection import (
     MotorSelectionToolbarBundle,
 )
-from bec_widgets.widgets.plots_next_gen.plot_base import PlotBase
+from bec_widgets.widgets.plots.plot_base import PlotBase
 
 logger = bec_logger.logger
 
diff --git a/bec_widgets/widgets/plots_next_gen/motor_map/motor_map.pyproject b/bec_widgets/widgets/plots/motor_map/motor_map.pyproject
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/motor_map/motor_map.pyproject
rename to bec_widgets/widgets/plots/motor_map/motor_map.pyproject
diff --git a/bec_widgets/widgets/plots_next_gen/motor_map/motor_map_plugin.py b/bec_widgets/widgets/plots/motor_map/motor_map_plugin.py
similarity index 90%
rename from bec_widgets/widgets/plots_next_gen/motor_map/motor_map_plugin.py
rename to bec_widgets/widgets/plots/motor_map/motor_map_plugin.py
index bcfc5968..d1cac238 100644
--- a/bec_widgets/widgets/plots_next_gen/motor_map/motor_map_plugin.py
+++ b/bec_widgets/widgets/plots/motor_map/motor_map_plugin.py
@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.plots_next_gen.motor_map.motor_map import MotorMap
+from bec_widgets.widgets.plots.motor_map.motor_map import MotorMap
 
 DOM_XML = """
 <ui language='c++'>
@@ -27,7 +27,7 @@ class MotorMapPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "Plot Widgets Next Gen"
+        return "Plot Widgets"
 
     def icon(self):
         return designer_material_icon(MotorMap.ICON_NAME)
diff --git a/bec_widgets/widgets/plots_next_gen/motor_map/register_motor_map.py b/bec_widgets/widgets/plots/motor_map/register_motor_map.py
similarity index 80%
rename from bec_widgets/widgets/plots_next_gen/motor_map/register_motor_map.py
rename to bec_widgets/widgets/plots/motor_map/register_motor_map.py
index db80dabb..5ae50fbf 100644
--- a/bec_widgets/widgets/plots_next_gen/motor_map/register_motor_map.py
+++ b/bec_widgets/widgets/plots/motor_map/register_motor_map.py
@@ -6,7 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.plots_next_gen.motor_map.motor_map_plugin import MotorMapPlugin
+    from bec_widgets.widgets.plots.motor_map.motor_map_plugin import MotorMapPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(MotorMapPlugin())
 
diff --git a/bec_widgets/widgets/plots_next_gen/motor_map/settings/__init__.py b/bec_widgets/widgets/plots/motor_map/settings/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/motor_map/settings/__init__.py
rename to bec_widgets/widgets/plots/motor_map/settings/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/motor_map/settings/motor_map_settings.py b/bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/motor_map/settings/motor_map_settings.py
rename to bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.py
diff --git a/bec_widgets/widgets/plots_next_gen/motor_map/settings/motor_map_settings.ui b/bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.ui
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/motor_map/settings/motor_map_settings.ui
rename to bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.ui
diff --git a/bec_widgets/widgets/plots_next_gen/motor_map/toolbar_bundles/__init__.py b/bec_widgets/widgets/plots/motor_map/toolbar_bundles/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/motor_map/toolbar_bundles/__init__.py
rename to bec_widgets/widgets/plots/motor_map/toolbar_bundles/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/motor_map/toolbar_bundles/motor_selection.py b/bec_widgets/widgets/plots/motor_map/toolbar_bundles/motor_selection.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/motor_map/toolbar_bundles/motor_selection.py
rename to bec_widgets/widgets/plots/motor_map/toolbar_bundles/motor_selection.py
diff --git a/bec_widgets/widgets/plots_next_gen/multi_waveform/__init__.py b/bec_widgets/widgets/plots/multi_waveform/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/multi_waveform/__init__.py
rename to bec_widgets/widgets/plots/multi_waveform/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/multi_waveform/multi_waveform.py b/bec_widgets/widgets/plots/multi_waveform/multi_waveform.py
similarity index 98%
rename from bec_widgets/widgets/plots_next_gen/multi_waveform/multi_waveform.py
rename to bec_widgets/widgets/plots/multi_waveform/multi_waveform.py
index 2761b366..9801498b 100644
--- a/bec_widgets/widgets/plots_next_gen/multi_waveform/multi_waveform.py
+++ b/bec_widgets/widgets/plots/multi_waveform/multi_waveform.py
@@ -12,13 +12,13 @@ from qtpy.QtWidgets import QWidget
 from bec_widgets.qt_utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.qt_utils.side_panel import SidePanel
 from bec_widgets.utils import Colors, ConnectionConfig
-from bec_widgets.widgets.plots_next_gen.multi_waveform.settings.control_panel import (
+from bec_widgets.widgets.plots.multi_waveform.settings.control_panel import (
     MultiWaveformControlPanel,
 )
-from bec_widgets.widgets.plots_next_gen.multi_waveform.toolbar_bundles.monitor_selection import (
+from bec_widgets.widgets.plots.multi_waveform.toolbar_bundles.monitor_selection import (
     MultiWaveformSelectionToolbarBundle,
 )
-from bec_widgets.widgets.plots_next_gen.plot_base import PlotBase
+from bec_widgets.widgets.plots.plot_base import PlotBase
 
 logger = bec_logger.logger
 
diff --git a/bec_widgets/widgets/plots_next_gen/multi_waveform/multi_waveform.pyproject b/bec_widgets/widgets/plots/multi_waveform/multi_waveform.pyproject
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/multi_waveform/multi_waveform.pyproject
rename to bec_widgets/widgets/plots/multi_waveform/multi_waveform.pyproject
diff --git a/bec_widgets/widgets/plots_next_gen/multi_waveform/multi_waveform_plugin.py b/bec_widgets/widgets/plots/multi_waveform/multi_waveform_plugin.py
similarity index 90%
rename from bec_widgets/widgets/plots_next_gen/multi_waveform/multi_waveform_plugin.py
rename to bec_widgets/widgets/plots/multi_waveform/multi_waveform_plugin.py
index d7164878..dd0aba5b 100644
--- a/bec_widgets/widgets/plots_next_gen/multi_waveform/multi_waveform_plugin.py
+++ b/bec_widgets/widgets/plots/multi_waveform/multi_waveform_plugin.py
@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.plots_next_gen.multi_waveform.multi_waveform import MultiWaveform
+from bec_widgets.widgets.plots.multi_waveform.multi_waveform import MultiWaveform
 
 DOM_XML = """
 <ui language='c++'>
@@ -27,7 +27,7 @@ class MultiWaveformPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "Plot Widgets Next Gen"
+        return "Plot Widgets"
 
     def icon(self):
         return designer_material_icon(MultiWaveform.ICON_NAME)
diff --git a/bec_widgets/widgets/plots_next_gen/multi_waveform/register_multi_waveform.py b/bec_widgets/widgets/plots/multi_waveform/register_multi_waveform.py
similarity index 75%
rename from bec_widgets/widgets/plots_next_gen/multi_waveform/register_multi_waveform.py
rename to bec_widgets/widgets/plots/multi_waveform/register_multi_waveform.py
index 42bc3d87..50cf2913 100644
--- a/bec_widgets/widgets/plots_next_gen/multi_waveform/register_multi_waveform.py
+++ b/bec_widgets/widgets/plots/multi_waveform/register_multi_waveform.py
@@ -6,9 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.plots_next_gen.multi_waveform.multi_waveform_plugin import (
-        MultiWaveformPlugin,
-    )
+    from bec_widgets.widgets.plots.multi_waveform.multi_waveform_plugin import MultiWaveformPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(MultiWaveformPlugin())
 
diff --git a/bec_widgets/widgets/plots_next_gen/multi_waveform/settings/__init__.py b/bec_widgets/widgets/plots/multi_waveform/settings/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/multi_waveform/settings/__init__.py
rename to bec_widgets/widgets/plots/multi_waveform/settings/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/multi_waveform/settings/control_panel.py b/bec_widgets/widgets/plots/multi_waveform/settings/control_panel.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/multi_waveform/settings/control_panel.py
rename to bec_widgets/widgets/plots/multi_waveform/settings/control_panel.py
diff --git a/bec_widgets/widgets/plots_next_gen/multi_waveform/settings/multi_waveform_controls.ui b/bec_widgets/widgets/plots/multi_waveform/settings/multi_waveform_controls.ui
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/multi_waveform/settings/multi_waveform_controls.ui
rename to bec_widgets/widgets/plots/multi_waveform/settings/multi_waveform_controls.ui
diff --git a/bec_widgets/widgets/plots_next_gen/multi_waveform/toolbar_bundles/__init__.py b/bec_widgets/widgets/plots/multi_waveform/toolbar_bundles/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/multi_waveform/toolbar_bundles/__init__.py
rename to bec_widgets/widgets/plots/multi_waveform/toolbar_bundles/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/multi_waveform/toolbar_bundles/monitor_selection.py b/bec_widgets/widgets/plots/multi_waveform/toolbar_bundles/monitor_selection.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/multi_waveform/toolbar_bundles/monitor_selection.py
rename to bec_widgets/widgets/plots/multi_waveform/toolbar_bundles/monitor_selection.py
diff --git a/bec_widgets/widgets/plots_next_gen/plot_base.py b/bec_widgets/widgets/plots/plot_base.py
similarity index 98%
rename from bec_widgets/widgets/plots_next_gen/plot_base.py
rename to bec_widgets/widgets/plots/plot_base.py
index edbb5847..40aeaf0b 100644
--- a/bec_widgets/widgets/plots_next_gen/plot_base.py
+++ b/bec_widgets/widgets/plots/plot_base.py
@@ -19,12 +19,12 @@ from bec_widgets.utils.fps_counter import FPSCounter
 from bec_widgets.utils.plot_indicator_items import BECArrowItem, BECTickItem
 from bec_widgets.utils.widget_state_manager import WidgetStateManager
 from bec_widgets.widgets.containers.layout_manager.layout_manager import LayoutManagerWidget
-from bec_widgets.widgets.plots_next_gen.setting_menus.axis_settings import AxisSettings
-from bec_widgets.widgets.plots_next_gen.toolbar_bundles.mouse_interactions import (
+from bec_widgets.widgets.plots.setting_menus.axis_settings import AxisSettings
+from bec_widgets.widgets.plots.toolbar_bundles.mouse_interactions import (
     MouseInteractionToolbarBundle,
 )
-from bec_widgets.widgets.plots_next_gen.toolbar_bundles.plot_export import PlotExportBundle
-from bec_widgets.widgets.plots_next_gen.toolbar_bundles.roi_bundle import ROIBundle
+from bec_widgets.widgets.plots.toolbar_bundles.plot_export import PlotExportBundle
+from bec_widgets.widgets.plots.toolbar_bundles.roi_bundle import ROIBundle
 
 logger = bec_logger.logger
 
diff --git a/bec_widgets/widgets/plots_next_gen/scatter_waveform/__init__.py b/bec_widgets/widgets/plots/scatter_waveform/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/scatter_waveform/__init__.py
rename to bec_widgets/widgets/plots/scatter_waveform/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/scatter_waveform/register_scatter_waveform.py b/bec_widgets/widgets/plots/scatter_waveform/register_scatter_waveform.py
similarity index 82%
rename from bec_widgets/widgets/plots_next_gen/scatter_waveform/register_scatter_waveform.py
rename to bec_widgets/widgets/plots/scatter_waveform/register_scatter_waveform.py
index 101945f6..1d8ecf02 100644
--- a/bec_widgets/widgets/plots_next_gen/scatter_waveform/register_scatter_waveform.py
+++ b/bec_widgets/widgets/plots/scatter_waveform/register_scatter_waveform.py
@@ -6,7 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.plots_next_gen.scatter_waveform.scatter_waveform_plugin import (
+    from bec_widgets.widgets.plots.scatter_waveform.scatter_waveform_plugin import (
         ScatterWaveformPlugin,
     )
 
diff --git a/bec_widgets/widgets/plots_next_gen/scatter_waveform/scatter_curve.py b/bec_widgets/widgets/plots/scatter_waveform/scatter_curve.py
similarity index 98%
rename from bec_widgets/widgets/plots_next_gen/scatter_waveform/scatter_curve.py
rename to bec_widgets/widgets/plots/scatter_waveform/scatter_curve.py
index 144c9508..dc453b70 100644
--- a/bec_widgets/widgets/plots_next_gen/scatter_waveform/scatter_curve.py
+++ b/bec_widgets/widgets/plots/scatter_waveform/scatter_curve.py
@@ -11,7 +11,7 @@ from qtpy import QtCore
 from bec_widgets.utils import BECConnector, Colors, ConnectionConfig
 
 if TYPE_CHECKING:  # pragma: no cover
-    from bec_widgets.widgets.plots_next_gen.scatter_waveform.scatter_waveform import ScatterWaveform
+    from bec_widgets.widgets.plots.scatter_waveform.scatter_waveform import ScatterWaveform
 
 logger = bec_logger.logger
 
diff --git a/bec_widgets/widgets/plots_next_gen/scatter_waveform/scatter_waveform.py b/bec_widgets/widgets/plots/scatter_waveform/scatter_waveform.py
similarity index 98%
rename from bec_widgets/widgets/plots_next_gen/scatter_waveform/scatter_waveform.py
rename to bec_widgets/widgets/plots/scatter_waveform/scatter_waveform.py
index 827a47bf..93208032 100644
--- a/bec_widgets/widgets/plots_next_gen/scatter_waveform/scatter_waveform.py
+++ b/bec_widgets/widgets/plots/scatter_waveform/scatter_waveform.py
@@ -14,13 +14,13 @@ from bec_widgets.qt_utils.settings_dialog import SettingsDialog
 from bec_widgets.qt_utils.toolbar import MaterialIconAction
 from bec_widgets.utils import Colors, ConnectionConfig
 from bec_widgets.utils.colors import set_theme
-from bec_widgets.widgets.plots_next_gen.plot_base import PlotBase
-from bec_widgets.widgets.plots_next_gen.scatter_waveform.scatter_curve import (
+from bec_widgets.widgets.plots.plot_base import PlotBase
+from bec_widgets.widgets.plots.scatter_waveform.scatter_curve import (
     ScatterCurve,
     ScatterCurveConfig,
     ScatterDeviceSignal,
 )
-from bec_widgets.widgets.plots_next_gen.scatter_waveform.settings.scatter_curve_setting import (
+from bec_widgets.widgets.plots.scatter_waveform.settings.scatter_curve_setting import (
     ScatterCurveSettings,
 )
 
diff --git a/bec_widgets/widgets/plots_next_gen/scatter_waveform/scatter_waveform.pyproject b/bec_widgets/widgets/plots/scatter_waveform/scatter_waveform.pyproject
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/scatter_waveform/scatter_waveform.pyproject
rename to bec_widgets/widgets/plots/scatter_waveform/scatter_waveform.pyproject
diff --git a/bec_widgets/widgets/plots_next_gen/scatter_waveform/scatter_waveform_plugin.py b/bec_widgets/widgets/plots/scatter_waveform/scatter_waveform_plugin.py
similarity index 89%
rename from bec_widgets/widgets/plots_next_gen/scatter_waveform/scatter_waveform_plugin.py
rename to bec_widgets/widgets/plots/scatter_waveform/scatter_waveform_plugin.py
index 2a253684..4a122634 100644
--- a/bec_widgets/widgets/plots_next_gen/scatter_waveform/scatter_waveform_plugin.py
+++ b/bec_widgets/widgets/plots/scatter_waveform/scatter_waveform_plugin.py
@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.plots_next_gen.scatter_waveform.scatter_waveform import ScatterWaveform
+from bec_widgets.widgets.plots.scatter_waveform.scatter_waveform import ScatterWaveform
 
 DOM_XML = """
 <ui language='c++'>
@@ -27,7 +27,7 @@ class ScatterWaveformPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "Plot Widgets Next Gen"
+        return "Plot Widgets"
 
     def icon(self):
         return designer_material_icon(ScatterWaveform.ICON_NAME)
diff --git a/bec_widgets/widgets/plots_next_gen/scatter_waveform/settings/__init__.py b/bec_widgets/widgets/plots/scatter_waveform/settings/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/scatter_waveform/settings/__init__.py
rename to bec_widgets/widgets/plots/scatter_waveform/settings/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/scatter_waveform/settings/scatter_curve_setting.py b/bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_setting.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/scatter_waveform/settings/scatter_curve_setting.py
rename to bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_setting.py
diff --git a/bec_widgets/widgets/plots_next_gen/scatter_waveform/settings/scatter_curve_settings_horizontal.ui b/bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_settings_horizontal.ui
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/scatter_waveform/settings/scatter_curve_settings_horizontal.ui
rename to bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_settings_horizontal.ui
diff --git a/bec_widgets/widgets/plots_next_gen/scatter_waveform/settings/scatter_curve_settings_vertical.ui b/bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_settings_vertical.ui
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/scatter_waveform/settings/scatter_curve_settings_vertical.ui
rename to bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_settings_vertical.ui
diff --git a/bec_widgets/widgets/plots_next_gen/setting_menus/__init__.py b/bec_widgets/widgets/plots/setting_menus/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/setting_menus/__init__.py
rename to bec_widgets/widgets/plots/setting_menus/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/setting_menus/axis_settings.py b/bec_widgets/widgets/plots/setting_menus/axis_settings.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/setting_menus/axis_settings.py
rename to bec_widgets/widgets/plots/setting_menus/axis_settings.py
diff --git a/bec_widgets/widgets/plots_next_gen/setting_menus/axis_settings_horizontal.ui b/bec_widgets/widgets/plots/setting_menus/axis_settings_horizontal.ui
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/setting_menus/axis_settings_horizontal.ui
rename to bec_widgets/widgets/plots/setting_menus/axis_settings_horizontal.ui
diff --git a/bec_widgets/widgets/plots_next_gen/setting_menus/axis_settings_vertical.ui b/bec_widgets/widgets/plots/setting_menus/axis_settings_vertical.ui
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/setting_menus/axis_settings_vertical.ui
rename to bec_widgets/widgets/plots/setting_menus/axis_settings_vertical.ui
diff --git a/bec_widgets/widgets/plots_next_gen/toolbar_bundles/__init__.py b/bec_widgets/widgets/plots/toolbar_bundles/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/toolbar_bundles/__init__.py
rename to bec_widgets/widgets/plots/toolbar_bundles/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/toolbar_bundles/mouse_interactions.py b/bec_widgets/widgets/plots/toolbar_bundles/mouse_interactions.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/toolbar_bundles/mouse_interactions.py
rename to bec_widgets/widgets/plots/toolbar_bundles/mouse_interactions.py
diff --git a/bec_widgets/widgets/plots_next_gen/toolbar_bundles/plot_export.py b/bec_widgets/widgets/plots/toolbar_bundles/plot_export.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/toolbar_bundles/plot_export.py
rename to bec_widgets/widgets/plots/toolbar_bundles/plot_export.py
diff --git a/bec_widgets/widgets/plots_next_gen/toolbar_bundles/roi_bundle.py b/bec_widgets/widgets/plots/toolbar_bundles/roi_bundle.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/toolbar_bundles/roi_bundle.py
rename to bec_widgets/widgets/plots/toolbar_bundles/roi_bundle.py
diff --git a/bec_widgets/widgets/plots_next_gen/toolbar_bundles/save_state.py b/bec_widgets/widgets/plots/toolbar_bundles/save_state.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/toolbar_bundles/save_state.py
rename to bec_widgets/widgets/plots/toolbar_bundles/save_state.py
diff --git a/bec_widgets/widgets/plots_next_gen/waveform/__init__.py b/bec_widgets/widgets/plots/waveform/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/waveform/__init__.py
rename to bec_widgets/widgets/plots/waveform/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/waveform/curve.py b/bec_widgets/widgets/plots/waveform/curve.py
similarity index 99%
rename from bec_widgets/widgets/plots_next_gen/waveform/curve.py
rename to bec_widgets/widgets/plots/waveform/curve.py
index d73de2e3..2cad459f 100644
--- a/bec_widgets/widgets/plots_next_gen/waveform/curve.py
+++ b/bec_widgets/widgets/plots/waveform/curve.py
@@ -11,7 +11,7 @@ from qtpy import QtCore
 from bec_widgets.utils import BECConnector, Colors, ConnectionConfig
 
 if TYPE_CHECKING:  # pragma: no cover
-    from bec_widgets.widgets.plots_next_gen.waveform.waveform import Waveform
+    from bec_widgets.widgets.plots.waveform.waveform import Waveform
 
 logger = bec_logger.logger
 
diff --git a/bec_widgets/widgets/plots_next_gen/waveform/register_waveform.py b/bec_widgets/widgets/plots/waveform/register_waveform.py
similarity index 80%
rename from bec_widgets/widgets/plots_next_gen/waveform/register_waveform.py
rename to bec_widgets/widgets/plots/waveform/register_waveform.py
index 541b1578..d5933781 100644
--- a/bec_widgets/widgets/plots_next_gen/waveform/register_waveform.py
+++ b/bec_widgets/widgets/plots/waveform/register_waveform.py
@@ -6,7 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.plots_next_gen.waveform.waveform_plugin import WaveformPlugin
+    from bec_widgets.widgets.plots.waveform.waveform_plugin import WaveformPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(WaveformPlugin())
 
diff --git a/bec_widgets/widgets/plots_next_gen/waveform/settings/__init__.py b/bec_widgets/widgets/plots/waveform/settings/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/waveform/settings/__init__.py
rename to bec_widgets/widgets/plots/waveform/settings/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/waveform/settings/curve_settings/__init__.py b/bec_widgets/widgets/plots/waveform/settings/curve_settings/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/waveform/settings/curve_settings/__init__.py
rename to bec_widgets/widgets/plots/waveform/settings/curve_settings/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/waveform/settings/curve_settings/curve_setting.py b/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_setting.py
similarity index 95%
rename from bec_widgets/widgets/plots_next_gen/waveform/settings/curve_settings/curve_setting.py
rename to bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_setting.py
index eedb1db7..dfd906b7 100644
--- a/bec_widgets/widgets/plots_next_gen/waveform/settings/curve_settings/curve_setting.py
+++ b/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_setting.py
@@ -17,10 +17,10 @@ from bec_widgets.qt_utils.settings_dialog import SettingWidget
 from bec_widgets.widgets.control.device_input.device_line_edit.device_line_edit import (
     DeviceLineEdit,
 )
-from bec_widgets.widgets.plots_next_gen.waveform.settings.curve_settings.curve_tree import CurveTree
+from bec_widgets.widgets.plots.waveform.settings.curve_settings.curve_tree import CurveTree
 
 if TYPE_CHECKING:  # pragma: no cover
-    from bec_widgets.widgets.plots_next_gen.waveform.waveform import Waveform
+    from bec_widgets.widgets.plots.waveform.waveform import Waveform
 
 
 class CurveSetting(SettingWidget):
diff --git a/bec_widgets/widgets/plots_next_gen/waveform/settings/curve_settings/curve_tree.py b/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_tree.py
similarity index 99%
rename from bec_widgets/widgets/plots_next_gen/waveform/settings/curve_settings/curve_tree.py
rename to bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_tree.py
index aaef0543..0c794e74 100644
--- a/bec_widgets/widgets/plots_next_gen/waveform/settings/curve_settings/curve_tree.py
+++ b/bec_widgets/widgets/plots/waveform/settings/curve_settings/curve_tree.py
@@ -29,11 +29,11 @@ from bec_widgets.widgets.control.device_input.device_line_edit.device_line_edit
     DeviceLineEdit,
 )
 from bec_widgets.widgets.dap.dap_combo_box.dap_combo_box import DapComboBox
-from bec_widgets.widgets.plots_next_gen.waveform.curve import CurveConfig, DeviceSignal
+from bec_widgets.widgets.plots.waveform.curve import CurveConfig, DeviceSignal
 from bec_widgets.widgets.utility.visual.colormap_widget.colormap_widget import BECColorMapWidget
 
 if TYPE_CHECKING:  # pragma: no cover
-    from bec_widgets.widgets.plots_next_gen.waveform.waveform import Waveform
+    from bec_widgets.widgets.plots.waveform.waveform import Waveform
 
 
 class ColorButton(QPushButton):
diff --git a/bec_widgets/widgets/plots_next_gen/waveform/utils/__init__.py b/bec_widgets/widgets/plots/waveform/utils/__init__.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/waveform/utils/__init__.py
rename to bec_widgets/widgets/plots/waveform/utils/__init__.py
diff --git a/bec_widgets/widgets/plots_next_gen/waveform/utils/roi_manager.py b/bec_widgets/widgets/plots/waveform/utils/roi_manager.py
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/waveform/utils/roi_manager.py
rename to bec_widgets/widgets/plots/waveform/utils/roi_manager.py
diff --git a/bec_widgets/widgets/plots_next_gen/waveform/waveform.py b/bec_widgets/widgets/plots/waveform/waveform.py
similarity index 99%
rename from bec_widgets/widgets/plots_next_gen/waveform/waveform.py
rename to bec_widgets/widgets/plots/waveform/waveform.py
index 50ca29c6..139ffb21 100644
--- a/bec_widgets/widgets/plots_next_gen/waveform/waveform.py
+++ b/bec_widgets/widgets/plots/waveform/waveform.py
@@ -19,12 +19,10 @@ from bec_widgets.utils import ConnectionConfig
 from bec_widgets.utils.bec_signal_proxy import BECSignalProxy
 from bec_widgets.utils.colors import Colors, set_theme
 from bec_widgets.widgets.dap.lmfit_dialog.lmfit_dialog import LMFitDialog
-from bec_widgets.widgets.plots_next_gen.plot_base import PlotBase
-from bec_widgets.widgets.plots_next_gen.waveform.curve import Curve, CurveConfig, DeviceSignal
-from bec_widgets.widgets.plots_next_gen.waveform.settings.curve_settings.curve_setting import (
-    CurveSetting,
-)
-from bec_widgets.widgets.plots_next_gen.waveform.utils.roi_manager import WaveformROIManager
+from bec_widgets.widgets.plots.plot_base import PlotBase
+from bec_widgets.widgets.plots.waveform.curve import Curve, CurveConfig, DeviceSignal
+from bec_widgets.widgets.plots.waveform.settings.curve_settings.curve_setting import CurveSetting
+from bec_widgets.widgets.plots.waveform.utils.roi_manager import WaveformROIManager
 
 logger = bec_logger.logger
 
diff --git a/bec_widgets/widgets/plots_next_gen/waveform/waveform.pyproject b/bec_widgets/widgets/plots/waveform/waveform.pyproject
similarity index 100%
rename from bec_widgets/widgets/plots_next_gen/waveform/waveform.pyproject
rename to bec_widgets/widgets/plots/waveform/waveform.pyproject
diff --git a/bec_widgets/widgets/plots_next_gen/waveform/waveform_plugin.py b/bec_widgets/widgets/plots/waveform/waveform_plugin.py
similarity index 90%
rename from bec_widgets/widgets/plots_next_gen/waveform/waveform_plugin.py
rename to bec_widgets/widgets/plots/waveform/waveform_plugin.py
index 338eea67..f9e2526e 100644
--- a/bec_widgets/widgets/plots_next_gen/waveform/waveform_plugin.py
+++ b/bec_widgets/widgets/plots/waveform/waveform_plugin.py
@@ -4,7 +4,7 @@
 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.plots_next_gen.waveform.waveform import Waveform
+from bec_widgets.widgets.plots.waveform.waveform import Waveform
 
 DOM_XML = """
 <ui language='c++'>
@@ -27,7 +27,7 @@ class WaveformPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return DOM_XML
 
     def group(self):
-        return "Plot Widgets Next Gen"
+        return "Plot Widgets"
 
     def icon(self):
         return designer_material_icon(Waveform.ICON_NAME)
diff --git a/tests/unit_tests/test_axis_settings.py b/tests/unit_tests/test_axis_settings.py
index d55d9260..4f8c8ee1 100644
--- a/tests/unit_tests/test_axis_settings.py
+++ b/tests/unit_tests/test_axis_settings.py
@@ -1,8 +1,8 @@
 import pytest
 from qtpy.QtWidgets import QDoubleSpinBox, QLineEdit
 
-from bec_widgets.widgets.plots_next_gen.plot_base import PlotBase
-from bec_widgets.widgets.plots_next_gen.setting_menus.axis_settings import AxisSettings
+from bec_widgets.widgets.plots.plot_base import PlotBase
+from bec_widgets.widgets.plots.setting_menus.axis_settings import AxisSettings
 from tests.unit_tests.client_mocks import mocked_client
 from tests.unit_tests.conftest import create_widget
 
diff --git a/tests/unit_tests/test_color_utils.py b/tests/unit_tests/test_color_utils.py
index 163a9478..d36e0f03 100644
--- a/tests/unit_tests/test_color_utils.py
+++ b/tests/unit_tests/test_color_utils.py
@@ -7,7 +7,7 @@ from qtpy.QtWidgets import QVBoxLayout, QWidget
 from bec_widgets.utils import Colors, ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import apply_theme
-from bec_widgets.widgets.plots_next_gen.waveform.curve import CurveConfig
+from bec_widgets.widgets.plots.waveform.curve import CurveConfig
 from tests.unit_tests.client_mocks import mocked_client
 from tests.unit_tests.conftest import create_widget
 
diff --git a/tests/unit_tests/test_curve_settings.py b/tests/unit_tests/test_curve_settings.py
index a39b5ae9..2553c549 100644
--- a/tests/unit_tests/test_curve_settings.py
+++ b/tests/unit_tests/test_curve_settings.py
@@ -4,11 +4,9 @@ from unittest.mock import MagicMock, patch
 import pytest
 from qtpy.QtWidgets import QComboBox, QVBoxLayout
 
-from bec_widgets.widgets.plots_next_gen.waveform.settings.curve_settings.curve_setting import (
-    CurveSetting,
-)
-from bec_widgets.widgets.plots_next_gen.waveform.settings.curve_settings.curve_tree import CurveTree
-from bec_widgets.widgets.plots_next_gen.waveform.waveform import Waveform
+from bec_widgets.widgets.plots.waveform.settings.curve_settings.curve_setting import CurveSetting
+from bec_widgets.widgets.plots.waveform.settings.curve_settings.curve_tree import CurveTree
+from bec_widgets.widgets.plots.waveform.waveform import Waveform
 from tests.unit_tests.client_mocks import dap_plugin_message, mocked_client, mocked_client_with_dap
 from tests.unit_tests.conftest import create_widget
 
diff --git a/tests/unit_tests/test_image_view_next_gen.py b/tests/unit_tests/test_image_view_next_gen.py
index 08f5ddb3..68af7dab 100644
--- a/tests/unit_tests/test_image_view_next_gen.py
+++ b/tests/unit_tests/test_image_view_next_gen.py
@@ -2,7 +2,7 @@ import numpy as np
 import pyqtgraph as pg
 import pytest
 
-from bec_widgets.widgets.plots_next_gen.image.image import Image
+from bec_widgets.widgets.plots.image.image import Image
 from tests.unit_tests.client_mocks import mocked_client
 from tests.unit_tests.conftest import create_widget
 
diff --git a/tests/unit_tests/test_motor_map_next_gen.py b/tests/unit_tests/test_motor_map_next_gen.py
index 50f769ca..8b6abb10 100644
--- a/tests/unit_tests/test_motor_map_next_gen.py
+++ b/tests/unit_tests/test_motor_map_next_gen.py
@@ -1,7 +1,7 @@
 import numpy as np
 import pyqtgraph as pg
 
-from bec_widgets.widgets.plots_next_gen.motor_map.motor_map import MotorMap
+from bec_widgets.widgets.plots.motor_map.motor_map import MotorMap
 from tests.unit_tests.client_mocks import mocked_client
 
 from .conftest import create_widget
@@ -210,7 +210,7 @@ def test_motor_map_limit_map(qtbot, mocked_client):
 
     from qtpy import QtCore
 
-    from bec_widgets.widgets.plots_next_gen.motor_map.motor_map import FilledRectItem
+    from bec_widgets.widgets.plots.motor_map.motor_map import FilledRectItem
 
     assert isinstance(limit_map, FilledRectItem)
     rect = limit_map.boundingRect()
diff --git a/tests/unit_tests/test_multi_waveform_next_gen.py b/tests/unit_tests/test_multi_waveform_next_gen.py
index 5b845b0e..b5375bef 100644
--- a/tests/unit_tests/test_multi_waveform_next_gen.py
+++ b/tests/unit_tests/test_multi_waveform_next_gen.py
@@ -1,6 +1,6 @@
 import numpy as np
 
-from bec_widgets.widgets.plots_next_gen.multi_waveform.multi_waveform import MultiWaveform
+from bec_widgets.widgets.plots.multi_waveform.multi_waveform import MultiWaveform
 from tests.unit_tests.client_mocks import mocked_client
 
 from .conftest import create_widget
diff --git a/tests/unit_tests/test_plot_base_next_gen.py b/tests/unit_tests/test_plot_base_next_gen.py
index 4ffdde0f..b7e0adb7 100644
--- a/tests/unit_tests/test_plot_base_next_gen.py
+++ b/tests/unit_tests/test_plot_base_next_gen.py
@@ -1,4 +1,4 @@
-from bec_widgets.widgets.plots_next_gen.plot_base import PlotBase, UIMode
+from bec_widgets.widgets.plots.plot_base import PlotBase, UIMode
 
 from .client_mocks import mocked_client
 from .conftest import create_widget
diff --git a/tests/unit_tests/test_scatter_waveform.py b/tests/unit_tests/test_scatter_waveform.py
index 6e8ad2b6..ef84c196 100644
--- a/tests/unit_tests/test_scatter_waveform.py
+++ b/tests/unit_tests/test_scatter_waveform.py
@@ -2,11 +2,11 @@ import json
 
 import numpy as np
 
-from bec_widgets.widgets.plots_next_gen.scatter_waveform.scatter_curve import (
+from bec_widgets.widgets.plots.scatter_waveform.scatter_curve import (
     ScatterCurveConfig,
     ScatterDeviceSignal,
 )
-from bec_widgets.widgets.plots_next_gen.scatter_waveform.scatter_waveform import ScatterWaveform
+from bec_widgets.widgets.plots.scatter_waveform.scatter_waveform import ScatterWaveform
 from tests.unit_tests.client_mocks import create_dummy_scan_item, mocked_client
 
 from .conftest import create_widget
diff --git a/tests/unit_tests/test_utils_plot_indicators.py b/tests/unit_tests/test_utils_plot_indicators.py
index 4f61bbc3..6e1b491b 100644
--- a/tests/unit_tests/test_utils_plot_indicators.py
+++ b/tests/unit_tests/test_utils_plot_indicators.py
@@ -1,7 +1,7 @@
 import pytest
 from qtpy.QtCore import QPointF
 
-from bec_widgets.widgets.plots_next_gen.waveform.waveform import Waveform
+from bec_widgets.widgets.plots.waveform.waveform import Waveform
 
 from .client_mocks import mocked_client
 
diff --git a/tests/unit_tests/test_waveform_next_gen.py b/tests/unit_tests/test_waveform_next_gen.py
index ab8fa737..3883f8e7 100644
--- a/tests/unit_tests/test_waveform_next_gen.py
+++ b/tests/unit_tests/test_waveform_next_gen.py
@@ -6,9 +6,9 @@ import pyqtgraph as pg
 import pytest
 from pyqtgraph.graphicsItems.DateAxisItem import DateAxisItem
 
-from bec_widgets.widgets.plots_next_gen.plot_base import UIMode
-from bec_widgets.widgets.plots_next_gen.waveform.curve import DeviceSignal
-from bec_widgets.widgets.plots_next_gen.waveform.waveform import Waveform
+from bec_widgets.widgets.plots.plot_base import UIMode
+from bec_widgets.widgets.plots.waveform.curve import DeviceSignal
+from bec_widgets.widgets.plots.waveform.waveform import Waveform
 from tests.unit_tests.client_mocks import (
     DummyData,
     create_dummy_scan_item,