From 689be5f2d96bddf172fc07f5226d6c9a349fce60 Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Wed, 1 Nov 2017 12:11:04 +0100
Subject: [PATCH] Move all directories per theme
---
.gitignore | 6 +++---
{admin => core/admin}/.gitignore | 0
{admin => core/admin}/Dockerfile | 0
{admin => core/admin}/README.md | 0
{admin => core/admin}/audit.py | 0
{admin => core/admin}/babel.cfg | 0
{admin => core/admin}/mailu/__init__.py | 0
{admin => core/admin}/mailu/dkim.py | 0
{admin => core/admin}/mailu/dockercli.py | 0
{admin => core/admin}/mailu/internal/__init__.py | 0
{admin => core/admin}/mailu/internal/nginx.py | 0
{admin => core/admin}/mailu/internal/views.py | 0
{admin => core/admin}/mailu/models.py | 0
.../mailu/translations/de/LC_MESSAGES/messages.po | 0
.../mailu/translations/en/LC_MESSAGES/messages.po | 0
.../mailu/translations/fr/LC_MESSAGES/messages.po | 0
.../mailu/translations/pt/LC_MESSAGES/messages.po | 0
{admin => core/admin}/mailu/ui/__init__.py | 0
{admin => core/admin}/mailu/ui/access.py | 0
{admin => core/admin}/mailu/ui/forms.py | 0
.../mailu/ui/static/adminlte/css/AdminLTE.min.css | 0
.../mailu/ui/static/adminlte/css/skin-blue.min.css | 0
.../admin}/mailu/ui/static/adminlte/js/app.min.js | 0
{admin => core/admin}/mailu/ui/static/app.css | 0
.../mailu/ui/static/bootstrap/css/bootstrap.css.map | 0
.../mailu/ui/static/bootstrap/css/bootstrap.min.css | 0
.../fonts/glyphicons-halflings-regular.eot | Bin
.../fonts/glyphicons-halflings-regular.svg | 0
.../fonts/glyphicons-halflings-regular.ttf | Bin
.../fonts/glyphicons-halflings-regular.woff | Bin
.../fonts/glyphicons-halflings-regular.woff2 | Bin
.../mailu/ui/static/bootstrap/js/bootstrap.min.js | 0
.../mailu/ui/static/jquery/js/jquery-2.2.2.min.js | 0
.../mailu/ui/static/select2/css/select2.min.css | 0
.../admin}/mailu/ui/static/select2/js/i18n/ar.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/az.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/bg.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/ca.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/cs.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/da.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/de.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/el.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/en.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/es.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/et.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/eu.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/fa.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/fi.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/fr.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/gl.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/he.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/hi.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/hr.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/hu.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/id.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/is.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/it.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/ja.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/km.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/ko.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/lt.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/lv.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/mk.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/ms.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/nb.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/nl.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/pl.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/pt-BR.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/pt.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/ro.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/ru.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/sk.js | 0
.../mailu/ui/static/select2/js/i18n/sr-Cyrl.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/sr.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/sv.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/th.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/tr.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/uk.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/vi.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/zh-CN.js | 0
.../admin}/mailu/ui/static/select2/js/i18n/zh-TW.js | 0
.../mailu/ui/static/select2/js/select2.full.min.js | 0
.../mailu/ui/static/select2/js/select2.min.js | 0
.../admin}/mailu/ui/templates/admin/create.html | 0
.../admin}/mailu/ui/templates/admin/list.html | 0
.../admin}/mailu/ui/templates/alias/create.html | 0
.../admin}/mailu/ui/templates/alias/edit.html | 0
.../admin}/mailu/ui/templates/alias/list.html | 0
.../mailu/ui/templates/alternative/create.html | 0
.../admin}/mailu/ui/templates/alternative/list.html | 0
.../admin}/mailu/ui/templates/announcement.html | 0
{admin => core/admin}/mailu/ui/templates/base.html | 0
.../admin}/mailu/ui/templates/confirm.html | 0
.../admin}/mailu/ui/templates/docker-error.html | 0
.../admin}/mailu/ui/templates/domain/create.html | 0
.../admin}/mailu/ui/templates/domain/details.html | 0
.../admin}/mailu/ui/templates/domain/edit.html | 0
.../admin}/mailu/ui/templates/domain/list.html | 0
.../admin}/mailu/ui/templates/fetch/create.html | 0
.../admin}/mailu/ui/templates/fetch/edit.html | 0
.../admin}/mailu/ui/templates/fetch/list.html | 0
{admin => core/admin}/mailu/ui/templates/form.html | 0
{admin => core/admin}/mailu/ui/templates/login.html | 0
.../admin}/mailu/ui/templates/macros.html | 0
.../admin}/mailu/ui/templates/manager/create.html | 0
.../admin}/mailu/ui/templates/manager/list.html | 0
.../admin}/mailu/ui/templates/relay/create.html | 0
.../admin}/mailu/ui/templates/relay/edit.html | 0
.../admin}/mailu/ui/templates/relay/list.html | 0
.../admin}/mailu/ui/templates/services.html | 0
.../admin}/mailu/ui/templates/sidebar.html | 0
.../admin}/mailu/ui/templates/token/create.html | 0
.../admin}/mailu/ui/templates/token/list.html | 0
.../admin}/mailu/ui/templates/user/create.html | 0
.../admin}/mailu/ui/templates/user/edit.html | 0
.../admin}/mailu/ui/templates/user/forward.html | 0
.../admin}/mailu/ui/templates/user/list.html | 0
.../admin}/mailu/ui/templates/user/password.html | 0
.../admin}/mailu/ui/templates/user/reply.html | 0
.../admin}/mailu/ui/templates/user/settings.html | 0
.../admin}/mailu/ui/templates/working.html | 0
{admin => core/admin}/mailu/ui/views/__init__.py | 0
{admin => core/admin}/mailu/ui/views/admins.py | 0
{admin => core/admin}/mailu/ui/views/aliases.py | 0
.../admin}/mailu/ui/views/alternatives.py | 0
{admin => core/admin}/mailu/ui/views/base.py | 0
{admin => core/admin}/mailu/ui/views/domains.py | 0
{admin => core/admin}/mailu/ui/views/fetches.py | 0
{admin => core/admin}/mailu/ui/views/managers.py | 0
{admin => core/admin}/mailu/ui/views/relays.py | 0
{admin => core/admin}/mailu/ui/views/tokens.py | 0
{admin => core/admin}/mailu/ui/views/users.py | 0
{admin => core/admin}/manage.py | 0
{admin => core/admin}/messages.pot | 0
{admin => core/admin}/migrations/alembic.ini | 0
{admin => core/admin}/migrations/env.py | 0
{admin => core/admin}/migrations/script.py.mako | 0
.../admin}/migrations/versions/12e9a4f6ed73_.py | 0
.../admin}/migrations/versions/2335c80a6bc3_.py | 0
.../admin}/migrations/versions/27ae2f102682_.py | 0
.../admin}/migrations/versions/3f6994568962_.py | 0
.../admin}/migrations/versions/73e56bad5ec5_.py | 0
.../admin}/migrations/versions/9400a032eb1a_.py | 0
.../admin}/migrations/versions/9c28df23f77e_.py | 0
.../admin}/migrations/versions/a4accda8a8c7_.py | 0
.../admin}/migrations/versions/c162ac88012a_.py | 0
.../admin}/migrations/versions/c5696b48442d_.py | 0
.../admin}/migrations/versions/c9a0b4e653cf_.py | 0
.../admin}/migrations/versions/dc8c25cf5b98_.py | 0
.../admin}/migrations/versions/ff0417f4318f_.py | 0
{admin => core/admin}/requirements-prod.txt | 0
{admin => core/admin}/requirements.txt | 0
{admin => core/admin}/run.py | 0
{admin => core/admin}/start.sh | 0
{dovecot => core/dovecot}/Dockerfile | 0
{dovecot => core/dovecot}/README.md | 0
{dovecot => core/dovecot}/conf/dovecot-sql.conf.ext | 0
{dovecot => core/dovecot}/conf/dovecot.conf | 0
.../dovecot}/conf/pigeonhole-sieve.dict | 0
{dovecot => core/dovecot}/sieve/after.sieve | 0
{dovecot => core/dovecot}/sieve/before.sieve | 0
{dovecot => core/dovecot}/sieve/bin/mailtrain | 0
{dovecot => core/dovecot}/sieve/default.sieve | 0
{dovecot => core/dovecot}/sieve/report-ham.sieve | 0
{dovecot => core/dovecot}/sieve/report-spam.sieve | 0
{dovecot => core/dovecot}/start.py | 0
{nginx => core/nginx}/Dockerfile | 0
{nginx => core/nginx}/conf/nginx.conf | 0
{nginx => core/nginx}/conf/tls.conf | 0
{nginx => core/nginx}/config.py | 0
{nginx => core/nginx}/letsencrypt.py | 0
{nginx => core/nginx}/start.py | 0
{none => core/none}/Dockerfile | 0
{postfix => core/postfix}/Dockerfile | 0
{postfix => core/postfix}/conf/main.cf | 0
{postfix => core/postfix}/conf/master.cf | 0
.../postfix}/conf/outclean_header_filter.cf | 0
{postfix => core/postfix}/conf/rsyslog.conf | 0
.../postfix}/conf/sqlite-reject-spoofed.cf | 0
{postfix => core/postfix}/conf/sqlite-transport.cf | 0
.../postfix}/conf/sqlite-virtual_alias_maps.cf | 0
.../postfix}/conf/sqlite-virtual_mailbox_domains.cf | 0
{postfix => core/postfix}/start.py | 0
{clamav => optional/clamav}/Dockerfile | 0
{clamav => optional/clamav}/README.md | 0
{clamav => optional/clamav}/conf/clamd.conf | 0
{clamav => optional/clamav}/conf/freshclam.conf | 0
{clamav => optional/clamav}/start.sh | 0
{radicale => optional/radicale}/Dockerfile | 0
{radicale => optional/radicale}/radicale.conf | 0
{fetchmail => services/fetchmail}/Dockerfile | 0
{fetchmail => services/fetchmail}/fetchmail.py | 0
{rmilter => services/rmilter}/Dockerfile | 0
{rmilter => services/rmilter}/rmilter-clamav.conf | 0
{rmilter => services/rmilter}/rmilter.conf | 0
{rmilter => services/rmilter}/rsyslog.conf | 0
{rmilter => services/rmilter}/start.sh | 0
{rspamd => services/rspamd}/Dockerfile | 0
.../rspamd}/conf/worker-controller.conf | 0
{rspamd => services/rspamd}/conf/worker-normal.conf | 0
{rspamd => services/rspamd}/start.sh | 0
{rainloop => webmail/rainloop}/Dockerfile | 0
{rainloop => webmail/rainloop}/config.ini | 0
{rainloop => webmail/rainloop}/default.ini | 0
{rainloop => webmail/rainloop}/include.php | 0
{rainloop => webmail/rainloop}/php.ini | 0
{rainloop => webmail/rainloop}/start.sh | 0
{roundcube => webmail/roundcube}/Dockerfile | 0
{roundcube => webmail/roundcube}/config.inc.php | 0
{roundcube => webmail/roundcube}/start.sh | 0
210 files changed, 3 insertions(+), 3 deletions(-)
rename {admin => core/admin}/.gitignore (100%)
rename {admin => core/admin}/Dockerfile (100%)
rename {admin => core/admin}/README.md (100%)
rename {admin => core/admin}/audit.py (100%)
rename {admin => core/admin}/babel.cfg (100%)
rename {admin => core/admin}/mailu/__init__.py (100%)
rename {admin => core/admin}/mailu/dkim.py (100%)
rename {admin => core/admin}/mailu/dockercli.py (100%)
rename {admin => core/admin}/mailu/internal/__init__.py (100%)
rename {admin => core/admin}/mailu/internal/nginx.py (100%)
rename {admin => core/admin}/mailu/internal/views.py (100%)
rename {admin => core/admin}/mailu/models.py (100%)
rename {admin => core/admin}/mailu/translations/de/LC_MESSAGES/messages.po (100%)
rename {admin => core/admin}/mailu/translations/en/LC_MESSAGES/messages.po (100%)
rename {admin => core/admin}/mailu/translations/fr/LC_MESSAGES/messages.po (100%)
rename {admin => core/admin}/mailu/translations/pt/LC_MESSAGES/messages.po (100%)
rename {admin => core/admin}/mailu/ui/__init__.py (100%)
rename {admin => core/admin}/mailu/ui/access.py (100%)
rename {admin => core/admin}/mailu/ui/forms.py (100%)
rename {admin => core/admin}/mailu/ui/static/adminlte/css/AdminLTE.min.css (100%)
rename {admin => core/admin}/mailu/ui/static/adminlte/css/skin-blue.min.css (100%)
rename {admin => core/admin}/mailu/ui/static/adminlte/js/app.min.js (100%)
rename {admin => core/admin}/mailu/ui/static/app.css (100%)
rename {admin => core/admin}/mailu/ui/static/bootstrap/css/bootstrap.css.map (100%)
rename {admin => core/admin}/mailu/ui/static/bootstrap/css/bootstrap.min.css (100%)
rename {admin => core/admin}/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.eot (100%)
rename {admin => core/admin}/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.svg (100%)
rename {admin => core/admin}/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.ttf (100%)
rename {admin => core/admin}/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.woff (100%)
rename {admin => core/admin}/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.woff2 (100%)
rename {admin => core/admin}/mailu/ui/static/bootstrap/js/bootstrap.min.js (100%)
rename {admin => core/admin}/mailu/ui/static/jquery/js/jquery-2.2.2.min.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/css/select2.min.css (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/ar.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/az.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/bg.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/ca.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/cs.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/da.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/de.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/el.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/en.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/es.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/et.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/eu.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/fa.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/fi.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/fr.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/gl.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/he.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/hi.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/hr.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/hu.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/id.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/is.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/it.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/ja.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/km.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/ko.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/lt.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/lv.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/mk.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/ms.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/nb.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/nl.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/pl.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/pt-BR.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/pt.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/ro.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/ru.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/sk.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/sr-Cyrl.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/sr.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/sv.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/th.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/tr.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/uk.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/vi.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/zh-CN.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/i18n/zh-TW.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/select2.full.min.js (100%)
rename {admin => core/admin}/mailu/ui/static/select2/js/select2.min.js (100%)
rename {admin => core/admin}/mailu/ui/templates/admin/create.html (100%)
rename {admin => core/admin}/mailu/ui/templates/admin/list.html (100%)
rename {admin => core/admin}/mailu/ui/templates/alias/create.html (100%)
rename {admin => core/admin}/mailu/ui/templates/alias/edit.html (100%)
rename {admin => core/admin}/mailu/ui/templates/alias/list.html (100%)
rename {admin => core/admin}/mailu/ui/templates/alternative/create.html (100%)
rename {admin => core/admin}/mailu/ui/templates/alternative/list.html (100%)
rename {admin => core/admin}/mailu/ui/templates/announcement.html (100%)
rename {admin => core/admin}/mailu/ui/templates/base.html (100%)
rename {admin => core/admin}/mailu/ui/templates/confirm.html (100%)
rename {admin => core/admin}/mailu/ui/templates/docker-error.html (100%)
rename {admin => core/admin}/mailu/ui/templates/domain/create.html (100%)
rename {admin => core/admin}/mailu/ui/templates/domain/details.html (100%)
rename {admin => core/admin}/mailu/ui/templates/domain/edit.html (100%)
rename {admin => core/admin}/mailu/ui/templates/domain/list.html (100%)
rename {admin => core/admin}/mailu/ui/templates/fetch/create.html (100%)
rename {admin => core/admin}/mailu/ui/templates/fetch/edit.html (100%)
rename {admin => core/admin}/mailu/ui/templates/fetch/list.html (100%)
rename {admin => core/admin}/mailu/ui/templates/form.html (100%)
rename {admin => core/admin}/mailu/ui/templates/login.html (100%)
rename {admin => core/admin}/mailu/ui/templates/macros.html (100%)
rename {admin => core/admin}/mailu/ui/templates/manager/create.html (100%)
rename {admin => core/admin}/mailu/ui/templates/manager/list.html (100%)
rename {admin => core/admin}/mailu/ui/templates/relay/create.html (100%)
rename {admin => core/admin}/mailu/ui/templates/relay/edit.html (100%)
rename {admin => core/admin}/mailu/ui/templates/relay/list.html (100%)
rename {admin => core/admin}/mailu/ui/templates/services.html (100%)
rename {admin => core/admin}/mailu/ui/templates/sidebar.html (100%)
rename {admin => core/admin}/mailu/ui/templates/token/create.html (100%)
rename {admin => core/admin}/mailu/ui/templates/token/list.html (100%)
rename {admin => core/admin}/mailu/ui/templates/user/create.html (100%)
rename {admin => core/admin}/mailu/ui/templates/user/edit.html (100%)
rename {admin => core/admin}/mailu/ui/templates/user/forward.html (100%)
rename {admin => core/admin}/mailu/ui/templates/user/list.html (100%)
rename {admin => core/admin}/mailu/ui/templates/user/password.html (100%)
rename {admin => core/admin}/mailu/ui/templates/user/reply.html (100%)
rename {admin => core/admin}/mailu/ui/templates/user/settings.html (100%)
rename {admin => core/admin}/mailu/ui/templates/working.html (100%)
rename {admin => core/admin}/mailu/ui/views/__init__.py (100%)
rename {admin => core/admin}/mailu/ui/views/admins.py (100%)
rename {admin => core/admin}/mailu/ui/views/aliases.py (100%)
rename {admin => core/admin}/mailu/ui/views/alternatives.py (100%)
rename {admin => core/admin}/mailu/ui/views/base.py (100%)
rename {admin => core/admin}/mailu/ui/views/domains.py (100%)
rename {admin => core/admin}/mailu/ui/views/fetches.py (100%)
rename {admin => core/admin}/mailu/ui/views/managers.py (100%)
rename {admin => core/admin}/mailu/ui/views/relays.py (100%)
rename {admin => core/admin}/mailu/ui/views/tokens.py (100%)
rename {admin => core/admin}/mailu/ui/views/users.py (100%)
rename {admin => core/admin}/manage.py (100%)
rename {admin => core/admin}/messages.pot (100%)
rename {admin => core/admin}/migrations/alembic.ini (100%)
rename {admin => core/admin}/migrations/env.py (100%)
rename {admin => core/admin}/migrations/script.py.mako (100%)
rename {admin => core/admin}/migrations/versions/12e9a4f6ed73_.py (100%)
rename {admin => core/admin}/migrations/versions/2335c80a6bc3_.py (100%)
rename {admin => core/admin}/migrations/versions/27ae2f102682_.py (100%)
rename {admin => core/admin}/migrations/versions/3f6994568962_.py (100%)
rename {admin => core/admin}/migrations/versions/73e56bad5ec5_.py (100%)
rename {admin => core/admin}/migrations/versions/9400a032eb1a_.py (100%)
rename {admin => core/admin}/migrations/versions/9c28df23f77e_.py (100%)
rename {admin => core/admin}/migrations/versions/a4accda8a8c7_.py (100%)
rename {admin => core/admin}/migrations/versions/c162ac88012a_.py (100%)
rename {admin => core/admin}/migrations/versions/c5696b48442d_.py (100%)
rename {admin => core/admin}/migrations/versions/c9a0b4e653cf_.py (100%)
rename {admin => core/admin}/migrations/versions/dc8c25cf5b98_.py (100%)
rename {admin => core/admin}/migrations/versions/ff0417f4318f_.py (100%)
rename {admin => core/admin}/requirements-prod.txt (100%)
rename {admin => core/admin}/requirements.txt (100%)
rename {admin => core/admin}/run.py (100%)
rename {admin => core/admin}/start.sh (100%)
rename {dovecot => core/dovecot}/Dockerfile (100%)
rename {dovecot => core/dovecot}/README.md (100%)
rename {dovecot => core/dovecot}/conf/dovecot-sql.conf.ext (100%)
rename {dovecot => core/dovecot}/conf/dovecot.conf (100%)
rename {dovecot => core/dovecot}/conf/pigeonhole-sieve.dict (100%)
rename {dovecot => core/dovecot}/sieve/after.sieve (100%)
rename {dovecot => core/dovecot}/sieve/before.sieve (100%)
rename {dovecot => core/dovecot}/sieve/bin/mailtrain (100%)
rename {dovecot => core/dovecot}/sieve/default.sieve (100%)
rename {dovecot => core/dovecot}/sieve/report-ham.sieve (100%)
rename {dovecot => core/dovecot}/sieve/report-spam.sieve (100%)
rename {dovecot => core/dovecot}/start.py (100%)
rename {nginx => core/nginx}/Dockerfile (100%)
rename {nginx => core/nginx}/conf/nginx.conf (100%)
rename {nginx => core/nginx}/conf/tls.conf (100%)
rename {nginx => core/nginx}/config.py (100%)
rename {nginx => core/nginx}/letsencrypt.py (100%)
rename {nginx => core/nginx}/start.py (100%)
rename {none => core/none}/Dockerfile (100%)
rename {postfix => core/postfix}/Dockerfile (100%)
rename {postfix => core/postfix}/conf/main.cf (100%)
rename {postfix => core/postfix}/conf/master.cf (100%)
rename {postfix => core/postfix}/conf/outclean_header_filter.cf (100%)
rename {postfix => core/postfix}/conf/rsyslog.conf (100%)
rename {postfix => core/postfix}/conf/sqlite-reject-spoofed.cf (100%)
rename {postfix => core/postfix}/conf/sqlite-transport.cf (100%)
rename {postfix => core/postfix}/conf/sqlite-virtual_alias_maps.cf (100%)
rename {postfix => core/postfix}/conf/sqlite-virtual_mailbox_domains.cf (100%)
rename {postfix => core/postfix}/start.py (100%)
rename {clamav => optional/clamav}/Dockerfile (100%)
rename {clamav => optional/clamav}/README.md (100%)
rename {clamav => optional/clamav}/conf/clamd.conf (100%)
rename {clamav => optional/clamav}/conf/freshclam.conf (100%)
rename {clamav => optional/clamav}/start.sh (100%)
rename {radicale => optional/radicale}/Dockerfile (100%)
rename {radicale => optional/radicale}/radicale.conf (100%)
rename {fetchmail => services/fetchmail}/Dockerfile (100%)
rename {fetchmail => services/fetchmail}/fetchmail.py (100%)
rename {rmilter => services/rmilter}/Dockerfile (100%)
rename {rmilter => services/rmilter}/rmilter-clamav.conf (100%)
rename {rmilter => services/rmilter}/rmilter.conf (100%)
rename {rmilter => services/rmilter}/rsyslog.conf (100%)
rename {rmilter => services/rmilter}/start.sh (100%)
rename {rspamd => services/rspamd}/Dockerfile (100%)
rename {rspamd => services/rspamd}/conf/worker-controller.conf (100%)
rename {rspamd => services/rspamd}/conf/worker-normal.conf (100%)
rename {rspamd => services/rspamd}/start.sh (100%)
rename {rainloop => webmail/rainloop}/Dockerfile (100%)
rename {rainloop => webmail/rainloop}/config.ini (100%)
rename {rainloop => webmail/rainloop}/default.ini (100%)
rename {rainloop => webmail/rainloop}/include.php (100%)
rename {rainloop => webmail/rainloop}/php.ini (100%)
rename {rainloop => webmail/rainloop}/start.sh (100%)
rename {roundcube => webmail/roundcube}/Dockerfile (100%)
rename {roundcube => webmail/roundcube}/config.inc.php (100%)
rename {roundcube => webmail/roundcube}/start.sh (100%)
diff --git a/.gitignore b/.gitignore
index eb84ec09..9bd21471 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
*.pyc
*.mo
__pycache__
-/admin/lib
-/admin/bin
-/admin/include
+/core/admin/lib
+/core/admin/bin
+/core/admin/include
pip-selfcheck.json
/.env
/data
diff --git a/admin/.gitignore b/core/admin/.gitignore
similarity index 100%
rename from admin/.gitignore
rename to core/admin/.gitignore
diff --git a/admin/Dockerfile b/core/admin/Dockerfile
similarity index 100%
rename from admin/Dockerfile
rename to core/admin/Dockerfile
diff --git a/admin/README.md b/core/admin/README.md
similarity index 100%
rename from admin/README.md
rename to core/admin/README.md
diff --git a/admin/audit.py b/core/admin/audit.py
similarity index 100%
rename from admin/audit.py
rename to core/admin/audit.py
diff --git a/admin/babel.cfg b/core/admin/babel.cfg
similarity index 100%
rename from admin/babel.cfg
rename to core/admin/babel.cfg
diff --git a/admin/mailu/__init__.py b/core/admin/mailu/__init__.py
similarity index 100%
rename from admin/mailu/__init__.py
rename to core/admin/mailu/__init__.py
diff --git a/admin/mailu/dkim.py b/core/admin/mailu/dkim.py
similarity index 100%
rename from admin/mailu/dkim.py
rename to core/admin/mailu/dkim.py
diff --git a/admin/mailu/dockercli.py b/core/admin/mailu/dockercli.py
similarity index 100%
rename from admin/mailu/dockercli.py
rename to core/admin/mailu/dockercli.py
diff --git a/admin/mailu/internal/__init__.py b/core/admin/mailu/internal/__init__.py
similarity index 100%
rename from admin/mailu/internal/__init__.py
rename to core/admin/mailu/internal/__init__.py
diff --git a/admin/mailu/internal/nginx.py b/core/admin/mailu/internal/nginx.py
similarity index 100%
rename from admin/mailu/internal/nginx.py
rename to core/admin/mailu/internal/nginx.py
diff --git a/admin/mailu/internal/views.py b/core/admin/mailu/internal/views.py
similarity index 100%
rename from admin/mailu/internal/views.py
rename to core/admin/mailu/internal/views.py
diff --git a/admin/mailu/models.py b/core/admin/mailu/models.py
similarity index 100%
rename from admin/mailu/models.py
rename to core/admin/mailu/models.py
diff --git a/admin/mailu/translations/de/LC_MESSAGES/messages.po b/core/admin/mailu/translations/de/LC_MESSAGES/messages.po
similarity index 100%
rename from admin/mailu/translations/de/LC_MESSAGES/messages.po
rename to core/admin/mailu/translations/de/LC_MESSAGES/messages.po
diff --git a/admin/mailu/translations/en/LC_MESSAGES/messages.po b/core/admin/mailu/translations/en/LC_MESSAGES/messages.po
similarity index 100%
rename from admin/mailu/translations/en/LC_MESSAGES/messages.po
rename to core/admin/mailu/translations/en/LC_MESSAGES/messages.po
diff --git a/admin/mailu/translations/fr/LC_MESSAGES/messages.po b/core/admin/mailu/translations/fr/LC_MESSAGES/messages.po
similarity index 100%
rename from admin/mailu/translations/fr/LC_MESSAGES/messages.po
rename to core/admin/mailu/translations/fr/LC_MESSAGES/messages.po
diff --git a/admin/mailu/translations/pt/LC_MESSAGES/messages.po b/core/admin/mailu/translations/pt/LC_MESSAGES/messages.po
similarity index 100%
rename from admin/mailu/translations/pt/LC_MESSAGES/messages.po
rename to core/admin/mailu/translations/pt/LC_MESSAGES/messages.po
diff --git a/admin/mailu/ui/__init__.py b/core/admin/mailu/ui/__init__.py
similarity index 100%
rename from admin/mailu/ui/__init__.py
rename to core/admin/mailu/ui/__init__.py
diff --git a/admin/mailu/ui/access.py b/core/admin/mailu/ui/access.py
similarity index 100%
rename from admin/mailu/ui/access.py
rename to core/admin/mailu/ui/access.py
diff --git a/admin/mailu/ui/forms.py b/core/admin/mailu/ui/forms.py
similarity index 100%
rename from admin/mailu/ui/forms.py
rename to core/admin/mailu/ui/forms.py
diff --git a/admin/mailu/ui/static/adminlte/css/AdminLTE.min.css b/core/admin/mailu/ui/static/adminlte/css/AdminLTE.min.css
similarity index 100%
rename from admin/mailu/ui/static/adminlte/css/AdminLTE.min.css
rename to core/admin/mailu/ui/static/adminlte/css/AdminLTE.min.css
diff --git a/admin/mailu/ui/static/adminlte/css/skin-blue.min.css b/core/admin/mailu/ui/static/adminlte/css/skin-blue.min.css
similarity index 100%
rename from admin/mailu/ui/static/adminlte/css/skin-blue.min.css
rename to core/admin/mailu/ui/static/adminlte/css/skin-blue.min.css
diff --git a/admin/mailu/ui/static/adminlte/js/app.min.js b/core/admin/mailu/ui/static/adminlte/js/app.min.js
similarity index 100%
rename from admin/mailu/ui/static/adminlte/js/app.min.js
rename to core/admin/mailu/ui/static/adminlte/js/app.min.js
diff --git a/admin/mailu/ui/static/app.css b/core/admin/mailu/ui/static/app.css
similarity index 100%
rename from admin/mailu/ui/static/app.css
rename to core/admin/mailu/ui/static/app.css
diff --git a/admin/mailu/ui/static/bootstrap/css/bootstrap.css.map b/core/admin/mailu/ui/static/bootstrap/css/bootstrap.css.map
similarity index 100%
rename from admin/mailu/ui/static/bootstrap/css/bootstrap.css.map
rename to core/admin/mailu/ui/static/bootstrap/css/bootstrap.css.map
diff --git a/admin/mailu/ui/static/bootstrap/css/bootstrap.min.css b/core/admin/mailu/ui/static/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from admin/mailu/ui/static/bootstrap/css/bootstrap.min.css
rename to core/admin/mailu/ui/static/bootstrap/css/bootstrap.min.css
diff --git a/admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.eot b/core/admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.eot
rename to core/admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.svg b/core/admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.svg
rename to core/admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.ttf b/core/admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.ttf
rename to core/admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.woff b/core/admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.woff
rename to core/admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/core/admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.woff2
rename to core/admin/mailu/ui/static/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/admin/mailu/ui/static/bootstrap/js/bootstrap.min.js b/core/admin/mailu/ui/static/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from admin/mailu/ui/static/bootstrap/js/bootstrap.min.js
rename to core/admin/mailu/ui/static/bootstrap/js/bootstrap.min.js
diff --git a/admin/mailu/ui/static/jquery/js/jquery-2.2.2.min.js b/core/admin/mailu/ui/static/jquery/js/jquery-2.2.2.min.js
similarity index 100%
rename from admin/mailu/ui/static/jquery/js/jquery-2.2.2.min.js
rename to core/admin/mailu/ui/static/jquery/js/jquery-2.2.2.min.js
diff --git a/admin/mailu/ui/static/select2/css/select2.min.css b/core/admin/mailu/ui/static/select2/css/select2.min.css
similarity index 100%
rename from admin/mailu/ui/static/select2/css/select2.min.css
rename to core/admin/mailu/ui/static/select2/css/select2.min.css
diff --git a/admin/mailu/ui/static/select2/js/i18n/ar.js b/core/admin/mailu/ui/static/select2/js/i18n/ar.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/ar.js
rename to core/admin/mailu/ui/static/select2/js/i18n/ar.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/az.js b/core/admin/mailu/ui/static/select2/js/i18n/az.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/az.js
rename to core/admin/mailu/ui/static/select2/js/i18n/az.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/bg.js b/core/admin/mailu/ui/static/select2/js/i18n/bg.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/bg.js
rename to core/admin/mailu/ui/static/select2/js/i18n/bg.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/ca.js b/core/admin/mailu/ui/static/select2/js/i18n/ca.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/ca.js
rename to core/admin/mailu/ui/static/select2/js/i18n/ca.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/cs.js b/core/admin/mailu/ui/static/select2/js/i18n/cs.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/cs.js
rename to core/admin/mailu/ui/static/select2/js/i18n/cs.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/da.js b/core/admin/mailu/ui/static/select2/js/i18n/da.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/da.js
rename to core/admin/mailu/ui/static/select2/js/i18n/da.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/de.js b/core/admin/mailu/ui/static/select2/js/i18n/de.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/de.js
rename to core/admin/mailu/ui/static/select2/js/i18n/de.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/el.js b/core/admin/mailu/ui/static/select2/js/i18n/el.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/el.js
rename to core/admin/mailu/ui/static/select2/js/i18n/el.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/en.js b/core/admin/mailu/ui/static/select2/js/i18n/en.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/en.js
rename to core/admin/mailu/ui/static/select2/js/i18n/en.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/es.js b/core/admin/mailu/ui/static/select2/js/i18n/es.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/es.js
rename to core/admin/mailu/ui/static/select2/js/i18n/es.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/et.js b/core/admin/mailu/ui/static/select2/js/i18n/et.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/et.js
rename to core/admin/mailu/ui/static/select2/js/i18n/et.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/eu.js b/core/admin/mailu/ui/static/select2/js/i18n/eu.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/eu.js
rename to core/admin/mailu/ui/static/select2/js/i18n/eu.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/fa.js b/core/admin/mailu/ui/static/select2/js/i18n/fa.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/fa.js
rename to core/admin/mailu/ui/static/select2/js/i18n/fa.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/fi.js b/core/admin/mailu/ui/static/select2/js/i18n/fi.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/fi.js
rename to core/admin/mailu/ui/static/select2/js/i18n/fi.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/fr.js b/core/admin/mailu/ui/static/select2/js/i18n/fr.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/fr.js
rename to core/admin/mailu/ui/static/select2/js/i18n/fr.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/gl.js b/core/admin/mailu/ui/static/select2/js/i18n/gl.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/gl.js
rename to core/admin/mailu/ui/static/select2/js/i18n/gl.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/he.js b/core/admin/mailu/ui/static/select2/js/i18n/he.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/he.js
rename to core/admin/mailu/ui/static/select2/js/i18n/he.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/hi.js b/core/admin/mailu/ui/static/select2/js/i18n/hi.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/hi.js
rename to core/admin/mailu/ui/static/select2/js/i18n/hi.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/hr.js b/core/admin/mailu/ui/static/select2/js/i18n/hr.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/hr.js
rename to core/admin/mailu/ui/static/select2/js/i18n/hr.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/hu.js b/core/admin/mailu/ui/static/select2/js/i18n/hu.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/hu.js
rename to core/admin/mailu/ui/static/select2/js/i18n/hu.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/id.js b/core/admin/mailu/ui/static/select2/js/i18n/id.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/id.js
rename to core/admin/mailu/ui/static/select2/js/i18n/id.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/is.js b/core/admin/mailu/ui/static/select2/js/i18n/is.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/is.js
rename to core/admin/mailu/ui/static/select2/js/i18n/is.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/it.js b/core/admin/mailu/ui/static/select2/js/i18n/it.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/it.js
rename to core/admin/mailu/ui/static/select2/js/i18n/it.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/ja.js b/core/admin/mailu/ui/static/select2/js/i18n/ja.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/ja.js
rename to core/admin/mailu/ui/static/select2/js/i18n/ja.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/km.js b/core/admin/mailu/ui/static/select2/js/i18n/km.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/km.js
rename to core/admin/mailu/ui/static/select2/js/i18n/km.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/ko.js b/core/admin/mailu/ui/static/select2/js/i18n/ko.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/ko.js
rename to core/admin/mailu/ui/static/select2/js/i18n/ko.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/lt.js b/core/admin/mailu/ui/static/select2/js/i18n/lt.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/lt.js
rename to core/admin/mailu/ui/static/select2/js/i18n/lt.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/lv.js b/core/admin/mailu/ui/static/select2/js/i18n/lv.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/lv.js
rename to core/admin/mailu/ui/static/select2/js/i18n/lv.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/mk.js b/core/admin/mailu/ui/static/select2/js/i18n/mk.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/mk.js
rename to core/admin/mailu/ui/static/select2/js/i18n/mk.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/ms.js b/core/admin/mailu/ui/static/select2/js/i18n/ms.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/ms.js
rename to core/admin/mailu/ui/static/select2/js/i18n/ms.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/nb.js b/core/admin/mailu/ui/static/select2/js/i18n/nb.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/nb.js
rename to core/admin/mailu/ui/static/select2/js/i18n/nb.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/nl.js b/core/admin/mailu/ui/static/select2/js/i18n/nl.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/nl.js
rename to core/admin/mailu/ui/static/select2/js/i18n/nl.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/pl.js b/core/admin/mailu/ui/static/select2/js/i18n/pl.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/pl.js
rename to core/admin/mailu/ui/static/select2/js/i18n/pl.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/pt-BR.js b/core/admin/mailu/ui/static/select2/js/i18n/pt-BR.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/pt-BR.js
rename to core/admin/mailu/ui/static/select2/js/i18n/pt-BR.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/pt.js b/core/admin/mailu/ui/static/select2/js/i18n/pt.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/pt.js
rename to core/admin/mailu/ui/static/select2/js/i18n/pt.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/ro.js b/core/admin/mailu/ui/static/select2/js/i18n/ro.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/ro.js
rename to core/admin/mailu/ui/static/select2/js/i18n/ro.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/ru.js b/core/admin/mailu/ui/static/select2/js/i18n/ru.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/ru.js
rename to core/admin/mailu/ui/static/select2/js/i18n/ru.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/sk.js b/core/admin/mailu/ui/static/select2/js/i18n/sk.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/sk.js
rename to core/admin/mailu/ui/static/select2/js/i18n/sk.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/sr-Cyrl.js b/core/admin/mailu/ui/static/select2/js/i18n/sr-Cyrl.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/sr-Cyrl.js
rename to core/admin/mailu/ui/static/select2/js/i18n/sr-Cyrl.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/sr.js b/core/admin/mailu/ui/static/select2/js/i18n/sr.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/sr.js
rename to core/admin/mailu/ui/static/select2/js/i18n/sr.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/sv.js b/core/admin/mailu/ui/static/select2/js/i18n/sv.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/sv.js
rename to core/admin/mailu/ui/static/select2/js/i18n/sv.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/th.js b/core/admin/mailu/ui/static/select2/js/i18n/th.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/th.js
rename to core/admin/mailu/ui/static/select2/js/i18n/th.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/tr.js b/core/admin/mailu/ui/static/select2/js/i18n/tr.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/tr.js
rename to core/admin/mailu/ui/static/select2/js/i18n/tr.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/uk.js b/core/admin/mailu/ui/static/select2/js/i18n/uk.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/uk.js
rename to core/admin/mailu/ui/static/select2/js/i18n/uk.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/vi.js b/core/admin/mailu/ui/static/select2/js/i18n/vi.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/vi.js
rename to core/admin/mailu/ui/static/select2/js/i18n/vi.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/zh-CN.js b/core/admin/mailu/ui/static/select2/js/i18n/zh-CN.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/zh-CN.js
rename to core/admin/mailu/ui/static/select2/js/i18n/zh-CN.js
diff --git a/admin/mailu/ui/static/select2/js/i18n/zh-TW.js b/core/admin/mailu/ui/static/select2/js/i18n/zh-TW.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/i18n/zh-TW.js
rename to core/admin/mailu/ui/static/select2/js/i18n/zh-TW.js
diff --git a/admin/mailu/ui/static/select2/js/select2.full.min.js b/core/admin/mailu/ui/static/select2/js/select2.full.min.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/select2.full.min.js
rename to core/admin/mailu/ui/static/select2/js/select2.full.min.js
diff --git a/admin/mailu/ui/static/select2/js/select2.min.js b/core/admin/mailu/ui/static/select2/js/select2.min.js
similarity index 100%
rename from admin/mailu/ui/static/select2/js/select2.min.js
rename to core/admin/mailu/ui/static/select2/js/select2.min.js
diff --git a/admin/mailu/ui/templates/admin/create.html b/core/admin/mailu/ui/templates/admin/create.html
similarity index 100%
rename from admin/mailu/ui/templates/admin/create.html
rename to core/admin/mailu/ui/templates/admin/create.html
diff --git a/admin/mailu/ui/templates/admin/list.html b/core/admin/mailu/ui/templates/admin/list.html
similarity index 100%
rename from admin/mailu/ui/templates/admin/list.html
rename to core/admin/mailu/ui/templates/admin/list.html
diff --git a/admin/mailu/ui/templates/alias/create.html b/core/admin/mailu/ui/templates/alias/create.html
similarity index 100%
rename from admin/mailu/ui/templates/alias/create.html
rename to core/admin/mailu/ui/templates/alias/create.html
diff --git a/admin/mailu/ui/templates/alias/edit.html b/core/admin/mailu/ui/templates/alias/edit.html
similarity index 100%
rename from admin/mailu/ui/templates/alias/edit.html
rename to core/admin/mailu/ui/templates/alias/edit.html
diff --git a/admin/mailu/ui/templates/alias/list.html b/core/admin/mailu/ui/templates/alias/list.html
similarity index 100%
rename from admin/mailu/ui/templates/alias/list.html
rename to core/admin/mailu/ui/templates/alias/list.html
diff --git a/admin/mailu/ui/templates/alternative/create.html b/core/admin/mailu/ui/templates/alternative/create.html
similarity index 100%
rename from admin/mailu/ui/templates/alternative/create.html
rename to core/admin/mailu/ui/templates/alternative/create.html
diff --git a/admin/mailu/ui/templates/alternative/list.html b/core/admin/mailu/ui/templates/alternative/list.html
similarity index 100%
rename from admin/mailu/ui/templates/alternative/list.html
rename to core/admin/mailu/ui/templates/alternative/list.html
diff --git a/admin/mailu/ui/templates/announcement.html b/core/admin/mailu/ui/templates/announcement.html
similarity index 100%
rename from admin/mailu/ui/templates/announcement.html
rename to core/admin/mailu/ui/templates/announcement.html
diff --git a/admin/mailu/ui/templates/base.html b/core/admin/mailu/ui/templates/base.html
similarity index 100%
rename from admin/mailu/ui/templates/base.html
rename to core/admin/mailu/ui/templates/base.html
diff --git a/admin/mailu/ui/templates/confirm.html b/core/admin/mailu/ui/templates/confirm.html
similarity index 100%
rename from admin/mailu/ui/templates/confirm.html
rename to core/admin/mailu/ui/templates/confirm.html
diff --git a/admin/mailu/ui/templates/docker-error.html b/core/admin/mailu/ui/templates/docker-error.html
similarity index 100%
rename from admin/mailu/ui/templates/docker-error.html
rename to core/admin/mailu/ui/templates/docker-error.html
diff --git a/admin/mailu/ui/templates/domain/create.html b/core/admin/mailu/ui/templates/domain/create.html
similarity index 100%
rename from admin/mailu/ui/templates/domain/create.html
rename to core/admin/mailu/ui/templates/domain/create.html
diff --git a/admin/mailu/ui/templates/domain/details.html b/core/admin/mailu/ui/templates/domain/details.html
similarity index 100%
rename from admin/mailu/ui/templates/domain/details.html
rename to core/admin/mailu/ui/templates/domain/details.html
diff --git a/admin/mailu/ui/templates/domain/edit.html b/core/admin/mailu/ui/templates/domain/edit.html
similarity index 100%
rename from admin/mailu/ui/templates/domain/edit.html
rename to core/admin/mailu/ui/templates/domain/edit.html
diff --git a/admin/mailu/ui/templates/domain/list.html b/core/admin/mailu/ui/templates/domain/list.html
similarity index 100%
rename from admin/mailu/ui/templates/domain/list.html
rename to core/admin/mailu/ui/templates/domain/list.html
diff --git a/admin/mailu/ui/templates/fetch/create.html b/core/admin/mailu/ui/templates/fetch/create.html
similarity index 100%
rename from admin/mailu/ui/templates/fetch/create.html
rename to core/admin/mailu/ui/templates/fetch/create.html
diff --git a/admin/mailu/ui/templates/fetch/edit.html b/core/admin/mailu/ui/templates/fetch/edit.html
similarity index 100%
rename from admin/mailu/ui/templates/fetch/edit.html
rename to core/admin/mailu/ui/templates/fetch/edit.html
diff --git a/admin/mailu/ui/templates/fetch/list.html b/core/admin/mailu/ui/templates/fetch/list.html
similarity index 100%
rename from admin/mailu/ui/templates/fetch/list.html
rename to core/admin/mailu/ui/templates/fetch/list.html
diff --git a/admin/mailu/ui/templates/form.html b/core/admin/mailu/ui/templates/form.html
similarity index 100%
rename from admin/mailu/ui/templates/form.html
rename to core/admin/mailu/ui/templates/form.html
diff --git a/admin/mailu/ui/templates/login.html b/core/admin/mailu/ui/templates/login.html
similarity index 100%
rename from admin/mailu/ui/templates/login.html
rename to core/admin/mailu/ui/templates/login.html
diff --git a/admin/mailu/ui/templates/macros.html b/core/admin/mailu/ui/templates/macros.html
similarity index 100%
rename from admin/mailu/ui/templates/macros.html
rename to core/admin/mailu/ui/templates/macros.html
diff --git a/admin/mailu/ui/templates/manager/create.html b/core/admin/mailu/ui/templates/manager/create.html
similarity index 100%
rename from admin/mailu/ui/templates/manager/create.html
rename to core/admin/mailu/ui/templates/manager/create.html
diff --git a/admin/mailu/ui/templates/manager/list.html b/core/admin/mailu/ui/templates/manager/list.html
similarity index 100%
rename from admin/mailu/ui/templates/manager/list.html
rename to core/admin/mailu/ui/templates/manager/list.html
diff --git a/admin/mailu/ui/templates/relay/create.html b/core/admin/mailu/ui/templates/relay/create.html
similarity index 100%
rename from admin/mailu/ui/templates/relay/create.html
rename to core/admin/mailu/ui/templates/relay/create.html
diff --git a/admin/mailu/ui/templates/relay/edit.html b/core/admin/mailu/ui/templates/relay/edit.html
similarity index 100%
rename from admin/mailu/ui/templates/relay/edit.html
rename to core/admin/mailu/ui/templates/relay/edit.html
diff --git a/admin/mailu/ui/templates/relay/list.html b/core/admin/mailu/ui/templates/relay/list.html
similarity index 100%
rename from admin/mailu/ui/templates/relay/list.html
rename to core/admin/mailu/ui/templates/relay/list.html
diff --git a/admin/mailu/ui/templates/services.html b/core/admin/mailu/ui/templates/services.html
similarity index 100%
rename from admin/mailu/ui/templates/services.html
rename to core/admin/mailu/ui/templates/services.html
diff --git a/admin/mailu/ui/templates/sidebar.html b/core/admin/mailu/ui/templates/sidebar.html
similarity index 100%
rename from admin/mailu/ui/templates/sidebar.html
rename to core/admin/mailu/ui/templates/sidebar.html
diff --git a/admin/mailu/ui/templates/token/create.html b/core/admin/mailu/ui/templates/token/create.html
similarity index 100%
rename from admin/mailu/ui/templates/token/create.html
rename to core/admin/mailu/ui/templates/token/create.html
diff --git a/admin/mailu/ui/templates/token/list.html b/core/admin/mailu/ui/templates/token/list.html
similarity index 100%
rename from admin/mailu/ui/templates/token/list.html
rename to core/admin/mailu/ui/templates/token/list.html
diff --git a/admin/mailu/ui/templates/user/create.html b/core/admin/mailu/ui/templates/user/create.html
similarity index 100%
rename from admin/mailu/ui/templates/user/create.html
rename to core/admin/mailu/ui/templates/user/create.html
diff --git a/admin/mailu/ui/templates/user/edit.html b/core/admin/mailu/ui/templates/user/edit.html
similarity index 100%
rename from admin/mailu/ui/templates/user/edit.html
rename to core/admin/mailu/ui/templates/user/edit.html
diff --git a/admin/mailu/ui/templates/user/forward.html b/core/admin/mailu/ui/templates/user/forward.html
similarity index 100%
rename from admin/mailu/ui/templates/user/forward.html
rename to core/admin/mailu/ui/templates/user/forward.html
diff --git a/admin/mailu/ui/templates/user/list.html b/core/admin/mailu/ui/templates/user/list.html
similarity index 100%
rename from admin/mailu/ui/templates/user/list.html
rename to core/admin/mailu/ui/templates/user/list.html
diff --git a/admin/mailu/ui/templates/user/password.html b/core/admin/mailu/ui/templates/user/password.html
similarity index 100%
rename from admin/mailu/ui/templates/user/password.html
rename to core/admin/mailu/ui/templates/user/password.html
diff --git a/admin/mailu/ui/templates/user/reply.html b/core/admin/mailu/ui/templates/user/reply.html
similarity index 100%
rename from admin/mailu/ui/templates/user/reply.html
rename to core/admin/mailu/ui/templates/user/reply.html
diff --git a/admin/mailu/ui/templates/user/settings.html b/core/admin/mailu/ui/templates/user/settings.html
similarity index 100%
rename from admin/mailu/ui/templates/user/settings.html
rename to core/admin/mailu/ui/templates/user/settings.html
diff --git a/admin/mailu/ui/templates/working.html b/core/admin/mailu/ui/templates/working.html
similarity index 100%
rename from admin/mailu/ui/templates/working.html
rename to core/admin/mailu/ui/templates/working.html
diff --git a/admin/mailu/ui/views/__init__.py b/core/admin/mailu/ui/views/__init__.py
similarity index 100%
rename from admin/mailu/ui/views/__init__.py
rename to core/admin/mailu/ui/views/__init__.py
diff --git a/admin/mailu/ui/views/admins.py b/core/admin/mailu/ui/views/admins.py
similarity index 100%
rename from admin/mailu/ui/views/admins.py
rename to core/admin/mailu/ui/views/admins.py
diff --git a/admin/mailu/ui/views/aliases.py b/core/admin/mailu/ui/views/aliases.py
similarity index 100%
rename from admin/mailu/ui/views/aliases.py
rename to core/admin/mailu/ui/views/aliases.py
diff --git a/admin/mailu/ui/views/alternatives.py b/core/admin/mailu/ui/views/alternatives.py
similarity index 100%
rename from admin/mailu/ui/views/alternatives.py
rename to core/admin/mailu/ui/views/alternatives.py
diff --git a/admin/mailu/ui/views/base.py b/core/admin/mailu/ui/views/base.py
similarity index 100%
rename from admin/mailu/ui/views/base.py
rename to core/admin/mailu/ui/views/base.py
diff --git a/admin/mailu/ui/views/domains.py b/core/admin/mailu/ui/views/domains.py
similarity index 100%
rename from admin/mailu/ui/views/domains.py
rename to core/admin/mailu/ui/views/domains.py
diff --git a/admin/mailu/ui/views/fetches.py b/core/admin/mailu/ui/views/fetches.py
similarity index 100%
rename from admin/mailu/ui/views/fetches.py
rename to core/admin/mailu/ui/views/fetches.py
diff --git a/admin/mailu/ui/views/managers.py b/core/admin/mailu/ui/views/managers.py
similarity index 100%
rename from admin/mailu/ui/views/managers.py
rename to core/admin/mailu/ui/views/managers.py
diff --git a/admin/mailu/ui/views/relays.py b/core/admin/mailu/ui/views/relays.py
similarity index 100%
rename from admin/mailu/ui/views/relays.py
rename to core/admin/mailu/ui/views/relays.py
diff --git a/admin/mailu/ui/views/tokens.py b/core/admin/mailu/ui/views/tokens.py
similarity index 100%
rename from admin/mailu/ui/views/tokens.py
rename to core/admin/mailu/ui/views/tokens.py
diff --git a/admin/mailu/ui/views/users.py b/core/admin/mailu/ui/views/users.py
similarity index 100%
rename from admin/mailu/ui/views/users.py
rename to core/admin/mailu/ui/views/users.py
diff --git a/admin/manage.py b/core/admin/manage.py
similarity index 100%
rename from admin/manage.py
rename to core/admin/manage.py
diff --git a/admin/messages.pot b/core/admin/messages.pot
similarity index 100%
rename from admin/messages.pot
rename to core/admin/messages.pot
diff --git a/admin/migrations/alembic.ini b/core/admin/migrations/alembic.ini
similarity index 100%
rename from admin/migrations/alembic.ini
rename to core/admin/migrations/alembic.ini
diff --git a/admin/migrations/env.py b/core/admin/migrations/env.py
similarity index 100%
rename from admin/migrations/env.py
rename to core/admin/migrations/env.py
diff --git a/admin/migrations/script.py.mako b/core/admin/migrations/script.py.mako
similarity index 100%
rename from admin/migrations/script.py.mako
rename to core/admin/migrations/script.py.mako
diff --git a/admin/migrations/versions/12e9a4f6ed73_.py b/core/admin/migrations/versions/12e9a4f6ed73_.py
similarity index 100%
rename from admin/migrations/versions/12e9a4f6ed73_.py
rename to core/admin/migrations/versions/12e9a4f6ed73_.py
diff --git a/admin/migrations/versions/2335c80a6bc3_.py b/core/admin/migrations/versions/2335c80a6bc3_.py
similarity index 100%
rename from admin/migrations/versions/2335c80a6bc3_.py
rename to core/admin/migrations/versions/2335c80a6bc3_.py
diff --git a/admin/migrations/versions/27ae2f102682_.py b/core/admin/migrations/versions/27ae2f102682_.py
similarity index 100%
rename from admin/migrations/versions/27ae2f102682_.py
rename to core/admin/migrations/versions/27ae2f102682_.py
diff --git a/admin/migrations/versions/3f6994568962_.py b/core/admin/migrations/versions/3f6994568962_.py
similarity index 100%
rename from admin/migrations/versions/3f6994568962_.py
rename to core/admin/migrations/versions/3f6994568962_.py
diff --git a/admin/migrations/versions/73e56bad5ec5_.py b/core/admin/migrations/versions/73e56bad5ec5_.py
similarity index 100%
rename from admin/migrations/versions/73e56bad5ec5_.py
rename to core/admin/migrations/versions/73e56bad5ec5_.py
diff --git a/admin/migrations/versions/9400a032eb1a_.py b/core/admin/migrations/versions/9400a032eb1a_.py
similarity index 100%
rename from admin/migrations/versions/9400a032eb1a_.py
rename to core/admin/migrations/versions/9400a032eb1a_.py
diff --git a/admin/migrations/versions/9c28df23f77e_.py b/core/admin/migrations/versions/9c28df23f77e_.py
similarity index 100%
rename from admin/migrations/versions/9c28df23f77e_.py
rename to core/admin/migrations/versions/9c28df23f77e_.py
diff --git a/admin/migrations/versions/a4accda8a8c7_.py b/core/admin/migrations/versions/a4accda8a8c7_.py
similarity index 100%
rename from admin/migrations/versions/a4accda8a8c7_.py
rename to core/admin/migrations/versions/a4accda8a8c7_.py
diff --git a/admin/migrations/versions/c162ac88012a_.py b/core/admin/migrations/versions/c162ac88012a_.py
similarity index 100%
rename from admin/migrations/versions/c162ac88012a_.py
rename to core/admin/migrations/versions/c162ac88012a_.py
diff --git a/admin/migrations/versions/c5696b48442d_.py b/core/admin/migrations/versions/c5696b48442d_.py
similarity index 100%
rename from admin/migrations/versions/c5696b48442d_.py
rename to core/admin/migrations/versions/c5696b48442d_.py
diff --git a/admin/migrations/versions/c9a0b4e653cf_.py b/core/admin/migrations/versions/c9a0b4e653cf_.py
similarity index 100%
rename from admin/migrations/versions/c9a0b4e653cf_.py
rename to core/admin/migrations/versions/c9a0b4e653cf_.py
diff --git a/admin/migrations/versions/dc8c25cf5b98_.py b/core/admin/migrations/versions/dc8c25cf5b98_.py
similarity index 100%
rename from admin/migrations/versions/dc8c25cf5b98_.py
rename to core/admin/migrations/versions/dc8c25cf5b98_.py
diff --git a/admin/migrations/versions/ff0417f4318f_.py b/core/admin/migrations/versions/ff0417f4318f_.py
similarity index 100%
rename from admin/migrations/versions/ff0417f4318f_.py
rename to core/admin/migrations/versions/ff0417f4318f_.py
diff --git a/admin/requirements-prod.txt b/core/admin/requirements-prod.txt
similarity index 100%
rename from admin/requirements-prod.txt
rename to core/admin/requirements-prod.txt
diff --git a/admin/requirements.txt b/core/admin/requirements.txt
similarity index 100%
rename from admin/requirements.txt
rename to core/admin/requirements.txt
diff --git a/admin/run.py b/core/admin/run.py
similarity index 100%
rename from admin/run.py
rename to core/admin/run.py
diff --git a/admin/start.sh b/core/admin/start.sh
similarity index 100%
rename from admin/start.sh
rename to core/admin/start.sh
diff --git a/dovecot/Dockerfile b/core/dovecot/Dockerfile
similarity index 100%
rename from dovecot/Dockerfile
rename to core/dovecot/Dockerfile
diff --git a/dovecot/README.md b/core/dovecot/README.md
similarity index 100%
rename from dovecot/README.md
rename to core/dovecot/README.md
diff --git a/dovecot/conf/dovecot-sql.conf.ext b/core/dovecot/conf/dovecot-sql.conf.ext
similarity index 100%
rename from dovecot/conf/dovecot-sql.conf.ext
rename to core/dovecot/conf/dovecot-sql.conf.ext
diff --git a/dovecot/conf/dovecot.conf b/core/dovecot/conf/dovecot.conf
similarity index 100%
rename from dovecot/conf/dovecot.conf
rename to core/dovecot/conf/dovecot.conf
diff --git a/dovecot/conf/pigeonhole-sieve.dict b/core/dovecot/conf/pigeonhole-sieve.dict
similarity index 100%
rename from dovecot/conf/pigeonhole-sieve.dict
rename to core/dovecot/conf/pigeonhole-sieve.dict
diff --git a/dovecot/sieve/after.sieve b/core/dovecot/sieve/after.sieve
similarity index 100%
rename from dovecot/sieve/after.sieve
rename to core/dovecot/sieve/after.sieve
diff --git a/dovecot/sieve/before.sieve b/core/dovecot/sieve/before.sieve
similarity index 100%
rename from dovecot/sieve/before.sieve
rename to core/dovecot/sieve/before.sieve
diff --git a/dovecot/sieve/bin/mailtrain b/core/dovecot/sieve/bin/mailtrain
similarity index 100%
rename from dovecot/sieve/bin/mailtrain
rename to core/dovecot/sieve/bin/mailtrain
diff --git a/dovecot/sieve/default.sieve b/core/dovecot/sieve/default.sieve
similarity index 100%
rename from dovecot/sieve/default.sieve
rename to core/dovecot/sieve/default.sieve
diff --git a/dovecot/sieve/report-ham.sieve b/core/dovecot/sieve/report-ham.sieve
similarity index 100%
rename from dovecot/sieve/report-ham.sieve
rename to core/dovecot/sieve/report-ham.sieve
diff --git a/dovecot/sieve/report-spam.sieve b/core/dovecot/sieve/report-spam.sieve
similarity index 100%
rename from dovecot/sieve/report-spam.sieve
rename to core/dovecot/sieve/report-spam.sieve
diff --git a/dovecot/start.py b/core/dovecot/start.py
similarity index 100%
rename from dovecot/start.py
rename to core/dovecot/start.py
diff --git a/nginx/Dockerfile b/core/nginx/Dockerfile
similarity index 100%
rename from nginx/Dockerfile
rename to core/nginx/Dockerfile
diff --git a/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
similarity index 100%
rename from nginx/conf/nginx.conf
rename to core/nginx/conf/nginx.conf
diff --git a/nginx/conf/tls.conf b/core/nginx/conf/tls.conf
similarity index 100%
rename from nginx/conf/tls.conf
rename to core/nginx/conf/tls.conf
diff --git a/nginx/config.py b/core/nginx/config.py
similarity index 100%
rename from nginx/config.py
rename to core/nginx/config.py
diff --git a/nginx/letsencrypt.py b/core/nginx/letsencrypt.py
similarity index 100%
rename from nginx/letsencrypt.py
rename to core/nginx/letsencrypt.py
diff --git a/nginx/start.py b/core/nginx/start.py
similarity index 100%
rename from nginx/start.py
rename to core/nginx/start.py
diff --git a/none/Dockerfile b/core/none/Dockerfile
similarity index 100%
rename from none/Dockerfile
rename to core/none/Dockerfile
diff --git a/postfix/Dockerfile b/core/postfix/Dockerfile
similarity index 100%
rename from postfix/Dockerfile
rename to core/postfix/Dockerfile
diff --git a/postfix/conf/main.cf b/core/postfix/conf/main.cf
similarity index 100%
rename from postfix/conf/main.cf
rename to core/postfix/conf/main.cf
diff --git a/postfix/conf/master.cf b/core/postfix/conf/master.cf
similarity index 100%
rename from postfix/conf/master.cf
rename to core/postfix/conf/master.cf
diff --git a/postfix/conf/outclean_header_filter.cf b/core/postfix/conf/outclean_header_filter.cf
similarity index 100%
rename from postfix/conf/outclean_header_filter.cf
rename to core/postfix/conf/outclean_header_filter.cf
diff --git a/postfix/conf/rsyslog.conf b/core/postfix/conf/rsyslog.conf
similarity index 100%
rename from postfix/conf/rsyslog.conf
rename to core/postfix/conf/rsyslog.conf
diff --git a/postfix/conf/sqlite-reject-spoofed.cf b/core/postfix/conf/sqlite-reject-spoofed.cf
similarity index 100%
rename from postfix/conf/sqlite-reject-spoofed.cf
rename to core/postfix/conf/sqlite-reject-spoofed.cf
diff --git a/postfix/conf/sqlite-transport.cf b/core/postfix/conf/sqlite-transport.cf
similarity index 100%
rename from postfix/conf/sqlite-transport.cf
rename to core/postfix/conf/sqlite-transport.cf
diff --git a/postfix/conf/sqlite-virtual_alias_maps.cf b/core/postfix/conf/sqlite-virtual_alias_maps.cf
similarity index 100%
rename from postfix/conf/sqlite-virtual_alias_maps.cf
rename to core/postfix/conf/sqlite-virtual_alias_maps.cf
diff --git a/postfix/conf/sqlite-virtual_mailbox_domains.cf b/core/postfix/conf/sqlite-virtual_mailbox_domains.cf
similarity index 100%
rename from postfix/conf/sqlite-virtual_mailbox_domains.cf
rename to core/postfix/conf/sqlite-virtual_mailbox_domains.cf
diff --git a/postfix/start.py b/core/postfix/start.py
similarity index 100%
rename from postfix/start.py
rename to core/postfix/start.py
diff --git a/clamav/Dockerfile b/optional/clamav/Dockerfile
similarity index 100%
rename from clamav/Dockerfile
rename to optional/clamav/Dockerfile
diff --git a/clamav/README.md b/optional/clamav/README.md
similarity index 100%
rename from clamav/README.md
rename to optional/clamav/README.md
diff --git a/clamav/conf/clamd.conf b/optional/clamav/conf/clamd.conf
similarity index 100%
rename from clamav/conf/clamd.conf
rename to optional/clamav/conf/clamd.conf
diff --git a/clamav/conf/freshclam.conf b/optional/clamav/conf/freshclam.conf
similarity index 100%
rename from clamav/conf/freshclam.conf
rename to optional/clamav/conf/freshclam.conf
diff --git a/clamav/start.sh b/optional/clamav/start.sh
similarity index 100%
rename from clamav/start.sh
rename to optional/clamav/start.sh
diff --git a/radicale/Dockerfile b/optional/radicale/Dockerfile
similarity index 100%
rename from radicale/Dockerfile
rename to optional/radicale/Dockerfile
diff --git a/radicale/radicale.conf b/optional/radicale/radicale.conf
similarity index 100%
rename from radicale/radicale.conf
rename to optional/radicale/radicale.conf
diff --git a/fetchmail/Dockerfile b/services/fetchmail/Dockerfile
similarity index 100%
rename from fetchmail/Dockerfile
rename to services/fetchmail/Dockerfile
diff --git a/fetchmail/fetchmail.py b/services/fetchmail/fetchmail.py
similarity index 100%
rename from fetchmail/fetchmail.py
rename to services/fetchmail/fetchmail.py
diff --git a/rmilter/Dockerfile b/services/rmilter/Dockerfile
similarity index 100%
rename from rmilter/Dockerfile
rename to services/rmilter/Dockerfile
diff --git a/rmilter/rmilter-clamav.conf b/services/rmilter/rmilter-clamav.conf
similarity index 100%
rename from rmilter/rmilter-clamav.conf
rename to services/rmilter/rmilter-clamav.conf
diff --git a/rmilter/rmilter.conf b/services/rmilter/rmilter.conf
similarity index 100%
rename from rmilter/rmilter.conf
rename to services/rmilter/rmilter.conf
diff --git a/rmilter/rsyslog.conf b/services/rmilter/rsyslog.conf
similarity index 100%
rename from rmilter/rsyslog.conf
rename to services/rmilter/rsyslog.conf
diff --git a/rmilter/start.sh b/services/rmilter/start.sh
similarity index 100%
rename from rmilter/start.sh
rename to services/rmilter/start.sh
diff --git a/rspamd/Dockerfile b/services/rspamd/Dockerfile
similarity index 100%
rename from rspamd/Dockerfile
rename to services/rspamd/Dockerfile
diff --git a/rspamd/conf/worker-controller.conf b/services/rspamd/conf/worker-controller.conf
similarity index 100%
rename from rspamd/conf/worker-controller.conf
rename to services/rspamd/conf/worker-controller.conf
diff --git a/rspamd/conf/worker-normal.conf b/services/rspamd/conf/worker-normal.conf
similarity index 100%
rename from rspamd/conf/worker-normal.conf
rename to services/rspamd/conf/worker-normal.conf
diff --git a/rspamd/start.sh b/services/rspamd/start.sh
similarity index 100%
rename from rspamd/start.sh
rename to services/rspamd/start.sh
diff --git a/rainloop/Dockerfile b/webmail/rainloop/Dockerfile
similarity index 100%
rename from rainloop/Dockerfile
rename to webmail/rainloop/Dockerfile
diff --git a/rainloop/config.ini b/webmail/rainloop/config.ini
similarity index 100%
rename from rainloop/config.ini
rename to webmail/rainloop/config.ini
diff --git a/rainloop/default.ini b/webmail/rainloop/default.ini
similarity index 100%
rename from rainloop/default.ini
rename to webmail/rainloop/default.ini
diff --git a/rainloop/include.php b/webmail/rainloop/include.php
similarity index 100%
rename from rainloop/include.php
rename to webmail/rainloop/include.php
diff --git a/rainloop/php.ini b/webmail/rainloop/php.ini
similarity index 100%
rename from rainloop/php.ini
rename to webmail/rainloop/php.ini
diff --git a/rainloop/start.sh b/webmail/rainloop/start.sh
similarity index 100%
rename from rainloop/start.sh
rename to webmail/rainloop/start.sh
diff --git a/roundcube/Dockerfile b/webmail/roundcube/Dockerfile
similarity index 100%
rename from roundcube/Dockerfile
rename to webmail/roundcube/Dockerfile
diff --git a/roundcube/config.inc.php b/webmail/roundcube/config.inc.php
similarity index 100%
rename from roundcube/config.inc.php
rename to webmail/roundcube/config.inc.php
diff --git a/roundcube/start.sh b/webmail/roundcube/start.sh
similarity index 100%
rename from roundcube/start.sh
rename to webmail/roundcube/start.sh