diff --git a/build_windows_installer.bat b/build_windows_installer.bat
index 32bc95382..f623b9799 100644
--- a/build_windows_installer.bat
+++ b/build_windows_installer.bat
@@ -9,7 +9,7 @@ rem %rootdir% is the root directory of the respository. "." assumes the current
 rem Make sure to surround the directory in quotes (") in case it includes spaces.
 set rootdir=.
 
-set isspath=%rootdir%\windows-installer
+set isspath=%rootdir%\contrib\windows\installer
 set vsbinpath=%rootdir%\release\windows
 set mgbinpath=%rootdir%\..
 
diff --git a/windows-installer/7za.exe b/contrib/windows/installer/7za.exe
similarity index 100%
rename from windows-installer/7za.exe
rename to contrib/windows/installer/7za.exe
diff --git a/windows-installer/DOSBox-X-setup.iss b/contrib/windows/installer/DOSBox-X-setup.iss
similarity index 96%
rename from windows-installer/DOSBox-X-setup.iss
rename to contrib/windows/installer/DOSBox-X-setup.iss
index 07526a3e0..aa278a747 100644
--- a/windows-installer/DOSBox-X-setup.iss
+++ b/contrib/windows/installer/DOSBox-X-setup.iss
@@ -24,7 +24,7 @@ InfoBeforeFile=setup_preamble.txt
 InfoAfterFile=setup_epilogue.txt
 OutputDir=.\
 OutputBaseFilename=DOSBox-X-setup
-SetupIconFile=.\dosbox-x.ico
+SetupIconFile=..\..\icons\dosbox-x.ico
 Compression=lzma
 SolidCompression=yes
 UsePreviousAppDir=yes
@@ -38,7 +38,7 @@ AlwaysShowGroupOnReadyPage=yes
 ArchitecturesInstallIn64BitMode=x64
 PrivilegesRequired=lowest
 UninstallDisplayIcon={app}\{#MyAppExeName}
-WizardSmallImageFile=.\dosbox-x.bmp
+WizardSmallImageFile=..\..\icons\dosbox-x.bmp
 
 [Messages]
 InfoBeforeLabel=Please read the general information about DOSBox-X below.
@@ -64,10 +64,10 @@ Name: "full"; Description: "Copy all builds to subdirectories";   Types: full
 [Files]
 Source: ".\readme.txt"; DestDir: "{app}"; DestName: "README.txt"; Flags: ignoreversion; Components: full compact
 Source: ".\dosbox-x.reference.conf"; DestDir: "{app}"; Flags: ignoreversion; Components: full compact
-Source: "..\CHANGELOG"; DestDir: "{app}"; DestName: "changelog.txt"; Flags: ignoreversion; Components: full compact
-Source: "..\COPYING"; DestDir: "{app}"; DestName: "COPYING.txt"; Flags: ignoreversion; Components: full compact
-Source: "..\contrib\fonts\FREECG98.BMP"; DestDir: "{app}"; Flags: ignoreversion; Components: full compact
-Source: "..\shaders\*"; DestDir: "{app}\shaders"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: full compact
+Source: "..\..\..\CHANGELOG"; DestDir: "{app}"; DestName: "changelog.txt"; Flags: ignoreversion; Components: full compact
+Source: "..\..\..\COPYING"; DestDir: "{app}"; DestName: "COPYING.txt"; Flags: ignoreversion; Components: full compact
+Source: "..\..\fonts\FREECG98.BMP"; DestDir: "{app}"; Flags: ignoreversion; Components: full compact
+Source: "..\..\shaders\*"; DestDir: "{app}\shaders"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: full compact
 Source: "Win32_builds\x86_Release\dosbox-x.exe"; DestDir: "{app}"; Flags: ignoreversion; Check: CheckDirName('Win32_builds\x86_Release'); Components: full compact
 Source: "Win32_builds\x86_Release_SDL2\dosbox-x.exe"; DestDir: "{app}"; Flags: ignoreversion; Check: CheckDirName('Win32_builds\x86_Release SDL2'); Components: full compact
 Source: "Win32_builds\ARM_Release\dosbox-x.exe"; DestDir: "{app}"; Flags: ignoreversion; Check: CheckDirName('Win32_builds\ARM_Release'); Components: full compact
diff --git a/windows-installer/Default.isl b/contrib/windows/installer/Default.isl
similarity index 100%
rename from windows-installer/Default.isl
rename to contrib/windows/installer/Default.isl
diff --git a/windows-installer/ISCC.exe b/contrib/windows/installer/ISCC.exe
similarity index 100%
rename from windows-installer/ISCC.exe
rename to contrib/windows/installer/ISCC.exe
diff --git a/windows-installer/ISCmplr.dll b/contrib/windows/installer/ISCmplr.dll
similarity index 100%
rename from windows-installer/ISCmplr.dll
rename to contrib/windows/installer/ISCmplr.dll
diff --git a/windows-installer/ISPP.dll b/contrib/windows/installer/ISPP.dll
similarity index 100%
rename from windows-installer/ISPP.dll
rename to contrib/windows/installer/ISPP.dll
diff --git a/windows-installer/ISPPBuiltins.iss b/contrib/windows/installer/ISPPBuiltins.iss
similarity index 100%
rename from windows-installer/ISPPBuiltins.iss
rename to contrib/windows/installer/ISPPBuiltins.iss
diff --git a/windows-installer/Setup.e32 b/contrib/windows/installer/Setup.e32
similarity index 100%
rename from windows-installer/Setup.e32
rename to contrib/windows/installer/Setup.e32
diff --git a/windows-installer/SetupLdr.e32 b/contrib/windows/installer/SetupLdr.e32
similarity index 100%
rename from windows-installer/SetupLdr.e32
rename to contrib/windows/installer/SetupLdr.e32
diff --git a/windows-installer/WizModernImage.bmp b/contrib/windows/installer/WizModernImage.bmp
similarity index 100%
rename from windows-installer/WizModernImage.bmp
rename to contrib/windows/installer/WizModernImage.bmp
diff --git a/windows-installer/date.exe b/contrib/windows/installer/date.exe
similarity index 100%
rename from windows-installer/date.exe
rename to contrib/windows/installer/date.exe
diff --git a/windows-installer/islzma.dll b/contrib/windows/installer/islzma.dll
similarity index 100%
rename from windows-installer/islzma.dll
rename to contrib/windows/installer/islzma.dll
diff --git a/windows-installer/readme.txt b/contrib/windows/installer/readme.txt
similarity index 100%
rename from windows-installer/readme.txt
rename to contrib/windows/installer/readme.txt
diff --git a/windows-installer/setup_epilogue.txt b/contrib/windows/installer/setup_epilogue.txt
similarity index 100%
rename from windows-installer/setup_epilogue.txt
rename to contrib/windows/installer/setup_epilogue.txt
diff --git a/windows-installer/setup_preamble.txt b/contrib/windows/installer/setup_preamble.txt
similarity index 100%
rename from windows-installer/setup_preamble.txt
rename to contrib/windows/installer/setup_preamble.txt
diff --git a/windows-installer/unix2dos.exe b/contrib/windows/installer/unix2dos.exe
similarity index 100%
rename from windows-installer/unix2dos.exe
rename to contrib/windows/installer/unix2dos.exe
diff --git a/windows-installer/windows_explorer_context_menu_installer.bat b/contrib/windows/installer/windows_explorer_context_menu_installer.bat
similarity index 100%
rename from windows-installer/windows_explorer_context_menu_installer.bat
rename to contrib/windows/installer/windows_explorer_context_menu_installer.bat
diff --git a/windows-installer/windows_explorer_context_menu_uninstaller.bat b/contrib/windows/installer/windows_explorer_context_menu_uninstaller.bat
similarity index 100%
rename from windows-installer/windows_explorer_context_menu_uninstaller.bat
rename to contrib/windows/installer/windows_explorer_context_menu_uninstaller.bat