diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml
index bab0ea1..892a698 100644
--- a/.ci/azure-pipelines.yml
+++ b/.ci/azure-pipelines.yml
@@ -54,7 +54,7 @@ jobs:
         displayName: "Build NSIS Installer"
         inputs:
           targetType: "filePath"
-          filePath: ./deployment/windows/build-jellyfin.ps1
+          filePath: build-jellyfin.ps1
           arguments: -InstallFFMPEG -InstallNSSM -MakeNSIS -InstallTrayApp -UXLocation $(Agent.TempDirectory)\jellyfin-ux -InstallLocation $(build.artifactstagingdirectory)
           errorActionPreference: "stop"
           workingDirectory: $(Build.SourcesDirectory)
@@ -62,7 +62,7 @@ jobs:
       - task: CopyFiles@2
         displayName: "Copy NSIS Installer"
         inputs:
-          sourceFolder: $(Build.SourcesDirectory)/deployment/windows/
+          sourceFolder: $(Build.SourcesDirectory)/nsis
           contents: "jellyfin*.exe"
           targetFolder: $(System.ArtifactsDirectory)/setup
           cleanTargetFolder: true
diff --git a/Jellyfin.Windows.Tray.sln b/Jellyfin.Windows.Tray.sln
index e17ab1d..7971209 100644
--- a/Jellyfin.Windows.Tray.sln
+++ b/Jellyfin.Windows.Tray.sln
@@ -1,9 +1,9 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.Windows.Tray", "src\Jellyfin.Windows.Tray\Jellyfin.Windows.Tray.csproj", "{84B8A4C7-8BB5-48A4-8D59-BAEEF637F914}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.Windows.Tray", "Jellyfin.Windows.Tray\Jellyfin.Windows.Tray.csproj", "{84B8A4C7-8BB5-48A4-8D59-BAEEF637F914}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/build-jellyfin.ps1 b/build-jellyfin.ps1
index c762137..b6f64cd 100644
--- a/build-jellyfin.ps1
+++ b/build-jellyfin.ps1
@@ -116,11 +116,11 @@ function Make-NSIS {
 
     $env:InstallLocation = $ResolvedInstallLocation
     if($InstallNSIS.IsPresent -or ($InstallNSIS -eq $true)){
-        & "$tempdir/nsis/nsis-3.04/makensis.exe" /D$Architecture /DUXPATH=$ResolvedUXLocation ".\deployment\windows\jellyfin.nsi"
+        & "$tempdir/nsis/nsis-3.04/makensis.exe" /D$Architecture /DUXPATH=$ResolvedUXLocation ".\nsis\jellyfin.nsi"
     } else {
-        & "makensis" /D$Architecture /DUXPATH=$ResolvedUXLocation ".\deployment\windows\jellyfin.nsi"
+        & "makensis" /D$Architecture /DUXPATH=$ResolvedUXLocation ".\nsis\jellyfin.nsi"
     }
-    Copy-Item .\deployment\windows\jellyfin_*.exe $ResolvedInstallLocation\..\
+    Copy-Item .\nsis\jellyfin_*.exe $ResolvedInstallLocation\..\
 }
 
 
@@ -169,8 +169,6 @@ if($InstallTrayApp.IsPresent -or ($InstallTrayApp -eq $true)){
     Write-Verbose "Downloading Windows Tray App"
     Install-TrayApp $ResolvedInstallLocation $Architecture
 }
-#Copy-Item .\deployment\windows\install-jellyfin.ps1 $ResolvedInstallLocation\install-jellyfin.ps1
-#Copy-Item .\deployment\windows\install.bat $ResolvedInstallLocation\install.bat
 Copy-Item .\LICENSE $ResolvedInstallLocation\LICENSE
 if($InstallNSIS.IsPresent -or ($InstallNSIS -eq $true)){
     Write-Verbose "Installing NSIS"