diff --git a/docker/4_run/000-default.conf b/docker/4_run/apache/000-default.conf
similarity index 100%
rename from docker/4_run/000-default.conf
rename to docker/4_run/apache/000-default.conf
diff --git a/docker/4_run/apache2.conf b/docker/4_run/apache/apache2.conf
similarity index 100%
rename from docker/4_run/apache2.conf
rename to docker/4_run/apache/apache2.conf
diff --git a/docker/4_run/apache-logrotate.conf b/docker/4_run/apache/logrotate.conf
similarity index 100%
rename from docker/4_run/apache-logrotate.conf
rename to docker/4_run/apache/logrotate.conf
diff --git a/docker/4_run/wsgi-py36.conf b/docker/4_run/apache/wsgi-py36.conf
similarity index 100%
rename from docker/4_run/wsgi-py36.conf
rename to docker/4_run/apache/wsgi-py36.conf
diff --git a/docker/4_run/wsgi-py36.load b/docker/4_run/apache/wsgi-py36.load
similarity index 100%
rename from docker/4_run/wsgi-py36.load
rename to docker/4_run/apache/wsgi-py36.load
diff --git a/docker/4_run/run.docker b/docker/4_run/run.docker
index 121b449..eee2634 100755
--- a/docker/4_run/run.docker
+++ b/docker/4_run/run.docker
@@ -36,12 +36,12 @@ ENV USE_X_SENDFILE True
 EXPOSE 80
 EXPOSE 5000
 
-ADD wsgi-py36.* /etc/apache2/mods-available/
+ADD apache/wsgi-py36.* /etc/apache2/mods-available/
 RUN a2enmod rewrite && a2enmod wsgi-py36
 
-ADD apache2.conf /etc/apache2/apache2.conf
-ADD 000-default.conf /etc/apache2/sites-available/000-default.conf
-ADD apache-logrotate.conf /etc/logrotate.d/apache2
+ADD apache/apache2.conf /etc/apache2/apache2.conf
+ADD apache/000-default.conf /etc/apache2/sites-available/000-default.conf
+ADD apache/logrotate.conf /etc/logrotate.d/apache2
 ADD *.sh /
 
 # Remove some empty top-level directories we won't use anyway.