diff --git a/packweb-apache/tasks/main.yml b/packweb-apache/tasks/main.yml
index 4abe074a..5bcd59d9 100644
--- a/packweb-apache/tasks/main.yml
+++ b/packweb-apache/tasks/main.yml
@@ -120,7 +120,7 @@
 
 - name: Install Evoadmin
   include_role:
-    name: evoadmin
+    name: webapps/evoadmin-web
   vars:
     evoadmin_enable_vhost: "{{ packweb_enable_evoadmin_vhost }}"
 
diff --git a/evoadmin/defaults/main.yml b/webapps/evoadmin-web/defaults/main.yml
similarity index 100%
rename from evoadmin/defaults/main.yml
rename to webapps/evoadmin-web/defaults/main.yml
diff --git a/evoadmin/files/evolinux.conf.diff b/webapps/evoadmin-web/files/evolinux.conf.diff
similarity index 100%
rename from evoadmin/files/evolinux.conf.diff
rename to webapps/evoadmin-web/files/evolinux.conf.diff
diff --git a/evoadmin/handlers/main.yml b/webapps/evoadmin-web/handlers/main.yml
similarity index 100%
rename from evoadmin/handlers/main.yml
rename to webapps/evoadmin-web/handlers/main.yml
diff --git a/evoadmin/tasks/config.yml b/webapps/evoadmin-web/tasks/config.yml
similarity index 100%
rename from evoadmin/tasks/config.yml
rename to webapps/evoadmin-web/tasks/config.yml
diff --git a/evoadmin/tasks/ftp.yml b/webapps/evoadmin-web/tasks/ftp.yml
similarity index 100%
rename from evoadmin/tasks/ftp.yml
rename to webapps/evoadmin-web/tasks/ftp.yml
diff --git a/evoadmin/tasks/main.yml b/webapps/evoadmin-web/tasks/main.yml
similarity index 100%
rename from evoadmin/tasks/main.yml
rename to webapps/evoadmin-web/tasks/main.yml
diff --git a/evoadmin/tasks/packages.yml b/webapps/evoadmin-web/tasks/packages.yml
similarity index 100%
rename from evoadmin/tasks/packages.yml
rename to webapps/evoadmin-web/tasks/packages.yml
diff --git a/evoadmin/tasks/remount_usr_rw.yml b/webapps/evoadmin-web/tasks/remount_usr_rw.yml
similarity index 100%
rename from evoadmin/tasks/remount_usr_rw.yml
rename to webapps/evoadmin-web/tasks/remount_usr_rw.yml
diff --git a/evoadmin/tasks/ssl.yml b/webapps/evoadmin-web/tasks/ssl.yml
similarity index 100%
rename from evoadmin/tasks/ssl.yml
rename to webapps/evoadmin-web/tasks/ssl.yml
diff --git a/evoadmin/tasks/user.yml b/webapps/evoadmin-web/tasks/user.yml
similarity index 100%
rename from evoadmin/tasks/user.yml
rename to webapps/evoadmin-web/tasks/user.yml
diff --git a/evoadmin/tasks/web.yml b/webapps/evoadmin-web/tasks/web.yml
similarity index 100%
rename from evoadmin/tasks/web.yml
rename to webapps/evoadmin-web/tasks/web.yml
diff --git a/evoadmin/templates/config.local.php.j2 b/webapps/evoadmin-web/templates/config.local.php.j2
similarity index 100%
rename from evoadmin/templates/config.local.php.j2
rename to webapps/evoadmin-web/templates/config.local.php.j2
diff --git a/evoadmin/templates/evoadmin.conf.j2 b/webapps/evoadmin-web/templates/evoadmin.conf.j2
similarity index 100%
rename from evoadmin/templates/evoadmin.conf.j2
rename to webapps/evoadmin-web/templates/evoadmin.conf.j2
diff --git a/evoadmin/templates/sudoers.j2 b/webapps/evoadmin-web/templates/sudoers.j2
similarity index 100%
rename from evoadmin/templates/sudoers.j2
rename to webapps/evoadmin-web/templates/sudoers.j2
diff --git a/evoadmin/templates/web-add.conf.j2 b/webapps/evoadmin-web/templates/web-add.conf.j2
similarity index 100%
rename from evoadmin/templates/web-add.conf.j2
rename to webapps/evoadmin-web/templates/web-add.conf.j2
diff --git a/evoadmin/templates/web-mail.tpl.j2 b/webapps/evoadmin-web/templates/web-mail.tpl.j2
similarity index 100%
rename from evoadmin/templates/web-mail.tpl.j2
rename to webapps/evoadmin-web/templates/web-mail.tpl.j2