diff --git a/.pipelines/msix/Images/logo.png b/.pipelines/msix/Images/logo.png
deleted file mode 100644
index 8495aaf09d..0000000000
Binary files a/.pipelines/msix/Images/logo.png and /dev/null differ
diff --git a/.pipelines/msix/Images/logo150.png b/.pipelines/msix/Images/logo150.png
deleted file mode 100644
index 3186a72996..0000000000
Binary files a/.pipelines/msix/Images/logo150.png and /dev/null differ
diff --git a/.pipelines/msix/Images/logo44.png b/.pipelines/msix/Images/logo44.png
deleted file mode 100644
index cbc9822292..0000000000
Binary files a/.pipelines/msix/Images/logo44.png and /dev/null differ
diff --git a/.pipelines/msix/PackagingLayout.xml b/.pipelines/msix/PackagingLayout.xml
deleted file mode 100644
index 9bd2e40b61..0000000000
--- a/.pipelines/msix/PackagingLayout.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<PackagingLayout xmlns="http://schemas.microsoft.com/appx/makeappx/2017">
-  <PackageFamily ID="PowerToys" FlatBundle="true" ManifestPath="appxmanifest.xml" ResourceManager="false">
-    
-    <Package ID="PowerToys-x64" ProcessorArchitecture="x64">
-      <Files>
-        <File DestinationPath="License.rtf" SourcePath="..\..\License.rtf"/>
-
-        <File DestinationPath="action_runner.exe" SourcePath="..\..\x64\Release\action_runner.exe"/>
-        <File DestinationPath="PowerToys.exe" SourcePath="..\..\x64\Release\PowerToys.exe"/>
-        <File DestinationPath="PowerToysSettings.exe" SourcePath="..\..\x64\Release\PowerToysSettings.exe"/>
-
-        <File DestinationPath="modules\FancyZonesEditor.exe" SourcePath="..\..\x64\Release\modules\FancyZonesEditor.exe"/>
-        <File DestinationPath="modules\ControlzEx.dll" SourcePath="..\..\x64\Release\modules\ControlzEx.dll"/>
-        <File DestinationPath="modules\fancyzones.dll" SourcePath="..\..\x64\Release\modules\fancyzones.dll"/>
-        <File DestinationPath="modules\MahApps.Metro.dll" SourcePath="..\..\x64\Release\modules\MahApps.Metro.dll"/>
-        <File DestinationPath="modules\Microsoft.Xaml.Behaviors.dll" SourcePath="..\..\x64\Release\modules\Microsoft.Xaml.Behaviors.dll"/>
-        <File DestinationPath="modules\PowerRenameExt.dll" SourcePath="..\..\x64\Release\modules\PowerRenameExt.dll"/>
-        <File DestinationPath="modules\shortcut_guide.dll" SourcePath="..\..\x64\Release\modules\shortcut_guide.dll"/>
-        <File DestinationPath="modules\PowerRenameUWPUI.exe" SourcePath="..\..\x64\Release\PowerRenameUWPUI.exe"/>
-        <File DestinationPath="modules\System.Text.Json.dll" SourcePath="..\..\x64\Release\modules\System.Text.Json.dll"/>
-        <File DestinationPath="modules\System.Memory.dll" SourcePath="..\..\x64\Release\modules\System.Memory.dll"/>
-        <File DestinationPath="modules\System.Buffers.dll" SourcePath="..\..\x64\Release\modules\System.Buffers.dll"/>
-        <File DestinationPath="modules\System.Runtime.CompilerServices.Unsafe.dll" SourcePath="..\..\x64\Release\modules\System.Runtime.CompilerServices.Unsafe.dll"/>
-        <File DestinationPath="modules\System.Text.Encodings.Web.dll" SourcePath="..\..\x64\Release\modules\System.Text.Encodings.Web.dll"/>
-        <File DestinationPath="modules\System.Threading.Tasks.Extensions.dll" SourcePath="..\..\x64\Release\modules\System.Threading.Tasks.Extensions.dll"/>
-        <File DestinationPath="modules\System.ValueTuple.dll" SourcePath="..\..\x64\Release\modules\System.ValueTuple.dll"/>
-        <File DestinationPath="modules\System.Numerics.Vectors.dll" SourcePath="..\..\x64\Release\modules\System.Numerics.Vectors.dll"/>
-        <File DestinationPath="modules\Microsoft.Bcl.AsyncInterfaces.dll" SourcePath="..\..\x64\Release\modules\Microsoft.Bcl.AsyncInterfaces.dll"/>
-
-        <File DestinationPath="modules\FancyZonesEditor.exe.config" SourcePath="..\..\x64\Release\modules\FancyZonesEditor.exe.config"/>
-
-        <File DestinationPath="Notifications.dll" SourcePath="..\..\x64\Release\Notifications.dll"/>
-
-        <File DestinationPath="svgs\*" SourcePath="..\..\x64\Release\svgs\*"/>
-        <File DestinationPath="settings-html\**" SourcePath="..\..\x64\Release\settings-html\**"/>
-        <File DestinationPath="Images\*.png" SourcePath="Images\*.png"/>
-      </Files>
-    </Package>
-  </PackageFamily>
-</PackagingLayout>
diff --git a/.pipelines/msix/appxmanifest.xml b/.pipelines/msix/appxmanifest.xml
deleted file mode 100644
index 117b747a66..0000000000
--- a/.pipelines/msix/appxmanifest.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" 
-  xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10" 
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" 
-  xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" 
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" 
-  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" 
-  xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4" 
-  xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5" IgnorableNamespaces="desktop4">
-  <Identity Name="Microsoft.PowerToys" Version="0.15.0.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" ProcessorArchitecture="x64" />
-  <Properties>
-    <DisplayName>PowerToys</DisplayName>
-    <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
-    <Description>Windows system utilities to maximize productivity</Description>
-    <Logo>Images\logo.png</Logo>
-  </Properties>
-  <Resources>
-    <Resource Language="en-us" />
-  </Resources>
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.18362.30" />
-  </Dependencies>
-  <Capabilities>
-    <rescap:Capability Name="runFullTrust"/>
-    <rescap:Capability Name="allowElevation"/>
-  </Capabilities>
-  <Applications>
-    <Application Id="PowerToys" Executable="PowerToys.exe" EntryPoint="Windows.FullTrustApplication">
-      <uap:VisualElements DisplayName="PowerToys (Experimental)" Description="Windows system utilities to maximize productivity" Square150x150Logo="Images\logo150.png" Square44x44Logo="Images\logo44.png" BackgroundColor="transparent" />
-      <Extensions>
-        <uap5:Extension Category="windows.startupTask" Executable="PowerToys.exe" EntryPoint="Windows.FullTrustApplication">
-          <uap5:StartupTask TaskId="PowerToysStartupTaskID" Enabled="true" DisplayName="PowerToys" />
-        </uap5:Extension>
-        <com:Extension Category="windows.comServer">
-          <com:ComServer>
-            <com:ExeServer Executable="modules\PowerRenameUWPUI.exe" DisplayName="PowerRenameUWPUI">
-              <com:Class Id="0440049F-D1DC-4E46-B27B-98393D79486B"/>
-            </com:ExeServer>
-          </com:ComServer>
-        </com:Extension>
-        <desktop4:Extension Category="windows.fileExplorerContextMenus">
-          <desktop4:FileExplorerContextMenus>
-            <desktop4:ItemType Type="*">
-              <desktop4:Verb Id="FilePowerRename" Clsid="0440049F-D1DC-4E46-B27B-98393D79486B" />
-            </desktop4:ItemType>
-            <desktop5:ItemType Type="Directory">
-              <desktop5:Verb Id="DirectoryPowerRename" Clsid="0440049F-D1DC-4E46-B27B-98393D79486B" />
-            </desktop5:ItemType>
-          </desktop4:FileExplorerContextMenus>
-        </desktop4:Extension>
-        <Extension Category="windows.backgroundTasks" EntryPoint="PowerToysNotifications.BackgroundHandler">
-          <BackgroundTasks>
-            <Task Type="general" />
-          </BackgroundTasks>
-        </Extension>
-      </Extensions>
-    </Application>
-  </Applications>
-  <Extensions>
-    <Extension Category="windows.activatableClass.inProcessServer">
-      <InProcessServer>
-        <Path>Notifications.dll</Path>
-        <ActivatableClass ActivatableClassId="PowerToysNotifications.BackgroundHandler" ThreadingModel="both"/>
-      </InProcessServer>
-    </Extension>
-  </Extensions>
-</Package>
diff --git a/.pipelines/pipeline.user.windows.yml b/.pipelines/pipeline.user.windows.yml
index f91b4f54bd..eb21c624a0 100644
--- a/.pipelines/pipeline.user.windows.yml
+++ b/.pipelines/pipeline.user.windows.yml
@@ -67,9 +67,9 @@ package:
   commands:
     - !!buildcommand
       name: 'Build MSIX package'
-      command: '.pipelines\msix\build_msix.cmd'
+      command: 'installer\msix\build_msix_cdpx.cmd'
       artifacts:
-        - from: '.pipelines\msix\bin'
+        - from: 'installer\msix\bin'
           to: 'Build_MSIX_Package_Output'
           include:
             - 'PowerToys-x64.msix'
diff --git a/.pipelines/msix/build_msix.cmd b/installer/MSIX/build_msix_cdpx.cmd
similarity index 100%
rename from .pipelines/msix/build_msix.cmd
rename to installer/MSIX/build_msix_cdpx.cmd