diff --git a/Makefile b/Makefile
index 30109bb..d50179d 100644
--- a/Makefile
+++ b/Makefile
@@ -185,11 +185,11 @@ sync-wsl:
 WIN = (Windows) # specific prefix since we're running it from WSL for windows
 sync-windows:
 # Scripts
-	@$(WGET) $(REPO_SRC)/windows/blockthespot.bat -O $(WIN_HOME)/Documents/Local/blockthespot.bat
-	@$(WGET) $(REPO_SRC)/windows/ctmpf.bat -O $(WIN_HOME)/Documents/Local/ctmpf.bat
 	@$(WGET) $(REPO_SRC)/windows/update.bat -O $(WIN_HOME)/Documents/Local/update.bat
+	@$(WGET) $(REPO_SRC)/windows/clean.bat -O $(WIN_HOME)/Documents/Local/ctmpf.bat
+	@$(WGET) $(REPO_SRC)/windows/installers/spotify.bat -O $(WIN_HOME)/Documents/Local/blockthespot.bat
+	@$(WGET) $(REPO_SRC)/windows/installers/vencord.bat -O $(WIN_HOME)/Documents/Local/vencord_installer.bat
 	@$(WGET) $(REPO_SRC)/windows/fix_nvidia_wsl.bat -O $(WIN_HOME)/Documents/Local/fix_nvidia_wsl.bat
-	@$(WGET) $(REPO_SRC)/windows/vencord_installer.bat -O $(WIN_HOME)/Documents/Local/vencord_installer.bat
 	@$(WGET) $(REPO_SRC)/windows/fix_mihoyo_shortcut.bat -O $(WIN_HOME)/Documents/Local/fix_mihoyo_shortcut.bat
 #	@$(WGET) $(REPO_SRC)/windows/fix_obs_shortcut.bat -O $(WIN_HOME)/Documents/Local/fix_obs_shortcut.bat
 	@echo "$(WIN) Scripts synced!"
diff --git a/windows/ctmpf.bat b/windows/clean.bat
similarity index 100%
rename from windows/ctmpf.bat
rename to windows/clean.bat
diff --git a/windows/blockthespot.bat b/windows/installers/spotify.bat
similarity index 100%
rename from windows/blockthespot.bat
rename to windows/installers/spotify.bat
diff --git a/windows/vencord_installer.bat b/windows/installers/vencord.bat
similarity index 100%
rename from windows/vencord_installer.bat
rename to windows/installers/vencord.bat
diff --git a/windows11.bat b/windows11.bat
index d59f83b..d94ce55 100644
--- a/windows11.bat
+++ b/windows11.bat
@@ -18,9 +18,19 @@ fltmc >NUL 2>&1 || (
     "del .\winget.msixbundle"
 
 
+  :: === Scripts from ./windows directory ==
+  PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/update.bat -OutFile '!local!\update.bat'"
+  PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/clean.bat -OutFile '!local!\ctmpf.bat'"
+  PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/installers/spotify.bat -OutFile '!local!\blockthespot.bat'"
+  PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/installers/vencord.bat -OutFile '!local!\vencord_installer.bat'"
+  PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/fix_nvidia_wsl.bat -OutFile '!local!\fix_nvidia_wsl.bat'"
+  PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/fix_mihoyo_shortcut.bat -OutFile '!local!\fix_mihoyo_shortcut.bat'"
+  :: PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/fix_obs_shortcut.bat -OutFile '!local!\fix_obs_shortcut.bat'"
+
+
   :: === Install Spotify ==
-  PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/blockthespot.bat -OutFile '!local!\blockthespot.bat'"
   DEL "%APPDATA%\Spotify"
+  :: Use already downloaded script
   ECHO Y| CMD /c "!local!\blockthespot.bat" yes
   PowerShell -Command "Stop-Process -Name Spotify -ErrorAction SilentlyContinue"
 
@@ -219,15 +229,6 @@ PowerShell -Command "Install-PackageProvider -Name NuGet -Force"
 PowerShell -Command "Install-Module -Name PSWindowsUpdate -Force"
 
 
-:: === Scripts from ./windows directory ==
-PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/ctmpf.bat -OutFile '!local!\ctmpf.bat'"
-PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/update.bat -OutFile '!local!\update.bat'"
-PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/fix_nvidia_wsl.bat -OutFile '!local!\fix_nvidia_wsl.bat'"
-PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/vencord_installer.bat -OutFile '!local!\vencord_installer.bat'"
-PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/fix_mihoyo_shortcut.bat -OutFile '!local!\fix_mihoyo_shortcut.bat'"
-:: PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/fix_obs_shortcut.bat -OutFile '!local!\fix_obs_shortcut.bat'"
-
-
 :: === Geek Uninstaller ==
 ECHO Geek Uninstaller...
 PowerShell -Command "" ^