diff --git a/admin/win/RELEASE_NOTES.txt b/admin/win/nsi/RELEASE_NOTES.txt
similarity index 100%
rename from admin/win/RELEASE_NOTES.txt
rename to admin/win/nsi/RELEASE_NOTES.txt
diff --git a/admin/win/installer.ico b/admin/win/nsi/installer.ico
similarity index 100%
rename from admin/win/installer.ico
rename to admin/win/nsi/installer.ico
diff --git a/admin/win/nsis_uac/History.txt b/admin/win/nsi/nsis_uac/History.txt
similarity index 100%
rename from admin/win/nsis_uac/History.txt
rename to admin/win/nsi/nsis_uac/History.txt
diff --git a/admin/win/nsis_uac/License.txt b/admin/win/nsi/nsis_uac/License.txt
similarity index 100%
rename from admin/win/nsis_uac/License.txt
rename to admin/win/nsi/nsis_uac/License.txt
diff --git a/admin/win/nsis_uac/NSISUtil.h b/admin/win/nsi/nsis_uac/NSISUtil.h
similarity index 100%
rename from admin/win/nsis_uac/NSISUtil.h
rename to admin/win/nsi/nsis_uac/NSISUtil.h
diff --git a/admin/win/nsis_uac/Release/A/UAC.dll b/admin/win/nsi/nsis_uac/Release/A/UAC.dll
similarity index 100%
rename from admin/win/nsis_uac/Release/A/UAC.dll
rename to admin/win/nsi/nsis_uac/Release/A/UAC.dll
diff --git a/admin/win/nsis_uac/Release/U/UAC.dll b/admin/win/nsi/nsis_uac/Release/U/UAC.dll
similarity index 100%
rename from admin/win/nsis_uac/Release/U/UAC.dll
rename to admin/win/nsi/nsis_uac/Release/U/UAC.dll
diff --git a/admin/win/nsis_uac/RunAs.cpp b/admin/win/nsi/nsis_uac/RunAs.cpp
similarity index 100%
rename from admin/win/nsis_uac/RunAs.cpp
rename to admin/win/nsi/nsis_uac/RunAs.cpp
diff --git a/admin/win/nsis_uac/UAC Readme.html b/admin/win/nsi/nsis_uac/UAC Readme.html
similarity index 100%
rename from admin/win/nsis_uac/UAC Readme.html
rename to admin/win/nsi/nsis_uac/UAC Readme.html
diff --git a/admin/win/nsis_uac/UAC.nsh b/admin/win/nsi/nsis_uac/UAC.nsh
similarity index 100%
rename from admin/win/nsis_uac/UAC.nsh
rename to admin/win/nsi/nsis_uac/UAC.nsh
diff --git a/admin/win/nsis_uac/UAC_AdminOnly.nsi b/admin/win/nsi/nsis_uac/UAC_AdminOnly.nsi
similarity index 100%
rename from admin/win/nsis_uac/UAC_AdminOnly.nsi
rename to admin/win/nsi/nsis_uac/UAC_AdminOnly.nsi
diff --git a/admin/win/nsis_uac/UAC_AllowLUA.nsi b/admin/win/nsi/nsis_uac/UAC_AllowLUA.nsi
similarity index 100%
rename from admin/win/nsis_uac/UAC_AllowLUA.nsi
rename to admin/win/nsi/nsis_uac/UAC_AllowLUA.nsi
diff --git a/admin/win/nsis_uac/UAC_GetUserShellFolderPath.nsi b/admin/win/nsi/nsis_uac/UAC_GetUserShellFolderPath.nsi
similarity index 100%
rename from admin/win/nsis_uac/UAC_GetUserShellFolderPath.nsi
rename to admin/win/nsi/nsis_uac/UAC_GetUserShellFolderPath.nsi
diff --git a/admin/win/nsis_uac/UAC_RealWorldFullyLoadedDualModeExample.nsi b/admin/win/nsi/nsis_uac/UAC_RealWorldFullyLoadedDualModeExample.nsi
similarity index 100%
rename from admin/win/nsis_uac/UAC_RealWorldFullyLoadedDualModeExample.nsi
rename to admin/win/nsi/nsis_uac/UAC_RealWorldFullyLoadedDualModeExample.nsi
diff --git a/admin/win/nsis_uac/UAC_Uninstaller.nsi b/admin/win/nsi/nsis_uac/UAC_Uninstaller.nsi
similarity index 100%
rename from admin/win/nsis_uac/UAC_Uninstaller.nsi
rename to admin/win/nsi/nsis_uac/UAC_Uninstaller.nsi
diff --git a/admin/win/nsis_uac/resource.h b/admin/win/nsi/nsis_uac/resource.h
similarity index 100%
rename from admin/win/nsis_uac/resource.h
rename to admin/win/nsi/nsis_uac/resource.h
diff --git a/admin/win/nsis_uac/resource.rc b/admin/win/nsi/nsis_uac/resource.rc
similarity index 100%
rename from admin/win/nsis_uac/resource.rc
rename to admin/win/nsi/nsis_uac/resource.rc
diff --git a/admin/win/nsis_uac/uac.cpp b/admin/win/nsi/nsis_uac/uac.cpp
similarity index 100%
rename from admin/win/nsis_uac/uac.cpp
rename to admin/win/nsi/nsis_uac/uac.cpp
diff --git a/admin/win/nsis_uac/uac.h b/admin/win/nsi/nsis_uac/uac.h
similarity index 100%
rename from admin/win/nsis_uac/uac.h
rename to admin/win/nsi/nsis_uac/uac.h
diff --git a/admin/win/page_header.bmp b/admin/win/nsi/page_header.bmp
similarity index 100%
rename from admin/win/page_header.bmp
rename to admin/win/nsi/page_header.bmp
diff --git a/admin/win/revision.txt b/admin/win/nsi/revision.txt
similarity index 100%
rename from admin/win/revision.txt
rename to admin/win/nsi/revision.txt
diff --git a/admin/win/tomahawk.ini b/admin/win/nsi/tomahawk.ini
similarity index 100%
rename from admin/win/tomahawk.ini
rename to admin/win/nsi/tomahawk.ini
diff --git a/admin/win/tomahawk.nsi b/admin/win/nsi/tomahawk.nsi
similarity index 100%
rename from admin/win/tomahawk.nsi
rename to admin/win/nsi/tomahawk.nsi
diff --git a/admin/win/welcome.bmp b/admin/win/nsi/welcome.bmp
similarity index 100%
rename from admin/win/welcome.bmp
rename to admin/win/nsi/welcome.bmp