diff --git a/scripts/windows/build-installer.ps1 b/scripts/windows/build-installer.ps1 index dd2dd796d1..12e346c7fe 100644 --- a/scripts/windows/build-installer.ps1 +++ b/scripts/windows/build-installer.ps1 @@ -1,6 +1,6 @@ $ErrorActionPreference = "Stop" $script_path = (split-path -parent $MyInvocation.MyCommand.Definition) + "\" -$conf_path = $script_path + "wix-installer\WiXInstaller\Configuration.wxi" +$conf_path = $script_path + "installer\WiXInstaller\Configuration.wxi" If ($Args.Count -ne 1) { echo "Usage:" @@ -25,13 +25,13 @@ $semverVersion = $version.Split("@")[-1] echo "Downloading binary dependencies: 7za" $7za_url = "https://s3.amazonaws.com/meteor-windows/build-deps/7za.exe" $client = new-object System.Net.WebClient -$client.DownloadFile($7za_url, $script_path + "wix-installer\WiXInstaller\Resources\7za.exe") +$client.DownloadFile($7za_url, $script_path + "installer\WiXInstaller\Resources\7za.exe") -Push-Location wix-installer +Push-Location installer Invoke-Expression ("cmd /c build.bat") Pop-Location -move-item ($script_path + "wix-installer\Release\Setup_Meteor.exe") ($script_path + "InstallMeteor.exe") +move-item ($script_path + "installer\Release\Setup_Meteor.exe") ($script_path + "InstallMeteor.exe") echo "Clean up" rm $conf_path diff --git a/scripts/windows/wix-installer/!ReadMe.txt b/scripts/windows/installer/!ReadMe.txt similarity index 100% rename from scripts/windows/wix-installer/!ReadMe.txt rename to scripts/windows/installer/!ReadMe.txt diff --git a/scripts/windows/wix-installer/.gitignore b/scripts/windows/installer/.gitignore similarity index 100% rename from scripts/windows/wix-installer/.gitignore rename to scripts/windows/installer/.gitignore diff --git a/scripts/windows/wix-installer/MeteorSetup.sln b/scripts/windows/installer/MeteorSetup.sln similarity index 100% rename from scripts/windows/wix-installer/MeteorSetup.sln rename to scripts/windows/installer/MeteorSetup.sln diff --git a/scripts/windows/wix-installer/WiXBalExtension/.gitignore b/scripts/windows/installer/WiXBalExtension/.gitignore similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/.gitignore rename to scripts/windows/installer/WiXBalExtension/.gitignore diff --git a/scripts/windows/wix-installer/WiXBalExtension/BalExtensionExt.sln b/scripts/windows/installer/WiXBalExtension/BalExtensionExt.sln similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/BalExtensionExt.sln rename to scripts/windows/installer/WiXBalExtension/BalExtensionExt.sln diff --git a/scripts/windows/wix-installer/WiXBalExtension/LICENSE.TXT b/scripts/windows/installer/WiXBalExtension/LICENSE.TXT similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/LICENSE.TXT rename to scripts/windows/installer/WiXBalExtension/LICENSE.TXT diff --git a/scripts/windows/wix-installer/WiXBalExtension/build.bat b/scripts/windows/installer/WiXBalExtension/build.bat similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/build.bat rename to scripts/windows/installer/WiXBalExtension/build.bat diff --git a/scripts/windows/wix-installer/WiXBalExtension/inc/Version.proj b/scripts/windows/installer/WiXBalExtension/inc/Version.proj similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/inc/Version.proj rename to scripts/windows/installer/WiXBalExtension/inc/Version.proj diff --git a/scripts/windows/wix-installer/WiXBalExtension/inc/WixDistribution.cs b/scripts/windows/installer/WiXBalExtension/inc/WixDistribution.cs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/inc/WixDistribution.cs rename to scripts/windows/installer/WiXBalExtension/inc/WixDistribution.cs diff --git a/scripts/windows/wix-installer/WiXBalExtension/inc/WixDistribution.h b/scripts/windows/installer/WiXBalExtension/inc/WixDistribution.h similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/inc/WixDistribution.h rename to scripts/windows/installer/WiXBalExtension/inc/WixDistribution.h diff --git a/scripts/windows/wix-installer/WiXBalExtension/inc/wix.rc b/scripts/windows/installer/WiXBalExtension/inc/wix.rc similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/inc/wix.rc rename to scripts/windows/installer/WiXBalExtension/inc/wix.rc diff --git a/scripts/windows/wix-installer/WiXBalExtension/inc/wixver.cs b/scripts/windows/installer/WiXBalExtension/inc/wixver.cs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/inc/wixver.cs rename to scripts/windows/installer/WiXBalExtension/inc/wixver.cs diff --git a/scripts/windows/wix-installer/WiXBalExtension/inc/wixver.h b/scripts/windows/installer/WiXBalExtension/inc/wixver.h similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/inc/wixver.h rename to scripts/windows/installer/WiXBalExtension/inc/wixver.h diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixext/BalCompiler.cs b/scripts/windows/installer/WiXBalExtension/wixext/BalCompiler.cs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixext/BalCompiler.cs rename to scripts/windows/installer/WiXBalExtension/wixext/BalCompiler.cs diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixext/BalExtension.cs b/scripts/windows/installer/WiXBalExtension/wixext/BalExtension.cs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixext/BalExtension.cs rename to scripts/windows/installer/WiXBalExtension/wixext/BalExtension.cs diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixext/BalPreprocessorExtension.cs b/scripts/windows/installer/WiXBalExtension/wixext/BalPreprocessorExtension.cs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixext/BalPreprocessorExtension.cs rename to scripts/windows/installer/WiXBalExtension/wixext/BalPreprocessorExtension.cs diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixext/Properties/AssemblyInfo.cs b/scripts/windows/installer/WiXBalExtension/wixext/Properties/AssemblyInfo.cs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixext/Properties/AssemblyInfo.cs rename to scripts/windows/installer/WiXBalExtension/wixext/Properties/AssemblyInfo.cs diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixext/WixBalExtensionExt.csproj b/scripts/windows/installer/WiXBalExtension/wixext/WixBalExtensionExt.csproj similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixext/WixBalExtensionExt.csproj rename to scripts/windows/installer/WiXBalExtension/wixext/WixBalExtensionExt.csproj diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixext/Xsd/bal.xsd b/scripts/windows/installer/WiXBalExtension/wixext/Xsd/bal.xsd similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixext/Xsd/bal.xsd rename to scripts/windows/installer/WiXBalExtension/wixext/Xsd/bal.xsd diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixext/data/messages.xml b/scripts/windows/installer/WiXBalExtension/wixext/data/messages.xml similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixext/data/messages.xml rename to scripts/windows/installer/WiXBalExtension/wixext/data/messages.xml diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixext/data/tables.xml b/scripts/windows/installer/WiXBalExtension/wixext/data/tables.xml similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixext/data/tables.xml rename to scripts/windows/installer/WiXBalExtension/wixext/data/tables.xml diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixlib/BalExtension.wixproj b/scripts/windows/installer/WiXBalExtension/wixlib/BalExtension.wixproj similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixlib/BalExtension.wixproj rename to scripts/windows/installer/WiXBalExtension/wixlib/BalExtension.wixproj diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixlib/BalExtension.wxs b/scripts/windows/installer/WiXBalExtension/wixlib/BalExtension.wxs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixlib/BalExtension.wxs rename to scripts/windows/installer/WiXBalExtension/wixlib/BalExtension.wxs diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixlib/wixstdba.wxs b/scripts/windows/installer/WiXBalExtension/wixlib/wixstdba.wxs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixlib/wixstdba.wxs rename to scripts/windows/installer/WiXBalExtension/wixlib/wixstdba.wxs diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixlib/wixstdba_platform.wxi b/scripts/windows/installer/WiXBalExtension/wixlib/wixstdba_platform.wxi similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixlib/wixstdba_platform.wxi rename to scripts/windows/installer/WiXBalExtension/wixlib/wixstdba_platform.wxi diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixlib/wixstdba_x86.wxs b/scripts/windows/installer/WiXBalExtension/wixlib/wixstdba_x86.wxs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixlib/wixstdba_x86.wxs rename to scripts/windows/installer/WiXBalExtension/wixlib/wixstdba_x86.wxs diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/JSON.cpp b/scripts/windows/installer/WiXBalExtension/wixstdba/JSON.cpp similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/JSON.cpp rename to scripts/windows/installer/WiXBalExtension/wixstdba/JSON.cpp diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/JSON.h b/scripts/windows/installer/WiXBalExtension/wixstdba/JSON.h similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/JSON.h rename to scripts/windows/installer/WiXBalExtension/wixstdba/JSON.h diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/JSONValue.cpp b/scripts/windows/installer/WiXBalExtension/wixstdba/JSONValue.cpp similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/JSONValue.cpp rename to scripts/windows/installer/WiXBalExtension/wixstdba/JSONValue.cpp diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/JSONValue.h b/scripts/windows/installer/WiXBalExtension/wixstdba/JSONValue.h similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/JSONValue.h rename to scripts/windows/installer/WiXBalExtension/wixstdba/JSONValue.h diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/Hyperlink2Theme.xml b/scripts/windows/installer/WiXBalExtension/wixstdba/Resources/Hyperlink2Theme.xml similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/Hyperlink2Theme.xml rename to scripts/windows/installer/WiXBalExtension/wixstdba/Resources/Hyperlink2Theme.xml diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.wxl b/scripts/windows/installer/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.wxl similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.wxl rename to scripts/windows/installer/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.wxl diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.xml b/scripts/windows/installer/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.xml similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.xml rename to scripts/windows/installer/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.xml diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/LogoSide.png b/scripts/windows/installer/WiXBalExtension/wixstdba/Resources/LogoSide.png similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/LogoSide.png rename to scripts/windows/installer/WiXBalExtension/wixstdba/Resources/LogoSide.png diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/LoremIpsumLicense.rtf b/scripts/windows/installer/WiXBalExtension/wixstdba/Resources/LoremIpsumLicense.rtf similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/LoremIpsumLicense.rtf rename to scripts/windows/installer/WiXBalExtension/wixstdba/Resources/LoremIpsumLicense.rtf diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/RtfTheme.wxl b/scripts/windows/installer/WiXBalExtension/wixstdba/Resources/RtfTheme.wxl similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/RtfTheme.wxl rename to scripts/windows/installer/WiXBalExtension/wixstdba/Resources/RtfTheme.wxl diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/RtfTheme.xml b/scripts/windows/installer/WiXBalExtension/wixstdba/Resources/RtfTheme.xml similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/RtfTheme.xml rename to scripts/windows/installer/WiXBalExtension/wixstdba/Resources/RtfTheme.xml diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/logo.png b/scripts/windows/installer/WiXBalExtension/wixstdba/Resources/logo.png similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/logo.png rename to scripts/windows/installer/WiXBalExtension/wixstdba/Resources/logo.png diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/WixStandardBootstrapperApplication.cpp b/scripts/windows/installer/WiXBalExtension/wixstdba/WixStandardBootstrapperApplication.cpp similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/WixStandardBootstrapperApplication.cpp rename to scripts/windows/installer/WiXBalExtension/wixstdba/WixStandardBootstrapperApplication.cpp diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/precomp.h b/scripts/windows/installer/WiXBalExtension/wixstdba/precomp.h similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/precomp.h rename to scripts/windows/installer/WiXBalExtension/wixstdba/precomp.h diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/resource.h b/scripts/windows/installer/WiXBalExtension/wixstdba/resource.h similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/resource.h rename to scripts/windows/installer/WiXBalExtension/wixstdba/resource.h diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.cpp b/scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.cpp similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.cpp rename to scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.cpp diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.def b/scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.def similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.def rename to scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.def diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.rc b/scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.rc similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.rc rename to scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.rc diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.vcxproj b/scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.vcxproj similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.vcxproj rename to scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.vcxproj diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.vcxproj.filters b/scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.vcxproj.filters similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.vcxproj.filters rename to scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.vcxproj.filters diff --git a/scripts/windows/wix-installer/WiXHelper/.gitignore b/scripts/windows/installer/WiXHelper/.gitignore similarity index 100% rename from scripts/windows/wix-installer/WiXHelper/.gitignore rename to scripts/windows/installer/WiXHelper/.gitignore diff --git a/scripts/windows/wix-installer/WiXHelper/CustomAction.cpp b/scripts/windows/installer/WiXHelper/CustomAction.cpp similarity index 100% rename from scripts/windows/wix-installer/WiXHelper/CustomAction.cpp rename to scripts/windows/installer/WiXHelper/CustomAction.cpp diff --git a/scripts/windows/wix-installer/WiXHelper/CustomAction.def b/scripts/windows/installer/WiXHelper/CustomAction.def similarity index 100% rename from scripts/windows/wix-installer/WiXHelper/CustomAction.def rename to scripts/windows/installer/WiXHelper/CustomAction.def diff --git a/scripts/windows/wix-installer/WiXHelper/WiXHelper.vcxproj b/scripts/windows/installer/WiXHelper/WiXHelper.vcxproj similarity index 100% rename from scripts/windows/wix-installer/WiXHelper/WiXHelper.vcxproj rename to scripts/windows/installer/WiXHelper/WiXHelper.vcxproj diff --git a/scripts/windows/wix-installer/WiXHelper/WiXHelper.vcxproj.filters b/scripts/windows/installer/WiXHelper/WiXHelper.vcxproj.filters similarity index 100% rename from scripts/windows/wix-installer/WiXHelper/WiXHelper.vcxproj.filters rename to scripts/windows/installer/WiXHelper/WiXHelper.vcxproj.filters diff --git a/scripts/windows/wix-installer/WiXHelper/stdafx.cpp b/scripts/windows/installer/WiXHelper/stdafx.cpp similarity index 100% rename from scripts/windows/wix-installer/WiXHelper/stdafx.cpp rename to scripts/windows/installer/WiXHelper/stdafx.cpp diff --git a/scripts/windows/wix-installer/WiXHelper/stdafx.h b/scripts/windows/installer/WiXHelper/stdafx.h similarity index 100% rename from scripts/windows/wix-installer/WiXHelper/stdafx.h rename to scripts/windows/installer/WiXHelper/stdafx.h diff --git a/scripts/windows/wix-installer/WiXHelper/targetver.h b/scripts/windows/installer/WiXHelper/targetver.h similarity index 100% rename from scripts/windows/wix-installer/WiXHelper/targetver.h rename to scripts/windows/installer/WiXHelper/targetver.h diff --git a/scripts/windows/wix-installer/WiXInstaller/.gitignore b/scripts/windows/installer/WiXInstaller/.gitignore similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/.gitignore rename to scripts/windows/installer/WiXInstaller/.gitignore diff --git a/scripts/windows/wix-installer/WiXInstaller/Configuration.wxi_ b/scripts/windows/installer/WiXInstaller/Configuration.wxi_ similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Configuration.wxi_ rename to scripts/windows/installer/WiXInstaller/Configuration.wxi_ diff --git a/scripts/windows/wix-installer/WiXInstaller/MSIPackage.wixproj b/scripts/windows/installer/WiXInstaller/MSIPackage.wixproj similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/MSIPackage.wixproj rename to scripts/windows/installer/WiXInstaller/MSIPackage.wixproj diff --git a/scripts/windows/wix-installer/WiXInstaller/Meteor_Bundle.wxs b/scripts/windows/installer/WiXInstaller/Meteor_Bundle.wxs similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Meteor_Bundle.wxs rename to scripts/windows/installer/WiXInstaller/Meteor_Bundle.wxs diff --git a/scripts/windows/wix-installer/WiXInstaller/Meteor_Product.wxs b/scripts/windows/installer/WiXInstaller/Meteor_Product.wxs similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Meteor_Product.wxs rename to scripts/windows/installer/WiXInstaller/Meteor_Product.wxs diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/Background - Copy.png b/scripts/windows/installer/WiXInstaller/Resources/Background - Copy.png similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/Background - Copy.png rename to scripts/windows/installer/WiXInstaller/Resources/Background - Copy.png diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/Background.png b/scripts/windows/installer/WiXInstaller/Resources/Background.png similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/Background.png rename to scripts/windows/installer/WiXInstaller/Resources/Background.png diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/License.htm b/scripts/windows/installer/WiXInstaller/Resources/License.htm similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/License.htm rename to scripts/windows/installer/WiXInstaller/Resources/License.htm diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/License.rtf b/scripts/windows/installer/WiXInstaller/Resources/License.rtf similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/License.rtf rename to scripts/windows/installer/WiXInstaller/Resources/License.rtf diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/LogoSide.png b/scripts/windows/installer/WiXInstaller/Resources/LogoSide.png similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/LogoSide.png rename to scripts/windows/installer/WiXInstaller/Resources/LogoSide.png diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/Product.ico b/scripts/windows/installer/WiXInstaller/Resources/Product.ico similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/Product.ico rename to scripts/windows/installer/WiXInstaller/Resources/Product.ico diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/Theme_Meteor.wxl b/scripts/windows/installer/WiXInstaller/Resources/Theme_Meteor.wxl similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/Theme_Meteor.wxl rename to scripts/windows/installer/WiXInstaller/Resources/Theme_Meteor.wxl diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/Theme_Meteor.xml b/scripts/windows/installer/WiXInstaller/Resources/Theme_Meteor.xml similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/Theme_Meteor.xml rename to scripts/windows/installer/WiXInstaller/Resources/Theme_Meteor.xml diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/TopHeader.png b/scripts/windows/installer/WiXInstaller/Resources/TopHeader.png similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/TopHeader.png rename to scripts/windows/installer/WiXInstaller/Resources/TopHeader.png diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/dummy.file b/scripts/windows/installer/WiXInstaller/Resources/dummy.file similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/dummy.file rename to scripts/windows/installer/WiXInstaller/Resources/dummy.file diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/meteor-logo.png b/scripts/windows/installer/WiXInstaller/Resources/meteor-logo.png similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/meteor-logo.png rename to scripts/windows/installer/WiXInstaller/Resources/meteor-logo.png diff --git a/scripts/windows/wix-installer/WiXInstaller/SetupPackage.wixproj b/scripts/windows/installer/WiXInstaller/SetupPackage.wixproj similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/SetupPackage.wixproj rename to scripts/windows/installer/WiXInstaller/SetupPackage.wixproj diff --git a/scripts/windows/wix-installer/WiXSDK/inc/BalBaseBootstrapperApplication.h b/scripts/windows/installer/WiXSDK/inc/BalBaseBootstrapperApplication.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/BalBaseBootstrapperApplication.h rename to scripts/windows/installer/WiXSDK/inc/BalBaseBootstrapperApplication.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/IBootstrapperApplication.h b/scripts/windows/installer/WiXSDK/inc/IBootstrapperApplication.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/IBootstrapperApplication.h rename to scripts/windows/installer/WiXSDK/inc/IBootstrapperApplication.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/IBootstrapperBAFunction.h b/scripts/windows/installer/WiXSDK/inc/IBootstrapperBAFunction.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/IBootstrapperBAFunction.h rename to scripts/windows/installer/WiXSDK/inc/IBootstrapperBAFunction.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/IBootstrapperEngine.h b/scripts/windows/installer/WiXSDK/inc/IBootstrapperEngine.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/IBootstrapperEngine.h rename to scripts/windows/installer/WiXSDK/inc/IBootstrapperEngine.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/aclutil.h b/scripts/windows/installer/WiXSDK/inc/aclutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/aclutil.h rename to scripts/windows/installer/WiXSDK/inc/aclutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/apuputil.h b/scripts/windows/installer/WiXSDK/inc/apuputil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/apuputil.h rename to scripts/windows/installer/WiXSDK/inc/apuputil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/atomutil.h b/scripts/windows/installer/WiXSDK/inc/atomutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/atomutil.h rename to scripts/windows/installer/WiXSDK/inc/atomutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/balcondition.h b/scripts/windows/installer/WiXSDK/inc/balcondition.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/balcondition.h rename to scripts/windows/installer/WiXSDK/inc/balcondition.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/balinfo.h b/scripts/windows/installer/WiXSDK/inc/balinfo.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/balinfo.h rename to scripts/windows/installer/WiXSDK/inc/balinfo.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/balretry.h b/scripts/windows/installer/WiXSDK/inc/balretry.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/balretry.h rename to scripts/windows/installer/WiXSDK/inc/balretry.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/balutil.h b/scripts/windows/installer/WiXSDK/inc/balutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/balutil.h rename to scripts/windows/installer/WiXSDK/inc/balutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/buffutil.h b/scripts/windows/installer/WiXSDK/inc/buffutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/buffutil.h rename to scripts/windows/installer/WiXSDK/inc/buffutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/cabcutil.h b/scripts/windows/installer/WiXSDK/inc/cabcutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/cabcutil.h rename to scripts/windows/installer/WiXSDK/inc/cabcutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/cabutil.h b/scripts/windows/installer/WiXSDK/inc/cabutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/cabutil.h rename to scripts/windows/installer/WiXSDK/inc/cabutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/certutil.h b/scripts/windows/installer/WiXSDK/inc/certutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/certutil.h rename to scripts/windows/installer/WiXSDK/inc/certutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/conutil.h b/scripts/windows/installer/WiXSDK/inc/conutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/conutil.h rename to scripts/windows/installer/WiXSDK/inc/conutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/cryputil.h b/scripts/windows/installer/WiXSDK/inc/cryputil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/cryputil.h rename to scripts/windows/installer/WiXSDK/inc/cryputil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/custommsierrors.h b/scripts/windows/installer/WiXSDK/inc/custommsierrors.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/custommsierrors.h rename to scripts/windows/installer/WiXSDK/inc/custommsierrors.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/dictutil.h b/scripts/windows/installer/WiXSDK/inc/dictutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/dictutil.h rename to scripts/windows/installer/WiXSDK/inc/dictutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/dirutil.h b/scripts/windows/installer/WiXSDK/inc/dirutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/dirutil.h rename to scripts/windows/installer/WiXSDK/inc/dirutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/dutil.h b/scripts/windows/installer/WiXSDK/inc/dutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/dutil.h rename to scripts/windows/installer/WiXSDK/inc/dutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/eseutil.h b/scripts/windows/installer/WiXSDK/inc/eseutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/eseutil.h rename to scripts/windows/installer/WiXSDK/inc/eseutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/fileutil.h b/scripts/windows/installer/WiXSDK/inc/fileutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/fileutil.h rename to scripts/windows/installer/WiXSDK/inc/fileutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/gdiputil.h b/scripts/windows/installer/WiXSDK/inc/gdiputil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/gdiputil.h rename to scripts/windows/installer/WiXSDK/inc/gdiputil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/iis7util.h b/scripts/windows/installer/WiXSDK/inc/iis7util.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/iis7util.h rename to scripts/windows/installer/WiXSDK/inc/iis7util.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/inetutil.h b/scripts/windows/installer/WiXSDK/inc/inetutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/inetutil.h rename to scripts/windows/installer/WiXSDK/inc/inetutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/iniutil.h b/scripts/windows/installer/WiXSDK/inc/iniutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/iniutil.h rename to scripts/windows/installer/WiXSDK/inc/iniutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/jsonutil.h b/scripts/windows/installer/WiXSDK/inc/jsonutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/jsonutil.h rename to scripts/windows/installer/WiXSDK/inc/jsonutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/locutil.h b/scripts/windows/installer/WiXSDK/inc/locutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/locutil.h rename to scripts/windows/installer/WiXSDK/inc/locutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/logutil.h b/scripts/windows/installer/WiXSDK/inc/logutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/logutil.h rename to scripts/windows/installer/WiXSDK/inc/logutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/memutil.h b/scripts/windows/installer/WiXSDK/inc/memutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/memutil.h rename to scripts/windows/installer/WiXSDK/inc/memutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/metautil.h b/scripts/windows/installer/WiXSDK/inc/metautil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/metautil.h rename to scripts/windows/installer/WiXSDK/inc/metautil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/osutil.h b/scripts/windows/installer/WiXSDK/inc/osutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/osutil.h rename to scripts/windows/installer/WiXSDK/inc/osutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/pathutil.h b/scripts/windows/installer/WiXSDK/inc/pathutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/pathutil.h rename to scripts/windows/installer/WiXSDK/inc/pathutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/perfutil.h b/scripts/windows/installer/WiXSDK/inc/perfutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/perfutil.h rename to scripts/windows/installer/WiXSDK/inc/perfutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/polcutil.h b/scripts/windows/installer/WiXSDK/inc/polcutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/polcutil.h rename to scripts/windows/installer/WiXSDK/inc/polcutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/procutil.h b/scripts/windows/installer/WiXSDK/inc/procutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/procutil.h rename to scripts/windows/installer/WiXSDK/inc/procutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/regutil.h b/scripts/windows/installer/WiXSDK/inc/regutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/regutil.h rename to scripts/windows/installer/WiXSDK/inc/regutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/resrutil.h b/scripts/windows/installer/WiXSDK/inc/resrutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/resrutil.h rename to scripts/windows/installer/WiXSDK/inc/resrutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/reswutil.h b/scripts/windows/installer/WiXSDK/inc/reswutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/reswutil.h rename to scripts/windows/installer/WiXSDK/inc/reswutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/rexutil.h b/scripts/windows/installer/WiXSDK/inc/rexutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/rexutil.h rename to scripts/windows/installer/WiXSDK/inc/rexutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/rmutil.h b/scripts/windows/installer/WiXSDK/inc/rmutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/rmutil.h rename to scripts/windows/installer/WiXSDK/inc/rmutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/rssutil.h b/scripts/windows/installer/WiXSDK/inc/rssutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/rssutil.h rename to scripts/windows/installer/WiXSDK/inc/rssutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/sceutil.h b/scripts/windows/installer/WiXSDK/inc/sceutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/sceutil.h rename to scripts/windows/installer/WiXSDK/inc/sceutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/shelutil.h b/scripts/windows/installer/WiXSDK/inc/shelutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/shelutil.h rename to scripts/windows/installer/WiXSDK/inc/shelutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/sqlutil.h b/scripts/windows/installer/WiXSDK/inc/sqlutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/sqlutil.h rename to scripts/windows/installer/WiXSDK/inc/sqlutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/srputil.h b/scripts/windows/installer/WiXSDK/inc/srputil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/srputil.h rename to scripts/windows/installer/WiXSDK/inc/srputil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/strutil.h b/scripts/windows/installer/WiXSDK/inc/strutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/strutil.h rename to scripts/windows/installer/WiXSDK/inc/strutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/svcutil.h b/scripts/windows/installer/WiXSDK/inc/svcutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/svcutil.h rename to scripts/windows/installer/WiXSDK/inc/svcutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/thmutil.h b/scripts/windows/installer/WiXSDK/inc/thmutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/thmutil.h rename to scripts/windows/installer/WiXSDK/inc/thmutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/timeutil.h b/scripts/windows/installer/WiXSDK/inc/timeutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/timeutil.h rename to scripts/windows/installer/WiXSDK/inc/timeutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/uriutil.h b/scripts/windows/installer/WiXSDK/inc/uriutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/uriutil.h rename to scripts/windows/installer/WiXSDK/inc/uriutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/userutil.h b/scripts/windows/installer/WiXSDK/inc/userutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/userutil.h rename to scripts/windows/installer/WiXSDK/inc/userutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/wcalog.h b/scripts/windows/installer/WiXSDK/inc/wcalog.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/wcalog.h rename to scripts/windows/installer/WiXSDK/inc/wcalog.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/wcautil.h b/scripts/windows/installer/WiXSDK/inc/wcautil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/wcautil.h rename to scripts/windows/installer/WiXSDK/inc/wcautil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/wcawow64.h b/scripts/windows/installer/WiXSDK/inc/wcawow64.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/wcawow64.h rename to scripts/windows/installer/WiXSDK/inc/wcawow64.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/wcawrapquery.h b/scripts/windows/installer/WiXSDK/inc/wcawrapquery.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/wcawrapquery.h rename to scripts/windows/installer/WiXSDK/inc/wcawrapquery.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/wiutil.h b/scripts/windows/installer/WiXSDK/inc/wiutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/wiutil.h rename to scripts/windows/installer/WiXSDK/inc/wiutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/wuautil.h b/scripts/windows/installer/WiXSDK/inc/wuautil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/wuautil.h rename to scripts/windows/installer/WiXSDK/inc/wuautil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/xmlutil.h b/scripts/windows/installer/WiXSDK/inc/xmlutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/xmlutil.h rename to scripts/windows/installer/WiXSDK/inc/xmlutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/vs2010/lib/x86/balutil.lib b/scripts/windows/installer/WiXSDK/vs2010/lib/x86/balutil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2010/lib/x86/balutil.lib rename to scripts/windows/installer/WiXSDK/vs2010/lib/x86/balutil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2010/lib/x86/deputil.lib b/scripts/windows/installer/WiXSDK/vs2010/lib/x86/deputil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2010/lib/x86/deputil.lib rename to scripts/windows/installer/WiXSDK/vs2010/lib/x86/deputil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2010/lib/x86/dutil.lib b/scripts/windows/installer/WiXSDK/vs2010/lib/x86/dutil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2010/lib/x86/dutil.lib rename to scripts/windows/installer/WiXSDK/vs2010/lib/x86/dutil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2010/lib/x86/wcautil.lib b/scripts/windows/installer/WiXSDK/vs2010/lib/x86/wcautil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2010/lib/x86/wcautil.lib rename to scripts/windows/installer/WiXSDK/vs2010/lib/x86/wcautil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2012/lib/x86/balutil.lib b/scripts/windows/installer/WiXSDK/vs2012/lib/x86/balutil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2012/lib/x86/balutil.lib rename to scripts/windows/installer/WiXSDK/vs2012/lib/x86/balutil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2012/lib/x86/deputil.lib b/scripts/windows/installer/WiXSDK/vs2012/lib/x86/deputil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2012/lib/x86/deputil.lib rename to scripts/windows/installer/WiXSDK/vs2012/lib/x86/deputil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2012/lib/x86/dutil.lib b/scripts/windows/installer/WiXSDK/vs2012/lib/x86/dutil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2012/lib/x86/dutil.lib rename to scripts/windows/installer/WiXSDK/vs2012/lib/x86/dutil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2012/lib/x86/wcautil.lib b/scripts/windows/installer/WiXSDK/vs2012/lib/x86/wcautil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2012/lib/x86/wcautil.lib rename to scripts/windows/installer/WiXSDK/vs2012/lib/x86/wcautil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2013/lib/x86/balutil.lib b/scripts/windows/installer/WiXSDK/vs2013/lib/x86/balutil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2013/lib/x86/balutil.lib rename to scripts/windows/installer/WiXSDK/vs2013/lib/x86/balutil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2013/lib/x86/deputil.lib b/scripts/windows/installer/WiXSDK/vs2013/lib/x86/deputil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2013/lib/x86/deputil.lib rename to scripts/windows/installer/WiXSDK/vs2013/lib/x86/deputil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2013/lib/x86/dutil.lib b/scripts/windows/installer/WiXSDK/vs2013/lib/x86/dutil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2013/lib/x86/dutil.lib rename to scripts/windows/installer/WiXSDK/vs2013/lib/x86/dutil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2013/lib/x86/wcautil.lib b/scripts/windows/installer/WiXSDK/vs2013/lib/x86/wcautil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2013/lib/x86/wcautil.lib rename to scripts/windows/installer/WiXSDK/vs2013/lib/x86/wcautil.lib diff --git a/scripts/windows/wix-installer/build.bat b/scripts/windows/installer/build.bat similarity index 100% rename from scripts/windows/wix-installer/build.bat rename to scripts/windows/installer/build.bat