diff --git a/playbooks/bootstrap.yml b/playbooks/bootstrap.yml
index 786be94..91c1ad0 100644
--- a/playbooks/bootstrap.yml
+++ b/playbooks/bootstrap.yml
@@ -13,7 +13,7 @@
       when: ansible_distribution in [ "AlmaLinux", "CentOS" ]
 
     # Upgrade all packages and install the basic-bitch ones
-    - role: system/base
+    - role: base/system
       become: true
 
     # Enable Cockpit
@@ -37,7 +37,7 @@
       tags: sshd
 
     # Handle basic user configuration
-    - user/base
+    - base/desktop
 
     # Shell utilities
     - role: user/shell/zsh
diff --git a/roles/user/base/files/srht.py b/roles/base/desktop/files/srht.py
similarity index 100%
rename from roles/user/base/files/srht.py
rename to roles/base/desktop/files/srht.py
diff --git a/roles/user/base/files/toolbox_name.sh b/roles/base/desktop/files/toolbox_name.sh
similarity index 100%
rename from roles/user/base/files/toolbox_name.sh
rename to roles/base/desktop/files/toolbox_name.sh
diff --git a/roles/user/base/tasks/desktop-utilities.yml b/roles/base/desktop/tasks/desktop-utilities.yml
similarity index 100%
rename from roles/user/base/tasks/desktop-utilities.yml
rename to roles/base/desktop/tasks/desktop-utilities.yml
diff --git a/roles/user/base/tasks/main.yml b/roles/base/desktop/tasks/main.yml
similarity index 79%
rename from roles/user/base/tasks/main.yml
rename to roles/base/desktop/tasks/main.yml
index bcc1f7c..20f32cc 100644
--- a/roles/user/base/tasks/main.yml
+++ b/roles/base/desktop/tasks/main.yml
@@ -4,8 +4,8 @@
 
 - name: Scripts
   ansible.builtin.include_tasks: scripts.yml
-  tags: user/base/scripts
+  tags: base/user/scripts
 
 - name: Desktop utilities
   ansible.builtin.include_tasks: desktop-utilities.yml
-  tags: user/base/desktop-utilities
+  tags: base/user/desktop-utilities
diff --git a/roles/user/base/tasks/scripts.yml b/roles/base/desktop/tasks/scripts.yml
similarity index 100%
rename from roles/user/base/tasks/scripts.yml
rename to roles/base/desktop/tasks/scripts.yml
diff --git a/roles/user/base/tasks/structure.yml b/roles/base/desktop/tasks/structure.yml
similarity index 100%
rename from roles/user/base/tasks/structure.yml
rename to roles/base/desktop/tasks/structure.yml
diff --git a/roles/server/base/tasks/main.yml b/roles/base/server/tasks/main.yml
similarity index 100%
rename from roles/server/base/tasks/main.yml
rename to roles/base/server/tasks/main.yml
diff --git a/roles/system/base/tasks/main.yml b/roles/base/system/tasks/main.yml
similarity index 100%
rename from roles/system/base/tasks/main.yml
rename to roles/base/system/tasks/main.yml
diff --git a/roles/system/base/tasks/upgrade.yml b/roles/base/system/tasks/upgrade.yml
similarity index 100%
rename from roles/system/base/tasks/upgrade.yml
rename to roles/base/system/tasks/upgrade.yml