diff --git a/dirigera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/model/device/speaker/SpeakerAudioAttributes.java b/dirigera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/model/device/speaker/SpeakerAudioAttributes.java
index 15afaa6..5a52f98 100644
--- a/dirigera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/model/device/speaker/SpeakerAudioAttributes.java
+++ b/dirigera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/model/device/speaker/SpeakerAudioAttributes.java
@@ -2,19 +2,20 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import de.dvdgeisler.iot.dirigera.client.api.model.music.MusicPlayItem;
 
 @JsonInclude(Include.NON_NULL)
 public class SpeakerAudioAttributes {
   public String serviceType;
   public String providerType;
-  public SpeakerPlayItem playItem;
-  public SpeakerPlayItem nextPlayItem;
+  public MusicPlayItem playItem;
+  public MusicPlayItem nextPlayItem;
 
   public SpeakerAudioAttributes() {
   }
 
-  public SpeakerAudioAttributes(String serviceType, String providerType, SpeakerPlayItem playItem,
-      SpeakerPlayItem nextPlayItem) {
+  public SpeakerAudioAttributes(String serviceType, String providerType, MusicPlayItem playItem,
+      MusicPlayItem nextPlayItem) {
     this.serviceType = serviceType;
     this.providerType = providerType;
     this.playItem = playItem;
diff --git a/dirigera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/model/device/speaker/SpeakerPlayItem.java b/dirigera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/model/music/MusicPlayItem.java
similarity index 63%
rename from dirigera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/model/device/speaker/SpeakerPlayItem.java
rename to dirigera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/model/music/MusicPlayItem.java
index 3c9b9e4..f178eea 100644
--- a/dirigera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/model/device/speaker/SpeakerPlayItem.java
+++ b/dirigera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/model/music/MusicPlayItem.java
@@ -1,21 +1,21 @@
-package de.dvdgeisler.iot.dirigera.client.api.model.device.speaker;
+package de.dvdgeisler.iot.dirigera.client.api.model.music;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 @JsonInclude(Include.NON_NULL)
-public class SpeakerPlayItem {
+public class MusicPlayItem {
   public String title;
   public String artist;
   public String album;
   public String imageUrl;
   public Long duration;
 
-  public SpeakerPlayItem() {
+  public MusicPlayItem() {
   }
 
-  public SpeakerPlayItem(String title, String artist, String album, String imageUrl,
-      Long duration) {
+  public MusicPlayItem(String title, String artist, String album, String imageUrl,
+                       Long duration) {
     this.title = title;
     this.artist = artist;
     this.album = album;
diff --git a/dirigera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/model/music/MusicPlayList.java b/dirigera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/model/music/MusicPlayList.java
index 517e99c..a30692b 100644
--- a/dirigera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/model/music/MusicPlayList.java
+++ b/dirigera-client-api/src/main/java/de/dvdgeisler/iot/dirigera/client/api/model/music/MusicPlayList.java
@@ -1,15 +1,13 @@
 package de.dvdgeisler.iot.dirigera.client.api.model.music;
 
-import de.dvdgeisler.iot.dirigera.client.api.model.device.speaker.SpeakerPlayItem;
-
 import java.util.List;
 
 public class MusicPlayList {
     public String id;
-    public List<SpeakerPlayItem> playItems;
+    public List<MusicPlayItem> playItems;
     public String title;
 
-    public MusicPlayList(final String id, final List<SpeakerPlayItem> playItems, final String title) {
+    public MusicPlayList(final String id, final List<MusicPlayItem> playItems, final String title) {
         this.id = id;
         this.playItems = playItems;
         this.title = title;