diff --git a/src/playbook/Configuration/custom.yml b/src/playbook/Configuration/custom.yml
index 01c2896c1b..9ecade0515 100644
--- a/src/playbook/Configuration/custom.yml
+++ b/src/playbook/Configuration/custom.yml
@@ -28,7 +28,7 @@ actions:
     # Prevent annoying notifications during deployment
   - !taskKill: {name: 'explorer'}
   - !cmd:
-    command: '"AtlasDesktop\3. General Configuration\Notifications\Disable Notifications.cmd" /includeuserservice'
+    command: '"AtlasDesktop\6. General Configuration\Services\Notifications\Disable Notifications.cmd" /includeuserservice'
     exeDir: true
     wait: true
     runas: currentUserElevated
diff --git a/src/playbook/Configuration/tweaks/misc/enable-notifications.yml b/src/playbook/Configuration/tweaks/misc/enable-notifications.yml
index 8c103b6840..726e05f758 100644
--- a/src/playbook/Configuration/tweaks/misc/enable-notifications.yml
+++ b/src/playbook/Configuration/tweaks/misc/enable-notifications.yml
@@ -3,6 +3,6 @@ title: Enable Notifications
 description: Notifications were turned off at the start of the Playbook to prevent random notifications from interfering with the process. This task re-enables notifications if the user chose to do so.
 actions:
   - !cmd:
-    command: '"AtlasDesktop\3. General Configuration\Notifications\Enable Notifications.cmd" /silent'
+    command: '"AtlasDesktop\6. General Configuration\Services\Notifications\Enable Notifications.cmd" /silent'
     exeDir: true
     wait: true
diff --git a/src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/NVIDIA Display Container/Context Menu/Enable Container Context Menu.cmd b/src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/NVIDIA Display Container/Context Menu/Enable Container Context Menu.cmd
index 3f99dfe972..0223404daf 100644
--- a/src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/NVIDIA Display Container/Context Menu/Enable Container Context Menu.cmd	
+++ b/src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/NVIDIA Display Container/Context Menu/Enable Container Context Menu.cmd	
@@ -29,10 +29,10 @@ reg add "HKCR\DesktopBackground\Shell\NVIDIAContainer" /v "Position" /t REG_SZ /
 reg add "HKCR\DesktopBackground\Shell\NVIDIAContainer" /v "SubCommands" /t REG_SZ /d "" /f > nul
 reg add "HKCR\DesktopBackground\shell\NVIDIAContainer\shell\NVIDIAContainer001" /v "HasLUAShield" /t REG_SZ /d "" /f > nul
 reg add "HKCR\DesktopBackground\shell\NVIDIAContainer\shell\NVIDIAContainer001" /v "MUIVerb" /t REG_SZ /d "Enable NVIDIA Display Container LS" /f > nul
-reg add "HKCR\DesktopBackground\shell\NVIDIAContainer\shell\NVIDIAContainer001\command" /ve /t REG_SZ /d "\"%windir%\AtlasDesktop\3. General Configuration\NVIDIA Display Container\Enable NVIDIA Display Container LS.cmd"" /f > nul
+reg add "HKCR\DesktopBackground\shell\NVIDIAContainer\shell\NVIDIAContainer001\command" /ve /t REG_SZ /d "\"%windir%\AtlasDesktop\6. Advanced Configuration\NVIDIA Display Container\Enable NVIDIA Display Container LS.cmd"" /f > nul
 reg add "HKCR\DesktopBackground\shell\NVIDIAContainer\shell\NVIDIAContainer002" /v "HasLUAShield" /t REG_SZ /d "" /f > nul
 reg add "HKCR\DesktopBackground\shell\NVIDIAContainer\shell\NVIDIAContainer002" /v "MUIVerb" /t REG_SZ /d "Disable NVIDIA Display Container LS" /f > nul
-reg add "HKCR\DesktopBackground\shell\NVIDIAContainer\shell\NVIDIAContainer002\command" /ve /t REG_SZ /d "\"%windir%\AtlasDesktop\3. General Configuration\NVIDIA Display Container\Disable NVIDIA Display Container LS.cmd"" /f > nul
+reg add "HKCR\DesktopBackground\shell\NVIDIAContainer\shell\NVIDIAContainer002\command" /ve /t REG_SZ /d "\"%windir%\AtlasDesktop\6. Advanced Configuration\NVIDIA Display Container\Disable NVIDIA Display Container LS.cmd"" /f > nul
 
 taskkill /f /im explorer.exe > nul 2>&1
 start explorer.exe
diff --git a/src/playbook/Executables/AtlasModules/Scripts/ScriptWrappers/DisableFileSharing.ps1 b/src/playbook/Executables/AtlasModules/Scripts/ScriptWrappers/DisableFileSharing.ps1
index 974554f8cf..315b39eae0 100644
--- a/src/playbook/Executables/AtlasModules/Scripts/ScriptWrappers/DisableFileSharing.ps1
+++ b/src/playbook/Executables/AtlasModules/Scripts/ScriptWrappers/DisableFileSharing.ps1
@@ -4,7 +4,7 @@ param (
     [switch]$Silent
 )
 
-$networkDiscoveryConfigPath = "$([Environment]::GetFolderPath('Windows'))\AtlasDesktop\3. General Configuration\Network Discovery"
+$fileSharingConfigPath = "$([Environment]::GetFolderPath('Windows'))\AtlasDesktop\3. General Configuration\File Sharing"
 
 # Disable network items
 Disable-NetAdapterBinding -Name "*" -ComponentID ms_msclient, ms_server, ms_lltdio, ms_rspndr | Out-Null
diff --git a/src/playbook/Executables/AtlasModules/Scripts/ScriptWrappers/EnableFileSharing.ps1 b/src/playbook/Executables/AtlasModules/Scripts/ScriptWrappers/EnableFileSharing.ps1
index 8d65d7cb2d..ffb46772df 100644
--- a/src/playbook/Executables/AtlasModules/Scripts/ScriptWrappers/EnableFileSharing.ps1
+++ b/src/playbook/Executables/AtlasModules/Scripts/ScriptWrappers/EnableFileSharing.ps1
@@ -1,12 +1,12 @@
 #Requires -RunAsAdministrator
 
-$networkDiscoveryConfigPath = "$([Environment]::GetFolderPath('Windows'))\AtlasDesktop\3. General Configuration\Network Discovery"
+$networkDiscoveryConfigPath = "$([Environment]::GetFolderPath('Windows'))\AtlasDesktop\6. Advanced Configuration\Services\Network Discovery"
 
 # Enable network items
 Enable-NetAdapterBinding -Name "*" -ComponentID ms_msclient, ms_server, ms_lltdio, ms_rspndr | Out-Null
 
 # Enable Network Discovery services and its dependencies
-Start-Process -FilePath "$networkDiscoveryConfigPath\Enable Network Discovery Services (default)" -ArgumentList "/silent" -WindowStyle Hidden
+Start-Process -FilePath "$networkDiscoveryConfigPath\Enable Network Discovery Services (default).cmd" -ArgumentList "/silent" -WindowStyle Hidden
 
 # Enable NetBios over TCP/IP
 $interfaces = Get-ChildItem "HKLM:\SYSTEM\CurrentControlSet\Services\NetBT\Parameters\Interfaces" -Recurse | Where-Object { $_.GetValue("NetbiosOptions") -ne $null }
@@ -38,7 +38,7 @@ if ($LASTEXITCODE -eq 1) {
 
 choice /c:yn /n /m "Would you like to add the Network Navigation Pane to the Explorer sidebar? [Y/N] "
 if ($LASTEXITCODE -eq 1) {
-    reg import "$networkDiscoveryConfigPath\Network Navigation Pane\User Network Navigation Pane choice.reg" | Out-Null
+    reg import "$([Environment]::GetFolderPath('Windows'))\AtlasDesktop\3. General Configuration\File Sharing\Network Navigation Pane\User Network Navigation Pane choice.reg" | Out-Null
 }
 
 Write-Host "Completed!" -ForegroundColor Green
diff --git a/src/playbook/Executables/AtlasModules/Scripts/newUsers.ps1 b/src/playbook/Executables/AtlasModules/Scripts/newUsers.ps1
index 39dcda1390..b112c1351b 100644
--- a/src/playbook/Executables/AtlasModules/Scripts/newUsers.ps1
+++ b/src/playbook/Executables/AtlasModules/Scripts/newUsers.ps1
@@ -44,7 +44,7 @@ if ([System.Environment]::OSVersion.Version.Build -ge 22000) {
 & "$atlasModules\Scripts\lockscreen.ps1"
 
 # Disable 'Network' in navigation pane
-reg import "$atlasDesktop\3. General Configuration\Network Discovery\Network Navigation Pane\Disable Network Navigation Pane (default).reg" *>$null
+reg import "$atlasDesktop\3. General Configuration\File Sharing\Network Navigation Pane\Disable Network Navigation Pane (default).reg" *>$null
 
 # Set visual effects
 & "$atlasDesktop\4. Interface Tweaks\Visual Effects\Atlas Visual Effects (default).cmd" /silent