diff --git a/mopidy-addon/.mdlrc b/mopidy/.mdlrc
similarity index 100%
rename from mopidy-addon/.mdlrc
rename to mopidy/.mdlrc
diff --git a/mopidy-addon/.yamllint b/mopidy/.yamllint
similarity index 100%
rename from mopidy-addon/.yamllint
rename to mopidy/.yamllint
diff --git a/mopidy-addon/DOCS.md b/mopidy/DOCS.md
similarity index 100%
rename from mopidy-addon/DOCS.md
rename to mopidy/DOCS.md
diff --git a/mopidy-addon/Dockerfile b/mopidy/Dockerfile
similarity index 100%
rename from mopidy-addon/Dockerfile
rename to mopidy/Dockerfile
diff --git a/mopidy-addon/LICENSE.md b/mopidy/LICENSE.md
similarity index 100%
rename from mopidy-addon/LICENSE.md
rename to mopidy/LICENSE.md
diff --git a/mopidy-addon/README.md b/mopidy/README.md
similarity index 100%
rename from mopidy-addon/README.md
rename to mopidy/README.md
diff --git a/mopidy-addon/build.yaml b/mopidy/build.yaml
similarity index 100%
rename from mopidy-addon/build.yaml
rename to mopidy/build.yaml
diff --git a/mopidy-addon/config.yaml b/mopidy/config.yaml
similarity index 100%
rename from mopidy-addon/config.yaml
rename to mopidy/config.yaml
diff --git a/mopidy-addon/icon.png b/mopidy/icon.png
similarity index 100%
rename from mopidy-addon/icon.png
rename to mopidy/icon.png
diff --git a/mopidy-addon/images/screenshot.png b/mopidy/images/screenshot.png
similarity index 100%
rename from mopidy-addon/images/screenshot.png
rename to mopidy/images/screenshot.png
diff --git a/mopidy-addon/logo.png b/mopidy/logo.png
similarity index 100%
rename from mopidy-addon/logo.png
rename to mopidy/logo.png
diff --git a/mopidy-addon/requirements.txt b/mopidy/requirements.txt
similarity index 100%
rename from mopidy-addon/requirements.txt
rename to mopidy/requirements.txt
diff --git a/mopidy-addon/rootfs/etc/cont-init.d/folders.sh b/mopidy/rootfs/etc/cont-init.d/folders.sh
similarity index 100%
rename from mopidy-addon/rootfs/etc/cont-init.d/folders.sh
rename to mopidy/rootfs/etc/cont-init.d/folders.sh
diff --git a/mopidy-addon/rootfs/etc/cont-init.d/nginx.sh b/mopidy/rootfs/etc/cont-init.d/nginx.sh
similarity index 100%
rename from mopidy-addon/rootfs/etc/cont-init.d/nginx.sh
rename to mopidy/rootfs/etc/cont-init.d/nginx.sh
diff --git a/mopidy-addon/rootfs/etc/cont-init.d/packages.sh b/mopidy/rootfs/etc/cont-init.d/packages.sh
similarity index 100%
rename from mopidy-addon/rootfs/etc/cont-init.d/packages.sh
rename to mopidy/rootfs/etc/cont-init.d/packages.sh
diff --git a/mopidy-addon/rootfs/etc/mopidy/mopidy.conf b/mopidy/rootfs/etc/mopidy/mopidy.conf
similarity index 100%
rename from mopidy-addon/rootfs/etc/mopidy/mopidy.conf
rename to mopidy/rootfs/etc/mopidy/mopidy.conf
diff --git a/mopidy-addon/rootfs/etc/nginx/includes/mime.types b/mopidy/rootfs/etc/nginx/includes/mime.types
similarity index 100%
rename from mopidy-addon/rootfs/etc/nginx/includes/mime.types
rename to mopidy/rootfs/etc/nginx/includes/mime.types
diff --git a/mopidy-addon/rootfs/etc/nginx/includes/proxy_params.conf b/mopidy/rootfs/etc/nginx/includes/proxy_params.conf
similarity index 100%
rename from mopidy-addon/rootfs/etc/nginx/includes/proxy_params.conf
rename to mopidy/rootfs/etc/nginx/includes/proxy_params.conf
diff --git a/mopidy-addon/rootfs/etc/nginx/includes/server_params.conf b/mopidy/rootfs/etc/nginx/includes/server_params.conf
similarity index 100%
rename from mopidy-addon/rootfs/etc/nginx/includes/server_params.conf
rename to mopidy/rootfs/etc/nginx/includes/server_params.conf
diff --git a/mopidy-addon/rootfs/etc/nginx/includes/ssl_params.conf b/mopidy/rootfs/etc/nginx/includes/ssl_params.conf
similarity index 100%
rename from mopidy-addon/rootfs/etc/nginx/includes/ssl_params.conf
rename to mopidy/rootfs/etc/nginx/includes/ssl_params.conf
diff --git a/mopidy-addon/rootfs/etc/nginx/includes/upstream.conf b/mopidy/rootfs/etc/nginx/includes/upstream.conf
similarity index 100%
rename from mopidy-addon/rootfs/etc/nginx/includes/upstream.conf
rename to mopidy/rootfs/etc/nginx/includes/upstream.conf
diff --git a/mopidy-addon/rootfs/etc/nginx/nginx.conf b/mopidy/rootfs/etc/nginx/nginx.conf
similarity index 100%
rename from mopidy-addon/rootfs/etc/nginx/nginx.conf
rename to mopidy/rootfs/etc/nginx/nginx.conf
diff --git a/mopidy-addon/rootfs/etc/nginx/servers/.gitkeep b/mopidy/rootfs/etc/nginx/servers/.gitkeep
similarity index 100%
rename from mopidy-addon/rootfs/etc/nginx/servers/.gitkeep
rename to mopidy/rootfs/etc/nginx/servers/.gitkeep
diff --git a/mopidy-addon/rootfs/etc/nginx/templates/direct.gtpl b/mopidy/rootfs/etc/nginx/templates/direct.gtpl
similarity index 100%
rename from mopidy-addon/rootfs/etc/nginx/templates/direct.gtpl
rename to mopidy/rootfs/etc/nginx/templates/direct.gtpl
diff --git a/mopidy-addon/rootfs/etc/nginx/templates/ingress.gtpl b/mopidy/rootfs/etc/nginx/templates/ingress.gtpl
similarity index 100%
rename from mopidy-addon/rootfs/etc/nginx/templates/ingress.gtpl
rename to mopidy/rootfs/etc/nginx/templates/ingress.gtpl
diff --git a/mopidy-addon/rootfs/etc/services.d/mopidy/finish b/mopidy/rootfs/etc/services.d/mopidy/finish
similarity index 100%
rename from mopidy-addon/rootfs/etc/services.d/mopidy/finish
rename to mopidy/rootfs/etc/services.d/mopidy/finish
diff --git a/mopidy-addon/rootfs/etc/services.d/mopidy/run b/mopidy/rootfs/etc/services.d/mopidy/run
similarity index 100%
rename from mopidy-addon/rootfs/etc/services.d/mopidy/run
rename to mopidy/rootfs/etc/services.d/mopidy/run
diff --git a/mopidy-addon/rootfs/etc/services.d/nginx/finish b/mopidy/rootfs/etc/services.d/nginx/finish
similarity index 100%
rename from mopidy-addon/rootfs/etc/services.d/nginx/finish
rename to mopidy/rootfs/etc/services.d/nginx/finish
diff --git a/mopidy-addon/rootfs/etc/services.d/nginx/run b/mopidy/rootfs/etc/services.d/nginx/run
similarity index 100%
rename from mopidy-addon/rootfs/etc/services.d/nginx/run
rename to mopidy/rootfs/etc/services.d/nginx/run