diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 004004b..d8390a9 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -24,7 +24,9 @@
 
 - include: tor.yml
 
-- include: users.yml
+- name: Générer les comptes utilisateurices
+  include: users/main.yml
+  when: users is defined
 
 - name: Activer le peering
   include: peering/main.yml
diff --git a/roles/common/tasks/users.yml b/roles/common/tasks/users/main.yml
similarity index 100%
rename from roles/common/tasks/users.yml
rename to roles/common/tasks/users/main.yml
diff --git a/roles/common/tasks/setup_user.yml b/roles/common/tasks/users/setup_user.yml
similarity index 93%
rename from roles/common/tasks/setup_user.yml
rename to roles/common/tasks/users/setup_user.yml
index 3a1efc7..d971d3d 100644
--- a/roles/common/tasks/setup_user.yml
+++ b/roles/common/tasks/users/setup_user.yml
@@ -22,5 +22,5 @@
 
 - name: Génerer un onion pour l'utilisateurice
   template:
-    src: ../files/onion.conf.j2
+    src: ../../files/onion.conf.j2
     dest: "/etc/tor/onions/{{ item.name }}.conf"