diff --git a/roles/webservers/files/nginx_localhost b/roles/webserver/files/nginx_localhost
similarity index 100%
rename from roles/webservers/files/nginx_localhost
rename to roles/webserver/files/nginx_localhost
diff --git a/roles/webservers/handlers/main.yml b/roles/webserver/handlers/main.yml
similarity index 100%
rename from roles/webservers/handlers/main.yml
rename to roles/webserver/handlers/main.yml
diff --git a/roles/webservers/tasks/apps/apps.yml b/roles/webserver/tasks/apps/apps.yml
similarity index 100%
rename from roles/webservers/tasks/apps/apps.yml
rename to roles/webserver/tasks/apps/apps.yml
diff --git a/roles/webservers/tasks/apps/nextcloud/nextcloud.yml b/roles/webserver/tasks/apps/nextcloud/nextcloud.yml
similarity index 100%
rename from roles/webservers/tasks/apps/nextcloud/nextcloud.yml
rename to roles/webserver/tasks/apps/nextcloud/nextcloud.yml
diff --git a/roles/webservers/tasks/apps/nextcloud/prereq.yml b/roles/webserver/tasks/apps/nextcloud/prereq.yml
similarity index 100%
rename from roles/webservers/tasks/apps/nextcloud/prereq.yml
rename to roles/webserver/tasks/apps/nextcloud/prereq.yml
diff --git a/roles/webservers/tasks/configure_apache_snmpd.yml b/roles/webserver/tasks/configure_apache_snmpd.yml
similarity index 100%
rename from roles/webservers/tasks/configure_apache_snmpd.yml
rename to roles/webserver/tasks/configure_apache_snmpd.yml
diff --git a/roles/webservers/tasks/configure_nginx_snmpd.yml b/roles/webserver/tasks/configure_nginx_snmpd.yml
similarity index 100%
rename from roles/webservers/tasks/configure_nginx_snmpd.yml
rename to roles/webserver/tasks/configure_nginx_snmpd.yml
diff --git a/roles/webservers/tasks/install_apache.yml b/roles/webserver/tasks/install_apache.yml
similarity index 100%
rename from roles/webservers/tasks/install_apache.yml
rename to roles/webserver/tasks/install_apache.yml
diff --git a/roles/webservers/tasks/install_nginx.yml b/roles/webserver/tasks/install_nginx.yml
similarity index 100%
rename from roles/webservers/tasks/install_nginx.yml
rename to roles/webserver/tasks/install_nginx.yml
diff --git a/roles/webservers/tasks/install_php.yml b/roles/webserver/tasks/install_php.yml
similarity index 100%
rename from roles/webservers/tasks/install_php.yml
rename to roles/webserver/tasks/install_php.yml
diff --git a/roles/webservers/tasks/main.yml b/roles/webserver/tasks/main.yml
similarity index 100%
rename from roles/webservers/tasks/main.yml
rename to roles/webserver/tasks/main.yml
diff --git a/roles/webservers/templates/nextcloud/config.php.j2 b/roles/webserver/templates/nextcloud/config.php.j2
similarity index 100%
rename from roles/webservers/templates/nextcloud/config.php.j2
rename to roles/webserver/templates/nextcloud/config.php.j2
diff --git a/roles/webservers/vars/debian.yml b/roles/webserver/vars/debian.yml
similarity index 100%
rename from roles/webservers/vars/debian.yml
rename to roles/webserver/vars/debian.yml
diff --git a/roles/webservers/vars/nextcloud.yml b/roles/webserver/vars/nextcloud.yml
similarity index 100%
rename from roles/webservers/vars/nextcloud.yml
rename to roles/webserver/vars/nextcloud.yml
diff --git a/roles/webservers/vars/ubuntu.yml b/roles/webserver/vars/ubuntu.yml
similarity index 100%
rename from roles/webservers/vars/ubuntu.yml
rename to roles/webserver/vars/ubuntu.yml