diff --git a/setup-development/install-windows.ps1 b/setup-development/windows/install-windows.ps1
similarity index 96%
rename from setup-development/install-windows.ps1
rename to setup-development/windows/install-windows.ps1
index 6aba77d..36bb44f 100644
--- a/setup-development/install-windows.ps1
+++ b/setup-development/windows/install-windows.ps1
@@ -56,7 +56,8 @@ param (
    [switch]$DryRun                 # Run script without installing
 )
 
-$SetupPath = 'Mind_Reader/setup-development'
+$RepoPath  = "$GitDir\Mind_Reader"
+$SetupPath = "$RepoPath\setup-development\windows"
 
 if ($h -or $Help) {
    Get-Help ./install-windows.ps1
@@ -166,9 +167,11 @@ $args += if ($DryRun) {" -DryRun"} else {""}
 PowerShell ("./upgrade-windows.ps1 -Install -NoPrompt" + $args)
 
 # Open VSCode in the repository location
-code .
+Write-Host "`nOpening Visual Studio Code"
+cd $RepoPath
+Dry-Run "code ."
 
 cd $dir
 if ( -not $NoPrompt ) {
-   Write-Host "Press any key to exit."; [void][Console]::ReadKey(1)
+   Write-Host "`nPress any key to exit."; [void][Console]::ReadKey(1)
 }
\ No newline at end of file
diff --git a/setup-development/upgrade-windows.ps1 b/setup-development/windows/upgrade-windows.ps1
similarity index 98%
rename from setup-development/upgrade-windows.ps1
rename to setup-development/windows/upgrade-windows.ps1
index dbff3f3..e9cdd18 100644
--- a/setup-development/upgrade-windows.ps1
+++ b/setup-development/windows/upgrade-windows.ps1
@@ -157,7 +157,7 @@ $prev_directory = $pwd
 
 # install NodeJS dependencies for this extension
 Write-Host "`nInstalling NodeJS Dependencies..."
-cd ..
+cd ..\..
 Dry-Run 'npm install'
 
 # if we're on a known VSCode version, go ahead and run electron-rebuild
@@ -189,5 +189,5 @@ switch -Regex (code --version) {
 # Return from whence we came
 cd $prev_directory
 if ( -not $NoPrompt ) {
-   Write-Host "Press any key to exit."; [void][Console]::ReadKey(1)
+   Write-Host "`nPress any key to exit."; [void][Console]::ReadKey(1)
 }
\ No newline at end of file
diff --git a/setup-development/winget/dependencies.json b/setup-development/windows/winget/dependencies.json
similarity index 100%
rename from setup-development/winget/dependencies.json
rename to setup-development/windows/winget/dependencies.json