diff --git a/Dockerfile b/Dockerfile
index da9e48a..7de0ed8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,10 +24,10 @@ RUN npm link
 RUN mkdir -p /srv/repos/pear
 
 
-COPY default /etc/nginx/sites-enabled/default
+COPY docker/nginx-default-config /etc/nginx/sites-enabled/default
 
 WORKDIR /app
-COPY entrypoint.sh .
+COPY docker/entrypoint.sh .
 RUN chmod +x entrypoint.sh
 
 ENTRYPOINT ["/bin/bash", "-c", "/app/entrypoint.sh"]
diff --git a/entrypoint.sh b/docker/entrypoint.sh
similarity index 100%
rename from entrypoint.sh
rename to docker/entrypoint.sh
diff --git a/default b/docker/nginx-default-config
similarity index 100%
rename from default
rename to docker/nginx-default-config