diff --git a/roles/database/tasks/configure_snmpd.yml b/roles/databases/tasks/configure_snmpd.yml
similarity index 100%
rename from roles/database/tasks/configure_snmpd.yml
rename to roles/databases/tasks/configure_snmpd.yml
diff --git a/roles/database/tasks/install_check_postgres.yml b/roles/databases/tasks/install_check_postgres.yml
similarity index 100%
rename from roles/database/tasks/install_check_postgres.yml
rename to roles/databases/tasks/install_check_postgres.yml
diff --git a/roles/database/tasks/install_mysql.yml b/roles/databases/tasks/install_mysql.yml
similarity index 100%
rename from roles/database/tasks/install_mysql.yml
rename to roles/databases/tasks/install_mysql.yml
diff --git a/roles/database/tasks/install_postgres.yml b/roles/databases/tasks/install_postgres.yml
similarity index 100%
rename from roles/database/tasks/install_postgres.yml
rename to roles/databases/tasks/install_postgres.yml
diff --git a/roles/database/tasks/install_redis.yml b/roles/databases/tasks/install_redis.yml
similarity index 100%
rename from roles/database/tasks/install_redis.yml
rename to roles/databases/tasks/install_redis.yml
diff --git a/roles/database/tasks/main.yml b/roles/databases/tasks/main.yml
similarity index 100%
rename from roles/database/tasks/main.yml
rename to roles/databases/tasks/main.yml
diff --git a/roles/database/vars/debian.yml b/roles/databases/vars/debian.yml
similarity index 100%
rename from roles/database/vars/debian.yml
rename to roles/databases/vars/debian.yml
diff --git a/roles/database/vars/ubuntu.yml b/roles/databases/vars/ubuntu.yml
similarity index 100%
rename from roles/database/vars/ubuntu.yml
rename to roles/databases/vars/ubuntu.yml
diff --git a/roles/nameserver/files/snmpd_bind.conf b/roles/nameservers/files/snmpd_bind.conf
similarity index 100%
rename from roles/nameserver/files/snmpd_bind.conf
rename to roles/nameservers/files/snmpd_bind.conf
diff --git a/roles/nameserver/handlers/main.yml b/roles/nameservers/handlers/main.yml
similarity index 100%
rename from roles/nameserver/handlers/main.yml
rename to roles/nameservers/handlers/main.yml
diff --git a/roles/nameserver/tasks/configure_bind_snmpd.yml b/roles/nameservers/tasks/configure_bind_snmpd.yml
similarity index 100%
rename from roles/nameserver/tasks/configure_bind_snmpd.yml
rename to roles/nameservers/tasks/configure_bind_snmpd.yml
diff --git a/roles/nameserver/tasks/configure_unbound_snmpd.yml b/roles/nameservers/tasks/configure_unbound_snmpd.yml
similarity index 100%
rename from roles/nameserver/tasks/configure_unbound_snmpd.yml
rename to roles/nameservers/tasks/configure_unbound_snmpd.yml
diff --git a/roles/nameserver/tasks/disable-systemd-resolved.yml b/roles/nameservers/tasks/disable-systemd-resolved.yml
similarity index 100%
rename from roles/nameserver/tasks/disable-systemd-resolved.yml
rename to roles/nameservers/tasks/disable-systemd-resolved.yml
diff --git a/roles/nameserver/tasks/install_bind.yml b/roles/nameservers/tasks/install_bind.yml
similarity index 100%
rename from roles/nameserver/tasks/install_bind.yml
rename to roles/nameservers/tasks/install_bind.yml
diff --git a/roles/nameserver/tasks/install_unbound.yml b/roles/nameservers/tasks/install_unbound.yml
similarity index 100%
rename from roles/nameserver/tasks/install_unbound.yml
rename to roles/nameservers/tasks/install_unbound.yml
diff --git a/roles/nameserver/tasks/main.yml b/roles/nameservers/tasks/main.yml
similarity index 100%
rename from roles/nameserver/tasks/main.yml
rename to roles/nameservers/tasks/main.yml
diff --git a/roles/nameserver/templates/unbound_network.conf.j2 b/roles/nameservers/templates/unbound_network.conf.j2
similarity index 100%
rename from roles/nameserver/templates/unbound_network.conf.j2
rename to roles/nameservers/templates/unbound_network.conf.j2
diff --git a/roles/nameserver/vars/Archlinux.yml b/roles/nameservers/vars/Archlinux.yml
similarity index 100%
rename from roles/nameserver/vars/Archlinux.yml
rename to roles/nameservers/vars/Archlinux.yml
diff --git a/roles/nameserver/vars/Debian.yml b/roles/nameservers/vars/Debian.yml
similarity index 100%
rename from roles/nameserver/vars/Debian.yml
rename to roles/nameservers/vars/Debian.yml
diff --git a/roles/nameserver/vars/Ubuntu.yml b/roles/nameservers/vars/Ubuntu.yml
similarity index 100%
rename from roles/nameserver/vars/Ubuntu.yml
rename to roles/nameservers/vars/Ubuntu.yml
diff --git a/roles/proxyserver/tasks/main.yaml b/roles/proxyservers/tasks/main.yaml
similarity index 100%
rename from roles/proxyserver/tasks/main.yaml
rename to roles/proxyservers/tasks/main.yaml
diff --git a/roles/proxyserver/tasks/squid.yml b/roles/proxyservers/tasks/squid.yml
similarity index 100%
rename from roles/proxyserver/tasks/squid.yml
rename to roles/proxyservers/tasks/squid.yml
diff --git a/roles/proxyserver/tasks/tinyproxy.yaml b/roles/proxyservers/tasks/tinyproxy.yaml
similarity index 100%
rename from roles/proxyserver/tasks/tinyproxy.yaml
rename to roles/proxyservers/tasks/tinyproxy.yaml
diff --git a/roles/server/files/distro b/roles/servers/files/distro
similarity index 100%
rename from roles/server/files/distro
rename to roles/servers/files/distro
diff --git a/roles/server/files/sudoers b/roles/servers/files/sudoers
similarity index 100%
rename from roles/server/files/sudoers
rename to roles/servers/files/sudoers
diff --git a/roles/server/handlers/main.yml b/roles/servers/handlers/main.yml
similarity index 100%
rename from roles/server/handlers/main.yml
rename to roles/servers/handlers/main.yml
diff --git a/roles/server/tasks/main.yml b/roles/servers/tasks/main.yml
similarity index 100%
rename from roles/server/tasks/main.yml
rename to roles/servers/tasks/main.yml
diff --git a/roles/server/tasks/system_setup/cron.yml b/roles/servers/tasks/system_setup/cron.yml
similarity index 100%
rename from roles/server/tasks/system_setup/cron.yml
rename to roles/servers/tasks/system_setup/cron.yml
diff --git a/roles/server/tasks/system_setup/mail.yml b/roles/servers/tasks/system_setup/mail.yml
similarity index 100%
rename from roles/server/tasks/system_setup/mail.yml
rename to roles/servers/tasks/system_setup/mail.yml
diff --git a/roles/server/tasks/system_setup/swap.yml b/roles/servers/tasks/system_setup/swap.yml
similarity index 100%
rename from roles/server/tasks/system_setup/swap.yml
rename to roles/servers/tasks/system_setup/swap.yml
diff --git a/roles/server/tasks/system_setup/sysctl.yml b/roles/servers/tasks/system_setup/sysctl.yml
similarity index 100%
rename from roles/server/tasks/system_setup/sysctl.yml
rename to roles/servers/tasks/system_setup/sysctl.yml
diff --git a/roles/server/tasks/utilities/glusterfs.yml b/roles/servers/tasks/utilities/glusterfs.yml
similarity index 100%
rename from roles/server/tasks/utilities/glusterfs.yml
rename to roles/servers/tasks/utilities/glusterfs.yml
diff --git a/roles/server/tasks/utilities/mta.yml b/roles/servers/tasks/utilities/mta.yml
similarity index 100%
rename from roles/server/tasks/utilities/mta.yml
rename to roles/servers/tasks/utilities/mta.yml
diff --git a/roles/server/tasks/utilities/netdata.yml b/roles/servers/tasks/utilities/netdata.yml
similarity index 100%
rename from roles/server/tasks/utilities/netdata.yml
rename to roles/servers/tasks/utilities/netdata.yml
diff --git a/roles/server/tasks/utilities/snmpd.yml b/roles/servers/tasks/utilities/snmpd.yml
similarity index 100%
rename from roles/server/tasks/utilities/snmpd.yml
rename to roles/servers/tasks/utilities/snmpd.yml
diff --git a/roles/server/templates/client_VPN.conf.j2 b/roles/servers/templates/client_VPN.conf.j2
similarity index 100%
rename from roles/server/templates/client_VPN.conf.j2
rename to roles/servers/templates/client_VPN.conf.j2
diff --git a/roles/server/templates/main.yml b/roles/servers/templates/main.yml
similarity index 100%
rename from roles/server/templates/main.yml
rename to roles/servers/templates/main.yml
diff --git a/roles/server/vars/Archlinux.yml b/roles/servers/vars/Archlinux.yml
similarity index 100%
rename from roles/server/vars/Archlinux.yml
rename to roles/servers/vars/Archlinux.yml
diff --git a/roles/server/vars/Debian.yml b/roles/servers/vars/Debian.yml
similarity index 100%
rename from roles/server/vars/Debian.yml
rename to roles/servers/vars/Debian.yml
diff --git a/roles/server/vars/Ubuntu.yml b/roles/servers/vars/Ubuntu.yml
similarity index 100%
rename from roles/server/vars/Ubuntu.yml
rename to roles/servers/vars/Ubuntu.yml
diff --git a/roles/server/vars/main.yml b/roles/servers/vars/main.yml
similarity index 100%
rename from roles/server/vars/main.yml
rename to roles/servers/vars/main.yml
diff --git a/roles/server/vars/mewimeet.com.yml b/roles/servers/vars/mewimeet.com.yml
similarity index 100%
rename from roles/server/vars/mewimeet.com.yml
rename to roles/servers/vars/mewimeet.com.yml
diff --git a/roles/server/vars/mewimeet.de.yml b/roles/servers/vars/mewimeet.de.yml
similarity index 100%
rename from roles/server/vars/mewimeet.de.yml
rename to roles/servers/vars/mewimeet.de.yml
diff --git a/roles/server/vars/snmp_users.yml b/roles/servers/vars/snmp_users.yml
similarity index 100%
rename from roles/server/vars/snmp_users.yml
rename to roles/servers/vars/snmp_users.yml
diff --git a/roles/webserver/files/nginx_localhost b/roles/webservers/files/nginx_localhost
similarity index 100%
rename from roles/webserver/files/nginx_localhost
rename to roles/webservers/files/nginx_localhost
diff --git a/roles/webserver/handlers/main.yml b/roles/webservers/handlers/main.yml
similarity index 100%
rename from roles/webserver/handlers/main.yml
rename to roles/webservers/handlers/main.yml
diff --git a/roles/webserver/tasks/apps/apps.yml b/roles/webservers/tasks/apps/apps.yml
similarity index 100%
rename from roles/webserver/tasks/apps/apps.yml
rename to roles/webservers/tasks/apps/apps.yml
diff --git a/roles/webserver/tasks/apps/nextcloud/nextcloud.yml b/roles/webservers/tasks/apps/nextcloud/nextcloud.yml
similarity index 100%
rename from roles/webserver/tasks/apps/nextcloud/nextcloud.yml
rename to roles/webservers/tasks/apps/nextcloud/nextcloud.yml
diff --git a/roles/webserver/tasks/apps/nextcloud/prereq.yml b/roles/webservers/tasks/apps/nextcloud/prereq.yml
similarity index 100%
rename from roles/webserver/tasks/apps/nextcloud/prereq.yml
rename to roles/webservers/tasks/apps/nextcloud/prereq.yml
diff --git a/roles/webserver/tasks/configure_nginx_snmpd.yml b/roles/webservers/tasks/configure_nginx_snmpd.yml
similarity index 100%
rename from roles/webserver/tasks/configure_nginx_snmpd.yml
rename to roles/webservers/tasks/configure_nginx_snmpd.yml
diff --git a/roles/webserver/tasks/install_apache.yml b/roles/webservers/tasks/install_apache.yml
similarity index 100%
rename from roles/webserver/tasks/install_apache.yml
rename to roles/webservers/tasks/install_apache.yml
diff --git a/roles/webserver/tasks/install_nginx.yml b/roles/webservers/tasks/install_nginx.yml
similarity index 100%
rename from roles/webserver/tasks/install_nginx.yml
rename to roles/webservers/tasks/install_nginx.yml
diff --git a/roles/webserver/tasks/install_php.yml b/roles/webservers/tasks/install_php.yml
similarity index 100%
rename from roles/webserver/tasks/install_php.yml
rename to roles/webservers/tasks/install_php.yml
diff --git a/roles/webserver/tasks/main.yml b/roles/webservers/tasks/main.yml
similarity index 100%
rename from roles/webserver/tasks/main.yml
rename to roles/webservers/tasks/main.yml
diff --git a/roles/webserver/templates/nextcloud/config.php.j2 b/roles/webservers/templates/nextcloud/config.php.j2
similarity index 100%
rename from roles/webserver/templates/nextcloud/config.php.j2
rename to roles/webservers/templates/nextcloud/config.php.j2
diff --git a/roles/webserver/vars/Debian.yml b/roles/webservers/vars/Debian.yml
similarity index 100%
rename from roles/webserver/vars/Debian.yml
rename to roles/webservers/vars/Debian.yml
diff --git a/roles/webserver/vars/Ubuntu.yml b/roles/webservers/vars/Ubuntu.yml
similarity index 100%
rename from roles/webserver/vars/Ubuntu.yml
rename to roles/webservers/vars/Ubuntu.yml
diff --git a/roles/webserver/vars/nextcloud.yml b/roles/webservers/vars/nextcloud.yml
similarity index 100%
rename from roles/webserver/vars/nextcloud.yml
rename to roles/webservers/vars/nextcloud.yml