diff --git a/webkit/Dockerfile b/webkit/Dockerfile
index fb0d73e..1cafc1c 100644
--- a/webkit/Dockerfile
+++ b/webkit/Dockerfile
@@ -11,11 +11,11 @@ RUN mkdir -p /data/ /webkit/includes/
 ADD ./*.js /webkit/
 ADD ./includes/ /webkit/includes/
 ADD ./bin/ /usr/local/bin/
-ADD ./haproxy.cfg /etc/haproxy/
-ADD ./supervisor/supervisord.conf /etc/supervisor/
-ADD ./supervisor/conf.d/ /etc/supervisor/conf.d/
-ADD ./monit/conf.d/ /etc/monit/conf.d/
-ADD ./nginx.cfg /etc/nginx/sites-enabled/default
+ADD ./etc/haproxy.cfg /etc/haproxy/
+ADD ./etc/supervisor/supervisord.conf /etc/supervisor/
+ADD ./etc/supervisor/conf.d/ /etc/supervisor/conf.d/
+ADD ./etc/monit/conf.d/ /etc/monit/conf.d/
+ADD ./etc/nginx.cfg /etc/nginx/sites-enabled/default
 
 VOLUME /data/
 EXPOSE 80 1024 2812 9001
diff --git a/webkit/bin/monit b/webkit/bin/monit
deleted file mode 100755
index aa86037..0000000
Binary files a/webkit/bin/monit and /dev/null differ
diff --git a/webkit/haproxy.cfg b/webkit/etc/haproxy.cfg
similarity index 100%
rename from webkit/haproxy.cfg
rename to webkit/etc/haproxy.cfg
diff --git a/webkit/monit/conf.d/setting.cfg b/webkit/etc/monit/conf.d/setting.cfg
similarity index 100%
rename from webkit/monit/conf.d/setting.cfg
rename to webkit/etc/monit/conf.d/setting.cfg
diff --git a/webkit/monit/conf.d/webkit.cfg b/webkit/etc/monit/conf.d/webkit.cfg
similarity index 100%
rename from webkit/monit/conf.d/webkit.cfg
rename to webkit/etc/monit/conf.d/webkit.cfg
diff --git a/webkit/nginx.cfg b/webkit/etc/nginx.cfg
similarity index 88%
rename from webkit/nginx.cfg
rename to webkit/etc/nginx.cfg
index eef84e3..dbaba97 100644
--- a/webkit/nginx.cfg
+++ b/webkit/etc/nginx.cfg
@@ -6,7 +6,7 @@ server {
 
     location / {
         autoindex on;
-        expires 365d;
+        expires max;
         try_files $uri $uri/ =404;
     }
 }
diff --git a/webkit/supervisor/conf.d/haproxy.conf b/webkit/etc/supervisor/conf.d/haproxy.conf
similarity index 100%
rename from webkit/supervisor/conf.d/haproxy.conf
rename to webkit/etc/supervisor/conf.d/haproxy.conf
diff --git a/webkit/supervisor/conf.d/monit.conf b/webkit/etc/supervisor/conf.d/monit.conf
similarity index 100%
rename from webkit/supervisor/conf.d/monit.conf
rename to webkit/etc/supervisor/conf.d/monit.conf
diff --git a/webkit/supervisor/conf.d/nginx.conf b/webkit/etc/supervisor/conf.d/nginx.conf
similarity index 100%
rename from webkit/supervisor/conf.d/nginx.conf
rename to webkit/etc/supervisor/conf.d/nginx.conf
diff --git a/webkit/supervisor/conf.d/webkit.conf b/webkit/etc/supervisor/conf.d/webkit.conf
similarity index 100%
rename from webkit/supervisor/conf.d/webkit.conf
rename to webkit/etc/supervisor/conf.d/webkit.conf
diff --git a/webkit/supervisor/supervisord.conf b/webkit/etc/supervisor/supervisord.conf
similarity index 100%
rename from webkit/supervisor/supervisord.conf
rename to webkit/etc/supervisor/supervisord.conf