diff --git a/roles/bastionhost/tasks/aide.yml b/roles/bastionhost/tasks/system_setup/aide.yml
similarity index 100%
rename from roles/bastionhost/tasks/aide.yml
rename to roles/bastionhost/tasks/system_setup/aide.yml
diff --git a/roles/bastionhost/tasks/firewall.yml b/roles/bastionhost/tasks/system_setup/firewall.yml
similarity index 100%
rename from roles/bastionhost/tasks/firewall.yml
rename to roles/bastionhost/tasks/system_setup/firewall.yml
diff --git a/roles/bastionhost/tasks/openssh_hardening.yml b/roles/bastionhost/tasks/system_setup/openssh_hardening.yml
similarity index 100%
rename from roles/bastionhost/tasks/openssh_hardening.yml
rename to roles/bastionhost/tasks/system_setup/openssh_hardening.yml
diff --git a/roles/bastionhost/tasks/package_hardening.yml b/roles/bastionhost/tasks/system_setup/package_hardening.yml
similarity index 100%
rename from roles/bastionhost/tasks/package_hardening.yml
rename to roles/bastionhost/tasks/system_setup/package_hardening.yml
diff --git a/roles/bastionhost/tasks/user_hardening.yml b/roles/bastionhost/tasks/system_setup/user_hardening.yml
similarity index 100%
rename from roles/bastionhost/tasks/user_hardening.yml
rename to roles/bastionhost/tasks/system_setup/user_hardening.yml