diff --git a/archive/apps-connect.bat b/archive/old/apps-connect.bat
similarity index 100%
rename from archive/apps-connect.bat
rename to archive/old/apps-connect.bat
diff --git a/archive/apps-disconnect.bat b/archive/old/apps-disconnect.bat
similarity index 100%
rename from archive/apps-disconnect.bat
rename to archive/old/apps-disconnect.bat
diff --git a/archive/apps-manager.bat b/archive/old/apps-manager.bat
similarity index 100%
rename from archive/apps-manager.bat
rename to archive/old/apps-manager.bat
diff --git a/archive/apps-reconnect.bat b/archive/old/apps-reconnect.bat
similarity index 100%
rename from archive/apps-reconnect.bat
rename to archive/old/apps-reconnect.bat
diff --git a/data/apps/[archive]/64Gram.bat b/archive/old/data/[all]/64Gram.bat
similarity index 100%
rename from data/apps/[archive]/64Gram.bat
rename to archive/old/data/[all]/64Gram.bat
diff --git a/data/apps/[all]/AIMP.bat b/archive/old/data/[all]/AIMP.bat
similarity index 100%
rename from data/apps/[all]/AIMP.bat
rename to archive/old/data/[all]/AIMP.bat
diff --git a/data/apps/[archive]/EqualizerAPO.bat b/archive/old/data/[all]/EqualizerAPO.bat
similarity index 100%
rename from data/apps/[archive]/EqualizerAPO.bat
rename to archive/old/data/[all]/EqualizerAPO.bat
diff --git a/data/apps/[archive]/KeePassXC.bat b/archive/old/data/[all]/KeePassXC.bat
similarity index 100%
rename from data/apps/[archive]/KeePassXC.bat
rename to archive/old/data/[all]/KeePassXC.bat
diff --git a/data/apps/[archive]/Nekoray.bat b/archive/old/data/[all]/Nekoray.bat
similarity index 100%
rename from data/apps/[archive]/Nekoray.bat
rename to archive/old/data/[all]/Nekoray.bat
diff --git a/data/apps/[archive]/Playnite.bat b/archive/old/data/[all]/Playnite.bat
similarity index 100%
rename from data/apps/[archive]/Playnite.bat
rename to archive/old/data/[all]/Playnite.bat
diff --git a/data/apps/[archive]/Powertoys.bat b/archive/old/data/[all]/Powertoys.bat
similarity index 100%
rename from data/apps/[archive]/Powertoys.bat
rename to archive/old/data/[all]/Powertoys.bat
diff --git a/data/apps/[archive]/PrismLauncher.bat b/archive/old/data/[all]/PrismLauncher.bat
similarity index 100%
rename from data/apps/[archive]/PrismLauncher.bat
rename to archive/old/data/[all]/PrismLauncher.bat
diff --git a/data/apps/[archive]/Sublime Text.bat b/archive/old/data/[all]/Sublime Text.bat
similarity index 100%
rename from data/apps/[archive]/Sublime Text.bat
rename to archive/old/data/[all]/Sublime Text.bat
diff --git a/data/apps/[archive]/SumatraPDF.bat b/archive/old/data/[all]/SumatraPDF.bat
similarity index 100%
rename from data/apps/[archive]/SumatraPDF.bat
rename to archive/old/data/[all]/SumatraPDF.bat
diff --git a/data/apps/[archive]/Syncthing.bat b/archive/old/data/[all]/Syncthing.bat
similarity index 100%
rename from data/apps/[archive]/Syncthing.bat
rename to archive/old/data/[all]/Syncthing.bat
diff --git a/data/apps/[archive]/Transmission.bat b/archive/old/data/[all]/Transmission.bat
similarity index 100%
rename from data/apps/[archive]/Transmission.bat
rename to archive/old/data/[all]/Transmission.bat
diff --git a/data/apps/[archive]/VSCodium.bat b/archive/old/data/[all]/VSCodium.bat
similarity index 100%
rename from data/apps/[archive]/VSCodium.bat
rename to archive/old/data/[all]/VSCodium.bat
diff --git a/data/apps/[archive]/beets.bat b/archive/old/data/[all]/beets.bat
similarity index 100%
rename from data/apps/[archive]/beets.bat
rename to archive/old/data/[all]/beets.bat
diff --git a/data/apps/[archive]/glzr.bat b/archive/old/data/[all]/glzr.bat
similarity index 100%
rename from data/apps/[archive]/glzr.bat
rename to archive/old/data/[all]/glzr.bat
diff --git a/data/apps/[archive]/gramps.bat b/archive/old/data/[all]/gramps.bat
similarity index 100%
rename from data/apps/[archive]/gramps.bat
rename to archive/old/data/[all]/gramps.bat
diff --git a/data/apps/[archive]/hfdownloader.bat b/archive/old/data/[all]/hfdownloader.bat
similarity index 100%
rename from data/apps/[archive]/hfdownloader.bat
rename to archive/old/data/[all]/hfdownloader.bat
diff --git a/data/apps/[archive]/ludusavi.bat b/archive/old/data/[all]/ludusavi.bat
similarity index 100%
rename from data/apps/[archive]/ludusavi.bat
rename to archive/old/data/[all]/ludusavi.bat
diff --git a/data/apps/[archive]/v2rayN.bat b/archive/old/data/[all]/v2rayN.bat
similarity index 100%
rename from data/apps/[archive]/v2rayN.bat
rename to archive/old/data/[all]/v2rayN.bat
diff --git a/data/apps/legacy/EqualizerAPO.bat b/archive/old/data/legacy/EqualizerAPO.bat
similarity index 100%
rename from data/apps/legacy/EqualizerAPO.bat
rename to archive/old/data/legacy/EqualizerAPO.bat
diff --git a/data/mounts/all.bat b/archive/old/data/mounts/all.bat
similarity index 95%
rename from data/mounts/all.bat
rename to archive/old/data/mounts/all.bat
index dc397e8..6177617 100644
--- a/data/mounts/all.bat
+++ b/archive/old/data/mounts/all.bat
@@ -1,33 +1,33 @@
-@echo off
-
-:: .ssh
-setlocal
-set "from_1=%storage%\SSH\%user-name%"
-set "to_1=%USERPROFILE%\.ssh"
-rd /q "%to_1%"
-mklink /D "%to_1%" "%from_1%"
-endlocal
-
-:: Bash
-setlocal
-set "from_1=%storage%\User Folder\.bashrc"
-set "to_1=%USERPROFILE%\.bashrc"
-set "from_2=%storage%\User Folder\.inputrc"
-set "to_2=%USERPROFILE%\.inputrc"
-set "from_3=%storage%\User Folder\.gitconfig"
-set "to_3=%USERPROFILE%\.gitconfig"
-del /q "%to_1%"
-del /q "%to_2%"
-del /q "%to_3%"
-mklink "%to_1%" "%from_1%"
-mklink "%to_2%" "%from_2%"
-mklink "%to_3%" "%from_3%"
-endlocal
-
-:: WSL
-setlocal
-set "from_1=%storage%\User Folder\.wslconfig"
-set "to_1=%USERPROFILE%\.wslconfig"
-del /q "%to_1%"
-mklink "%to_1%" "%from_1%"
+@echo off
+
+:: .ssh
+setlocal
+set "from_1=%storage%\SSH\%user-name%"
+set "to_1=%USERPROFILE%\.ssh"
+rd /q "%to_1%"
+mklink /D "%to_1%" "%from_1%"
+endlocal
+
+:: Bash
+setlocal
+set "from_1=%storage%\User Folder\.bashrc"
+set "to_1=%USERPROFILE%\.bashrc"
+set "from_2=%storage%\User Folder\.inputrc"
+set "to_2=%USERPROFILE%\.inputrc"
+set "from_3=%storage%\User Folder\.gitconfig"
+set "to_3=%USERPROFILE%\.gitconfig"
+del /q "%to_1%"
+del /q "%to_2%"
+del /q "%to_3%"
+mklink "%to_1%" "%from_1%"
+mklink "%to_2%" "%from_2%"
+mklink "%to_3%" "%from_3%"
+endlocal
+
+:: WSL
+setlocal
+set "from_1=%storage%\User Folder\.wslconfig"
+set "to_1=%USERPROFILE%\.wslconfig"
+del /q "%to_1%"
+mklink "%to_1%" "%from_1%"
 endlocal
\ No newline at end of file
diff --git a/archive/deploy.bat b/archive/old/deploy.bat
similarity index 100%
rename from archive/deploy.bat
rename to archive/old/deploy.bat
diff --git a/modules/mounts-connect.bat b/archive/old/modules/mounts-connect.bat
similarity index 100%
rename from modules/mounts-connect.bat
rename to archive/old/modules/mounts-connect.bat
diff --git a/modules/storage-reconnect.bat b/archive/old/modules/storage-reconnect.bat
similarity index 100%
rename from modules/storage-reconnect.bat
rename to archive/old/modules/storage-reconnect.bat
diff --git a/settings/init.bat b/archive/old/settings/init.bat
similarity index 94%
rename from settings/init.bat
rename to archive/old/settings/init.bat
index 0164192..82c47ea 100644
--- a/settings/init.bat
+++ b/archive/old/settings/init.bat
@@ -1,7 +1,7 @@
-@echo off
-
-cd /d "%~dp0"
-set "root=%~dp0..\"
-
-set "vars=%root%\settings\vars.bat"
+@echo off
+
+cd /d "%~dp0"
+set "root=%~dp0..\"
+
+set "vars=%root%\settings\vars.bat"
 call "%vars%"
\ No newline at end of file
diff --git a/settings/vars.bat b/archive/old/settings/vars.bat
similarity index 95%
rename from settings/vars.bat
rename to archive/old/settings/vars.bat
index 3da6124..359bc8e 100644
--- a/settings/vars.bat
+++ b/archive/old/settings/vars.bat
@@ -1,32 +1,32 @@
-:: LOCAL ::
-
-:: Package Managers
-set "winget=%root%\winget.ps1"
-
-:: Local Root
-set "data=%root%\data"
-
-:: Packages
-set "packages=%data%\packages"
-set "packages-installer=%packages%\install.bat"
-set "packages-all-lists=%packages%\[all]"
-set "packages-user-lists=%packages%\%computername%"
-set "packages-user-lists-other=%packages-user-lists%\other.bat"
-
-:: Apps
-set "apps=%data%\apps"
-set "apps-all=%apps%\all.csv"
-set "apps-legacy=%apps%\legacy"
-set "apps-user=%apps%\%computername%"
-:: Mounts
-set "mounts=%data%\mounts"
-
-
-:: GLOBAL ::
-set "disk-label=S:"
-set "user-name=oqyude"
-
-:: Main Folder
-set "games=%disk-label%\Games"
-set "storage=%userprofile%\Storage"
+:: LOCAL ::
+
+:: Package Managers
+set "winget=%root%\winget.ps1"
+
+:: Local Root
+set "data=%root%\data"
+
+:: Packages
+set "packages=%data%\packages"
+set "packages-installer=%packages%\install.bat"
+set "packages-all-lists=%packages%\[all]"
+set "packages-user-lists=%packages%\%computername%"
+set "packages-user-lists-other=%packages-user-lists%\other.bat"
+
+:: Apps
+set "apps=%data%\apps"
+set "apps-all=%apps%\all.csv"
+set "apps-legacy=%apps%\legacy"
+set "apps-user=%apps%\%computername%"
+:: Mounts
+set "mounts=%data%\mounts"
+
+
+:: GLOBAL ::
+set "disk-label=S:"
+set "user-name=oqyude"
+
+:: Main Folder
+set "games=%disk-label%\Games"
+set "storage=%userprofile%\Storage"
 set "storage-games=N:\Games\.storage"
\ No newline at end of file
diff --git a/archive/test.bat b/archive/old/test.bat
similarity index 100%
rename from archive/test.bat
rename to archive/old/test.bat
diff --git a/data/apps/all.csv b/data/all.csv
similarity index 100%
rename from data/apps/all.csv
rename to data/all.csv
diff --git a/settings/vars.ps1 b/settings/vars.ps1
index 1519569..c625702 100644
--- a/settings/vars.ps1
+++ b/settings/vars.ps1
@@ -6,18 +6,11 @@ $winget = "$PSScriptRoot\winget.ps1"
 # Local Root
 $data = "$root\data"
 
-# Packages
-$packages = "$data\packages"
-$packagesInstaller = "$packages\install.bat"
-$packagesAllLists = "$packages\[all]"
-$packagesUserLists = "$packages\$env:COMPUTERNAME"
-$packagesUserListsOther = "$packagesUserLists\other.bat"
-
 # Apps
 $apps = "$data\apps"
-$appsAll = "$apps\all.csv"
-$appsLegacy = "$apps\legacy"
+$appsAll = "$data\all.csv"
 $appsUser = "$apps\$env:COMPUTERNAME"
+$appsLegacy = "$apps\legacy"
 
 # Mounts
 $mounts = "$data\mounts"