diff --git a/FlippR-Driver/contrib/uml/output_umldiagramm.xcore b/FlippR-Driver/contrib/uml/output_umldiagramm.puml
similarity index 100%
rename from FlippR-Driver/contrib/uml/output_umldiagramm.xcore
rename to FlippR-Driver/contrib/uml/output_umldiagramm.puml
diff --git a/FlippR-Driver/src/output/IOutputGPIOInterface.h b/FlippR-Driver/src/output/IOutputGPIOInterface.h
index 5861818..a080c4e 100644
--- a/FlippR-Driver/src/output/IOutputGPIOInterface.h
+++ b/FlippR-Driver/src/output/IOutputGPIOInterface.h
@@ -8,7 +8,7 @@
 #include "IOutputGPIOInterface.h"
 
 #include "output/items/DriverBoardItem.h"
-#include "output/items/SoundItem.h"
+#include "output/items/Sound.h"
 #include "output/items/IDisplay.h"
 
 #include <memory>
@@ -24,10 +24,10 @@ public:
   virtual ~IOutputGPIOInterface() = default;
 
   virtual void activate(items::DriverBoardItem *driver_board_item) = 0;
-  virtual void activate(items::SoundItem *sound) = 0;
+  virtual void activate(items::Item *sound) = 0;
 
   virtual void deactivate(items::DriverBoardItem *driver_board_item) = 0;
-  virtual void deactivate(items::SoundItem *sound) = 0;
+  virtual void deactivate(items::Item *sound) = 0;
 
   virtual void write_display(std::shared_ptr<output::items::IDisplay> display) = 0;
   //Display gpio interface!
diff --git a/FlippR-Driver/src/output/OutputGPIOInterface.cpp b/FlippR-Driver/src/output/OutputGPIOInterface.cpp
index 71e1c0c..476fdd9 100644
--- a/FlippR-Driver/src/output/OutputGPIOInterface.cpp
+++ b/FlippR-Driver/src/output/OutputGPIOInterface.cpp
@@ -44,7 +44,7 @@ void OutputGPIOInterface::initialize_i2c_addresses()
   mcp23017Setup(pins_display.at("pin_base"), pins_display.at("i2c_address"));
 }
 
-void OutputGPIOInterface::activate(items::SoundItem *sound)
+void OutputGPIOInterface::activate(items::Item *sound)
 {
   std::lock_guard<std::mutex> guard(output_item_mutex);
 
@@ -71,7 +71,7 @@ void OutputGPIOInterface::deactivate(items::DriverBoardItem *driver_board_item)
   write_data(false);
 }
 
-void OutputGPIOInterface::deactivate(items::SoundItem *sound)
+void OutputGPIOInterface::deactivate(items::Item *sound)
 {
   std::lock_guard<std::mutex> guard(output_item_mutex);
 
diff --git a/FlippR-Driver/src/output/OutputGPIOInterface.h b/FlippR-Driver/src/output/OutputGPIOInterface.h
index 0ac8e4a..f3894e0 100644
--- a/FlippR-Driver/src/output/OutputGPIOInterface.h
+++ b/FlippR-Driver/src/output/OutputGPIOInterface.h
@@ -28,10 +28,10 @@ public:
   ~OutputGPIOInterface() override = default;
 
   void activate(items::DriverBoardItem *driver_board_item) override;
-  void activate(items::SoundItem *sound) override;
+  void activate(items::Item *sound) override;
 
   void deactivate(items::DriverBoardItem *driver_board_item) override;
-  void deactivate(items::SoundItem *sound) override;
+  void deactivate(items::Item *sound) override;
 
   void write_display(std::shared_ptr<output::items::IDisplay> display) override;
 
diff --git a/FlippR-Driver/src/output/items/Sound.cpp b/FlippR-Driver/src/output/items/Sound.cpp
index a29bdcf..caf03c3 100644
--- a/FlippR-Driver/src/output/items/Sound.cpp
+++ b/FlippR-Driver/src/output/items/Sound.cpp
@@ -17,7 +17,7 @@ namespace items
 {
 
 Sound::Sound(std::shared_ptr<IOutputGPIOInterface> output_gpio_interface, uint8_t address, std::string name, std::chrono::milliseconds deactivation_time, u_int id) :
-  SoundItem(std::move(output_gpio_interface), address, std::move(name)), deactivation_time(deactivation_time), id(id)
+  Item(std::move(output_gpio_interface), address, std::move(name)), deactivation_time(deactivation_time), id(id)
 {}
 
 void Sound::play()
diff --git a/FlippR-Driver/src/output/items/Sound.h b/FlippR-Driver/src/output/items/Sound.h
index 115b7ff..bb29386 100644
--- a/FlippR-Driver/src/output/items/Sound.h
+++ b/FlippR-Driver/src/output/items/Sound.h
@@ -9,7 +9,7 @@
 #define _SRC_OUTPUT_SOUND_H_
 
 #include "output/items/ISound.h"
-#include "output/items/SoundItem.h"
+#include "output/items/Item.h"
 
 #include <memory>
 #include <string>
@@ -23,7 +23,7 @@ namespace output
 namespace items
 {
 
-class Sound : public SoundItem, public ISound
+class Sound : public Item, public ISound
 {
 public:
 	u_int id;
diff --git a/FlippR-Driver/src/output/items/SoundItem.h b/FlippR-Driver/src/output/items/SoundItem.h
deleted file mode 100644
index 8ea6061..0000000
--- a/FlippR-Driver/src/output/items/SoundItem.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Created by rhetenor on 23.11.18.
-//
-
-#ifndef FLIPPR_DRIVER_ISOUNDITEM_H
-#define FLIPPR_DRIVER_ISOUNDITEM_H
-
-#include "Item.h"
-
-namespace flippR_driver
-{
-namespace output
-{
-namespace items
-{
-
-class SoundItem : public Item
-{
-public:
-  SoundItem(std::shared_ptr<IOutputGPIOInterface> output_gpio_interface, uint8_t address, std::string name) :
-  Item(std::move(output_gpio_interface), address, std::move(name)) {}
-  ~SoundItem() override = default;
-};
-
-}
-}
-}
-
-#endif //FLIPPR_DRIVER_ISOUNDITEM_H