diff --git a/src/modules/cmdpal/Exts/TemplateExtension/Pages/TemplateExtensionPage.cs b/src/modules/cmdpal/Exts/TemplateExtension/Pages/TemplateExtensionPage.cs
new file mode 100644
index 0000000000..acbd925780
--- /dev/null
+++ b/src/modules/cmdpal/Exts/TemplateExtension/Pages/TemplateExtensionPage.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Microsoft.CmdPal.Extensions;
+using Microsoft.CmdPal.Extensions.Helpers;
+
+namespace TemplateExtension;
+
+internal sealed partial class TemplateExtensionPage : ListPage
+{
+    public TemplateExtensionPage()
+    {
+        Icon = new(string.Empty);
+        Name = "TemplateDisplayName";
+    }
+
+    public override ISection[] GetItems()
+    {
+        return [
+            new ListSection()
+            {
+                Items = [
+                    new ListItem(new NoOpCommand()) { Title = "TODO: Implement your extension here" }
+                ],
+            }
+        ];
+    }
+}
diff --git a/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtension.csproj b/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtension.csproj
index a101b90964..fd6552d2ff 100644
--- a/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtension.csproj
+++ b/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtension.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -36,6 +36,11 @@
   <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <ProjectCapability Include="Msix" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Data\" />
+    <Folder Include="Forms\" />
+    <Folder Include="Commands\" />
+  </ItemGroup>
 
   <!--
     Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
diff --git a/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtensionCommandsProvider.cs b/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtensionCommandsProvider.cs
new file mode 100644
index 0000000000..2944ae882d
--- /dev/null
+++ b/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtensionCommandsProvider.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.CmdPal.Extensions;
+using Microsoft.CmdPal.Extensions.Helpers;
+
+namespace TemplateExtension;
+
+public partial class TemplateExtensionActionsProvider : ICommandProvider
+{
+    public string DisplayName => $"TemplateDisplayName Commands";
+
+    public IconDataType Icon => new(string.Empty);
+
+    private readonly IListItem[] _commands = [
+        new ListItem(new TemplateExtensionPage()),
+    ];
+
+#pragma warning disable CA1816 // Dispose methods should call SuppressFinalize
+    public void Dispose() => throw new NotImplementedException();
+#pragma warning restore CA1816 // Dispose methods should call SuppressFinalize
+
+    public IListItem[] TopLevelCommands()
+    {
+        return _commands;
+    }
+}
diff --git a/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtensionPage.cs b/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtensionPage.cs
deleted file mode 100644
index f743546c04..0000000000
--- a/src/modules/cmdpal/Exts/TemplateExtension/TemplateExtensionPage.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Microsoft.CmdPal.Extensions;
-using Microsoft.CmdPal.Extensions.Helpers;
-
-namespace TemplateExtension;
-
-[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "This is sample code")]
-internal sealed partial class TemplateExtensionPage : ListPage
-{
-    public TemplateExtensionPage()
-    {
-        Icon = new(string.Empty);
-        Name = "TemplateDisplayName";
-    }
-
-    public override ISection[] GetItems()
-    {
-        return [
-            new ListSection()
-            {
-                Items = [
-                    new ListItem(new NoOpCommand()) { Title = "TODO: Implement your extension here" }
-                ],
-            }
-        ];
-    }
-}
-
-[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "This is sample code")]
-public partial class TemplateExtensionActionsProvider : ICommandProvider
-{
-    public string DisplayName => $"TemplateDisplayName Commands";
-
-    public IconDataType Icon => new(string.Empty);
-
-    private readonly IListItem[] _actions = [
-        new ListItem(new TemplateExtensionPage()),
-    ];
-
-#pragma warning disable CA1816 // Dispose methods should call SuppressFinalize
-    public void Dispose() => throw new NotImplementedException();
-#pragma warning restore CA1816 // Dispose methods should call SuppressFinalize
-
-    public IListItem[] TopLevelCommands()
-    {
-        return _actions;
-    }
-}