diff --git a/conf.d/it-strategy-dashboard.conf b/conf.d/dashboard/it-strategy-dashboard.conf
similarity index 100%
rename from conf.d/it-strategy-dashboard.conf
rename to conf.d/dashboard/it-strategy-dashboard.conf
diff --git a/conf.d/elog-lmx.conf b/conf.d/elog/elog-lmx.conf
similarity index 100%
rename from conf.d/elog-lmx.conf
rename to conf.d/elog/elog-lmx.conf
diff --git a/conf.d/lac-elog.conf b/conf.d/elog/lac-elog.conf
similarity index 100%
rename from conf.d/lac-elog.conf
rename to conf.d/elog/lac-elog.conf
diff --git a/conf.d/lmu-elog.psi.ch.conf b/conf.d/elog/lmu-elog.psi.ch.conf
similarity index 100%
rename from conf.d/lmu-elog.psi.ch.conf
rename to conf.d/elog/lmu-elog.psi.ch.conf
diff --git a/conf.d/pif-elog.conf b/conf.d/elog/pif-elog.conf
similarity index 100%
rename from conf.d/pif-elog.conf
rename to conf.d/elog/pif-elog.conf
diff --git a/conf.d/excalidraw.conf b/conf.d/excalidraw/excalidraw.conf
similarity index 100%
rename from conf.d/excalidraw.conf
rename to conf.d/excalidraw/excalidraw.conf
diff --git a/conf.d/sf-hedgedoc.conf b/conf.d/hedgedoc/sf-hedgedoc.conf
similarity index 100%
rename from conf.d/sf-hedgedoc.conf
rename to conf.d/hedgedoc/sf-hedgedoc.conf
diff --git a/conf.d/cas-status-test.conf b/conf.d/legacy-web/cas-status-test.conf
similarity index 100%
rename from conf.d/cas-status-test.conf
rename to conf.d/legacy-web/cas-status-test.conf
diff --git a/conf.d/fluid-eos-test.conf b/conf.d/legacy-web/fluid-eos-test.conf
similarity index 100%
rename from conf.d/fluid-eos-test.conf
rename to conf.d/legacy-web/fluid-eos-test.conf
diff --git a/conf.d/lbr-scheduler.conf b/conf.d/legacy-web/lbr-scheduler.conf
similarity index 100%
rename from conf.d/lbr-scheduler.conf
rename to conf.d/legacy-web/lbr-scheduler.conf
diff --git a/conf.d/megwiki-test.conf b/conf.d/legacy-web/megwiki-test.conf
similarity index 100%
rename from conf.d/megwiki-test.conf
rename to conf.d/legacy-web/megwiki-test.conf
diff --git a/conf.d/omny.conf b/conf.d/legacy-web/omny.conf
similarity index 100%
rename from conf.d/omny.conf
rename to conf.d/legacy-web/omny.conf
diff --git a/conf.d/rfmwtools.conf b/conf.d/legacy-web/rfmwtools.conf
similarity index 100%
rename from conf.d/rfmwtools.conf
rename to conf.d/legacy-web/rfmwtools.conf
diff --git a/conf.d/sinqimaging.conf b/conf.d/legacy-web/sinqimaging.conf
similarity index 100%
rename from conf.d/sinqimaging.conf
rename to conf.d/legacy-web/sinqimaging.conf
diff --git a/conf.d/sls2.conf b/conf.d/legacy-web/sls2.conf
similarity index 100%
rename from conf.d/sls2.conf
rename to conf.d/legacy-web/sls2.conf
diff --git a/conf.d/srem-test.conf b/conf.d/legacy-web/srem-test.conf
similarity index 100%
rename from conf.d/srem-test.conf
rename to conf.d/legacy-web/srem-test.conf
diff --git a/conf.d/n8n.conf b/conf.d/n8n/n8n.conf
similarity index 100%
rename from conf.d/n8n.conf
rename to conf.d/n8n/n8n.conf
diff --git a/conf.d/opticswiki.conf b/conf.d/opticswiki/opticswiki.conf
similarity index 100%
rename from conf.d/opticswiki.conf
rename to conf.d/opticswiki/opticswiki.conf
diff --git a/conf.d/panda-maintenance.conf b/conf.d/panda-maintenance/panda-maintenance.conf
similarity index 100%
rename from conf.d/panda-maintenance.conf
rename to conf.d/panda-maintenance/panda-maintenance.conf
diff --git a/conf.d/pepiso-test.conf b/conf.d/pepisco/pepiso-test.conf
similarity index 100%
rename from conf.d/pepiso-test.conf
rename to conf.d/pepisco/pepiso-test.conf
diff --git a/conf.d/rf-pikett.conf b/conf.d/pikettlischte-beautifier/rf-pikett.conf
similarity index 100%
rename from conf.d/rf-pikett.conf
rename to conf.d/pikettlischte-beautifier/rf-pikett.conf
diff --git a/conf.d/00-default.conf b/conf.d/proxy/00-default.conf
similarity index 100%
rename from conf.d/00-default.conf
rename to conf.d/proxy/00-default.conf
diff --git a/conf.d/saparchive-test.conf b/conf.d/sap/saparchive-test.conf
similarity index 100%
rename from conf.d/saparchive-test.conf
rename to conf.d/sap/saparchive-test.conf
diff --git a/conf.d/saparchive.conf b/conf.d/sap/saparchive.conf
similarity index 100%
rename from conf.d/saparchive.conf
rename to conf.d/sap/saparchive.conf
diff --git a/conf.d/sapdocrouter-test.conf b/conf.d/sap/sapdocrouter-test.conf
similarity index 100%
rename from conf.d/sapdocrouter-test.conf
rename to conf.d/sap/sapdocrouter-test.conf
diff --git a/conf.d/sapdocrouter.conf b/conf.d/sap/sapdocrouter.conf
similarity index 100%
rename from conf.d/sapdocrouter.conf
rename to conf.d/sap/sapdocrouter.conf
diff --git a/conf.d/scicat-rocrate-dev.conf b/conf.d/scicat-rocrate/scicat-rocrate-dev.conf
similarity index 100%
rename from conf.d/scicat-rocrate-dev.conf
rename to conf.d/scicat-rocrate/scicat-rocrate-dev.conf
diff --git a/conf.d/sf-rffaultevents.conf b/conf.d/sf-rffaultevents/sf-rffaultevents.conf
similarity index 100%
rename from conf.d/sf-rffaultevents.conf
rename to conf.d/sf-rffaultevents/sf-rffaultevents.conf
diff --git a/conf.d/slsbl.conf b/conf.d/slsbl/slsbl.conf
similarity index 100%
rename from conf.d/slsbl.conf
rename to conf.d/slsbl/slsbl.conf
diff --git a/conf.d/summer-project-selection.conf b/conf.d/summer-project-selection/summer-project-selection.conf
similarity index 100%
rename from conf.d/summer-project-selection.conf
rename to conf.d/summer-project-selection/summer-project-selection.conf
diff --git a/conf.d/swiss-ecargo.conf b/conf.d/swiss-ecargo/swiss-ecargo.conf
similarity index 100%
rename from conf.d/swiss-ecargo.conf
rename to conf.d/swiss-ecargo/swiss-ecargo.conf
diff --git a/conf.d/tomcatwiki.conf b/conf.d/tomcatwiki/tomcatwiki.conf
similarity index 100%
rename from conf.d/tomcatwiki.conf
rename to conf.d/tomcatwiki/tomcatwiki.conf
diff --git a/conf.d/sinqstatus-test.conf b/conf.d/webcontent/sinqstatus-test.conf
similarity index 100%
rename from conf.d/sinqstatus-test.conf
rename to conf.d/webcontent/sinqstatus-test.conf
diff --git a/conf.d/yourls.conf b/conf.d/yourls/yourls.conf
similarity index 100%
rename from conf.d/yourls.conf
rename to conf.d/yourls/yourls.conf