diff --git a/src/redist/packaging/osx/clisdk/Distribution-Template b/src/redist/packaging/osx/Distribution-Template
similarity index 100%
rename from src/redist/packaging/osx/clisdk/Distribution-Template
rename to src/redist/packaging/osx/Distribution-Template
diff --git a/src/redist/packaging/osx/clisdk/Distribution-Template-x64 b/src/redist/packaging/osx/Distribution-Template-x64
similarity index 100%
rename from src/redist/packaging/osx/clisdk/Distribution-Template-x64
rename to src/redist/packaging/osx/Distribution-Template-x64
diff --git a/src/redist/packaging/osx/clisdk/resources/conclusion.html.lci b/src/redist/packaging/osx/resources/conclusion.html.lci
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/conclusion.html.lci
rename to src/redist/packaging/osx/resources/conclusion.html.lci
diff --git a/src/redist/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/src/redist/packaging/osx/resources/cs.lproj/conclusion.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/cs.lproj/conclusion.html
rename to src/redist/packaging/osx/resources/cs.lproj/conclusion.html
diff --git a/src/redist/packaging/osx/clisdk/resources/cs.lproj/welcome.html b/src/redist/packaging/osx/resources/cs.lproj/welcome.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/cs.lproj/welcome.html
rename to src/redist/packaging/osx/resources/cs.lproj/welcome.html
diff --git a/src/redist/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/src/redist/packaging/osx/resources/de.lproj/conclusion.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/de.lproj/conclusion.html
rename to src/redist/packaging/osx/resources/de.lproj/conclusion.html
diff --git a/src/redist/packaging/osx/clisdk/resources/de.lproj/welcome.html b/src/redist/packaging/osx/resources/de.lproj/welcome.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/de.lproj/welcome.html
rename to src/redist/packaging/osx/resources/de.lproj/welcome.html
diff --git a/src/redist/packaging/osx/clisdk/resources/dotnetbackground.png b/src/redist/packaging/osx/resources/dotnetbackground.png
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/dotnetbackground.png
rename to src/redist/packaging/osx/resources/dotnetbackground.png
diff --git a/src/redist/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/src/redist/packaging/osx/resources/en.lproj/conclusion.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/en.lproj/conclusion.html
rename to src/redist/packaging/osx/resources/en.lproj/conclusion.html
diff --git a/src/redist/packaging/osx/clisdk/resources/en.lproj/welcome.html b/src/redist/packaging/osx/resources/en.lproj/welcome.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/en.lproj/welcome.html
rename to src/redist/packaging/osx/resources/en.lproj/welcome.html
diff --git a/src/redist/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/src/redist/packaging/osx/resources/es.lproj/conclusion.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/es.lproj/conclusion.html
rename to src/redist/packaging/osx/resources/es.lproj/conclusion.html
diff --git a/src/redist/packaging/osx/clisdk/resources/es.lproj/welcome.html b/src/redist/packaging/osx/resources/es.lproj/welcome.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/es.lproj/welcome.html
rename to src/redist/packaging/osx/resources/es.lproj/welcome.html
diff --git a/src/redist/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/src/redist/packaging/osx/resources/fr.lproj/conclusion.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/fr.lproj/conclusion.html
rename to src/redist/packaging/osx/resources/fr.lproj/conclusion.html
diff --git a/src/redist/packaging/osx/clisdk/resources/fr.lproj/welcome.html b/src/redist/packaging/osx/resources/fr.lproj/welcome.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/fr.lproj/welcome.html
rename to src/redist/packaging/osx/resources/fr.lproj/welcome.html
diff --git a/src/redist/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/src/redist/packaging/osx/resources/it.lproj/conclusion.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/it.lproj/conclusion.html
rename to src/redist/packaging/osx/resources/it.lproj/conclusion.html
diff --git a/src/redist/packaging/osx/clisdk/resources/it.lproj/welcome.html b/src/redist/packaging/osx/resources/it.lproj/welcome.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/it.lproj/welcome.html
rename to src/redist/packaging/osx/resources/it.lproj/welcome.html
diff --git a/src/redist/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/src/redist/packaging/osx/resources/ja.lproj/conclusion.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/ja.lproj/conclusion.html
rename to src/redist/packaging/osx/resources/ja.lproj/conclusion.html
diff --git a/src/redist/packaging/osx/clisdk/resources/ja.lproj/welcome.html b/src/redist/packaging/osx/resources/ja.lproj/welcome.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/ja.lproj/welcome.html
rename to src/redist/packaging/osx/resources/ja.lproj/welcome.html
diff --git a/src/redist/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/src/redist/packaging/osx/resources/ko.lproj/conclusion.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/ko.lproj/conclusion.html
rename to src/redist/packaging/osx/resources/ko.lproj/conclusion.html
diff --git a/src/redist/packaging/osx/clisdk/resources/ko.lproj/welcome.html b/src/redist/packaging/osx/resources/ko.lproj/welcome.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/ko.lproj/welcome.html
rename to src/redist/packaging/osx/resources/ko.lproj/welcome.html
diff --git a/src/redist/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/src/redist/packaging/osx/resources/pl.lproj/conclusion.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/pl.lproj/conclusion.html
rename to src/redist/packaging/osx/resources/pl.lproj/conclusion.html
diff --git a/src/redist/packaging/osx/clisdk/resources/pl.lproj/welcome.html b/src/redist/packaging/osx/resources/pl.lproj/welcome.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/pl.lproj/welcome.html
rename to src/redist/packaging/osx/resources/pl.lproj/welcome.html
diff --git a/src/redist/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/src/redist/packaging/osx/resources/pt-br.lproj/conclusion.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
rename to src/redist/packaging/osx/resources/pt-br.lproj/conclusion.html
diff --git a/src/redist/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html b/src/redist/packaging/osx/resources/pt-br.lproj/welcome.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html
rename to src/redist/packaging/osx/resources/pt-br.lproj/welcome.html
diff --git a/src/redist/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/src/redist/packaging/osx/resources/ru.lproj/conclusion.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/ru.lproj/conclusion.html
rename to src/redist/packaging/osx/resources/ru.lproj/conclusion.html
diff --git a/src/redist/packaging/osx/clisdk/resources/ru.lproj/welcome.html b/src/redist/packaging/osx/resources/ru.lproj/welcome.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/ru.lproj/welcome.html
rename to src/redist/packaging/osx/resources/ru.lproj/welcome.html
diff --git a/src/redist/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/src/redist/packaging/osx/resources/tr.lproj/conclusion.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/tr.lproj/conclusion.html
rename to src/redist/packaging/osx/resources/tr.lproj/conclusion.html
diff --git a/src/redist/packaging/osx/clisdk/resources/tr.lproj/welcome.html b/src/redist/packaging/osx/resources/tr.lproj/welcome.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/tr.lproj/welcome.html
rename to src/redist/packaging/osx/resources/tr.lproj/welcome.html
diff --git a/src/redist/packaging/osx/clisdk/resources/welcome.html.lci b/src/redist/packaging/osx/resources/welcome.html.lci
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/welcome.html.lci
rename to src/redist/packaging/osx/resources/welcome.html.lci
diff --git a/src/redist/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/src/redist/packaging/osx/resources/zh-hans.lproj/conclusion.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
rename to src/redist/packaging/osx/resources/zh-hans.lproj/conclusion.html
diff --git a/src/redist/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html b/src/redist/packaging/osx/resources/zh-hans.lproj/welcome.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html
rename to src/redist/packaging/osx/resources/zh-hans.lproj/welcome.html
diff --git a/src/redist/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/src/redist/packaging/osx/resources/zh-hant.lproj/conclusion.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
rename to src/redist/packaging/osx/resources/zh-hant.lproj/conclusion.html
diff --git a/src/redist/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html b/src/redist/packaging/osx/resources/zh-hant.lproj/welcome.html
similarity index 100%
rename from src/redist/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html
rename to src/redist/packaging/osx/resources/zh-hant.lproj/welcome.html
diff --git a/src/redist/packaging/osx/clisdk/scripts/postinstall b/src/redist/packaging/osx/scripts/postinstall
similarity index 100%
rename from src/redist/packaging/osx/clisdk/scripts/postinstall
rename to src/redist/packaging/osx/scripts/postinstall
diff --git a/src/redist/packaging/windows/clisdk/Init.cmd b/src/redist/packaging/windows/Init.cmd
similarity index 100%
rename from src/redist/packaging/windows/clisdk/Init.cmd
rename to src/redist/packaging/windows/Init.cmd
diff --git a/src/redist/packaging/windows/clisdk/LCID/1028/bundle.wxl b/src/redist/packaging/windows/LCID/1028/bundle.wxl
similarity index 100%
rename from src/redist/packaging/windows/clisdk/LCID/1028/bundle.wxl
rename to src/redist/packaging/windows/LCID/1028/bundle.wxl
diff --git a/src/redist/packaging/windows/clisdk/LCID/1029/bundle.wxl b/src/redist/packaging/windows/LCID/1029/bundle.wxl
similarity index 100%
rename from src/redist/packaging/windows/clisdk/LCID/1029/bundle.wxl
rename to src/redist/packaging/windows/LCID/1029/bundle.wxl
diff --git a/src/redist/packaging/windows/clisdk/LCID/1031/bundle.wxl b/src/redist/packaging/windows/LCID/1031/bundle.wxl
similarity index 100%
rename from src/redist/packaging/windows/clisdk/LCID/1031/bundle.wxl
rename to src/redist/packaging/windows/LCID/1031/bundle.wxl
diff --git a/src/redist/packaging/windows/clisdk/LCID/1033/bundle.wxl b/src/redist/packaging/windows/LCID/1033/bundle.wxl
similarity index 100%
rename from src/redist/packaging/windows/clisdk/LCID/1033/bundle.wxl
rename to src/redist/packaging/windows/LCID/1033/bundle.wxl
diff --git a/src/redist/packaging/windows/clisdk/LCID/1036/bundle.wxl b/src/redist/packaging/windows/LCID/1036/bundle.wxl
similarity index 100%
rename from src/redist/packaging/windows/clisdk/LCID/1036/bundle.wxl
rename to src/redist/packaging/windows/LCID/1036/bundle.wxl
diff --git a/src/redist/packaging/windows/clisdk/LCID/1040/bundle.wxl b/src/redist/packaging/windows/LCID/1040/bundle.wxl
similarity index 100%
rename from src/redist/packaging/windows/clisdk/LCID/1040/bundle.wxl
rename to src/redist/packaging/windows/LCID/1040/bundle.wxl
diff --git a/src/redist/packaging/windows/clisdk/LCID/1041/bundle.wxl b/src/redist/packaging/windows/LCID/1041/bundle.wxl
similarity index 100%
rename from src/redist/packaging/windows/clisdk/LCID/1041/bundle.wxl
rename to src/redist/packaging/windows/LCID/1041/bundle.wxl
diff --git a/src/redist/packaging/windows/clisdk/LCID/1042/bundle.wxl b/src/redist/packaging/windows/LCID/1042/bundle.wxl
similarity index 100%
rename from src/redist/packaging/windows/clisdk/LCID/1042/bundle.wxl
rename to src/redist/packaging/windows/LCID/1042/bundle.wxl
diff --git a/src/redist/packaging/windows/clisdk/LCID/1045/bundle.wxl b/src/redist/packaging/windows/LCID/1045/bundle.wxl
similarity index 100%
rename from src/redist/packaging/windows/clisdk/LCID/1045/bundle.wxl
rename to src/redist/packaging/windows/LCID/1045/bundle.wxl
diff --git a/src/redist/packaging/windows/clisdk/LCID/1046/bundle.wxl b/src/redist/packaging/windows/LCID/1046/bundle.wxl
similarity index 100%
rename from src/redist/packaging/windows/clisdk/LCID/1046/bundle.wxl
rename to src/redist/packaging/windows/LCID/1046/bundle.wxl
diff --git a/src/redist/packaging/windows/clisdk/LCID/1049/bundle.wxl b/src/redist/packaging/windows/LCID/1049/bundle.wxl
similarity index 100%
rename from src/redist/packaging/windows/clisdk/LCID/1049/bundle.wxl
rename to src/redist/packaging/windows/LCID/1049/bundle.wxl
diff --git a/src/redist/packaging/windows/clisdk/LCID/1055/bundle.wxl b/src/redist/packaging/windows/LCID/1055/bundle.wxl
similarity index 100%
rename from src/redist/packaging/windows/clisdk/LCID/1055/bundle.wxl
rename to src/redist/packaging/windows/LCID/1055/bundle.wxl
diff --git a/src/redist/packaging/windows/clisdk/LCID/2052/bundle.wxl b/src/redist/packaging/windows/LCID/2052/bundle.wxl
similarity index 100%
rename from src/redist/packaging/windows/clisdk/LCID/2052/bundle.wxl
rename to src/redist/packaging/windows/LCID/2052/bundle.wxl
diff --git a/src/redist/packaging/windows/clisdk/LCID/3082/bundle.wxl b/src/redist/packaging/windows/LCID/3082/bundle.wxl
similarity index 100%
rename from src/redist/packaging/windows/clisdk/LCID/3082/bundle.wxl
rename to src/redist/packaging/windows/LCID/3082/bundle.wxl
diff --git a/src/redist/packaging/windows/clisdk/StableFileIdForApphostTransform.xslt b/src/redist/packaging/windows/StableFileIdForApphostTransform.xslt
similarity index 100%
rename from src/redist/packaging/windows/clisdk/StableFileIdForApphostTransform.xslt
rename to src/redist/packaging/windows/StableFileIdForApphostTransform.xslt
diff --git a/src/redist/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec b/src/redist/packaging/windows/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec
similarity index 100%
rename from src/redist/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec
rename to src/redist/packaging/windows/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec
diff --git a/src/redist/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec b/src/redist/packaging/windows/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec
similarity index 100%
rename from src/redist/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec
rename to src/redist/packaging/windows/VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.nuspec
diff --git a/src/redist/packaging/windows/clisdk/VS.Redist.Common.NetCore.SdkPlaceholder.nuspec b/src/redist/packaging/windows/VS.Redist.Common.NetCore.SdkPlaceholder.nuspec
similarity index 100%
rename from src/redist/packaging/windows/clisdk/VS.Redist.Common.NetCore.SdkPlaceholder.nuspec
rename to src/redist/packaging/windows/VS.Redist.Common.NetCore.SdkPlaceholder.nuspec
diff --git a/src/redist/packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec b/src/redist/packaging/windows/VS.Redist.Common.NetCore.Templates.nuspec
similarity index 100%
rename from src/redist/packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec
rename to src/redist/packaging/windows/VS.Redist.Common.NetCore.Templates.nuspec
diff --git a/src/redist/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec b/src/redist/packaging/windows/VS.Redist.Common.NetCore.Toolset.nuspec
similarity index 100%
rename from src/redist/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec
rename to src/redist/packaging/windows/VS.Redist.Common.NetCore.Toolset.nuspec
diff --git a/src/redist/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.cxspec b/src/redist/packaging/windows/VS.Tools.Net.Core.SDK.Resolver.cxspec
similarity index 100%
rename from src/redist/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.cxspec
rename to src/redist/packaging/windows/VS.Tools.Net.Core.SDK.Resolver.cxspec
diff --git a/src/redist/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.nuspec b/src/redist/packaging/windows/VS.Tools.Net.Core.SDK.Resolver.nuspec
similarity index 100%
rename from src/redist/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.nuspec
rename to src/redist/packaging/windows/VS.Tools.Net.Core.SDK.Resolver.nuspec
diff --git a/src/redist/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec b/src/redist/packaging/windows/VS.Tools.Net.Core.SDK.nuspec
similarity index 100%
rename from src/redist/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec
rename to src/redist/packaging/windows/VS.Tools.Net.Core.SDK.nuspec
diff --git a/src/redist/packaging/windows/clisdk/bundle.thm b/src/redist/packaging/windows/bundle.thm
similarity index 100%
rename from src/redist/packaging/windows/clisdk/bundle.thm
rename to src/redist/packaging/windows/bundle.thm
diff --git a/src/redist/packaging/windows/clisdk/bundle.wxs b/src/redist/packaging/windows/bundle.wxs
similarity index 100%
rename from src/redist/packaging/windows/clisdk/bundle.wxs
rename to src/redist/packaging/windows/bundle.wxs
diff --git a/src/redist/packaging/windows/clisdk/dotnet.wxs b/src/redist/packaging/windows/dotnet.wxs
similarity index 100%
rename from src/redist/packaging/windows/clisdk/dotnet.wxs
rename to src/redist/packaging/windows/dotnet.wxs
diff --git a/src/redist/packaging/windows/clisdk/dotnethome_x64.wxs b/src/redist/packaging/windows/dotnethome_x64.wxs
similarity index 100%
rename from src/redist/packaging/windows/clisdk/dotnethome_x64.wxs
rename to src/redist/packaging/windows/dotnethome_x64.wxs
diff --git a/src/redist/packaging/windows/clisdk/dummyeula.rtf b/src/redist/packaging/windows/dummyeula.rtf
similarity index 100%
rename from src/redist/packaging/windows/clisdk/dummyeula.rtf
rename to src/redist/packaging/windows/dummyeula.rtf
diff --git a/src/redist/packaging/windows/clisdk/generatebundle.ps1 b/src/redist/packaging/windows/generatebundle.ps1
similarity index 100%
rename from src/redist/packaging/windows/clisdk/generatebundle.ps1
rename to src/redist/packaging/windows/generatebundle.ps1
diff --git a/src/redist/packaging/windows/clisdk/generatemsi.ps1 b/src/redist/packaging/windows/generatemsi.ps1
similarity index 100%
rename from src/redist/packaging/windows/clisdk/generatemsi.ps1
rename to src/redist/packaging/windows/generatemsi.ps1
diff --git a/src/redist/packaging/windows/clisdk/generatenupkg.ps1 b/src/redist/packaging/windows/generatenupkg.ps1
similarity index 100%
rename from src/redist/packaging/windows/clisdk/generatenupkg.ps1
rename to src/redist/packaging/windows/generatenupkg.ps1
diff --git a/src/redist/packaging/windows/clisdk/generatesdkplaceholdermsi.ps1 b/src/redist/packaging/windows/generatesdkplaceholdermsi.ps1
similarity index 100%
rename from src/redist/packaging/windows/clisdk/generatesdkplaceholdermsi.ps1
rename to src/redist/packaging/windows/generatesdkplaceholdermsi.ps1
diff --git a/src/redist/packaging/windows/clisdk/generatetemplatesmsi.ps1 b/src/redist/packaging/windows/generatetemplatesmsi.ps1
similarity index 100%
rename from src/redist/packaging/windows/clisdk/generatetemplatesmsi.ps1
rename to src/redist/packaging/windows/generatetemplatesmsi.ps1
diff --git a/src/redist/packaging/windows/clisdk/manifests.wxs b/src/redist/packaging/windows/manifests.wxs
similarity index 100%
rename from src/redist/packaging/windows/clisdk/manifests.wxs
rename to src/redist/packaging/windows/manifests.wxs
diff --git a/src/redist/packaging/windows/clisdk/msi b/src/redist/packaging/windows/msi
similarity index 100%
rename from src/redist/packaging/windows/clisdk/msi
rename to src/redist/packaging/windows/msi
diff --git a/src/redist/packaging/windows/clisdk/msi.ico b/src/redist/packaging/windows/msi.ico
similarity index 100%
rename from src/redist/packaging/windows/clisdk/msi.ico
rename to src/redist/packaging/windows/msi.ico
diff --git a/src/redist/packaging/windows/clisdk/provider.wxs b/src/redist/packaging/windows/provider.wxs
similarity index 100%
rename from src/redist/packaging/windows/clisdk/provider.wxs
rename to src/redist/packaging/windows/provider.wxs
diff --git a/src/redist/packaging/windows/clisdk/registrykeys.wxs b/src/redist/packaging/windows/registrykeys.wxs
similarity index 100%
rename from src/redist/packaging/windows/clisdk/registrykeys.wxs
rename to src/redist/packaging/windows/registrykeys.wxs
diff --git a/src/redist/packaging/windows/clisdk/sdkplaceholder.wxs b/src/redist/packaging/windows/sdkplaceholder.wxs
similarity index 100%
rename from src/redist/packaging/windows/clisdk/sdkplaceholder.wxs
rename to src/redist/packaging/windows/sdkplaceholder.wxs
diff --git a/src/redist/packaging/windows/clisdk/templates.wxs b/src/redist/packaging/windows/templates.wxs
similarity index 100%
rename from src/redist/packaging/windows/clisdk/templates.wxs
rename to src/redist/packaging/windows/templates.wxs
diff --git a/src/redist/packaging/windows/clisdk/variables.wxi b/src/redist/packaging/windows/variables.wxi
similarity index 100%
rename from src/redist/packaging/windows/clisdk/variables.wxi
rename to src/redist/packaging/windows/variables.wxi