diff --git a/data/templates/dnsmasq/domain.tpl b/conf/dnsmasq/domain.tpl
similarity index 100%
rename from data/templates/dnsmasq/domain.tpl
rename to conf/dnsmasq/domain.tpl
diff --git a/data/templates/dnsmasq/plain/dnsmasq.conf b/conf/dnsmasq/plain/dnsmasq.conf
similarity index 100%
rename from data/templates/dnsmasq/plain/dnsmasq.conf
rename to conf/dnsmasq/plain/dnsmasq.conf
diff --git a/data/templates/dnsmasq/plain/etcdefault b/conf/dnsmasq/plain/etcdefault
similarity index 100%
rename from data/templates/dnsmasq/plain/etcdefault
rename to conf/dnsmasq/plain/etcdefault
diff --git a/data/templates/dnsmasq/plain/resolv.dnsmasq.conf b/conf/dnsmasq/plain/resolv.dnsmasq.conf
similarity index 100%
rename from data/templates/dnsmasq/plain/resolv.dnsmasq.conf
rename to conf/dnsmasq/plain/resolv.dnsmasq.conf
diff --git a/data/templates/dovecot/dovecot-ldap.conf b/conf/dovecot/dovecot-ldap.conf
similarity index 100%
rename from data/templates/dovecot/dovecot-ldap.conf
rename to conf/dovecot/dovecot-ldap.conf
diff --git a/data/templates/dovecot/dovecot.conf b/conf/dovecot/dovecot.conf
similarity index 100%
rename from data/templates/dovecot/dovecot.conf
rename to conf/dovecot/dovecot.conf
diff --git a/data/templates/dovecot/dovecot.sieve b/conf/dovecot/dovecot.sieve
similarity index 100%
rename from data/templates/dovecot/dovecot.sieve
rename to conf/dovecot/dovecot.sieve
diff --git a/data/templates/dovecot/post-ext.conf b/conf/dovecot/post-ext.conf
similarity index 100%
rename from data/templates/dovecot/post-ext.conf
rename to conf/dovecot/post-ext.conf
diff --git a/data/templates/dovecot/pre-ext.conf b/conf/dovecot/pre-ext.conf
similarity index 100%
rename from data/templates/dovecot/pre-ext.conf
rename to conf/dovecot/pre-ext.conf
diff --git a/data/templates/fail2ban/jail.conf b/conf/fail2ban/jail.conf
similarity index 100%
rename from data/templates/fail2ban/jail.conf
rename to conf/fail2ban/jail.conf
diff --git a/data/templates/fail2ban/yunohost-jails.conf b/conf/fail2ban/yunohost-jails.conf
similarity index 100%
rename from data/templates/fail2ban/yunohost-jails.conf
rename to conf/fail2ban/yunohost-jails.conf
diff --git a/data/templates/fail2ban/yunohost.conf b/conf/fail2ban/yunohost.conf
similarity index 100%
rename from data/templates/fail2ban/yunohost.conf
rename to conf/fail2ban/yunohost.conf
diff --git a/data/templates/mdns/yunomdns.service b/conf/mdns/yunomdns.service
similarity index 100%
rename from data/templates/mdns/yunomdns.service
rename to conf/mdns/yunomdns.service
diff --git a/data/templates/metronome/domain.tpl.cfg.lua b/conf/metronome/domain.tpl.cfg.lua
similarity index 100%
rename from data/templates/metronome/domain.tpl.cfg.lua
rename to conf/metronome/domain.tpl.cfg.lua
diff --git a/data/templates/metronome/metronome.cfg.lua b/conf/metronome/metronome.cfg.lua
similarity index 100%
rename from data/templates/metronome/metronome.cfg.lua
rename to conf/metronome/metronome.cfg.lua
diff --git a/lib/metronome/modules/ldap.lib.lua b/conf/metronome/modules/ldap.lib.lua
similarity index 100%
rename from lib/metronome/modules/ldap.lib.lua
rename to conf/metronome/modules/ldap.lib.lua
diff --git a/lib/metronome/modules/mod_auth_ldap2.lua b/conf/metronome/modules/mod_auth_ldap2.lua
similarity index 100%
rename from lib/metronome/modules/mod_auth_ldap2.lua
rename to conf/metronome/modules/mod_auth_ldap2.lua
diff --git a/lib/metronome/modules/mod_legacyauth.lua b/conf/metronome/modules/mod_legacyauth.lua
similarity index 100%
rename from lib/metronome/modules/mod_legacyauth.lua
rename to conf/metronome/modules/mod_legacyauth.lua
diff --git a/lib/metronome/modules/mod_storage_ldap.lua b/conf/metronome/modules/mod_storage_ldap.lua
similarity index 100%
rename from lib/metronome/modules/mod_storage_ldap.lua
rename to conf/metronome/modules/mod_storage_ldap.lua
diff --git a/lib/metronome/modules/vcard.lib.lua b/conf/metronome/modules/vcard.lib.lua
similarity index 100%
rename from lib/metronome/modules/vcard.lib.lua
rename to conf/metronome/modules/vcard.lib.lua
diff --git a/data/templates/nginx/autoconfig.tpl.xml b/conf/nginx/autoconfig.tpl.xml
similarity index 100%
rename from data/templates/nginx/autoconfig.tpl.xml
rename to conf/nginx/autoconfig.tpl.xml
diff --git a/data/templates/nginx/plain/acme-challenge.conf.inc b/conf/nginx/plain/acme-challenge.conf.inc
similarity index 100%
rename from data/templates/nginx/plain/acme-challenge.conf.inc
rename to conf/nginx/plain/acme-challenge.conf.inc
diff --git a/data/templates/nginx/plain/global.conf b/conf/nginx/plain/global.conf
similarity index 100%
rename from data/templates/nginx/plain/global.conf
rename to conf/nginx/plain/global.conf
diff --git a/data/templates/nginx/plain/ssowat.conf b/conf/nginx/plain/ssowat.conf
similarity index 100%
rename from data/templates/nginx/plain/ssowat.conf
rename to conf/nginx/plain/ssowat.conf
diff --git a/data/templates/nginx/plain/yunohost_panel.conf.inc b/conf/nginx/plain/yunohost_panel.conf.inc
similarity index 100%
rename from data/templates/nginx/plain/yunohost_panel.conf.inc
rename to conf/nginx/plain/yunohost_panel.conf.inc
diff --git a/data/templates/nginx/plain/yunohost_sso.conf.inc b/conf/nginx/plain/yunohost_sso.conf.inc
similarity index 100%
rename from data/templates/nginx/plain/yunohost_sso.conf.inc
rename to conf/nginx/plain/yunohost_sso.conf.inc
diff --git a/data/templates/nginx/redirect_to_admin.conf b/conf/nginx/redirect_to_admin.conf
similarity index 100%
rename from data/templates/nginx/redirect_to_admin.conf
rename to conf/nginx/redirect_to_admin.conf
diff --git a/data/templates/nginx/security.conf.inc b/conf/nginx/security.conf.inc
similarity index 100%
rename from data/templates/nginx/security.conf.inc
rename to conf/nginx/security.conf.inc
diff --git a/data/templates/nginx/server.tpl.conf b/conf/nginx/server.tpl.conf
similarity index 100%
rename from data/templates/nginx/server.tpl.conf
rename to conf/nginx/server.tpl.conf
diff --git a/data/templates/nginx/yunohost_admin.conf b/conf/nginx/yunohost_admin.conf
similarity index 100%
rename from data/templates/nginx/yunohost_admin.conf
rename to conf/nginx/yunohost_admin.conf
diff --git a/data/templates/nginx/yunohost_admin.conf.inc b/conf/nginx/yunohost_admin.conf.inc
similarity index 100%
rename from data/templates/nginx/yunohost_admin.conf.inc
rename to conf/nginx/yunohost_admin.conf.inc
diff --git a/data/templates/nginx/yunohost_api.conf.inc b/conf/nginx/yunohost_api.conf.inc
similarity index 100%
rename from data/templates/nginx/yunohost_api.conf.inc
rename to conf/nginx/yunohost_api.conf.inc
diff --git a/data/templates/nslcd/nslcd.conf b/conf/nslcd/nslcd.conf
similarity index 100%
rename from data/templates/nslcd/nslcd.conf
rename to conf/nslcd/nslcd.conf
diff --git a/data/templates/nsswitch/nsswitch.conf b/conf/nsswitch/nsswitch.conf
similarity index 100%
rename from data/templates/nsswitch/nsswitch.conf
rename to conf/nsswitch/nsswitch.conf
diff --git a/data/templates/postfix/main.cf b/conf/postfix/main.cf
similarity index 100%
rename from data/templates/postfix/main.cf
rename to conf/postfix/main.cf
diff --git a/data/templates/postfix/plain/header_checks b/conf/postfix/plain/header_checks
similarity index 100%
rename from data/templates/postfix/plain/header_checks
rename to conf/postfix/plain/header_checks
diff --git a/data/templates/postfix/plain/ldap-accounts.cf b/conf/postfix/plain/ldap-accounts.cf
similarity index 100%
rename from data/templates/postfix/plain/ldap-accounts.cf
rename to conf/postfix/plain/ldap-accounts.cf
diff --git a/data/templates/postfix/plain/ldap-aliases.cf b/conf/postfix/plain/ldap-aliases.cf
similarity index 100%
rename from data/templates/postfix/plain/ldap-aliases.cf
rename to conf/postfix/plain/ldap-aliases.cf
diff --git a/data/templates/postfix/plain/ldap-domains.cf b/conf/postfix/plain/ldap-domains.cf
similarity index 100%
rename from data/templates/postfix/plain/ldap-domains.cf
rename to conf/postfix/plain/ldap-domains.cf
diff --git a/data/templates/postfix/plain/master.cf b/conf/postfix/plain/master.cf
similarity index 100%
rename from data/templates/postfix/plain/master.cf
rename to conf/postfix/plain/master.cf
diff --git a/data/templates/postfix/plain/sender_canonical b/conf/postfix/plain/sender_canonical
similarity index 100%
rename from data/templates/postfix/plain/sender_canonical
rename to conf/postfix/plain/sender_canonical
diff --git a/data/templates/postfix/plain/smtp_reply_filter b/conf/postfix/plain/smtp_reply_filter
similarity index 100%
rename from data/templates/postfix/plain/smtp_reply_filter
rename to conf/postfix/plain/smtp_reply_filter
diff --git a/data/templates/postfix/postsrsd b/conf/postfix/postsrsd
similarity index 100%
rename from data/templates/postfix/postsrsd
rename to conf/postfix/postsrsd
diff --git a/data/templates/rspamd/dkim_signing.conf b/conf/rspamd/dkim_signing.conf
similarity index 100%
rename from data/templates/rspamd/dkim_signing.conf
rename to conf/rspamd/dkim_signing.conf
diff --git a/data/templates/rspamd/metrics.local.conf b/conf/rspamd/metrics.local.conf
similarity index 100%
rename from data/templates/rspamd/metrics.local.conf
rename to conf/rspamd/metrics.local.conf
diff --git a/data/templates/rspamd/milter_headers.conf b/conf/rspamd/milter_headers.conf
similarity index 100%
rename from data/templates/rspamd/milter_headers.conf
rename to conf/rspamd/milter_headers.conf
diff --git a/data/templates/rspamd/rspamd.sieve b/conf/rspamd/rspamd.sieve
similarity index 100%
rename from data/templates/rspamd/rspamd.sieve
rename to conf/rspamd/rspamd.sieve
diff --git a/data/templates/slapd/config.ldif b/conf/slapd/config.ldif
similarity index 100%
rename from data/templates/slapd/config.ldif
rename to conf/slapd/config.ldif
diff --git a/data/templates/slapd/db_init.ldif b/conf/slapd/db_init.ldif
similarity index 100%
rename from data/templates/slapd/db_init.ldif
rename to conf/slapd/db_init.ldif
diff --git a/data/templates/slapd/ldap.conf b/conf/slapd/ldap.conf
similarity index 100%
rename from data/templates/slapd/ldap.conf
rename to conf/slapd/ldap.conf
diff --git a/data/templates/slapd/mailserver.ldif b/conf/slapd/mailserver.ldif
similarity index 100%
rename from data/templates/slapd/mailserver.ldif
rename to conf/slapd/mailserver.ldif
diff --git a/data/templates/slapd/permission.ldif b/conf/slapd/permission.ldif
similarity index 100%
rename from data/templates/slapd/permission.ldif
rename to conf/slapd/permission.ldif
diff --git a/data/templates/slapd/slapd.default b/conf/slapd/slapd.default
similarity index 100%
rename from data/templates/slapd/slapd.default
rename to conf/slapd/slapd.default
diff --git a/data/templates/slapd/sudo.ldif b/conf/slapd/sudo.ldif
similarity index 100%
rename from data/templates/slapd/sudo.ldif
rename to conf/slapd/sudo.ldif
diff --git a/data/templates/slapd/systemd-override.conf b/conf/slapd/systemd-override.conf
similarity index 100%
rename from data/templates/slapd/systemd-override.conf
rename to conf/slapd/systemd-override.conf
diff --git a/data/templates/ssh/sshd_config b/conf/ssh/sshd_config
similarity index 100%
rename from data/templates/ssh/sshd_config
rename to conf/ssh/sshd_config
diff --git a/data/templates/ssl/openssl.cnf b/conf/ssl/openssl.cnf
similarity index 100%
rename from data/templates/ssl/openssl.cnf
rename to conf/ssl/openssl.cnf
diff --git a/data/templates/yunohost/dpkg-origins b/conf/yunohost/dpkg-origins
similarity index 100%
rename from data/templates/yunohost/dpkg-origins
rename to conf/yunohost/dpkg-origins
diff --git a/data/templates/yunohost/firewall.yml b/conf/yunohost/firewall.yml
similarity index 100%
rename from data/templates/yunohost/firewall.yml
rename to conf/yunohost/firewall.yml
diff --git a/data/templates/yunohost/proc-hidepid.service b/conf/yunohost/proc-hidepid.service
similarity index 100%
rename from data/templates/yunohost/proc-hidepid.service
rename to conf/yunohost/proc-hidepid.service
diff --git a/data/templates/yunohost/services.yml b/conf/yunohost/services.yml
similarity index 100%
rename from data/templates/yunohost/services.yml
rename to conf/yunohost/services.yml
diff --git a/data/templates/yunohost/yunoprompt.service b/conf/yunohost/yunoprompt.service
similarity index 100%
rename from data/templates/yunohost/yunoprompt.service
rename to conf/yunohost/yunoprompt.service
diff --git a/data/actionsmap/yunohost_completion.py b/doc/generate_bash_completion.py
similarity index 100%
rename from data/actionsmap/yunohost_completion.py
rename to doc/generate_bash_completion.py
diff --git a/data/helpers.d/apt b/helpers/apt
similarity index 100%
rename from data/helpers.d/apt
rename to helpers/apt
diff --git a/data/helpers.d/backup b/helpers/backup
similarity index 100%
rename from data/helpers.d/backup
rename to helpers/backup
diff --git a/data/helpers.d/config b/helpers/config
similarity index 100%
rename from data/helpers.d/config
rename to helpers/config
diff --git a/data/helpers.d/fail2ban b/helpers/fail2ban
similarity index 100%
rename from data/helpers.d/fail2ban
rename to helpers/fail2ban
diff --git a/data/helpers.d/getopts b/helpers/getopts
similarity index 100%
rename from data/helpers.d/getopts
rename to helpers/getopts
diff --git a/data/helpers.d/hardware b/helpers/hardware
similarity index 100%
rename from data/helpers.d/hardware
rename to helpers/hardware
diff --git a/data/helpers.d/logging b/helpers/logging
similarity index 100%
rename from data/helpers.d/logging
rename to helpers/logging
diff --git a/data/helpers.d/logrotate b/helpers/logrotate
similarity index 100%
rename from data/helpers.d/logrotate
rename to helpers/logrotate
diff --git a/data/helpers.d/multimedia b/helpers/multimedia
similarity index 100%
rename from data/helpers.d/multimedia
rename to helpers/multimedia
diff --git a/data/helpers.d/mysql b/helpers/mysql
similarity index 100%
rename from data/helpers.d/mysql
rename to helpers/mysql
diff --git a/data/helpers.d/network b/helpers/network
similarity index 100%
rename from data/helpers.d/network
rename to helpers/network
diff --git a/data/helpers.d/nginx b/helpers/nginx
similarity index 100%
rename from data/helpers.d/nginx
rename to helpers/nginx
diff --git a/data/helpers.d/nodejs b/helpers/nodejs
similarity index 100%
rename from data/helpers.d/nodejs
rename to helpers/nodejs
diff --git a/data/helpers.d/permission b/helpers/permission
similarity index 100%
rename from data/helpers.d/permission
rename to helpers/permission
diff --git a/data/helpers.d/php b/helpers/php
similarity index 100%
rename from data/helpers.d/php
rename to helpers/php
diff --git a/data/helpers.d/postgresql b/helpers/postgresql
similarity index 100%
rename from data/helpers.d/postgresql
rename to helpers/postgresql
diff --git a/data/helpers.d/setting b/helpers/setting
similarity index 100%
rename from data/helpers.d/setting
rename to helpers/setting
diff --git a/data/helpers.d/string b/helpers/string
similarity index 100%
rename from data/helpers.d/string
rename to helpers/string
diff --git a/data/helpers.d/systemd b/helpers/systemd
similarity index 100%
rename from data/helpers.d/systemd
rename to helpers/systemd
diff --git a/data/helpers.d/user b/helpers/user
similarity index 100%
rename from data/helpers.d/user
rename to helpers/user
diff --git a/data/helpers.d/utils b/helpers/utils
similarity index 100%
rename from data/helpers.d/utils
rename to helpers/utils
diff --git a/data/hooks/backup/05-conf_ldap b/hooks/backup/05-conf_ldap
similarity index 100%
rename from data/hooks/backup/05-conf_ldap
rename to hooks/backup/05-conf_ldap
diff --git a/data/hooks/backup/17-data_home b/hooks/backup/17-data_home
similarity index 100%
rename from data/hooks/backup/17-data_home
rename to hooks/backup/17-data_home
diff --git a/data/hooks/backup/18-data_multimedia b/hooks/backup/18-data_multimedia
similarity index 100%
rename from data/hooks/backup/18-data_multimedia
rename to hooks/backup/18-data_multimedia
diff --git a/data/hooks/backup/20-conf_ynh_settings b/hooks/backup/20-conf_ynh_settings
similarity index 100%
rename from data/hooks/backup/20-conf_ynh_settings
rename to hooks/backup/20-conf_ynh_settings
diff --git a/data/hooks/backup/21-conf_ynh_certs b/hooks/backup/21-conf_ynh_certs
similarity index 100%
rename from data/hooks/backup/21-conf_ynh_certs
rename to hooks/backup/21-conf_ynh_certs
diff --git a/data/hooks/backup/23-data_mail b/hooks/backup/23-data_mail
similarity index 100%
rename from data/hooks/backup/23-data_mail
rename to hooks/backup/23-data_mail
diff --git a/data/hooks/backup/27-data_xmpp b/hooks/backup/27-data_xmpp
similarity index 100%
rename from data/hooks/backup/27-data_xmpp
rename to hooks/backup/27-data_xmpp
diff --git a/data/hooks/backup/50-conf_manually_modified_files b/hooks/backup/50-conf_manually_modified_files
similarity index 100%
rename from data/hooks/backup/50-conf_manually_modified_files
rename to hooks/backup/50-conf_manually_modified_files
diff --git a/data/hooks/conf_regen/01-yunohost b/hooks/conf_regen/01-yunohost
similarity index 100%
rename from data/hooks/conf_regen/01-yunohost
rename to hooks/conf_regen/01-yunohost
diff --git a/data/hooks/conf_regen/02-ssl b/hooks/conf_regen/02-ssl
similarity index 100%
rename from data/hooks/conf_regen/02-ssl
rename to hooks/conf_regen/02-ssl
diff --git a/data/hooks/conf_regen/03-ssh b/hooks/conf_regen/03-ssh
similarity index 100%
rename from data/hooks/conf_regen/03-ssh
rename to hooks/conf_regen/03-ssh
diff --git a/data/hooks/conf_regen/06-slapd b/hooks/conf_regen/06-slapd
similarity index 100%
rename from data/hooks/conf_regen/06-slapd
rename to hooks/conf_regen/06-slapd
diff --git a/data/hooks/conf_regen/09-nslcd b/hooks/conf_regen/09-nslcd
similarity index 100%
rename from data/hooks/conf_regen/09-nslcd
rename to hooks/conf_regen/09-nslcd
diff --git a/data/hooks/conf_regen/10-apt b/hooks/conf_regen/10-apt
similarity index 100%
rename from data/hooks/conf_regen/10-apt
rename to hooks/conf_regen/10-apt
diff --git a/data/hooks/conf_regen/12-metronome b/hooks/conf_regen/12-metronome
similarity index 100%
rename from data/hooks/conf_regen/12-metronome
rename to hooks/conf_regen/12-metronome
diff --git a/data/hooks/conf_regen/15-nginx b/hooks/conf_regen/15-nginx
similarity index 100%
rename from data/hooks/conf_regen/15-nginx
rename to hooks/conf_regen/15-nginx
diff --git a/data/hooks/conf_regen/19-postfix b/hooks/conf_regen/19-postfix
similarity index 100%
rename from data/hooks/conf_regen/19-postfix
rename to hooks/conf_regen/19-postfix
diff --git a/data/hooks/conf_regen/25-dovecot b/hooks/conf_regen/25-dovecot
similarity index 100%
rename from data/hooks/conf_regen/25-dovecot
rename to hooks/conf_regen/25-dovecot
diff --git a/data/hooks/conf_regen/31-rspamd b/hooks/conf_regen/31-rspamd
similarity index 100%
rename from data/hooks/conf_regen/31-rspamd
rename to hooks/conf_regen/31-rspamd
diff --git a/data/hooks/conf_regen/34-mysql b/hooks/conf_regen/34-mysql
similarity index 100%
rename from data/hooks/conf_regen/34-mysql
rename to hooks/conf_regen/34-mysql
diff --git a/data/hooks/conf_regen/35-redis b/hooks/conf_regen/35-redis
similarity index 100%
rename from data/hooks/conf_regen/35-redis
rename to hooks/conf_regen/35-redis
diff --git a/data/hooks/conf_regen/37-mdns b/hooks/conf_regen/37-mdns
similarity index 100%
rename from data/hooks/conf_regen/37-mdns
rename to hooks/conf_regen/37-mdns
diff --git a/data/hooks/conf_regen/43-dnsmasq b/hooks/conf_regen/43-dnsmasq
similarity index 100%
rename from data/hooks/conf_regen/43-dnsmasq
rename to hooks/conf_regen/43-dnsmasq
diff --git a/data/hooks/conf_regen/46-nsswitch b/hooks/conf_regen/46-nsswitch
similarity index 100%
rename from data/hooks/conf_regen/46-nsswitch
rename to hooks/conf_regen/46-nsswitch
diff --git a/data/hooks/conf_regen/52-fail2ban b/hooks/conf_regen/52-fail2ban
similarity index 100%
rename from data/hooks/conf_regen/52-fail2ban
rename to hooks/conf_regen/52-fail2ban
diff --git a/data/hooks/post_user_create/ynh_multimedia b/hooks/post_user_create/ynh_multimedia
similarity index 100%
rename from data/hooks/post_user_create/ynh_multimedia
rename to hooks/post_user_create/ynh_multimedia
diff --git a/data/hooks/post_user_delete/ynh_multimedia b/hooks/post_user_delete/ynh_multimedia
similarity index 100%
rename from data/hooks/post_user_delete/ynh_multimedia
rename to hooks/post_user_delete/ynh_multimedia
diff --git a/data/hooks/restore/05-conf_ldap b/hooks/restore/05-conf_ldap
similarity index 100%
rename from data/hooks/restore/05-conf_ldap
rename to hooks/restore/05-conf_ldap
diff --git a/data/hooks/restore/17-data_home b/hooks/restore/17-data_home
similarity index 100%
rename from data/hooks/restore/17-data_home
rename to hooks/restore/17-data_home
diff --git a/data/hooks/restore/18-data_multimedia b/hooks/restore/18-data_multimedia
similarity index 100%
rename from data/hooks/restore/18-data_multimedia
rename to hooks/restore/18-data_multimedia
diff --git a/data/hooks/restore/20-conf_ynh_settings b/hooks/restore/20-conf_ynh_settings
similarity index 100%
rename from data/hooks/restore/20-conf_ynh_settings
rename to hooks/restore/20-conf_ynh_settings
diff --git a/data/hooks/restore/21-conf_ynh_certs b/hooks/restore/21-conf_ynh_certs
similarity index 100%
rename from data/hooks/restore/21-conf_ynh_certs
rename to hooks/restore/21-conf_ynh_certs
diff --git a/data/hooks/restore/23-data_mail b/hooks/restore/23-data_mail
similarity index 100%
rename from data/hooks/restore/23-data_mail
rename to hooks/restore/23-data_mail
diff --git a/data/hooks/restore/27-data_xmpp b/hooks/restore/27-data_xmpp
similarity index 100%
rename from data/hooks/restore/27-data_xmpp
rename to hooks/restore/27-data_xmpp
diff --git a/data/hooks/restore/50-conf_manually_modified_files b/hooks/restore/50-conf_manually_modified_files
similarity index 100%
rename from data/hooks/restore/50-conf_manually_modified_files
rename to hooks/restore/50-conf_manually_modified_files
diff --git a/data/other/password/100000-most-used.txt.gz b/share/100000-most-used-passwords.txt.gz
similarity index 100%
rename from data/other/password/100000-most-used.txt.gz
rename to share/100000-most-used-passwords.txt.gz
diff --git a/data/actionsmap/yunohost.yml b/share/actionsmap.yml
similarity index 100%
rename from data/actionsmap/yunohost.yml
rename to share/actionsmap.yml
diff --git a/data/other/config_domain.toml b/share/config_domain.toml
similarity index 100%
rename from data/other/config_domain.toml
rename to share/config_domain.toml
diff --git a/data/other/dnsbl_list.yml b/share/dnsbl_list.yml
similarity index 100%
rename from data/other/dnsbl_list.yml
rename to share/dnsbl_list.yml
diff --git a/data/other/ffdhe2048.pem b/share/ffdhe2048.pem
similarity index 100%
rename from data/other/ffdhe2048.pem
rename to share/ffdhe2048.pem
diff --git a/data/helpers b/share/helpers
similarity index 100%
rename from data/helpers
rename to share/helpers
diff --git a/data/other/registrar_list.toml b/share/registrar_list.toml
similarity index 100%
rename from data/other/registrar_list.toml
rename to share/registrar_list.toml
diff --git a/src/yunohost/__init__.py b/src/__init__.py
similarity index 100%
rename from src/yunohost/__init__.py
rename to src/__init__.py
diff --git a/src/yunohost/app.py b/src/app.py
similarity index 100%
rename from src/yunohost/app.py
rename to src/app.py
diff --git a/src/yunohost/app_catalog.py b/src/app_catalog.py
similarity index 100%
rename from src/yunohost/app_catalog.py
rename to src/app_catalog.py
diff --git a/src/yunohost/authenticators/ldap_admin.py b/src/authenticators/ldap_admin.py
similarity index 100%
rename from src/yunohost/authenticators/ldap_admin.py
rename to src/authenticators/ldap_admin.py
diff --git a/src/yunohost/backup.py b/src/backup.py
similarity index 100%
rename from src/yunohost/backup.py
rename to src/backup.py
diff --git a/src/yunohost/certificate.py b/src/certificate.py
similarity index 100%
rename from src/yunohost/certificate.py
rename to src/certificate.py
diff --git a/src/yunohost/data_migrations/0021_migrate_to_bullseye.py b/src/data_migrations/0021_migrate_to_bullseye.py
similarity index 100%
rename from src/yunohost/data_migrations/0021_migrate_to_bullseye.py
rename to src/data_migrations/0021_migrate_to_bullseye.py
diff --git a/src/yunohost/data_migrations/0022_php73_to_php74_pools.py b/src/data_migrations/0022_php73_to_php74_pools.py
similarity index 100%
rename from src/yunohost/data_migrations/0022_php73_to_php74_pools.py
rename to src/data_migrations/0022_php73_to_php74_pools.py
diff --git a/src/yunohost/data_migrations/0023_postgresql_11_to_13.py b/src/data_migrations/0023_postgresql_11_to_13.py
similarity index 100%
rename from src/yunohost/data_migrations/0023_postgresql_11_to_13.py
rename to src/data_migrations/0023_postgresql_11_to_13.py
diff --git a/src/yunohost/data_migrations/__init__.py b/src/data_migrations/__init__.py
similarity index 100%
rename from src/yunohost/data_migrations/__init__.py
rename to src/data_migrations/__init__.py
diff --git a/src/yunohost/diagnosis.py b/src/diagnosis.py
similarity index 100%
rename from src/yunohost/diagnosis.py
rename to src/diagnosis.py
diff --git a/data/hooks/diagnosis/00-basesystem.py b/src/diagnosis/00-basesystem.py
similarity index 100%
rename from data/hooks/diagnosis/00-basesystem.py
rename to src/diagnosis/00-basesystem.py
diff --git a/data/hooks/diagnosis/10-ip.py b/src/diagnosis/10-ip.py
similarity index 100%
rename from data/hooks/diagnosis/10-ip.py
rename to src/diagnosis/10-ip.py
diff --git a/data/hooks/diagnosis/12-dnsrecords.py b/src/diagnosis/12-dnsrecords.py
similarity index 100%
rename from data/hooks/diagnosis/12-dnsrecords.py
rename to src/diagnosis/12-dnsrecords.py
diff --git a/data/hooks/diagnosis/14-ports.py b/src/diagnosis/14-ports.py
similarity index 100%
rename from data/hooks/diagnosis/14-ports.py
rename to src/diagnosis/14-ports.py
diff --git a/data/hooks/diagnosis/21-web.py b/src/diagnosis/21-web.py
similarity index 100%
rename from data/hooks/diagnosis/21-web.py
rename to src/diagnosis/21-web.py
diff --git a/data/hooks/diagnosis/24-mail.py b/src/diagnosis/24-mail.py
similarity index 100%
rename from data/hooks/diagnosis/24-mail.py
rename to src/diagnosis/24-mail.py
diff --git a/data/hooks/diagnosis/30-services.py b/src/diagnosis/30-services.py
similarity index 100%
rename from data/hooks/diagnosis/30-services.py
rename to src/diagnosis/30-services.py
diff --git a/data/hooks/diagnosis/50-systemresources.py b/src/diagnosis/50-systemresources.py
similarity index 100%
rename from data/hooks/diagnosis/50-systemresources.py
rename to src/diagnosis/50-systemresources.py
diff --git a/data/hooks/diagnosis/70-regenconf.py b/src/diagnosis/70-regenconf.py
similarity index 100%
rename from data/hooks/diagnosis/70-regenconf.py
rename to src/diagnosis/70-regenconf.py
diff --git a/data/hooks/diagnosis/80-apps.py b/src/diagnosis/80-apps.py
similarity index 100%
rename from data/hooks/diagnosis/80-apps.py
rename to src/diagnosis/80-apps.py
diff --git a/src/yunohost/dns.py b/src/dns.py
similarity index 100%
rename from src/yunohost/dns.py
rename to src/dns.py
diff --git a/src/yunohost/domain.py b/src/domain.py
similarity index 100%
rename from src/yunohost/domain.py
rename to src/domain.py
diff --git a/src/yunohost/dyndns.py b/src/dyndns.py
similarity index 100%
rename from src/yunohost/dyndns.py
rename to src/dyndns.py
diff --git a/src/yunohost/firewall.py b/src/firewall.py
similarity index 100%
rename from src/yunohost/firewall.py
rename to src/firewall.py
diff --git a/src/yunohost/hook.py b/src/hook.py
similarity index 100%
rename from src/yunohost/hook.py
rename to src/hook.py
diff --git a/src/yunohost/log.py b/src/log.py
similarity index 100%
rename from src/yunohost/log.py
rename to src/log.py
diff --git a/src/yunohost/permission.py b/src/permission.py
similarity index 100%
rename from src/yunohost/permission.py
rename to src/permission.py
diff --git a/src/yunohost/regenconf.py b/src/regenconf.py
similarity index 100%
rename from src/yunohost/regenconf.py
rename to src/regenconf.py
diff --git a/src/yunohost/service.py b/src/service.py
similarity index 100%
rename from src/yunohost/service.py
rename to src/service.py
diff --git a/src/yunohost/settings.py b/src/settings.py
similarity index 100%
rename from src/yunohost/settings.py
rename to src/settings.py
diff --git a/src/yunohost/ssh.py b/src/ssh.py
similarity index 100%
rename from src/yunohost/ssh.py
rename to src/ssh.py
diff --git a/src/yunohost/tests/__init__.py b/src/tests/__init__.py
similarity index 100%
rename from src/yunohost/tests/__init__.py
rename to src/tests/__init__.py
diff --git a/src/yunohost/tests/conftest.py b/src/tests/conftest.py
similarity index 100%
rename from src/yunohost/tests/conftest.py
rename to src/tests/conftest.py
diff --git a/src/yunohost/tests/test_app_catalog.py b/src/tests/test_app_catalog.py
similarity index 100%
rename from src/yunohost/tests/test_app_catalog.py
rename to src/tests/test_app_catalog.py
diff --git a/src/yunohost/tests/test_app_config.py b/src/tests/test_app_config.py
similarity index 100%
rename from src/yunohost/tests/test_app_config.py
rename to src/tests/test_app_config.py
diff --git a/src/yunohost/tests/test_apps.py b/src/tests/test_apps.py
similarity index 100%
rename from src/yunohost/tests/test_apps.py
rename to src/tests/test_apps.py
diff --git a/src/yunohost/tests/test_appurl.py b/src/tests/test_appurl.py
similarity index 100%
rename from src/yunohost/tests/test_appurl.py
rename to src/tests/test_appurl.py
diff --git a/src/yunohost/tests/test_backuprestore.py b/src/tests/test_backuprestore.py
similarity index 100%
rename from src/yunohost/tests/test_backuprestore.py
rename to src/tests/test_backuprestore.py
diff --git a/src/yunohost/tests/test_changeurl.py b/src/tests/test_changeurl.py
similarity index 100%
rename from src/yunohost/tests/test_changeurl.py
rename to src/tests/test_changeurl.py
diff --git a/src/yunohost/tests/test_dns.py b/src/tests/test_dns.py
similarity index 100%
rename from src/yunohost/tests/test_dns.py
rename to src/tests/test_dns.py
diff --git a/src/yunohost/tests/test_domains.py b/src/tests/test_domains.py
similarity index 100%
rename from src/yunohost/tests/test_domains.py
rename to src/tests/test_domains.py
diff --git a/src/yunohost/tests/test_ldapauth.py b/src/tests/test_ldapauth.py
similarity index 100%
rename from src/yunohost/tests/test_ldapauth.py
rename to src/tests/test_ldapauth.py
diff --git a/src/yunohost/tests/test_permission.py b/src/tests/test_permission.py
similarity index 100%
rename from src/yunohost/tests/test_permission.py
rename to src/tests/test_permission.py
diff --git a/src/yunohost/tests/test_questions.py b/src/tests/test_questions.py
similarity index 100%
rename from src/yunohost/tests/test_questions.py
rename to src/tests/test_questions.py
diff --git a/src/yunohost/tests/test_regenconf.py b/src/tests/test_regenconf.py
similarity index 100%
rename from src/yunohost/tests/test_regenconf.py
rename to src/tests/test_regenconf.py
diff --git a/src/yunohost/tests/test_service.py b/src/tests/test_service.py
similarity index 100%
rename from src/yunohost/tests/test_service.py
rename to src/tests/test_service.py
diff --git a/src/yunohost/tests/test_settings.py b/src/tests/test_settings.py
similarity index 100%
rename from src/yunohost/tests/test_settings.py
rename to src/tests/test_settings.py
diff --git a/src/yunohost/tests/test_user-group.py b/src/tests/test_user-group.py
similarity index 100%
rename from src/yunohost/tests/test_user-group.py
rename to src/tests/test_user-group.py
diff --git a/src/yunohost/tools.py b/src/tools.py
similarity index 100%
rename from src/yunohost/tools.py
rename to src/tools.py
diff --git a/src/yunohost/user.py b/src/user.py
similarity index 100%
rename from src/yunohost/user.py
rename to src/user.py
diff --git a/src/yunohost/utils/__init__.py b/src/utils/__init__.py
similarity index 100%
rename from src/yunohost/utils/__init__.py
rename to src/utils/__init__.py
diff --git a/src/yunohost/utils/config.py b/src/utils/config.py
similarity index 100%
rename from src/yunohost/utils/config.py
rename to src/utils/config.py
diff --git a/src/yunohost/utils/dns.py b/src/utils/dns.py
similarity index 100%
rename from src/yunohost/utils/dns.py
rename to src/utils/dns.py
diff --git a/src/yunohost/utils/error.py b/src/utils/error.py
similarity index 100%
rename from src/yunohost/utils/error.py
rename to src/utils/error.py
diff --git a/src/yunohost/utils/filesystem.py b/src/utils/filesystem.py
similarity index 100%
rename from src/yunohost/utils/filesystem.py
rename to src/utils/filesystem.py
diff --git a/src/yunohost/utils/i18n.py b/src/utils/i18n.py
similarity index 100%
rename from src/yunohost/utils/i18n.py
rename to src/utils/i18n.py
diff --git a/src/yunohost/utils/ldap.py b/src/utils/ldap.py
similarity index 100%
rename from src/yunohost/utils/ldap.py
rename to src/utils/ldap.py
diff --git a/src/yunohost/utils/legacy.py b/src/utils/legacy.py
similarity index 100%
rename from src/yunohost/utils/legacy.py
rename to src/utils/legacy.py
diff --git a/src/yunohost/utils/network.py b/src/utils/network.py
similarity index 100%
rename from src/yunohost/utils/network.py
rename to src/utils/network.py
diff --git a/src/yunohost/utils/packages.py b/src/utils/packages.py
similarity index 100%
rename from src/yunohost/utils/packages.py
rename to src/utils/packages.py
diff --git a/src/yunohost/utils/password.py b/src/utils/password.py
similarity index 100%
rename from src/yunohost/utils/password.py
rename to src/utils/password.py
diff --git a/src/yunohost/utils/yunopaste.py b/src/utils/yunopaste.py
similarity index 100%
rename from src/yunohost/utils/yunopaste.py
rename to src/utils/yunopaste.py
diff --git a/src/yunohost/vendor/__init__.py b/src/vendor/__init__.py
similarity index 100%
rename from src/yunohost/vendor/__init__.py
rename to src/vendor/__init__.py
diff --git a/src/yunohost/vendor/acme_tiny/__init__.py b/src/vendor/acme_tiny/__init__.py
similarity index 100%
rename from src/yunohost/vendor/acme_tiny/__init__.py
rename to src/vendor/acme_tiny/__init__.py
diff --git a/src/yunohost/vendor/acme_tiny/acme_tiny.py b/src/vendor/acme_tiny/acme_tiny.py
similarity index 100%
rename from src/yunohost/vendor/acme_tiny/acme_tiny.py
rename to src/vendor/acme_tiny/acme_tiny.py
diff --git a/src/yunohost/vendor/spectre-meltdown-checker/Dockerfile b/src/vendor/spectre-meltdown-checker/Dockerfile
similarity index 100%
rename from src/yunohost/vendor/spectre-meltdown-checker/Dockerfile
rename to src/vendor/spectre-meltdown-checker/Dockerfile
diff --git a/src/yunohost/vendor/spectre-meltdown-checker/LICENSE b/src/vendor/spectre-meltdown-checker/LICENSE
similarity index 100%
rename from src/yunohost/vendor/spectre-meltdown-checker/LICENSE
rename to src/vendor/spectre-meltdown-checker/LICENSE
diff --git a/src/yunohost/vendor/spectre-meltdown-checker/README.md b/src/vendor/spectre-meltdown-checker/README.md
similarity index 100%
rename from src/yunohost/vendor/spectre-meltdown-checker/README.md
rename to src/vendor/spectre-meltdown-checker/README.md
diff --git a/src/yunohost/vendor/spectre-meltdown-checker/docker-compose.yml b/src/vendor/spectre-meltdown-checker/docker-compose.yml
similarity index 100%
rename from src/yunohost/vendor/spectre-meltdown-checker/docker-compose.yml
rename to src/vendor/spectre-meltdown-checker/docker-compose.yml
diff --git a/src/yunohost/vendor/spectre-meltdown-checker/spectre-meltdown-checker.sh b/src/vendor/spectre-meltdown-checker/spectre-meltdown-checker.sh
similarity index 100%
rename from src/yunohost/vendor/spectre-meltdown-checker/spectre-meltdown-checker.sh
rename to src/vendor/spectre-meltdown-checker/spectre-meltdown-checker.sh