diff --git a/src/playbook/Configuration/tweaks/scripts/script-mitigations.yml b/src/playbook/Configuration/tweaks/scripts/script-mitigations.yml
index 6d6da73617d..b15e9a2fb90 100644
--- a/src/playbook/Configuration/tweaks/scripts/script-mitigations.yml
+++ b/src/playbook/Configuration/tweaks/scripts/script-mitigations.yml
@@ -4,7 +4,7 @@ description: Disables mitigations in Windows dependant on the user's options
 privilege: TrustedInstaller
 actions:
   - !run:
-    exe: 'C:\Windows\AtlasDesktop\3. Configuration\Mitigations\Disable All Mitigations.cmd'
+    exe: 'C:\Windows\AtlasDesktop\7. Security\Mitigations\Disable All Mitigations.cmd'
     args: '/silent'
     wait: true
     option: 'mitigations-disable'
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/Firewall/Disable Windows Firewall.cmd b/src/playbook/Executables/AtlasDesktop/7. Security/Firewall/Disable Windows Firewall.cmd
similarity index 100%
rename from src/playbook/Executables/AtlasDesktop/3. Configuration/Firewall/Disable Windows Firewall.cmd
rename to src/playbook/Executables/AtlasDesktop/7. Security/Firewall/Disable Windows Firewall.cmd
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/Firewall/Enable Windows Firewall (Default).cmd b/src/playbook/Executables/AtlasDesktop/7. Security/Firewall/Enable Windows Firewall (Default).cmd
similarity index 100%
rename from src/playbook/Executables/AtlasDesktop/3. Configuration/Firewall/Enable Windows Firewall (Default).cmd
rename to src/playbook/Executables/AtlasDesktop/7. Security/Firewall/Enable Windows Firewall (Default).cmd
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/Mitigations/Disable All Mitigations.cmd b/src/playbook/Executables/AtlasDesktop/7. Security/Mitigations/Disable All Mitigations.cmd
similarity index 100%
rename from src/playbook/Executables/AtlasDesktop/3. Configuration/Mitigations/Disable All Mitigations.cmd
rename to src/playbook/Executables/AtlasDesktop/7. Security/Mitigations/Disable All Mitigations.cmd
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/Mitigations/Enable All Mitigations.cmd b/src/playbook/Executables/AtlasDesktop/7. Security/Mitigations/Enable All Mitigations.cmd
similarity index 100%
rename from src/playbook/Executables/AtlasDesktop/3. Configuration/Mitigations/Enable All Mitigations.cmd
rename to src/playbook/Executables/AtlasDesktop/7. Security/Mitigations/Enable All Mitigations.cmd
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/Mitigations/Fault Tolerant Heap/Disable FTH (default).reg b/src/playbook/Executables/AtlasDesktop/7. Security/Mitigations/Fault Tolerant Heap/Disable FTH (default).reg
similarity index 100%
rename from src/playbook/Executables/AtlasDesktop/3. Configuration/Mitigations/Fault Tolerant Heap/Disable FTH (default).reg
rename to src/playbook/Executables/AtlasDesktop/7. Security/Mitigations/Fault Tolerant Heap/Disable FTH (default).reg
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/Mitigations/Fault Tolerant Heap/Enable FTH.reg b/src/playbook/Executables/AtlasDesktop/7. Security/Mitigations/Fault Tolerant Heap/Enable FTH.reg
similarity index 100%
rename from src/playbook/Executables/AtlasDesktop/3. Configuration/Mitigations/Fault Tolerant Heap/Enable FTH.reg
rename to src/playbook/Executables/AtlasDesktop/7. Security/Mitigations/Fault Tolerant Heap/Enable FTH.reg
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/Mitigations/Fault Tolerant Heap/Reset FTH entries.lnk b/src/playbook/Executables/AtlasDesktop/7. Security/Mitigations/Fault Tolerant Heap/Reset FTH entries.lnk
similarity index 100%
rename from src/playbook/Executables/AtlasDesktop/3. Configuration/Mitigations/Fault Tolerant Heap/Reset FTH entries.lnk
rename to src/playbook/Executables/AtlasDesktop/7. Security/Mitigations/Fault Tolerant Heap/Reset FTH entries.lnk
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/Mitigations/Set Windows Default Mitigations.cmd b/src/playbook/Executables/AtlasDesktop/7. Security/Mitigations/Set Windows Default Mitigations.cmd
similarity index 100%
rename from src/playbook/Executables/AtlasDesktop/3. Configuration/Mitigations/Set Windows Default Mitigations.cmd
rename to src/playbook/Executables/AtlasDesktop/7. Security/Mitigations/Set Windows Default Mitigations.cmd
diff --git a/src/playbook/Executables/AtlasDesktop/8. Troubleshooting/Services/Run with RunAsTI.lnk b/src/playbook/Executables/AtlasDesktop/8. Troubleshooting/Run with RunAsTI.lnk
similarity index 100%
rename from src/playbook/Executables/AtlasDesktop/8. Troubleshooting/Services/Run with RunAsTI.lnk
rename to src/playbook/Executables/AtlasDesktop/8. Troubleshooting/Run with RunAsTI.lnk
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/Troubleshooting/Disable Troubleshooting (default).cmd b/src/playbook/Executables/AtlasDesktop/8. Troubleshooting/Service/Disable Troubleshooting (default).cmd
similarity index 100%
rename from src/playbook/Executables/AtlasDesktop/3. Configuration/Troubleshooting/Disable Troubleshooting (default).cmd
rename to src/playbook/Executables/AtlasDesktop/8. Troubleshooting/Service/Disable Troubleshooting (default).cmd
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/Troubleshooting/Enable Troubleshooting.cmd b/src/playbook/Executables/AtlasDesktop/8. Troubleshooting/Service/Enable Troubleshooting.cmd
similarity index 100%
rename from src/playbook/Executables/AtlasDesktop/3. Configuration/Troubleshooting/Enable Troubleshooting.cmd
rename to src/playbook/Executables/AtlasDesktop/8. Troubleshooting/Service/Enable Troubleshooting.cmd