diff --git a/src/playbook/Configuration/tweaks/scripts/script-mitigations.yml b/src/playbook/Configuration/tweaks/scripts/script-mitigations.yml
index 6d6da73617..b15e9a2fb9 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/3. Configuration/User Account Control (UAC)/Configure UAC.lnk b/src/playbook/Executables/AtlasDesktop/7. Security/User Account Control (UAC)/Configure UAC.lnk
similarity index 100%
rename from src/playbook/Executables/AtlasDesktop/3. Configuration/User Account Control (UAC)/Configure UAC.lnk
rename to src/playbook/Executables/AtlasDesktop/7. Security/User Account Control (UAC)/Configure UAC.lnk
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/User Account Control (UAC)/Disable UAC.cmd b/src/playbook/Executables/AtlasDesktop/7. Security/User Account Control (UAC)/Disable UAC.cmd
similarity index 92%
rename from src/playbook/Executables/AtlasDesktop/3. Configuration/User Account Control (UAC)/Disable UAC.cmd
rename to src/playbook/Executables/AtlasDesktop/7. Security/User Account Control (UAC)/Disable UAC.cmd
index d48c4d2bce..05854b1508 100644
--- a/src/playbook/Executables/AtlasDesktop/3. Configuration/User Account Control (UAC)/Disable UAC.cmd	
+++ b/src/playbook/Executables/AtlasDesktop/7. Security/User Account Control (UAC)/Disable UAC.cmd	
@@ -25,7 +25,7 @@ reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System" /v "Ena
 reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System" /v "PromptOnSecureDesktop" /t REG_DWORD /d "0" /f > nul
 
 :: Lock UserAccountControlSettings.exe - users can enable UAC from there without luafv enabled, which breaks UAC completely and causes issues
-reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\UserAccountControlSettings.exe" /v "Debugger" /t REG_SZ /d "\"C:\Windows\AtlasDesktop\3. Configuration\User Account Control (UAC)\Enable UAC (default).cmd\" /uacSettings" /f > nul
+reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\UserAccountControlSettings.exe" /v "Debugger" /t REG_SZ /d "\"C:\Windows\AtlasDesktop\7. Security\User Account Control (UAC)\Enable UAC (default).cmd\" /uacSettings" /f > nul
 
 call setSvc.cmd luafv 4
 
diff --git a/src/playbook/Executables/AtlasDesktop/3. Configuration/User Account Control (UAC)/Enable UAC (default).cmd b/src/playbook/Executables/AtlasDesktop/7. Security/User Account Control (UAC)/Enable UAC (default).cmd
similarity index 100%
rename from src/playbook/Executables/AtlasDesktop/3. Configuration/User Account Control (UAC)/Enable UAC (default).cmd
rename to src/playbook/Executables/AtlasDesktop/7. Security/User Account Control (UAC)/Enable UAC (default).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