header, name most the include_tasks and reorder based on subgroups, refactoring a few file locations in some instances.

tasks/header.yml

@@ -106,60 +106,74 @@
 - name: Main | General
   block:
 
-    - name: Main | General | Swap
+    - name: Main | General | Software | runit
-      ansible.builtin.include_tasks: tasks/general/software/swap.yml
-
-    - name: Main | General | runit
       ansible.builtin.include_tasks: tasks/general/software/runit.yml
 
-    - name: Main | General | Packages
+    - name: Main | General | Software | Packages
       ansible.builtin.include_tasks: tasks/general/software/packages.yml
       when: internet
 
-    - name: Main | General | Services
+    - name: Main | General | Software | AUR
-      ansible.builtin.include_tasks: tasks/general/software/services.yml
+      ansible.builtin.include_tasks: tasks/general/software/aur.yml
+      when: internet and ansible_pkg_mgr == "pacman"
 
-    - name: Main | General | Settings | Tunnel
+    - name: Main | General | Software | Sendmail
-      ansible.builtin.include_tasks: tasks/general/settings/tunnel.yml
-
-    - name: Main | General | Sendmail
       ansible.builtin.include_tasks: tasks/general/software/sendmail.yml
       when: ansible_system == "FreeBSD"
         and internet
 
-    - ansible.builtin.include_tasks: tasks/general/software/aur.yml
+    - name: Main | General | Software | Metasploit
-      when: internet and ansible_pkg_mgr == "pacman"
+      ansible.builtin.include_tasks: tasks/general/software/metasploit.yml
+      when: internet
 
     # Gather again in case missing programs have now been installed.
-    - ansible.builtin.include_tasks: facts/general/gather.yml
+    - name: Main | General | Facts [Again]
+      ansible.builtin.include_tasks: facts/general/gather.yml
 
-    - ansible.builtin.include_tasks: tasks/general/settings/keyboard.yml
+    - name: Main | General | Settings | Swap
+      ansible.builtin.include_tasks: tasks/general/settings/swap.yml
 
-    - ansible.builtin.include_tasks: tasks/general/acct_mgmt/groups.yml
+    - name: Main | General | Settings | Services
+      ansible.builtin.include_tasks: tasks/general/settings/services.yml
 
-    - ansible.builtin.include_tasks: tasks/general/acct_mgmt/users.yml
+    - name: Main | General | Settings | Tunnel
+      ansible.builtin.include_tasks: tasks/general/settings/tunnel.yml
 
-    - ansible.builtin.include_tasks: tasks/general/acct_mgmt/sudo.yml
+    - name: Main | General | Settings | Keyboard
+      ansible.builtin.include_tasks: tasks/general/settings/keyboard.yml
 
-    - ansible.builtin.include_tasks: tasks/general/acct_mgmt/doas.yml
+    - name: Main | General | Accounts | Groups
+      ansible.builtin.include_tasks: tasks/general/acct_mgmt/groups.yml
+
+    - name: Main | General | Accounts | Users
+      ansible.builtin.include_tasks: tasks/general/acct_mgmt/users.yml
+
+    - name: Main | General | Accounts | sudo
+      ansible.builtin.include_tasks: tasks/general/acct_mgmt/sudo.yml
+
+    - name: Main | General | Accounts | doas
+      ansible.builtin.include_tasks: tasks/general/acct_mgmt/doas.yml
       when: internet
 
-    - ansible.builtin.include_tasks: tasks/general/software/env-shared.yml
+    - name: Main | General | Scripts | Root
+      ansible.builtin.include_tasks: tasks/general/scripts/root.yml
+
+    - name: Main | General | Scripts | User
+      ansible.builtin.include_tasks: tasks/general/scripts/user.yml
+
+    - name: Main | General | Scripts | Local
+      ansible.builtin.include_tasks: tasks/general/scripts/install.yml
+
+    - name: Main | General | Scripts | env-shared
+      ansible.builtin.include_tasks: tasks/general/scripts/env-shared.yml
       when: internet
 
-    - ansible.builtin.include_tasks: tasks/general/scripts/root.yml
+    - name: Main | General | Cron | Ansible
-
+      ansible.builtin.include_tasks: tasks/general/cron/ansible.yml
-    - ansible.builtin.include_tasks: tasks/general/scripts/user.yml
-
-    - ansible.builtin.include_tasks: tasks/general/scripts/install.yml
-
-    - ansible.builtin.include_tasks: tasks/general/cron/ansible.yml
 
     # TODO Need to refactor. Maybe tasks/general/cron/freebsd.yml
-    - ansible.builtin.include_tasks: tasks/workstation/freebsd/cron/ansible.yml
+    - name: Main | General | Cron | Ansible [FreeBSD]
+      ansible.builtin.include_tasks: tasks/workstation/freebsd/cron/ansible.yml
       when: ansible_system == "FreeBSD"
 
-    - ansible.builtin.include_tasks: tasks/general/software/metasploit.yml
-      when: internet
-
   when: provision