diff --git a/Dockerfile b/Dockerfile
index 808862f..322b227 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,26 +57,26 @@ RUN php5enmod mcrypt
 RUN rm -Rf /etc/nginx/conf.d/* && \
 rm -Rf /etc/nginx/sites-available/default && \
 mkdir -p /etc/nginx/ssl/
-ADD ./nginx-site.conf /etc/nginx/sites-available/default.conf
+ADD conf/nginx-site.conf /etc/nginx/sites-available/default.conf
 RUN ln -s /etc/nginx/sites-available/default.conf /etc/nginx/sites-enabled/default.conf
 
 # Add git commands to allow container updating
-ADD ./pull /usr/bin/pull
-ADD ./push /usr/bin/push
+ADD scripts/pull /usr/bin/pull
+ADD scripts/push /usr/bin/push
 RUN chmod 755 /usr/bin/pull && chmod 755 /usr/bin/push
 
 # Supervisor Config
-ADD ./supervisord.conf /etc/supervisord.conf
+ADD conf/supervisord.conf /etc/supervisord.conf
 
 # Start Supervisord
-ADD ./start.sh /start.sh
+ADD scripts/start.sh /start.sh
 RUN chmod 755 /start.sh
 
 # Setup Volume
 VOLUME ["/usr/share/nginx/html"]
 
 # add test PHP file
-ADD ./index.php /usr/share/nginx/html/index.php
+ADD src/index.php /usr/share/nginx/html/index.php
 RUN chown -Rf www-data.www-data /usr/share/nginx/html/
 
 # Expose Ports
diff --git a/nginx-site.conf b/conf/nginx-site.conf
similarity index 100%
rename from nginx-site.conf
rename to conf/nginx-site.conf
diff --git a/supervisord.conf b/conf/supervisord.conf
similarity index 100%
rename from supervisord.conf
rename to conf/supervisord.conf
diff --git a/pull b/scripts/pull
similarity index 100%
rename from pull
rename to scripts/pull
diff --git a/push b/scripts/push
similarity index 100%
rename from push
rename to scripts/push
diff --git a/start.sh b/scripts/start.sh
similarity index 100%
rename from start.sh
rename to scripts/start.sh
diff --git a/index.php b/src/index.php
similarity index 100%
rename from index.php
rename to src/index.php