diff --git a/ldap/run.sh b/ldap/run.sh
index b52fa9569d14edf7e4aaaecea082fdf0f623acc6..e660eaa5ac45c9dcc88215d6cf840bd4c887ea58 100644
--- a/ldap/run.sh
+++ b/ldap/run.sh
@@ -1,11 +1,14 @@
+SCRIPT=`realpath $0`
+SCRIPTPATH=`dirname $SCRIPT`
+
 docker kill ldap-service phpldapadmin-service
 docker rm ldap-service phpldapadmin-service
 docker run \
 	--env LDAP_ORGANISATION="Warpzone" \
 	--env LDAP_DOMAIN="warpzone.ms" \
 	--env LDAP_ADMIN_PASSWORD="k7dAw8j2" \
-	--volume /opt/warpzone/ldap/data/database:/var/lib/ldap \
-	--volume /opt/warpzone/ldap/data/config:/etc/ldap/slapd.d \
+	--volume $SCRIPTPATH/data/database:/var/lib/ldap \
+	--volume $SCRIPTPATH/data/config:/etc/ldap/slapd.d \
 	--name ldap-service \
 	--hostname ldap-service \
 	--detach osixia/openldap:latest
diff --git a/www/docker/Dockerfile b/www/Dockerfile
similarity index 82%
rename from www/docker/Dockerfile
rename to www/Dockerfile
index 1a1da0aac976102d62e93417e451673d43f91bb1..a35c6c98c707244698e13d85f627c6c65ded6dd0 100644
--- a/www/docker/Dockerfile
+++ b/www/Dockerfile
@@ -32,8 +32,11 @@ RUN pip3 install \
 RUN ln -s /opt/nginx/nginx_warpinfra.conf /etc/nginx/sites-enabled/
 RUN rm /etc/nginx/sites-enabled/default
 
-COPY ldapdb_base.py /usr/local/lib/python2.7/dist-packages/ldapdb/backends/ldap/base.py
-COPY entrypoint.sh /opt/entrypoint.sh
+COPY misc/ldapdb_base.py /usr/local/lib/python2.7/dist-packages/ldapdb/backends/ldap/base.py
+COPY misc/entrypoint.sh /opt/entrypoint.sh
+
+ADD web /opt/warpinfra/
+ADD nginx /opt/nginx
 
 EXPOSE 8000
 
diff --git a/www/build.sh b/www/build.sh
index 51abdce8f8e9fd90d119be91929c0c6d1b3388e6..787df73903305b2f19c7f02a778b546c80be29cd 100644
--- a/www/build.sh
+++ b/www/build.sh
@@ -1 +1,3 @@
-cd docker; docker build -t warpinfra .; cd -
+SCRIPT=`realpath $0`
+SCRIPTPATH=`dirname $SCRIPT`
+docker build -t warpinfra $SCRIPTPATH/.
\ No newline at end of file
diff --git a/www/docker/entrypoint.sh b/www/misc/entrypoint.sh
similarity index 100%
rename from www/docker/entrypoint.sh
rename to www/misc/entrypoint.sh
diff --git a/www/docker/ldapdb_base.py b/www/misc/ldapdb_base.py
similarity index 100%
rename from www/docker/ldapdb_base.py
rename to www/misc/ldapdb_base.py
diff --git a/www/docker/ldapdb_fields.py b/www/misc/ldapdb_fields.py
similarity index 100%
rename from www/docker/ldapdb_fields.py
rename to www/misc/ldapdb_fields.py
diff --git a/www/run_dev.sh b/www/run_dev.sh
new file mode 100644
index 0000000000000000000000000000000000000000..48e1990239cea2b08463c986d22f6302f64af70b
--- /dev/null
+++ b/www/run_dev.sh
@@ -0,0 +1,14 @@
+SCRIPT=`realpath $0`
+SCRIPTPATH=`dirname $SCRIPT`
+
+docker kill warpinfra
+docker rm warpinfra
+
+docker run \
+	-v $SCRIPTPATH/web:/opt/warpinfra \
+    -v $SCRIPTPATH/nginx:/opt/nginx \
+	--link ldap-service:ldap \
+	--name warpinfra \
+	-p 8000:443 \
+	-itd \
+	warpinfra
diff --git a/www/run.sh b/www/run_prod.sh
similarity index 60%
rename from www/run.sh
rename to www/run_prod.sh
index 5924b8333fc971da2be3e9c7d70ff24669727122..1a0869b0806c8ff657256988a67bd8d4dd9041e4 100644
--- a/www/run.sh
+++ b/www/run_prod.sh
@@ -1,9 +1,11 @@
+SCRIPT=`realpath $0`
+SCRIPTPATH=`dirname $SCRIPT`
+
+$SCRIPTPATH/build.sh
 docker kill warpinfra
 docker rm warpinfra
 
 docker run \
-	-v /opt/warpzone/www/web:/opt/warpinfra \
-        -v /opt/warpzone/www/nginx:/opt/nginx \
 	--link ldap-service:ldap \
 	--name warpinfra \
 	-p 8000:443 \