diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/FluentIconsKeyboardManager.png b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/KeyboardManagerEditor/FluentIconsKeyboardManager.png
similarity index 100%
rename from src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/FluentIconsKeyboardManager.png
rename to src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/KeyboardManagerEditor/FluentIconsKeyboardManager.png
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/Keyboard.ico b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/KeyboardManagerEditor/Keyboard.ico
similarity index 100%
rename from src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/Keyboard.ico
rename to src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/KeyboardManagerEditor/Keyboard.ico
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/Square150x150Logo.png b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/KeyboardManagerEditor/Square150x150Logo.png
similarity index 100%
rename from src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/Square150x150Logo.png
rename to src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/KeyboardManagerEditor/Square150x150Logo.png
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/Square44x44Logo.png b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/KeyboardManagerEditor/Square44x44Logo.png
similarity index 100%
rename from src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/Square44x44Logo.png
rename to src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/KeyboardManagerEditor/Square44x44Logo.png
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/StoreLogo.png b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/KeyboardManagerEditor/StoreLogo.png
similarity index 100%
rename from src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/StoreLogo.png
rename to src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/KeyboardManagerEditor/StoreLogo.png
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/kbm.jpg b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/KeyboardManagerEditor/kbm.jpg
similarity index 100%
rename from src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/kbm.jpg
rename to src/modules/keyboardmanager/KeyboardManagerEditorUI/Assets/KeyboardManagerEditor/kbm.jpg
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/KeyboardManagerEditorUI.csproj b/src/modules/keyboardmanager/KeyboardManagerEditorUI/KeyboardManagerEditorUI.csproj
index 02933b4bbe..5b184409fe 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/KeyboardManagerEditorUI.csproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/KeyboardManagerEditorUI.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>KeyboardManagerEditorUI</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <UseWinUI>true</UseWinUI>
-    <EnableMsixTooling>true</EnableMsixTooling>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
     <Nullable>enable</Nullable>
     <WindowsPackageType>None</WindowsPackageType>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@@ -26,10 +26,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="Assets\Keyboard.ico" />
+    <None Remove="Assets\KeyboardManagerEditor\Keyboard.ico" />
     <None Remove="Styles\Colors.xaml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Page Remove="KeyboardManagerEditorXAML\App.xaml" />
+  </ItemGroup>
+	
+  <ItemGroup>
+    <ApplicationDefinition Include="KeyboardManagerEditorXAML\App.xaml" />
+  </ItemGroup>
+	
   <ItemGroup>
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
@@ -39,7 +47,7 @@
     Tools extension to be activated for this project even if the Windows App SDK Nuget
     package has not yet been restored.
   -->
-  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
+  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnablePreviewMsixTooling)'=='true'">
     <ProjectCapability Include="Msix" />
   </ItemGroup>
   <ItemGroup>
@@ -56,12 +64,13 @@
     <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
     <ProjectReference Include="..\..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
     <ProjectReference Include="..\..\..\common\Common.UI\Common.UI.csproj" />
+	<ProjectReference Include="..\KeyboardManagerEditorLibraryWrapper\KeyboardManagerEditorLibraryWrapper.vcxproj" />
   </ItemGroup>
   <ItemGroup>
-    <Content Update="Assets\Keyboard.ico">
+    <Content Update="Assets\KeyboardManagerEditor\Keyboard.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Update="Assets\Square150x150Logo.png">
+    <Content Update="Assets\KeyboardManagerEditor\Square150x150Logo.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
@@ -81,7 +90,7 @@
     Explorer "Package and Publish" context menu entry to be enabled for this project even if
     the Windows App SDK Nuget package has not yet been restored.
   -->
-  <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
+  <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnablePreviewMsixTooling)'=='true'">
     <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
   </PropertyGroup>
 </Project>
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/App.xaml b/src/modules/keyboardmanager/KeyboardManagerEditorUI/KeyboardManagerEditorXAML/App.xaml
similarity index 100%
rename from src/modules/keyboardmanager/KeyboardManagerEditorUI/App.xaml
rename to src/modules/keyboardmanager/KeyboardManagerEditorUI/KeyboardManagerEditorXAML/App.xaml
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/App.xaml.cs b/src/modules/keyboardmanager/KeyboardManagerEditorUI/KeyboardManagerEditorXAML/App.xaml.cs
similarity index 100%
rename from src/modules/keyboardmanager/KeyboardManagerEditorUI/App.xaml.cs
rename to src/modules/keyboardmanager/KeyboardManagerEditorUI/KeyboardManagerEditorXAML/App.xaml.cs
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/MainWindow.xaml b/src/modules/keyboardmanager/KeyboardManagerEditorUI/KeyboardManagerEditorXAML/MainWindow.xaml
similarity index 94%
rename from src/modules/keyboardmanager/KeyboardManagerEditorUI/MainWindow.xaml
rename to src/modules/keyboardmanager/KeyboardManagerEditorUI/KeyboardManagerEditorXAML/MainWindow.xaml
index 3c33b29875..d4e02233bb 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/MainWindow.xaml
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/KeyboardManagerEditorXAML/MainWindow.xaml
@@ -31,7 +31,7 @@
                 <ImageIcon
                     Height="16"
                     Margin="16,0,0,0"
-                    Source="/Assets/FluentIconsKeyboardManager.png" />
+                    Source="/Assets/KeyboardManagerEditor/FluentIconsKeyboardManager.png" />
             </TitleBar.LeftHeader>
         </TitleBar>
 
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/MainWindow.xaml.cs b/src/modules/keyboardmanager/KeyboardManagerEditorUI/KeyboardManagerEditorXAML/MainWindow.xaml.cs
similarity index 96%
rename from src/modules/keyboardmanager/KeyboardManagerEditorUI/MainWindow.xaml.cs
rename to src/modules/keyboardmanager/KeyboardManagerEditorUI/KeyboardManagerEditorXAML/MainWindow.xaml.cs
index 879d457aa9..4d82edfc6b 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/MainWindow.xaml.cs
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/KeyboardManagerEditorXAML/MainWindow.xaml.cs
@@ -41,7 +41,7 @@ namespace KeyboardManagerEditorUI
         private void SetTitleBar()
         {
             ExtendsContentIntoTitleBar = true;
-            this.SetIcon(@"Assets\Keyboard.ico");
+            this.SetIcon(@"Assets\KeyboardManagerEditor\Keyboard.ico");
             this.SetTitleBar(titleBar);
             Title = "Keyboard Manager";
         }
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Package.appxmanifest b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Package.appxmanifest
index d33e0169de..f131ae118c 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Package.appxmanifest
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Package.appxmanifest
@@ -17,7 +17,7 @@
   <Properties>
     <DisplayName>Keyboard Manager</DisplayName>
     <PublisherDisplayName>haoliuu</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
+    <Logo>Assets\KeyboardManagerEditor\StoreLogo.png</Logo>
   </Properties>
 
   <Dependencies>
@@ -37,10 +37,10 @@
         DisplayName="Keyboard Manager"
         Description="Keyboard Manager"
         BackgroundColor="transparent"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" />
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+        Square150x150Logo="Assets\KeyboardManagerEditor\Square150x150Logo.png"
+        Square44x44Logo="Assets\KeyboardManagerEditor\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Assets\KeyboardManagerEditor\Wide310x150Logo.png" />
+        <uap:SplashScreen Image="Assets\KeyboardManagerEditor\SplashScreen.png" />
       </uap:VisualElements>
     </Application>
   </Applications>