diff --git a/apache/maintenance.conf b/apache/etc/httpd/conf.d/virtualhost-example.conf
similarity index 97%
rename from apache/maintenance.conf
rename to apache/etc/httpd/conf.d/virtualhost-example.conf
index 6576a7f..e08d0f4 100644
--- a/apache/maintenance.conf
+++ b/apache/etc/httpd/conf.d/virtualhost-example.conf
@@ -1,4 +1,6 @@
 <VirtualHost *:443>
+  # YOUR CONFIG
+
   # Redirect all request to a 503 return code when in maintenance mode
   ErrorDocument 503 /maintenance/index.html
   RewriteEngine on
@@ -12,4 +14,5 @@
   RewriteCond /var/www/maintenance/ALL !-f
   RewriteCond /var/www/maintenance/%{SERVER_NAME} !-f
   RewriteRule ^/maintenance/index.html$ / [R,L]
+
 </VirtualHost>
diff --git a/apache/etc/httpd/conf/httpd-maintenance.conf b/apache/etc/httpd/conf/httpd-maintenance.conf
new file mode 100644
index 0000000..d3fbced
--- /dev/null
+++ b/apache/etc/httpd/conf/httpd-maintenance.conf
@@ -0,0 +1,7 @@
+## YOUR CONFIG HERE
+
+<IfModule alias_module>
+  ## OTHER CONFIG HERE
+
+  Alias "/maintenance" "/var/www/maintenance"
+</IfModule>
diff --git a/apache/etc/httpd/conf/httpd-no-signature.conf b/apache/etc/httpd/conf/httpd-no-signature.conf
new file mode 100644
index 0000000..09cafd0
--- /dev/null
+++ b/apache/etc/httpd/conf/httpd-no-signature.conf
@@ -0,0 +1,4 @@
+## MAIN CONFIG HERE
+
+ServerTokens Prod
+ServerSignature Off
diff --git a/apache/etc/httpd/conf/httpd-server-status.conf b/apache/etc/httpd/conf/httpd-server-status.conf
new file mode 100644
index 0000000..8a8a49d
--- /dev/null
+++ b/apache/etc/httpd/conf/httpd-server-status.conf
@@ -0,0 +1,8 @@
+## MAIN CONFIG HERE
+
+<Location "/server-status">
+    SetHandler server-status
+    Order deny,allow
+    Deny from all
+    Allow from 127.0.0.1
+</Location>
diff --git a/apache/maintenance.html b/apache/var/www/maintenance/index.html
similarity index 92%
rename from apache/maintenance.html
rename to apache/var/www/maintenance/index.html
index d0058ee..16fe47f 100644
--- a/apache/maintenance.html
+++ b/apache/var/www/maintenance/index.html
@@ -10,7 +10,7 @@
 </style>
 
 <article>
-    <img src="maintenance.png" height=270>
+    <img src="maintenance/index.png" height=270>
     <h1>We&rsquo;ll be back soon!</h1>
     <div>
         <p>We&rsquo;re performing some hacks at the moment.
diff --git a/apache/maintenance.png b/apache/var/www/maintenance/index.png
similarity index 100%
rename from apache/maintenance.png
rename to apache/var/www/maintenance/index.png
diff --git a/postgresql/pg_hba.conf b/postgresql/etc/postgresql/pg_hba.conf
similarity index 100%
rename from postgresql/pg_hba.conf
rename to postgresql/etc/postgresql/pg_hba.conf
diff --git a/postgresql/postgresql_custom.conf b/postgresql/etc/postgresql/postgresql.conf
similarity index 55%
rename from postgresql/postgresql_custom.conf
rename to postgresql/etc/postgresql/postgresql.conf
index 65c2e9f..e9efbc1 100644
--- a/postgresql/postgresql_custom.conf
+++ b/postgresql/etc/postgresql/postgresql.conf
@@ -1,5 +1,5 @@
-...
+## OTHER CONFIG
 
 password_encryption = scram-sha-256
 
-...
+## END CONFIG
diff --git a/prometheus/exporters/apache.conf b/prometheus/exporters/etc/default/prometheus-apache-exporter.conf
similarity index 100%
rename from prometheus/exporters/apache.conf
rename to prometheus/exporters/etc/default/prometheus-apache-exporter.conf
diff --git a/prometheus/exporters/nginx.conf b/prometheus/exporters/etc/default/prometheus-nginx-exporter.conf
similarity index 100%
rename from prometheus/exporters/nginx.conf
rename to prometheus/exporters/etc/default/prometheus-nginx-exporter.conf
diff --git a/prometheus/exporters/postgresql.conf b/prometheus/exporters/etc/default/prometheus-postgresql-exporter.conf
similarity index 100%
rename from prometheus/exporters/postgresql.conf
rename to prometheus/exporters/etc/default/prometheus-postgresql-exporter.conf
diff --git a/prometheus/exporters/apache.service b/prometheus/exporters/etc/systemd/systemd/prometheus-apache-exporter.service
similarity index 100%
rename from prometheus/exporters/apache.service
rename to prometheus/exporters/etc/systemd/systemd/prometheus-apache-exporter.service
diff --git a/prometheus/exporters/mysqld.service b/prometheus/exporters/etc/systemd/systemd/prometheus-mysqld-exporter.service
similarity index 100%
rename from prometheus/exporters/mysqld.service
rename to prometheus/exporters/etc/systemd/systemd/prometheus-mysqld-exporter.service