diff --git a/.gitignore b/.gitignore
index 8e36f022..f47dc58c 100755
--- a/.gitignore
+++ b/.gitignore
@@ -14,12 +14,13 @@ npm-debug.log
 .idea
 ._*
 venv
-docker/snapserver.conf
-docker/mopidy.conf
-docker/data/
+docker/snapserver/snapserver.conf
+docker/snapserver/snapserver.json
+docker/snapserver/meta_mopidy.py
+docker/mopidy/mopidy.conf
+docker/mopidy/iris/
+docker/mopidy/icecast2.xml
 docker/jellyfin/
-docker/icecast2.xml
-docker/meta_mopidy.py
 docker-compose.yml
 /.tox/
 /__tests__/__pycache__/
diff --git a/docker-compose.example.yml b/docker-compose.example.yml
index 651e9444..82aaadb3 100755
--- a/docker-compose.example.yml
+++ b/docker-compose.example.yml
@@ -8,9 +8,9 @@ services:
       - 1780:1780
     volumes:
       - /tmp/snapserver:/tmp
-      - ./docker/snapserver.conf:/etc/snapserver.conf # Copy from snapserver-example.conf
-      - ./docker/snapserver.json:/root/.config/snapserver/server.json
-      - ./docker/meta_mopidy.py:/usr/share/snapserver/plug-ins/meta_mopidy.py
+      - ./docker/snapserver/snapserver.conf:/etc/snapserver.conf
+      - ./docker/snapserver/snapserver.json:/root/.config/snapserver/server.json
+      - ./docker/snapserver/meta_mopidy.py:/usr/share/snapserver/plug-ins/meta_mopidy.py
   mopidy:
     image: jaedb/iris
     environment:
@@ -23,7 +23,8 @@ services:
       - 6600:6600
       - 6680:6680
     volumes:
-      - ./docker/data:/var/lib/mopidy/iris
-      - ./docker/mopidy.conf:/config/mopidy.conf
+      - ./docker/mopidy/iris:/var/lib/mopidy/iris # Iris-specific storage
+      - ./docker/mopidy/m3u:/var/lib/mopidy/m3u # To persist local playlists
+      - ./docker/mopidy/mopidy.conf:/config/mopidy.conf
       - /mnt/Music:/var/lib/mopidy/media
       - /tmp/snapserver:/tmp
diff --git a/docker/icecast2.example.xml b/docker/mopidy/icecast2.example.xml
similarity index 100%
rename from docker/icecast2.example.xml
rename to docker/mopidy/icecast2.example.xml
diff --git a/docker/mopidy.example.conf b/docker/mopidy/mopidy.example.conf
similarity index 100%
rename from docker/mopidy.example.conf
rename to docker/mopidy/mopidy.example.conf
diff --git a/docker/pulse-client.conf b/docker/mopidy/pulse-client.conf
similarity index 100%
rename from docker/pulse-client.conf
rename to docker/mopidy/pulse-client.conf
diff --git a/docker/snapserver-example.conf b/docker/snapserver/snapserver-example.conf
similarity index 96%
rename from docker/snapserver-example.conf
rename to docker/snapserver/snapserver-example.conf
index 9c29d2da..763399e9 100644
--- a/docker/snapserver-example.conf
+++ b/docker/snapserver/snapserver-example.conf
@@ -73,7 +73,7 @@ doc_root = /usr/share/snapserver/snapweb/
 # stream URI of the PCM input stream, can be configured multiple times
 # Format: TYPE://host/path?name=NAME[&codec=CODEC][&sampleformat=SAMPLEFORMAT]
 #stream = pipe:///tmp/snapfifo?name=default
-stream = pipe:///tmp/snapfifo?name=Default&sampleformat=48000:16:2&controlscript=meta_mpd.py
+stream = pipe:///tmp/snapfifo?name=Default&sampleformat=48000:16:2&controlscript=meta_mopidy.py
 
 # Default sample format
 #sampleformat = 48000:16:2