diff --git a/base/Dockerfile b/Dockerfile
similarity index 89%
rename from base/Dockerfile
rename to Dockerfile
index bf25201..1f21a3e 100644
--- a/base/Dockerfile
+++ b/Dockerfile
@@ -29,6 +29,12 @@ RUN pip install -U six \
     && pip install Mopidy-Local-SQLite \
     && pip install --upgrade pafy
 
+RUN pip install Mopidy-Mopify \
+    && pip install Mopidy-Spotmop \
+    && pip install Mopidy-MusicBox-Webclient \
+    && pip install Mopidy-API-Explorer
+
+
 ADD mopidy.conf /var/lib/mopidy/.config/mopidy/mopidy.conf
 
 ADD entrypoint.sh /entrypoint.sh
diff --git a/base/accounts.conf b/accounts.conf
similarity index 100%
rename from base/accounts.conf
rename to accounts.conf
diff --git a/base/entrypoint.sh b/entrypoint.sh
similarity index 100%
rename from base/entrypoint.sh
rename to entrypoint.sh
diff --git a/base/mopidy.conf b/mopidy.conf
similarity index 100%
rename from base/mopidy.conf
rename to mopidy.conf
diff --git a/web/Dockerfile b/web/Dockerfile
deleted file mode 100644
index ee03e7e..0000000
--- a/web/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM whhoesj/mopidy:latest
-MAINTAINER Wouter Habets (wouterhabets@gmail.com)
-
-USER root
-RUN pip install Mopidy-Mopify \
-    && pip install Mopidy-Spotmop \
-    && pip install Mopidy-MusicBox-Webclient \
-    && pip install Mopidy-API-Explorer
-USER mopidy