diff --git a/src/debian/Containerfile b/debian/Containerfile
similarity index 100%
rename from src/debian/Containerfile
rename to debian/Containerfile
diff --git a/src/debian/assets/bash.bashrc b/debian/assets/bash.bashrc
similarity index 100%
rename from src/debian/assets/bash.bashrc
rename to debian/assets/bash.bashrc
diff --git a/src/debian/assets/bin/dir b/debian/assets/bin/dir
similarity index 100%
rename from src/debian/assets/bin/dir
rename to debian/assets/bin/dir
diff --git a/src/debian/assets/bin/rsyn b/debian/assets/bin/rsyn
similarity index 100%
rename from src/debian/assets/bin/rsyn
rename to debian/assets/bin/rsyn
diff --git a/src/debian/assets/nanorc b/debian/assets/nanorc
similarity index 100%
rename from src/debian/assets/nanorc
rename to debian/assets/nanorc
diff --git a/src/gitea/Containerfile b/gitea/Containerfile
similarity index 100%
rename from src/gitea/Containerfile
rename to gitea/Containerfile
diff --git a/src/gitea/Systemdfile b/gitea/Systemdfile
similarity index 100%
rename from src/gitea/Systemdfile
rename to gitea/Systemdfile
diff --git a/src/gitea/assets/app.ini.esh b/gitea/assets/app.ini.esh
similarity index 100%
rename from src/gitea/assets/app.ini.esh
rename to gitea/assets/app.ini.esh
diff --git a/src/gitea/assets/bin/db-dump b/gitea/assets/bin/db-dump
similarity index 100%
rename from src/gitea/assets/bin/db-dump
rename to gitea/assets/bin/db-dump
diff --git a/src/gitea/assets/bin/db-load b/gitea/assets/bin/db-load
similarity index 100%
rename from src/gitea/assets/bin/db-load
rename to gitea/assets/bin/db-load
diff --git a/src/gitea/assets/bin/db-make b/gitea/assets/bin/db-make
similarity index 100%
rename from src/gitea/assets/bin/db-make
rename to gitea/assets/bin/db-make
diff --git a/src/gitea/assets/bin/esh b/gitea/assets/bin/esh
similarity index 100%
rename from src/gitea/assets/bin/esh
rename to gitea/assets/bin/esh
diff --git a/src/gitea/assets/bin/maint b/gitea/assets/bin/maint
similarity index 100%
rename from src/gitea/assets/bin/maint
rename to gitea/assets/bin/maint
diff --git a/src/gitea/assets/crontab b/gitea/assets/crontab
similarity index 100%
rename from src/gitea/assets/crontab
rename to gitea/assets/crontab
diff --git a/src/gitea/assets/gitea.service b/gitea/assets/gitea.service
similarity index 100%
rename from src/gitea/assets/gitea.service
rename to gitea/assets/gitea.service
diff --git a/src/gitea/assets/pg_hba.conf b/gitea/assets/pg_hba.conf
similarity index 100%
rename from src/gitea/assets/pg_hba.conf
rename to gitea/assets/pg_hba.conf
diff --git a/src/gitea/bugfix/cronfix b/gitea/bugfix/cronfix
similarity index 100%
rename from src/gitea/bugfix/cronfix
rename to gitea/bugfix/cronfix
diff --git a/src/gitea/docs/Build.md b/gitea/docs/Build.md
similarity index 100%
rename from src/gitea/docs/Build.md
rename to gitea/docs/Build.md
diff --git a/src/gitea/docs/Deploy.md b/gitea/docs/Deploy.md
similarity index 100%
rename from src/gitea/docs/Deploy.md
rename to gitea/docs/Deploy.md
diff --git a/src/mailsrv/Containerfile b/mailsrv/Containerfile
similarity index 100%
rename from src/mailsrv/Containerfile
rename to mailsrv/Containerfile
diff --git a/src/mailsrv/assets/bin/mkpass b/mailsrv/assets/bin/mkpass
similarity index 100%
rename from src/mailsrv/assets/bin/mkpass
rename to mailsrv/assets/bin/mkpass
diff --git a/src/mailsrv/assets/bin/mkvirt b/mailsrv/assets/bin/mkvirt
similarity index 100%
rename from src/mailsrv/assets/bin/mkvirt
rename to mailsrv/assets/bin/mkvirt
diff --git a/src/mailsrv/assets/crontab b/mailsrv/assets/crontab
similarity index 100%
rename from src/mailsrv/assets/crontab
rename to mailsrv/assets/crontab
diff --git a/src/mailsrv/assets/dovecot/conf.d/10-auth.conf b/mailsrv/assets/dovecot/conf.d/10-auth.conf
similarity index 100%
rename from src/mailsrv/assets/dovecot/conf.d/10-auth.conf
rename to mailsrv/assets/dovecot/conf.d/10-auth.conf
diff --git a/src/mailsrv/assets/dovecot/conf.d/10-mail.conf b/mailsrv/assets/dovecot/conf.d/10-mail.conf
similarity index 100%
rename from src/mailsrv/assets/dovecot/conf.d/10-mail.conf
rename to mailsrv/assets/dovecot/conf.d/10-mail.conf
diff --git a/src/mailsrv/assets/dovecot/conf.d/10-master.conf b/mailsrv/assets/dovecot/conf.d/10-master.conf
similarity index 100%
rename from src/mailsrv/assets/dovecot/conf.d/10-master.conf
rename to mailsrv/assets/dovecot/conf.d/10-master.conf
diff --git a/src/mailsrv/assets/dovecot/conf.d/10-ssl.conf b/mailsrv/assets/dovecot/conf.d/10-ssl.conf
similarity index 100%
rename from src/mailsrv/assets/dovecot/conf.d/10-ssl.conf
rename to mailsrv/assets/dovecot/conf.d/10-ssl.conf
diff --git a/src/mailsrv/assets/dovecot/conf.d/15-lda.conf b/mailsrv/assets/dovecot/conf.d/15-lda.conf
similarity index 100%
rename from src/mailsrv/assets/dovecot/conf.d/15-lda.conf
rename to mailsrv/assets/dovecot/conf.d/15-lda.conf
diff --git a/src/mailsrv/assets/dovecot/conf.d/15-mailboxes.conf b/mailsrv/assets/dovecot/conf.d/15-mailboxes.conf
similarity index 100%
rename from src/mailsrv/assets/dovecot/conf.d/15-mailboxes.conf
rename to mailsrv/assets/dovecot/conf.d/15-mailboxes.conf
diff --git a/src/mailsrv/assets/dovecot/conf.d/20-lmtp.conf b/mailsrv/assets/dovecot/conf.d/20-lmtp.conf
similarity index 100%
rename from src/mailsrv/assets/dovecot/conf.d/20-lmtp.conf
rename to mailsrv/assets/dovecot/conf.d/20-lmtp.conf
diff --git a/src/mailsrv/assets/dovecot/conf.d/30-stats.conf b/mailsrv/assets/dovecot/conf.d/30-stats.conf
similarity index 100%
rename from src/mailsrv/assets/dovecot/conf.d/30-stats.conf
rename to mailsrv/assets/dovecot/conf.d/30-stats.conf
diff --git a/src/mailsrv/assets/dovecot/dovecot.conf b/mailsrv/assets/dovecot/dovecot.conf
similarity index 100%
rename from src/mailsrv/assets/dovecot/dovecot.conf
rename to mailsrv/assets/dovecot/dovecot.conf
diff --git a/src/mailsrv/assets/mkvirtual.service b/mailsrv/assets/mkvirtual.service
similarity index 100%
rename from src/mailsrv/assets/mkvirtual.service
rename to mailsrv/assets/mkvirtual.service
diff --git a/src/mailsrv/assets/postfix/main.cf b/mailsrv/assets/postfix/main.cf
similarity index 100%
rename from src/mailsrv/assets/postfix/main.cf
rename to mailsrv/assets/postfix/main.cf
diff --git a/src/mailsrv/assets/postfix/master.cf b/mailsrv/assets/postfix/master.cf
similarity index 100%
rename from src/mailsrv/assets/postfix/master.cf
rename to mailsrv/assets/postfix/master.cf
diff --git a/src/mailsrv/bugfix/cronfix b/mailsrv/bugfix/cronfix
similarity index 100%
rename from src/mailsrv/bugfix/cronfix
rename to mailsrv/bugfix/cronfix
diff --git a/src/mailsrv/docs/Build.md b/mailsrv/docs/Build.md
similarity index 100%
rename from src/mailsrv/docs/Build.md
rename to mailsrv/docs/Build.md
diff --git a/src/mailsrv/docs/Deploy.md b/mailsrv/docs/Deploy.md
similarity index 100%
rename from src/mailsrv/docs/Deploy.md
rename to mailsrv/docs/Deploy.md
diff --git a/src/mailsrv/docs/Future.md b/mailsrv/docs/Future.md
similarity index 100%
rename from src/mailsrv/docs/Future.md
rename to mailsrv/docs/Future.md
diff --git a/src/mailsrv/docs/Resources.md b/mailsrv/docs/Resources.md
similarity index 100%
rename from src/mailsrv/docs/Resources.md
rename to mailsrv/docs/Resources.md
diff --git a/fail2ban/jail.d/mailsrv.local b/mailsrv/fail2ban/jail.d/mailsrv.local
similarity index 100%
rename from fail2ban/jail.d/mailsrv.local
rename to mailsrv/fail2ban/jail.d/mailsrv.local
diff --git a/src/mcbe/Containerfile b/mcbe/Containerfile
similarity index 100%
rename from src/mcbe/Containerfile
rename to mcbe/Containerfile
diff --git a/src/mcbe/assets/bin/maint b/mcbe/assets/bin/maint
similarity index 100%
rename from src/mcbe/assets/bin/maint
rename to mcbe/assets/bin/maint
diff --git a/src/mcbe/assets/bin/mcbe-backup b/mcbe/assets/bin/mcbe-backup
similarity index 100%
rename from src/mcbe/assets/bin/mcbe-backup
rename to mcbe/assets/bin/mcbe-backup
diff --git a/src/mcbe/assets/bin/mcbe-exec b/mcbe/assets/bin/mcbe-exec
similarity index 100%
rename from src/mcbe/assets/bin/mcbe-exec
rename to mcbe/assets/bin/mcbe-exec
diff --git a/src/mcbe/assets/bin/mcbe-restore b/mcbe/assets/bin/mcbe-restore
similarity index 100%
rename from src/mcbe/assets/bin/mcbe-restore
rename to mcbe/assets/bin/mcbe-restore
diff --git a/src/mcbe/assets/bin/mcbe-shutdown b/mcbe/assets/bin/mcbe-shutdown
similarity index 100%
rename from src/mcbe/assets/bin/mcbe-shutdown
rename to mcbe/assets/bin/mcbe-shutdown
diff --git a/src/mcbe/assets/minecraft/permissions.json b/mcbe/assets/minecraft/permissions.json
similarity index 100%
rename from src/mcbe/assets/minecraft/permissions.json
rename to mcbe/assets/minecraft/permissions.json
diff --git a/src/mcbe/assets/minecraft/server.properties b/mcbe/assets/minecraft/server.properties
similarity index 100%
rename from src/mcbe/assets/minecraft/server.properties
rename to mcbe/assets/minecraft/server.properties
diff --git a/src/mcbe/assets/minecraft/whitelist.json b/mcbe/assets/minecraft/whitelist.json
similarity index 100%
rename from src/mcbe/assets/minecraft/whitelist.json
rename to mcbe/assets/minecraft/whitelist.json
diff --git a/src/mcbe/assets/systemd/mcbe-backup.service b/mcbe/assets/systemd/mcbe-backup.service
similarity index 100%
rename from src/mcbe/assets/systemd/mcbe-backup.service
rename to mcbe/assets/systemd/mcbe-backup.service
diff --git a/src/mcbe/assets/systemd/mcbe-backup.timer b/mcbe/assets/systemd/mcbe-backup.timer
similarity index 100%
rename from src/mcbe/assets/systemd/mcbe-backup.timer
rename to mcbe/assets/systemd/mcbe-backup.timer
diff --git a/src/mcbe/assets/systemd/mcbe.service b/mcbe/assets/systemd/mcbe.service
similarity index 100%
rename from src/mcbe/assets/systemd/mcbe.service
rename to mcbe/assets/systemd/mcbe.service
diff --git a/src/mcbe/assets/systemd/mcbe.socket b/mcbe/assets/systemd/mcbe.socket
similarity index 100%
rename from src/mcbe/assets/systemd/mcbe.socket
rename to mcbe/assets/systemd/mcbe.socket
diff --git a/src/mcbe/docs/resources.md b/mcbe/docs/resources.md
similarity index 100%
rename from src/mcbe/docs/resources.md
rename to mcbe/docs/resources.md
diff --git a/src/nextcloud/Containerfile b/nextcloud/Containerfile
similarity index 100%
rename from src/nextcloud/Containerfile
rename to nextcloud/Containerfile
diff --git a/src/nextcloud/Systemdfile b/nextcloud/Systemdfile
similarity index 100%
rename from src/nextcloud/Systemdfile
rename to nextcloud/Systemdfile
diff --git a/src/nextcloud/assets/apache/nextcloud.conf b/nextcloud/assets/apache/nextcloud.conf
similarity index 100%
rename from src/nextcloud/assets/apache/nextcloud.conf
rename to nextcloud/assets/apache/nextcloud.conf
diff --git a/src/nextcloud/assets/bin/db-dump b/nextcloud/assets/bin/db-dump
similarity index 100%
rename from src/nextcloud/assets/bin/db-dump
rename to nextcloud/assets/bin/db-dump
diff --git a/src/nextcloud/assets/bin/db-load b/nextcloud/assets/bin/db-load
similarity index 100%
rename from src/nextcloud/assets/bin/db-load
rename to nextcloud/assets/bin/db-load
diff --git a/src/nextcloud/assets/bin/db-make b/nextcloud/assets/bin/db-make
similarity index 100%
rename from src/nextcloud/assets/bin/db-make
rename to nextcloud/assets/bin/db-make
diff --git a/src/nextcloud/assets/bin/maint b/nextcloud/assets/bin/maint
similarity index 100%
rename from src/nextcloud/assets/bin/maint
rename to nextcloud/assets/bin/maint
diff --git a/src/nextcloud/assets/bin/nc-adduser b/nextcloud/assets/bin/nc-adduser
similarity index 100%
rename from src/nextcloud/assets/bin/nc-adduser
rename to nextcloud/assets/bin/nc-adduser
diff --git a/src/nextcloud/assets/bin/nc-mntuser b/nextcloud/assets/bin/nc-mntuser
similarity index 100%
rename from src/nextcloud/assets/bin/nc-mntuser
rename to nextcloud/assets/bin/nc-mntuser
diff --git a/src/nextcloud/assets/bin/nc-occ b/nextcloud/assets/bin/nc-occ
similarity index 100%
rename from src/nextcloud/assets/bin/nc-occ
rename to nextcloud/assets/bin/nc-occ
diff --git a/src/nextcloud/assets/crontab b/nextcloud/assets/crontab
similarity index 100%
rename from src/nextcloud/assets/crontab
rename to nextcloud/assets/crontab
diff --git a/src/nextcloud/assets/my.config.php b/nextcloud/assets/my.config.php
similarity index 100%
rename from src/nextcloud/assets/my.config.php
rename to nextcloud/assets/my.config.php
diff --git a/src/nextcloud/assets/pg_hba.conf b/nextcloud/assets/pg_hba.conf
similarity index 100%
rename from src/nextcloud/assets/pg_hba.conf
rename to nextcloud/assets/pg_hba.conf
diff --git a/src/nextcloud/assets/php/php.ini b/nextcloud/assets/php/php.ini
similarity index 100%
rename from src/nextcloud/assets/php/php.ini
rename to nextcloud/assets/php/php.ini
diff --git a/src/nextcloud/assets/php/www.conf b/nextcloud/assets/php/www.conf
similarity index 100%
rename from src/nextcloud/assets/php/www.conf
rename to nextcloud/assets/php/www.conf
diff --git a/src/nextcloud/assets/redis.conf b/nextcloud/assets/redis.conf
similarity index 100%
rename from src/nextcloud/assets/redis.conf
rename to nextcloud/assets/redis.conf
diff --git a/src/nextcloud/bugfix/apache2.override b/nextcloud/bugfix/apache2.override
similarity index 100%
rename from src/nextcloud/bugfix/apache2.override
rename to nextcloud/bugfix/apache2.override
diff --git a/src/nextcloud/bugfix/cronfix b/nextcloud/bugfix/cronfix
similarity index 100%
rename from src/nextcloud/bugfix/cronfix
rename to nextcloud/bugfix/cronfix
diff --git a/src/nextcloud/bugfix/redis.service b/nextcloud/bugfix/redis.service
similarity index 100%
rename from src/nextcloud/bugfix/redis.service
rename to nextcloud/bugfix/redis.service
diff --git a/src/nextcloud/docs/Build.md b/nextcloud/docs/Build.md
similarity index 100%
rename from src/nextcloud/docs/Build.md
rename to nextcloud/docs/Build.md
diff --git a/src/nextcloud/docs/Deploy.md b/nextcloud/docs/Deploy.md
similarity index 100%
rename from src/nextcloud/docs/Deploy.md
rename to nextcloud/docs/Deploy.md
diff --git a/src/samba/Containerfile b/samba/Containerfile
similarity index 100%
rename from src/samba/Containerfile
rename to samba/Containerfile
diff --git a/src/samba/assets/bin/db-dump b/samba/assets/bin/db-dump
similarity index 100%
rename from src/samba/assets/bin/db-dump
rename to samba/assets/bin/db-dump
diff --git a/src/samba/assets/bin/db-load b/samba/assets/bin/db-load
similarity index 100%
rename from src/samba/assets/bin/db-load
rename to samba/assets/bin/db-load
diff --git a/src/samba/assets/bin/smbadduser b/samba/assets/bin/smbadduser
similarity index 100%
rename from src/samba/assets/bin/smbadduser
rename to samba/assets/bin/smbadduser
diff --git a/src/samba/assets/smb.conf b/samba/assets/smb.conf
similarity index 100%
rename from src/samba/assets/smb.conf
rename to samba/assets/smb.conf
diff --git a/src/samba/docs/Build.md b/samba/docs/Build.md
similarity index 100%
rename from src/samba/docs/Build.md
rename to samba/docs/Build.md
diff --git a/src/samba/docs/Deploy.md b/samba/docs/Deploy.md
similarity index 100%
rename from src/samba/docs/Deploy.md
rename to samba/docs/Deploy.md
diff --git a/src/startpage/Containerfile b/startpage/Containerfile
similarity index 100%
rename from src/startpage/Containerfile
rename to startpage/Containerfile
diff --git a/src/startpage/assets/config.php b/startpage/assets/config.php
similarity index 100%
rename from src/startpage/assets/config.php
rename to startpage/assets/config.php