From e0561e076c13b3e62948b77c3b66d95186ae4efc Mon Sep 17 00:00:00 2001
From: bschaper <bschaper@tcse.us>
Date: Fri, 20 Dec 2024 13:27:30 -0600
Subject: [PATCH] Cleaned Up Registry Folder/Imports

---
 .../Registry/Enable-Touch-Monitor.reg               | Bin
 {StartLayouts => Patches/Registry}/TCSE-Layout.xml  |   0
 .../Registry/Taskbar-Layout-Admin.reg               | Bin
 .../Registry/Taskbar-Layout-User.reg                | Bin
 .../Windows/Import-Registry-Changes.ps1             |   4 ++--
 TCSE-Computer-Deploy.bat                            |   8 ++++----
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename StartLayouts/TCSE-Touch-Monitor.reg => Patches/Registry/Enable-Touch-Monitor.reg (100%)
 rename {StartLayouts => Patches/Registry}/TCSE-Layout.xml (100%)
 rename StartLayouts/TCSE-Layout-Import-Admin.reg => Patches/Registry/Taskbar-Layout-Admin.reg (100%)
 rename StartLayouts/TCSE-Layout-Import-User.reg => Patches/Registry/Taskbar-Layout-User.reg (100%)
 rename StartLayouts/Set-Taskbar-Layout.ps1 => Patches/Windows/Import-Registry-Changes.ps1 (78%)

diff --git a/StartLayouts/TCSE-Touch-Monitor.reg b/Patches/Registry/Enable-Touch-Monitor.reg
similarity index 100%
rename from StartLayouts/TCSE-Touch-Monitor.reg
rename to Patches/Registry/Enable-Touch-Monitor.reg
diff --git a/StartLayouts/TCSE-Layout.xml b/Patches/Registry/TCSE-Layout.xml
similarity index 100%
rename from StartLayouts/TCSE-Layout.xml
rename to Patches/Registry/TCSE-Layout.xml
diff --git a/StartLayouts/TCSE-Layout-Import-Admin.reg b/Patches/Registry/Taskbar-Layout-Admin.reg
similarity index 100%
rename from StartLayouts/TCSE-Layout-Import-Admin.reg
rename to Patches/Registry/Taskbar-Layout-Admin.reg
diff --git a/StartLayouts/TCSE-Layout-Import-User.reg b/Patches/Registry/Taskbar-Layout-User.reg
similarity index 100%
rename from StartLayouts/TCSE-Layout-Import-User.reg
rename to Patches/Registry/Taskbar-Layout-User.reg
diff --git a/StartLayouts/Set-Taskbar-Layout.ps1 b/Patches/Windows/Import-Registry-Changes.ps1
similarity index 78%
rename from StartLayouts/Set-Taskbar-Layout.ps1
rename to Patches/Windows/Import-Registry-Changes.ps1
index 875803f..54d5208 100644
--- a/StartLayouts/Set-Taskbar-Layout.ps1
+++ b/Patches/Windows/Import-Registry-Changes.ps1
@@ -1,5 +1,5 @@
 # Define the directory containing the .reg files
-$regFilesDir = "C:\Scripts\StartLayouts"
+$regFilesDir = "C:\Scripts\Patches\Registry"
 
 # Get an array of all .reg files in the directory
 $regFiles = Get-ChildItem -Path $regFilesDir -Filter "*.reg"
@@ -13,4 +13,4 @@ foreach ($regFile in $regFiles) {
 Taskkill /F /IM explorer.exe
 Start-Process explorer.exe
 
-Write-Host "Taskbar layout successfully imported..."
\ No newline at end of file
+Write-Host "Registry changes successfully imported..."
\ No newline at end of file
diff --git a/TCSE-Computer-Deploy.bat b/TCSE-Computer-Deploy.bat
index 848c005..f7c723e 100644
--- a/TCSE-Computer-Deploy.bat
+++ b/TCSE-Computer-Deploy.bat
@@ -61,10 +61,10 @@ winget install --exact --id Adobe.Acrobat.Reader.64-bit --silent
 :: Enable UAC
 powershell Set-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System" -Name EnableLUA -Value 1 -Force
 
-:: Set Taskbar Layout for All Users
-echo Setting Taskbar Layout...
-powershell -ExecutionPolicy Bypass -File "C:\Scripts\StartLayouts\Set-Taskbar-Layout.ps1"
-echo Taskbar Layout is Set...
+:: Import Registry Changes
+echo Importing Registry Changes...
+powershell -ExecutionPolicy Bypass -File "C:\Scripts\Patches\Windows\Import-Registry-Changes.ps1"
+echo Registry Changes Imported...
 
 :: Delete Shortcuts from Public Desktop Folder
 echo Deleting Shortcuts from Public Desktop Folder...