diff --git a/Dockerfile b/Dockerfile
index a7878baff..892c28cec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,16 +45,17 @@ COPY --from=ironic-builder /tmp/ipxe/src/bin/undionly.kpxe /tmp/ipxe/src/bin-x86
 
 COPY --from=ironic-builder /tmp/esp.img /tmp/uefi_esp.img
 
-COPY config/ironic.conf.j2 /etc/ironic/
+COPY ironic-config/ironic.conf.j2 /etc/ironic/
 
-COPY scripts/ /bin/
-COPY config/dnsmasq.conf.j2 /etc/
-COPY config/inspector.ipxe.j2 config/dualboot.ipxe /tmp/
+COPY ironic-scripts/ /bin/
+COPY ironic-config/dnsmasq.conf.j2 /etc/
+COPY ironic-config/inspector.ipxe.j2 ironic-config/dualboot.ipxe /tmp/
 
 # Custom httpd config, removes all but the bare minimum needed modules
 RUN rm -f /etc/httpd/conf.d/autoindex.conf /etc/httpd/conf.d/welcome.conf /etc/httpd/conf.modules.d/*.conf
-COPY config/httpd.conf /etc/httpd/conf.d/
-COPY config/httpd-modules.conf /etc/httpd/conf.modules.d/
-COPY config/apache2-ironic-api.conf.j2 /etc/httpd-ironic-api.conf.j2
+COPY ironic-config/httpd.conf /etc/httpd/conf.d/
+COPY ironic-config/httpd-modules.conf /etc/httpd/conf.modules.d/
+COPY ironic-config/apache2-ironic-api.conf.j2 /etc/httpd-ironic-api.conf.j2
 
 ENTRYPOINT ["/bin/runironic"]
+
diff --git a/config/apache2-ironic-api.conf.j2 b/ironic-config/apache2-ironic-api.conf.j2
similarity index 100%
rename from config/apache2-ironic-api.conf.j2
rename to ironic-config/apache2-ironic-api.conf.j2
diff --git a/config/dnsmasq.conf.j2 b/ironic-config/dnsmasq.conf.j2
similarity index 100%
rename from config/dnsmasq.conf.j2
rename to ironic-config/dnsmasq.conf.j2
diff --git a/config/dualboot.ipxe b/ironic-config/dualboot.ipxe
similarity index 100%
rename from config/dualboot.ipxe
rename to ironic-config/dualboot.ipxe
diff --git a/config/httpd-modules.conf b/ironic-config/httpd-modules.conf
similarity index 100%
rename from config/httpd-modules.conf
rename to ironic-config/httpd-modules.conf
diff --git a/config/httpd.conf b/ironic-config/httpd.conf
similarity index 100%
rename from config/httpd.conf
rename to ironic-config/httpd.conf
diff --git a/config/inspector.ipxe.j2 b/ironic-config/inspector.ipxe.j2
similarity index 100%
rename from config/inspector.ipxe.j2
rename to ironic-config/inspector.ipxe.j2
diff --git a/config/ironic.conf.j2 b/ironic-config/ironic.conf.j2
similarity index 100%
rename from config/ironic.conf.j2
rename to ironic-config/ironic.conf.j2
diff --git a/scripts/configure-httpd-ipa.sh b/ironic-scripts/configure-httpd-ipa.sh
similarity index 100%
rename from scripts/configure-httpd-ipa.sh
rename to ironic-scripts/configure-httpd-ipa.sh
diff --git a/scripts/configure-ironic.sh b/ironic-scripts/configure-ironic.sh
similarity index 100%
rename from scripts/configure-ironic.sh
rename to ironic-scripts/configure-ironic.sh
diff --git a/scripts/ironic-common.sh b/ironic-scripts/ironic-common.sh
similarity index 100%
rename from scripts/ironic-common.sh
rename to ironic-scripts/ironic-common.sh
diff --git a/scripts/rundnsmasq b/ironic-scripts/rundnsmasq
similarity index 100%
rename from scripts/rundnsmasq
rename to ironic-scripts/rundnsmasq
diff --git a/scripts/runhttpd b/ironic-scripts/runhttpd
similarity index 100%
rename from scripts/runhttpd
rename to ironic-scripts/runhttpd
diff --git a/scripts/runironic-api b/ironic-scripts/runironic-api
similarity index 100%
rename from scripts/runironic-api
rename to ironic-scripts/runironic-api
diff --git a/scripts/runironic-conductor b/ironic-scripts/runironic-conductor
similarity index 100%
rename from scripts/runironic-conductor
rename to ironic-scripts/runironic-conductor
diff --git a/scripts/runironic-exporter b/ironic-scripts/runironic-exporter
similarity index 100%
rename from scripts/runironic-exporter
rename to ironic-scripts/runironic-exporter
diff --git a/scripts/runlogwatch.sh b/ironic-scripts/runlogwatch.sh
similarity index 100%
rename from scripts/runlogwatch.sh
rename to ironic-scripts/runlogwatch.sh
diff --git a/scripts/runmariadb b/ironic-scripts/runmariadb
similarity index 100%
rename from scripts/runmariadb
rename to ironic-scripts/runmariadb