diff --git a/OpenConsole.sln b/OpenConsole.sln
index 935e252c3..82ab30fdc 100644
--- a/OpenConsole.sln
+++ b/OpenConsole.sln
@@ -177,7 +177,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminal", "src\casc
 		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalApp", "src\cascadia\TerminalApp\TerminalApp.vcxproj", "{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalApp", "src\cascadia\TerminalApp\dll\TerminalApp.vcxproj", "{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
 		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
@@ -227,7 +227,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_TerminalApp", "sr
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAppLib", "src\cascadia\TerminalApp\lib\TerminalAppLib.vcxproj", "{CA5CAD1A-9A12-429C-B551-8562EC954746}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAppLib", "src\cascadia\TerminalApp\TerminalAppLib.vcxproj", "{CA5CAD1A-9A12-429C-B551-8562EC954746}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
 	EndProjectSection
diff --git a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj
index b99a61466..67952867d 100644
--- a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj
+++ b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj
@@ -74,14 +74,14 @@
 
   <!-- ========================= Project References ======================== -->
   <ItemGroup>
-    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalApp\lib\TerminalAppLib.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalApp\TerminalAppLib.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)\src\types\lib\types.vcxproj" />
 
     <!-- If you don't reference these projects here, the
     _ConsoleGenerateAdditionalWinmdManifests step won't gather the winmd's -->
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\TerminalApp.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\dll\TerminalApp.vcxproj" />
   </ItemGroup>
 
   <!-- ========================= Globals ======================== -->
@@ -89,7 +89,7 @@
   <!-- ====================== Compiler & Linker Flags ===================== -->
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\jsoncpp\json;$(OpenConsoleDir)src\inc;$(OpenConsoleDir)src\inc\test;$(WinRT_IncludePath)\..\cppwinrt\winrt;"$(OpenConsoleDir)\src\cascadia\TerminalApp\lib\Generated Files";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\jsoncpp\json;$(OpenConsoleDir)src\inc;$(OpenConsoleDir)src\inc\test;$(WinRT_IncludePath)\..\cppwinrt\winrt;"$(OpenConsoleDir)\src\cascadia\TerminalApp\Generated Files";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
 
       <!-- Manually disable unreachable code warning, because jconcpp has a ton of that. -->
diff --git a/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj b/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj
index f035d8a74..b6d85e9ae 100644
--- a/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj
+++ b/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj
@@ -96,7 +96,7 @@
     </ProjectReference>
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
 
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\TerminalApp.vcxproj">
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\dll\TerminalApp.vcxproj">
       <Project>{ca5cad1a-44bd-4ac7-ac72-f16e576fdd12}</Project>
     </ProjectReference>
 
diff --git a/src/cascadia/TerminalApp/App.idl b/src/cascadia/TerminalApp/App.idl
index 018c495b8..5e000c5a1 100644
--- a/src/cascadia/TerminalApp/App.idl
+++ b/src/cascadia/TerminalApp/App.idl
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import "../AppLogic.idl";
+import "AppLogic.idl";
 
 namespace TerminalApp
 {
diff --git a/src/cascadia/TerminalApp/AppKeyBindings.idl b/src/cascadia/TerminalApp/AppKeyBindings.idl
index 0dcba9355..ab670a339 100644
--- a/src/cascadia/TerminalApp/AppKeyBindings.idl
+++ b/src/cascadia/TerminalApp/AppKeyBindings.idl
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-import "../ActionArgs.idl";
-import "../ShortcutActionDispatch.idl";
+import "ActionArgs.idl";
+import "ShortcutActionDispatch.idl";
 
 namespace TerminalApp
 {
diff --git a/src/cascadia/TerminalApp/AppLogic.idl b/src/cascadia/TerminalApp/AppLogic.idl
index 00006608e..73b77b544 100644
--- a/src/cascadia/TerminalApp/AppLogic.idl
+++ b/src/cascadia/TerminalApp/AppLogic.idl
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import "../TerminalPage.idl";
-import "../ShortcutActionDispatch.idl";
-import "../IDirectKeyListener.idl";
+import "TerminalPage.idl";
+import "ShortcutActionDispatch.idl";
+import "IDirectKeyListener.idl";
 
 namespace TerminalApp
 {
diff --git a/src/cascadia/TerminalApp/Command.idl b/src/cascadia/TerminalApp/Command.idl
index beb0a43f1..eea4c9bac 100644
--- a/src/cascadia/TerminalApp/Command.idl
+++ b/src/cascadia/TerminalApp/Command.idl
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import "../ShortcutActionDispatch.idl";
+import "ShortcutActionDispatch.idl";
 
 namespace TerminalApp
 {
diff --git a/src/cascadia/TerminalApp/CommandPalette.idl b/src/cascadia/TerminalApp/CommandPalette.idl
index 93d5851f6..793ac8334 100644
--- a/src/cascadia/TerminalApp/CommandPalette.idl
+++ b/src/cascadia/TerminalApp/CommandPalette.idl
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import "../Command.idl";
+import "Command.idl";
 
 namespace TerminalApp
 {
diff --git a/src/cascadia/TerminalApp/MinMaxCloseControl.idl b/src/cascadia/TerminalApp/MinMaxCloseControl.idl
index c0ccb370f..eb8fbd16e 100644
--- a/src/cascadia/TerminalApp/MinMaxCloseControl.idl
+++ b/src/cascadia/TerminalApp/MinMaxCloseControl.idl
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import "..\TitlebarControl.idl";
+import "TitlebarControl.idl";
 
 namespace TerminalApp
 {
diff --git a/src/cascadia/TerminalApp/ShortcutActionDispatch.idl b/src/cascadia/TerminalApp/ShortcutActionDispatch.idl
index e13c04335..f34256f3a 100644
--- a/src/cascadia/TerminalApp/ShortcutActionDispatch.idl
+++ b/src/cascadia/TerminalApp/ShortcutActionDispatch.idl
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-import "../ActionArgs.idl";
+import "ActionArgs.idl";
 
 namespace TerminalApp
 {
diff --git a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
similarity index 52%
rename from src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj
rename to src/cascadia/TerminalApp/TerminalAppLib.vcxproj
index abb49e21e..807f94644 100644
--- a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj
+++ b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
@@ -24,9 +24,9 @@
     <DisableEmbeddedXbf>false</DisableEmbeddedXbf>
     <XamlComponentResourceLocation>nested</XamlComponentResourceLocation>
   </PropertyGroup>
-  <Import Project="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
+  <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
-  <Import Project="..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props" Condition="Exists('..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" />
+  <Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" />
 
   <ItemDefinitionGroup>
     <ClCompile>
@@ -42,190 +42,190 @@
       For any types that use XAML information, if their .idl and .h aren't
       marked DependentUpon the corresponding .xaml file, XamlTypeInfo.g.h won't
       pick it up correctly. -->
-    <ApplicationDefinition Include="..\App.xaml">
+    <ApplicationDefinition Include="App.xaml">
       <SubType>Designer</SubType>
     </ApplicationDefinition>
   </ItemGroup>
   <!-- When we add other user controls, they should go in here as so: -->
   <ItemGroup>
-    <Page Include="../MinMaxCloseControl.xaml">
+    <Page Include="MinMaxCloseControl.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="../TerminalPage.xaml">
+    <Page Include="TerminalPage.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="../TitlebarControl.xaml">
+    <Page Include="TitlebarControl.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="../TabRowControl.xaml">
+    <Page Include="TabRowControl.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="../ColorPickupFlyout.xaml">
+    <Page Include="ColorPickupFlyout.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="../CommandPalette.xaml">
+    <Page Include="CommandPalette.xaml">
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
   <!-- ========================= Headers ======================== -->
   <ItemGroup>
-    <ClInclude Include="../App.base.h" />
-    <ClInclude Include="../AppCommandlineArgs.h" />
-    <ClInclude Include="../Commandline.h" />
-    <ClInclude Include="../MinMaxCloseControl.h">
-      <DependentUpon>../MinMaxCloseControl.xaml</DependentUpon>
+    <ClInclude Include="App.base.h" />
+    <ClInclude Include="AppCommandlineArgs.h" />
+    <ClInclude Include="Commandline.h" />
+    <ClInclude Include="MinMaxCloseControl.h">
+      <DependentUpon>MinMaxCloseControl.xaml</DependentUpon>
     </ClInclude>
-    <ClInclude Include="../TerminalPage.h">
-      <DependentUpon>../TerminalPage.xaml</DependentUpon>
+    <ClInclude Include="TerminalPage.h">
+      <DependentUpon>TerminalPage.xaml</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
-    <ClInclude Include="../TitlebarControl.h">
-      <DependentUpon>../TitlebarControl.xaml</DependentUpon>
+    <ClInclude Include="TitlebarControl.h">
+      <DependentUpon>TitlebarControl.xaml</DependentUpon>
     </ClInclude>
-    <ClInclude Include="../TabRowControl.h">
-      <DependentUpon>../TabRowControl.xaml</DependentUpon>
+    <ClInclude Include="TabRowControl.h">
+      <DependentUpon>TabRowControl.xaml</DependentUpon>
     </ClInclude>
-    <ClInclude Include="../ColorPickupFlyout.h">
-      <DependentUpon>../ColorPickupFlyout.xaml</DependentUpon>
+    <ClInclude Include="ColorPickupFlyout.h">
+      <DependentUpon>ColorPickupFlyout.xaml</DependentUpon>
     </ClInclude>
-    <ClInclude Include="../CommandPalette.h">
-      <DependentUpon>../CommandPalette.xaml</DependentUpon>
+    <ClInclude Include="CommandPalette.h">
+      <DependentUpon>CommandPalette.xaml</DependentUpon>
     </ClInclude>
-    <ClInclude Include="../Command.h">
-      <DependentUpon>../Command.idl</DependentUpon>
+    <ClInclude Include="Command.h">
+      <DependentUpon>Command.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="../EmptyStringVisibilityConverter.h">
-      <DependentUpon>../EmptyStringVisibilityConverter.idl</DependentUpon>
+    <ClInclude Include="EmptyStringVisibilityConverter.h">
+      <DependentUpon>EmptyStringVisibilityConverter.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="../HasNestedCommandsVisibilityConverter.h">
-      <DependentUpon>../HasNestedCommandsVisibilityConverter.idl</DependentUpon>
+    <ClInclude Include="HasNestedCommandsVisibilityConverter.h">
+      <DependentUpon>HasNestedCommandsVisibilityConverter.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="../Tab.h">
-      <DependentUpon>../Tab.idl</DependentUpon>
+    <ClInclude Include="Tab.h">
+      <DependentUpon>Tab.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="../Pane.h" />
-    <ClInclude Include="../ColorScheme.h">
-      <DependentUpon>../ColorScheme.idl</DependentUpon>
+    <ClInclude Include="Pane.h" />
+    <ClInclude Include="ColorScheme.h">
+      <DependentUpon>ColorScheme.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="../GlobalAppSettings.h" />
-    <ClInclude Include="../Profile.h" />
-    <ClInclude Include="../CascadiaSettings.h" />
-    <ClInclude Include="../KeyChordSerialization.h" />
-    <ClInclude Include="../JsonUtils.h" />
-    <ClInclude Include="../Utils.h" />
-    <ClInclude Include="../DefaultProfileUtils.h" />
-    <ClInclude Include="../TerminalSettingsSerializationHelpers.h" />
-    <ClInclude Include="../TerminalWarnings.h" />
-    <ClInclude Include="../IDynamicProfileGenerator.h" />
-    <ClInclude Include="../PowershellCoreProfileGenerator.h" />
-    <ClInclude Include="../WslDistroGenerator.h" />
-    <ClInclude Include="../AzureCloudShellGenerator.h" />
-    <ClInclude Include="../TelnetGenerator.h" />
-    <ClInclude Include="../ColorHelper.h" />
-    <ClInclude Include="../TerminalSettings.h">
-      <DependentUpon>../TerminalSettings.idl</DependentUpon>
+    <ClInclude Include="GlobalAppSettings.h" />
+    <ClInclude Include="Profile.h" />
+    <ClInclude Include="CascadiaSettings.h" />
+    <ClInclude Include="KeyChordSerialization.h" />
+    <ClInclude Include="JsonUtils.h" />
+    <ClInclude Include="Utils.h" />
+    <ClInclude Include="DefaultProfileUtils.h" />
+    <ClInclude Include="TerminalSettingsSerializationHelpers.h" />
+    <ClInclude Include="TerminalWarnings.h" />
+    <ClInclude Include="IDynamicProfileGenerator.h" />
+    <ClInclude Include="PowershellCoreProfileGenerator.h" />
+    <ClInclude Include="WslDistroGenerator.h" />
+    <ClInclude Include="AzureCloudShellGenerator.h" />
+    <ClInclude Include="TelnetGenerator.h" />
+    <ClInclude Include="ColorHelper.h" />
+    <ClInclude Include="TerminalSettings.h">
+      <DependentUpon>TerminalSettings.idl</DependentUpon>
     </ClInclude>
     <ClInclude Include="pch.h" />
-    <ClInclude Include="../ShortcutActionDispatch.h">
-      <DependentUpon>../ShortcutActionDispatch.idl</DependentUpon>
+    <ClInclude Include="ShortcutActionDispatch.h">
+      <DependentUpon>ShortcutActionDispatch.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="../ActionArgs.h">
-      <DependentUpon>../ActionArgs.idl</DependentUpon>
+    <ClInclude Include="ActionArgs.h">
+      <DependentUpon>ActionArgs.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="../ActionAndArgs.h">
-      <DependentUpon>../ActionArgs.idl</DependentUpon>
+    <ClInclude Include="ActionAndArgs.h">
+      <DependentUpon>ActionArgs.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="../DebugTapConnection.h" />
-    <ClInclude Include="../AppKeyBindings.h">
-      <DependentUpon>../AppKeyBindings.idl</DependentUpon>
+    <ClInclude Include="DebugTapConnection.h" />
+    <ClInclude Include="AppKeyBindings.h">
+      <DependentUpon>AppKeyBindings.idl</DependentUpon>
     </ClInclude>
-    <ClInclude Include="../App.h">
-      <DependentUpon>../App.xaml</DependentUpon>
+    <ClInclude Include="App.h">
+      <DependentUpon>App.xaml</DependentUpon>
     </ClInclude>
-    <ClInclude Include="../AppLogic.h">
-      <DependentUpon>../AppLogic.idl</DependentUpon>
+    <ClInclude Include="AppLogic.h">
+      <DependentUpon>AppLogic.idl</DependentUpon>
     </ClInclude>
   </ItemGroup>
   <!-- ========================= Cpp Files ======================== -->
   <ItemGroup>
-    <ClCompile Include="../init.cpp" />
-    <ClCompile Include="../AppCommandlineArgs.cpp" />
-    <ClCompile Include="../Commandline.cpp" />
-    <ClCompile Include="../MinMaxCloseControl.cpp">
-      <DependentUpon>../MinMaxCloseControl.xaml</DependentUpon>
+    <ClCompile Include="init.cpp" />
+    <ClCompile Include="AppCommandlineArgs.cpp" />
+    <ClCompile Include="Commandline.cpp" />
+    <ClCompile Include="MinMaxCloseControl.cpp">
+      <DependentUpon>MinMaxCloseControl.xaml</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../TerminalPage.cpp">
-      <DependentUpon>../TerminalPage.xaml</DependentUpon>
+    <ClCompile Include="TerminalPage.cpp">
+      <DependentUpon>TerminalPage.xaml</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
-    <ClCompile Include="../TitlebarControl.cpp">
-      <DependentUpon>../TitlebarControl.xaml</DependentUpon>
+    <ClCompile Include="TitlebarControl.cpp">
+      <DependentUpon>TitlebarControl.xaml</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../TabRowControl.cpp">
-      <DependentUpon>../TabRowControl.xaml</DependentUpon>
+    <ClCompile Include="TabRowControl.cpp">
+      <DependentUpon>TabRowControl.xaml</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../ColorPickupFlyout.cpp">
-      <DependentUpon>../ColorPickupFlyout.xaml</DependentUpon>
+    <ClCompile Include="ColorPickupFlyout.cpp">
+      <DependentUpon>ColorPickupFlyout.xaml</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../CommandPalette.cpp">
-      <DependentUpon>../CommandPalette.xaml</DependentUpon>
+    <ClCompile Include="CommandPalette.cpp">
+      <DependentUpon>CommandPalette.xaml</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../Command.cpp">
-      <DependentUpon>../Command.idl</DependentUpon>
+    <ClCompile Include="Command.cpp">
+      <DependentUpon>Command.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../EmptyStringVisibilityConverter.cpp">
-      <DependentUpon>../EmptyStringVisibilityConverter.idl</DependentUpon>
+    <ClCompile Include="EmptyStringVisibilityConverter.cpp">
+      <DependentUpon>EmptyStringVisibilityConverter.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../HasNestedCommandsVisibilityConverter.cpp">
-      <DependentUpon>../HasNestedCommandsVisibilityConverter.idl</DependentUpon>
+    <ClCompile Include="HasNestedCommandsVisibilityConverter.cpp">
+      <DependentUpon>HasNestedCommandsVisibilityConverter.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../Tab.cpp">
-      <DependentUpon>../Tab.idl</DependentUpon>
+    <ClCompile Include="Tab.cpp">
+      <DependentUpon>Tab.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../Pane.cpp" />
-    <ClCompile Include="../ColorScheme.cpp">
-      <DependentUpon>../ColorScheme.idl</DependentUpon>
+    <ClCompile Include="Pane.cpp" />
+    <ClCompile Include="ColorScheme.cpp">
+      <DependentUpon>ColorScheme.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../GlobalAppSettings.cpp" />
-    <ClCompile Include="../Profile.cpp" />
-    <ClCompile Include="../CascadiaSettings.cpp" />
-    <ClCompile Include="../CascadiaSettingsSerialization.cpp" />
-    <ClCompile Include="../AppKeyBindingsSerialization.cpp" />
-    <ClCompile Include="../KeyChordSerialization.cpp" />
-    <ClCompile Include="../DefaultProfileUtils.cpp" />
-    <ClCompile Include="../PowershellCoreProfileGenerator.cpp" />
-    <ClCompile Include="../WslDistroGenerator.cpp" />
-    <ClCompile Include="../AzureCloudShellGenerator.cpp" />
-    <ClCompile Include="../Pane.LayoutSizeNode.cpp" />
-    <ClCompile Include="../ColorHelper.cpp" />
-    <ClCompile Include="../DebugTapConnection.cpp" />
-    <ClCompile Include="../Utils.cpp" />
-    <ClCompile Include="../TerminalSettings.cpp">
-      <DependentUpon>../TerminalSettings.idl</DependentUpon>
+    <ClCompile Include="GlobalAppSettings.cpp" />
+    <ClCompile Include="Profile.cpp" />
+    <ClCompile Include="CascadiaSettings.cpp" />
+    <ClCompile Include="CascadiaSettingsSerialization.cpp" />
+    <ClCompile Include="AppKeyBindingsSerialization.cpp" />
+    <ClCompile Include="KeyChordSerialization.cpp" />
+    <ClCompile Include="DefaultProfileUtils.cpp" />
+    <ClCompile Include="PowershellCoreProfileGenerator.cpp" />
+    <ClCompile Include="WslDistroGenerator.cpp" />
+    <ClCompile Include="AzureCloudShellGenerator.cpp" />
+    <ClCompile Include="Pane.LayoutSizeNode.cpp" />
+    <ClCompile Include="ColorHelper.cpp" />
+    <ClCompile Include="DebugTapConnection.cpp" />
+    <ClCompile Include="Utils.cpp" />
+    <ClCompile Include="TerminalSettings.cpp">
+      <DependentUpon>TerminalSettings.idl</DependentUpon>
     </ClCompile>
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="../AppKeyBindings.cpp">
-      <DependentUpon>../AppKeyBindings.idl</DependentUpon>
+    <ClCompile Include="AppKeyBindings.cpp">
+      <DependentUpon>AppKeyBindings.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../ShortcutActionDispatch.cpp">
-      <DependentUpon>../ShortcutActionDispatch.idl</DependentUpon>
+    <ClCompile Include="ShortcutActionDispatch.cpp">
+      <DependentUpon>ShortcutActionDispatch.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../ActionAndArgs.cpp">
-      <DependentUpon>../ActionArgs.idl</DependentUpon>
+    <ClCompile Include="ActionAndArgs.cpp">
+      <DependentUpon>ActionArgs.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../ActionArgs.cpp">
-      <DependentUpon>../ActionArgs.idl</DependentUpon>
+    <ClCompile Include="ActionArgs.cpp">
+      <DependentUpon>ActionArgs.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../App.cpp">
-      <DependentUpon>../App.xaml</DependentUpon>
+    <ClCompile Include="App.cpp">
+      <DependentUpon>App.xaml</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../AppActionHandlers.cpp">
-      <DependentUpon>../App.xaml</DependentUpon>
+    <ClCompile Include="AppActionHandlers.cpp">
+      <DependentUpon>App.xaml</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../AppLogic.cpp">
-      <DependentUpon>../AppLogic.idl</DependentUpon>
+    <ClCompile Include="AppLogic.cpp">
+      <DependentUpon>AppLogic.idl</DependentUpon>
     </ClCompile>
     <!-- You _NEED_ to include this file and the jsoncpp IncludePath (below) if
     you want to use jsoncpp -->
@@ -238,50 +238,50 @@
   <ItemGroup>
     <!-- If you add idl files here, make sure to include their implementation's
     header in TerminalApp.vcxproj (as well as in this file) -->
-    <Midl Include="../IDirectKeyListener.idl" />
-    <Midl Include="../App.idl">
-      <DependentUpon>../App.xaml</DependentUpon>
+    <Midl Include="IDirectKeyListener.idl" />
+    <Midl Include="App.idl">
+      <DependentUpon>App.xaml</DependentUpon>
     </Midl>
-    <Midl Include="../ShortcutActionDispatch.idl" />
-    <Midl Include="../AppKeyBindings.idl" />
-    <Midl Include="../AppLogic.idl" />
-    <Midl Include="../ActionArgs.idl" />
-    <Midl Include="../MinMaxCloseControl.idl">
-      <DependentUpon>../MinMaxCloseControl.xaml</DependentUpon>
+    <Midl Include="ShortcutActionDispatch.idl" />
+    <Midl Include="AppKeyBindings.idl" />
+    <Midl Include="AppLogic.idl" />
+    <Midl Include="ActionArgs.idl" />
+    <Midl Include="MinMaxCloseControl.idl">
+      <DependentUpon>MinMaxCloseControl.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="../TerminalPage.idl">
-      <DependentUpon>../TerminalPage.xaml</DependentUpon>
+    <Midl Include="TerminalPage.idl">
+      <DependentUpon>TerminalPage.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="../TitlebarControl.idl">
-      <DependentUpon>../TitlebarControl.xaml</DependentUpon>
+    <Midl Include="TitlebarControl.idl">
+      <DependentUpon>TitlebarControl.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="../TabRowControl.idl">
-      <DependentUpon>../TabRowControl.xaml</DependentUpon>
+    <Midl Include="TabRowControl.idl">
+      <DependentUpon>TabRowControl.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="../ColorPickupFlyout.idl">
-      <DependentUpon>../ColorPickupFlyout.xaml</DependentUpon>
+    <Midl Include="ColorPickupFlyout.idl">
+      <DependentUpon>ColorPickupFlyout.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="../CommandPalette.idl">
-      <DependentUpon>../CommandPalette.xaml</DependentUpon>
+    <Midl Include="CommandPalette.idl">
+      <DependentUpon>CommandPalette.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="../Command.idl" />
-    <Midl Include="../EmptyStringVisibilityConverter.idl" />
-    <Midl Include="../HasNestedCommandsVisibilityConverter.idl" />
-    <Midl Include="../Tab.idl" />
-    <Midl Include="../TerminalSettings.idl" />
-    <Midl Include="../ColorScheme.idl" />
+    <Midl Include="Command.idl" />
+    <Midl Include="EmptyStringVisibilityConverter.idl" />
+    <Midl Include="HasNestedCommandsVisibilityConverter.idl" />
+    <Midl Include="Tab.idl" />
+    <Midl Include="TerminalSettings.idl" />
+    <Midl Include="ColorScheme.idl" />
   </ItemGroup>
   <!-- ========================= Misc Files ======================== -->
   <ItemGroup>
-    <PRIResource Include="..\Resources\en-US\Resources.resw" />
-    <OCResourceDirectory Include="../Resources" />
-    <None Include="../packages.config" />
+    <PRIResource Include="Resources\en-US\Resources.resw" />
+    <OCResourceDirectory Include="Resources" />
+    <None Include="packages.config" />
   </ItemGroup>
   <!-- ========================= Project References ======================== -->
   <ItemGroup>
@@ -343,8 +343,8 @@
   <!-- ========================= Globals ======================== -->
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
 
-  <Import Project="..\..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets')" />
-  <Import Project="..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
+  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets')" />
+  <Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
@@ -375,16 +375,16 @@
   <!-- This target will take our defaults.json and stamp it into a .h file that
   we can include in the code directly. This way, we don't need to worry about
   failing to load the default settings at runtime. -->
-  <Target Name="_TerminalAppGenerateDefaultsH" Inputs="..\defaults.json" Outputs="Generated Files\defaults.h" BeforeTargets="BeforeClCompile">
-    <Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateHeaderForJson.ps1 -JsonFile ..\defaults.json -OutPath '&quot;Generated Files\defaults.h&quot;' -VariableName DefaultJson" />
+  <Target Name="_TerminalAppGenerateDefaultsH" Inputs="defaults.json" Outputs="Generated Files\defaults.h" BeforeTargets="BeforeClCompile">
+    <Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateHeaderForJson.ps1 -JsonFile defaults.json -OutPath '&quot;Generated Files\defaults.h&quot;' -VariableName DefaultJson" />
   </Target>
   <!-- A different set of defaults for Universal variant -->
-  <Target Name="_TerminalAppGenerateDefaultsUniversalH" Inputs="..\defaults-universal.json" Outputs="Generated Files\defaults-universal.h" BeforeTargets="BeforeClCompile">
-    <Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateHeaderForJson.ps1 -JsonFile ..\defaults-universal.json -OutPath '&quot;Generated Files\defaults-universal.h&quot;' -VariableName DefaultUniversalJson" />
+  <Target Name="_TerminalAppGenerateDefaultsUniversalH" Inputs="defaults-universal.json" Outputs="Generated Files\defaults-universal.h" BeforeTargets="BeforeClCompile">
+    <Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateHeaderForJson.ps1 -JsonFile defaults-universal.json -OutPath '&quot;Generated Files\defaults-universal.h&quot;' -VariableName DefaultUniversalJson" />
   </Target>
   <!-- Same as above, but for the default settings.json template -->
-  <Target Name="_TerminalAppGenerateUserSettingsH" Inputs="..\userDefaults.json" Outputs="Generated Files\userDefaults.h" BeforeTargets="BeforeClCompile">
-    <Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateHeaderForJson.ps1 -JsonFile ..\userDefaults.json -OutPath '&quot;Generated Files\userDefaults.h&quot;' -VariableName UserSettingsJson" />
+  <Target Name="_TerminalAppGenerateUserSettingsH" Inputs="userDefaults.json" Outputs="Generated Files\userDefaults.h" BeforeTargets="BeforeClCompile">
+    <Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateHeaderForJson.ps1 -JsonFile userDefaults.json -OutPath '&quot;Generated Files\userDefaults.h&quot;' -VariableName UserSettingsJson" />
   </Target>
 
   <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
diff --git a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj.filters b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters
similarity index 100%
rename from src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj.filters
rename to src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters
diff --git a/src/cascadia/TerminalApp/FixVisualStudioBug.targets b/src/cascadia/TerminalApp/dll/FixVisualStudioBug.targets
similarity index 100%
rename from src/cascadia/TerminalApp/FixVisualStudioBug.targets
rename to src/cascadia/TerminalApp/dll/FixVisualStudioBug.targets
diff --git a/src/cascadia/TerminalApp/TerminalApp.def b/src/cascadia/TerminalApp/dll/TerminalApp.def
similarity index 100%
rename from src/cascadia/TerminalApp/TerminalApp.def
rename to src/cascadia/TerminalApp/dll/TerminalApp.def
diff --git a/src/cascadia/TerminalApp/TerminalApp.vcxproj b/src/cascadia/TerminalApp/dll/TerminalApp.vcxproj
similarity index 78%
rename from src/cascadia/TerminalApp/TerminalApp.vcxproj
rename to src/cascadia/TerminalApp/dll/TerminalApp.vcxproj
index a19fa271c..8d8962cca 100644
--- a/src/cascadia/TerminalApp/TerminalApp.vcxproj
+++ b/src/cascadia/TerminalApp/dll/TerminalApp.vcxproj
@@ -17,9 +17,9 @@
      -->
     <NoOutputRedirection>true</NoOutputRedirection>
   </PropertyGroup>
-  <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
+  <Import Project="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
-  <Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" />
+  <Import Project="$(OpenConsoleDir)packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props" Condition="Exists('$(OpenConsoleDir)packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" />
   <!-- ========================= XAML files ======================== -->
   <ItemGroup>
     <!-- DON'T PUT XAML FILES HERE! Put them in TerminalAppLib.vcxproj -->
@@ -28,15 +28,15 @@
   <ItemGroup>
     <!-- Only put headers for winrt types in here. Don't put other header files
     in here - put them in TerminalAppLib.vcxproj instead! -->
-    <ClInclude Include="AppLogic.h" />
+    <ClInclude Include="../AppLogic.h" />
     <ClInclude Include="pch.h" />
-    <ClInclude Include="TerminalPage.h" />
-    <ClInclude Include="MinMaxCloseControl.h" />
-    <ClInclude Include="AppKeyBindings.h" />
-    <ClInclude Include="TitlebarControl.h" />
-    <ClInclude Include="TabRowControl.h" />
-    <ClInclude Include="App.h" />
-    <ClInclude Include="Tab.h" />
+    <ClInclude Include="../TerminalPage.h" />
+    <ClInclude Include="../MinMaxCloseControl.h" />
+    <ClInclude Include="../AppKeyBindings.h" />
+    <ClInclude Include="../TitlebarControl.h" />
+    <ClInclude Include="../TabRowControl.h" />
+    <ClInclude Include="../App.h" />
+    <ClInclude Include="../Tab.h" />
   </ItemGroup>
   <!-- ========================= Cpp Files ======================== -->
   <ItemGroup>
@@ -72,14 +72,14 @@
     <!-- Reference TerminalAppLib here, so we can use it's TerminalApp.winmd as
     our TerminalApp.winmd. This didn't work correctly in VS2017, you'd need to
     manually reference the lib -->
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\lib\TerminalAppLib.vcxproj">
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\TerminalAppLib.vcxproj">
       <Private>true</Private>
       <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
     </ProjectReference>
   </ItemGroup>
 
-  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets')" />
-  <Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
+  <Import Project="$(OpenConsoleDir)packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('$(OpenConsoleDir)packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets')" />
+  <Import Project="$(OpenConsoleDir)packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('$(OpenConsoleDir)packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
diff --git a/src/cascadia/TerminalApp/lib/pch.cpp b/src/cascadia/TerminalApp/dll/pch.cpp
similarity index 100%
rename from src/cascadia/TerminalApp/lib/pch.cpp
rename to src/cascadia/TerminalApp/dll/pch.cpp
diff --git a/src/cascadia/TerminalApp/dll/pch.h b/src/cascadia/TerminalApp/dll/pch.h
new file mode 100644
index 000000000..465827b00
--- /dev/null
+++ b/src/cascadia/TerminalApp/dll/pch.h
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+//
+// pch.h
+// Header for platform projection include files
+//
+
+#pragma once
+
+// This file can be empty - the pch.h in TerminalApp/lib does the heavy lifting
+// of including all the headers we need. As this project is just a dll wrapper,
+// we don't actually need anything in here.
diff --git a/src/cascadia/TerminalApp/lib/pch.h b/src/cascadia/TerminalApp/lib/pch.h
deleted file mode 100644
index dcac6c4e1..000000000
--- a/src/cascadia/TerminalApp/lib/pch.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-//
-// pch.h
-// Header for platform projection include files
-//
-
-#pragma once
-
-#define WIN32_LEAN_AND_MEAN
-
-// Manually include til after we include Windows.Foundation to give it winrt superpowers
-#define BLOCK_TIL
-#include <LibraryIncludes.h>
-// This is inexplicable, but for whatever reason, cppwinrt conflicts with the
-//      SDK definition of this function, so the only fix is to undef it.
-// from WinBase.h
-// Windows::UI::Xaml::Media::Animation::IStoryboard::GetCurrentTime
-#ifdef GetCurrentTime
-#undef GetCurrentTime
-#endif
-
-#include <wil/cppwinrt.h>
-
-#include <unknwn.h>
-
-#include <hstring.h>
-
-#include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.Foundation.Collections.h>
-#include <winrt/Windows.Foundation.Metadata.h>
-#include <winrt/Windows.Graphics.Display.h>
-#include <winrt/windows.ui.core.h>
-#include <winrt/Windows.ui.input.h>
-#include <winrt/Windows.UI.Text.h>
-#include <winrt/Windows.UI.Xaml.Controls.h>
-#include <winrt/Windows.UI.Xaml.Controls.Primitives.h>
-#include <winrt/Windows.UI.Xaml.Data.h>
-#include <winrt/Windows.ui.xaml.media.h>
-#include <winrt/Windows.ui.xaml.input.h>
-#include <winrt/Windows.UI.Xaml.Hosting.h>
-#include "winrt/Windows.UI.Xaml.Markup.h"
-#include "winrt/Windows.UI.Xaml.Documents.h"
-#include "winrt/Windows.UI.Xaml.Automation.h"
-#include <winrt/Windows.ApplicationModel.h>
-#include <winrt/Windows.ApplicationModel.DataTransfer.h>
-
-#include <winrt/Microsoft.Toolkit.Win32.UI.XamlHost.h>
-#include <winrt/Microsoft.UI.Xaml.Controls.h>
-#include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h>
-#include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h>
-
-#include <windows.ui.xaml.media.dxinterop.h>
-
-#include <winrt/Windows.System.h>
-
-// Including TraceLogging essentials for the binary
-#include <TraceLoggingProvider.h>
-#include <winmeta.h>
-TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider);
-#include <telemetry\ProjectTelemetry.h>
-#include <TraceLoggingActivity.h>
-
-// JsonCpp
-#include <json.h>
-
-#include <shellapi.h>
-
-#include <winrt/Microsoft.Terminal.TerminalConnection.h>
-#include <winrt/Windows.UI.Popups.h>
-
-#include <CLI11/CLI11.hpp>
-
-// Manually include til after we include Windows.Foundation to give it winrt superpowers
-#include "til.h"
diff --git a/src/cascadia/TerminalApp/pch.h b/src/cascadia/TerminalApp/pch.h
index 465827b00..dcac6c4e1 100644
--- a/src/cascadia/TerminalApp/pch.h
+++ b/src/cascadia/TerminalApp/pch.h
@@ -7,6 +7,69 @@
 
 #pragma once
 
-// This file can be empty - the pch.h in TerminalApp/lib does the heavy lifting
-// of including all the headers we need. As this project is just a dll wrapper,
-// we don't actually need anything in here.
+#define WIN32_LEAN_AND_MEAN
+
+// Manually include til after we include Windows.Foundation to give it winrt superpowers
+#define BLOCK_TIL
+#include <LibraryIncludes.h>
+// This is inexplicable, but for whatever reason, cppwinrt conflicts with the
+//      SDK definition of this function, so the only fix is to undef it.
+// from WinBase.h
+// Windows::UI::Xaml::Media::Animation::IStoryboard::GetCurrentTime
+#ifdef GetCurrentTime
+#undef GetCurrentTime
+#endif
+
+#include <wil/cppwinrt.h>
+
+#include <unknwn.h>
+
+#include <hstring.h>
+
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Foundation.Collections.h>
+#include <winrt/Windows.Foundation.Metadata.h>
+#include <winrt/Windows.Graphics.Display.h>
+#include <winrt/windows.ui.core.h>
+#include <winrt/Windows.ui.input.h>
+#include <winrt/Windows.UI.Text.h>
+#include <winrt/Windows.UI.Xaml.Controls.h>
+#include <winrt/Windows.UI.Xaml.Controls.Primitives.h>
+#include <winrt/Windows.UI.Xaml.Data.h>
+#include <winrt/Windows.ui.xaml.media.h>
+#include <winrt/Windows.ui.xaml.input.h>
+#include <winrt/Windows.UI.Xaml.Hosting.h>
+#include "winrt/Windows.UI.Xaml.Markup.h"
+#include "winrt/Windows.UI.Xaml.Documents.h"
+#include "winrt/Windows.UI.Xaml.Automation.h"
+#include <winrt/Windows.ApplicationModel.h>
+#include <winrt/Windows.ApplicationModel.DataTransfer.h>
+
+#include <winrt/Microsoft.Toolkit.Win32.UI.XamlHost.h>
+#include <winrt/Microsoft.UI.Xaml.Controls.h>
+#include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h>
+#include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h>
+
+#include <windows.ui.xaml.media.dxinterop.h>
+
+#include <winrt/Windows.System.h>
+
+// Including TraceLogging essentials for the binary
+#include <TraceLoggingProvider.h>
+#include <winmeta.h>
+TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider);
+#include <telemetry\ProjectTelemetry.h>
+#include <TraceLoggingActivity.h>
+
+// JsonCpp
+#include <json.h>
+
+#include <shellapi.h>
+
+#include <winrt/Microsoft.Terminal.TerminalConnection.h>
+#include <winrt/Windows.UI.Popups.h>
+
+#include <CLI11/CLI11.hpp>
+
+// Manually include til after we include Windows.Foundation to give it winrt superpowers
+#include "til.h"
diff --git a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
index b940f569e..395c76d9e 100644
--- a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
+++ b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
@@ -75,7 +75,7 @@
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
 
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\TerminalApp.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\dll\TerminalApp.vcxproj" />
 
     <ProjectReference Include="$(OpenConsoleDir)src\types\lib\types.vcxproj" />
   </ItemGroup>
diff --git a/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj b/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj
index f00135981..0a749357a 100644
--- a/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj
+++ b/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj
@@ -145,7 +145,7 @@
   <ItemGroup>
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
-    <ProjectReference Include="..\TerminalApp\TerminalApp.vcxproj">
+    <ProjectReference Include="..\TerminalApp\dll\TerminalApp.vcxproj">
       <Project>{ca5cad1a-44bd-4ac7-ac72-f16e576fdd12}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/src/cascadia/WindowsTerminalUniversal/main.cpp b/src/cascadia/WindowsTerminalUniversal/main.cpp
index 7808afeab..73e8d87f5 100644
--- a/src/cascadia/WindowsTerminalUniversal/main.cpp
+++ b/src/cascadia/WindowsTerminalUniversal/main.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 
-#include "Generated Files\winrt\TerminalApp.h"
+#include "winrt\TerminalApp.h"
 
 int __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
 {
diff --git a/src/cascadia/ut_app/TerminalApp.UnitTests.vcxproj b/src/cascadia/ut_app/TerminalApp.UnitTests.vcxproj
index 280cd1c3b..868002a5f 100644
--- a/src/cascadia/ut_app/TerminalApp.UnitTests.vcxproj
+++ b/src/cascadia/ut_app/TerminalApp.UnitTests.vcxproj
@@ -27,6 +27,14 @@
   <Import Project="$(SolutionDir)\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)\src\common.build.pre.props" />
 
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <!-- For CLI11: It uses dynamic_cast to cast types around, which depends
+      on being compiled with RTTI (/GR). -->
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
   <!-- ========================= Headers ======================== -->
   <ItemGroup>
     <ClInclude Include="precomp.h" />
@@ -53,7 +61,7 @@
 
   <!-- ========================= Project References ======================== -->
   <ItemGroup>
-    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalApp\lib\TerminalAppLib.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalApp\TerminalAppLib.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)\src\types\lib\types.vcxproj" />
   </ItemGroup>
 
@@ -62,7 +70,7 @@
   <!-- ====================== Compiler & Linker Flags ===================== -->
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..;$(OpenConsoleDir)\dep\jsoncpp\json;$(OpenConsoleDir)src\inc;$(OpenConsoleDir)src\inc\test;$(WinRT_IncludePath)\..\cppwinrt\winrt;"$(OpenConsoleDir)\src\cascadia\TerminalApp\lib\Generated Files";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;$(OpenConsoleDir)\dep\jsoncpp\json;$(OpenConsoleDir)src\inc;$(OpenConsoleDir)src\inc\test;$(WinRT_IncludePath)\..\cppwinrt\winrt;"$(OpenConsoleDir)\src\cascadia\TerminalApp\Generated Files";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
 
       <!-- Manually disable unreachable code warning, because jconcpp has a ton of that. -->
@@ -124,6 +132,6 @@
 
   <!-- Import this set of targets that fixes a VS bug that manifests when using
   the TerminalAppLib project -->
-  <Import Project="../TerminalApp/FixVisualStudioBug.targets" />
+  <Import Project="../TerminalApp/dll/FixVisualStudioBug.targets" />
 
 </Project>