diff --git a/OpenConsole.sln b/OpenConsole.sln
index 9d8a0e7d7..b084127dd 100644
--- a/OpenConsole.sln
+++ b/OpenConsole.sln
@@ -248,12 +248,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocalTests_TerminalApp", "s
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winconpty", "src\winconpty\winconpty.vcxproj", "{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RendererUia", "src\renderer\uia\lib\uia.vcxproj", "{48D21369-3D7B-4431-9967-24E81292CF63}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinRTUtils", "src\cascadia\WinRTUtils\WinRTUtils.vcxproj", "{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winconpty.LIB", "src\winconpty\lib\winconptylib.vcxproj", "{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winconpty.DLL", "src\winconpty\dll\winconptydll.vcxproj", "{A22EC5F6-7851-4B88-AC52-47249D437A52}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AuditMode|Any CPU = AuditMode|Any CPU
@@ -1229,24 +1231,6 @@ Global
 		{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}.Release|x64.Build.0 = Release|x64
 		{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}.Release|x86.ActiveCfg = Release|Win32
 		{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}.Release|x86.Build.0 = Release|Win32
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|ARM64.ActiveCfg = Release|ARM64
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|x64.ActiveCfg = Release|x64
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|x86.ActiveCfg = Release|Win32
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Debug|ARM64.Build.0 = Debug|ARM64
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Debug|x64.ActiveCfg = Debug|x64
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Debug|x64.Build.0 = Debug|x64
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Debug|x86.ActiveCfg = Debug|Win32
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Debug|x86.Build.0 = Debug|Win32
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Release|Any CPU.ActiveCfg = Release|Win32
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Release|ARM64.ActiveCfg = Release|ARM64
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Release|ARM64.Build.0 = Release|ARM64
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Release|x64.ActiveCfg = Release|x64
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Release|x64.Build.0 = Release|x64
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Release|x86.ActiveCfg = Release|Win32
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Release|x86.Build.0 = Release|Win32
 		{48D21369-3D7B-4431-9967-24E81292CF63}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
 		{48D21369-3D7B-4431-9967-24E81292CF63}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
 		{48D21369-3D7B-4431-9967-24E81292CF63}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
@@ -1286,6 +1270,46 @@ Global
 		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}.Release|x64.Build.0 = Release|x64
 		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}.Release|x86.ActiveCfg = Release|Win32
 		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}.Release|x86.Build.0 = Release|Win32
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|x64.ActiveCfg = Release|x64
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.AuditMode|x86.Build.0 = AuditMode|Win32
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Debug|ARM64.Build.0 = Debug|ARM64
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Debug|x64.ActiveCfg = Debug|x64
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Debug|x64.Build.0 = Debug|x64
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Debug|x86.ActiveCfg = Debug|Win32
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Debug|x86.Build.0 = Debug|Win32
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Release|Any CPU.ActiveCfg = Release|Win32
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Release|ARM64.Build.0 = Release|ARM64
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Release|x64.ActiveCfg = Release|x64
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Release|x64.Build.0 = Release|x64
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Release|x86.ActiveCfg = Release|Win32
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}.Release|x86.Build.0 = Release|Win32
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.AuditMode|x64.ActiveCfg = Release|x64
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.AuditMode|x86.Build.0 = AuditMode|Win32
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Debug|ARM64.Build.0 = Debug|ARM64
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Debug|x64.ActiveCfg = Debug|x64
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Debug|x64.Build.0 = Debug|x64
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Debug|x86.ActiveCfg = Debug|Win32
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Debug|x86.Build.0 = Debug|Win32
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Release|Any CPU.ActiveCfg = Release|Win32
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Release|ARM64.Build.0 = Release|ARM64
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Release|x64.ActiveCfg = Release|x64
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Release|x64.Build.0 = Release|x64
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Release|x86.ActiveCfg = Release|Win32
+		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1349,9 +1373,10 @@ Global
 		{CA5CAD1A-9333-4D05-B12A-1905CBF112F9} = {59840756-302F-44DF-AA47-441A9D673202}
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {59840756-302F-44DF-AA47-441A9D673202}
 		{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506} = {59840756-302F-44DF-AA47-441A9D673202}
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
 		{48D21369-3D7B-4431-9967-24E81292CF63} = {05500DEF-2294-41E3-AF9A-24E580B82836}
 		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE} = {59840756-302F-44DF-AA47-441A9D673202}
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
+		{A22EC5F6-7851-4B88-AC52-47249D437A52} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3140B1B7-C8EE-43D1-A772-D82A7061A271}
diff --git a/src/cascadia/TerminalConnection/TerminalConnection.vcxproj b/src/cascadia/TerminalConnection/TerminalConnection.vcxproj
index 9d2bbf059..ebd9c4189 100644
--- a/src/cascadia/TerminalConnection/TerminalConnection.vcxproj
+++ b/src/cascadia/TerminalConnection/TerminalConnection.vcxproj
@@ -71,7 +71,7 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
 
-    <ProjectReference Include="..\..\winconpty\winconpty.vcxproj">
+    <ProjectReference Include="..\..\winconpty\lib\winconptylib.vcxproj">
       <Project>{58a03bb2-df5a-4b66-91a0-7ef3ba01269a}</Project>
     </ProjectReference>
   </ItemGroup>
@@ -88,7 +88,7 @@
 
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalDependencies>$(OpenConsoleCommonOutDir)\conpty.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(OpenConsoleCommonOutDir)\conptylib.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 </Project>
diff --git a/src/winconpty/winconpty.def b/src/winconpty/dll/winconpty.def
similarity index 100%
rename from src/winconpty/winconpty.def
rename to src/winconpty/dll/winconpty.def
diff --git a/src/winconpty/dll/winconptydll.vcxproj b/src/winconpty/dll/winconptydll.vcxproj
new file mode 100644
index 000000000..8c9d17ee6
--- /dev/null
+++ b/src/winconpty/dll/winconptydll.vcxproj
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{a22ec5f6-7851-4b88-ac52-47249d437a52}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>winconpty</RootNamespace>
+    <ProjectName>winconpty.DLL</ProjectName>
+    <TargetName>conpty</TargetName>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)src\common.build.pre.props" />
+  <ItemGroup>
+    <ClCompile Include="../precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <None Include="winconpty.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\lib\winconptylib.vcxproj">
+      <Project>{58a03bb2-df5a-4b66-91a0-7ef3ba01269a}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
+  <Import Project="$(SolutionDir)src\common.build.post.props" />
+  <ItemDefinitionGroup>
+    <Link>
+      <ModuleDefinitionFile>winconpty.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+      <!-- Override GetPackagingOutputs to roll up our DLL.	
+       This is a heavily stripped version of the one in Microsoft.*.AppxPackage.targets.	
+  -->	
+  <PropertyGroup>	
+    <_ContinueOnError Condition="'$(BuildingProject)' == 'true'">true</_ContinueOnError>	
+    <_ContinueOnError Condition="'$(BuildingProject)' != 'true'">false</_ContinueOnError>	
+  </PropertyGroup>	
+  <Target Name="GetPackagingOutputs" Returns="@(PackagingOutputs)">	
+    <CallTarget Targets="BuiltProjectOutputGroup">	
+      <Output TaskParameter="TargetOutputs" ItemName="_BuiltProjectOutputGroupOutput" />	
+    </CallTarget>	
+    <ItemGroup>	
+      <_PackagingOutputsUnexpanded Include="%(_BuiltProjectOutputGroupOutput.FinalOutputPath)">	
+        <TargetPath>%(_BuiltProjectOutputGroupOutput.TargetPath)</TargetPath>	
+        <OutputGroup>BuiltProjectOutputGroup</OutputGroup>	
+        <ProjectName>$(ProjectName)</ProjectName>	
+      </_PackagingOutputsUnexpanded>	
+    </ItemGroup>	
+    <CallTarget Targets="DebugSymbolsProjectOutputGroup">	
+      <Output TaskParameter="TargetOutputs" ItemName="_DebugSymbolsProjectOutputGroupOutput" />	
+    </CallTarget>	
+    <ItemGroup>	
+      <_PackagingOutputsUnexpanded Include="%(_DebugSymbolsProjectOutputGroupOutput.FinalOutputPath)">	
+        <OutputGroup>DebugSymbolsProjectOutputGroup</OutputGroup>	
+        <ProjectName>$(ProjectName)</ProjectName>	
+      </_PackagingOutputsUnexpanded>	
+    </ItemGroup>	
+    <ItemGroup>	
+      <PackagingOutputs Include="@(_PackagingOutputsUnexpanded)">	
+        <TargetPath>%(Filename)%(Extension)</TargetPath>	
+      </PackagingOutputs>	
+    </ItemGroup>	
+  </Target>
+</Project>
diff --git a/src/winconpty/winconpty.vcxproj b/src/winconpty/lib/winconptylib.vcxproj
similarity index 53%
rename from src/winconpty/winconpty.vcxproj
rename to src/winconpty/lib/winconptylib.vcxproj
index 15797e77e..ea4b63f83 100644
--- a/src/winconpty/winconpty.vcxproj
+++ b/src/winconpty/lib/winconptylib.vcxproj
@@ -4,19 +4,18 @@
     <ProjectGuid>{58a03bb2-df5a-4b66-91a0-7ef3ba01269a}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>winconpty</RootNamespace>
-    <ProjectName>winconpty</ProjectName>
-    <TargetName>conpty</TargetName>
+    <ProjectName>winconpty.LIB</ProjectName>
+    <TargetName>conptylib</TargetName>
     <ConfigurationType>StaticLibrary</ConfigurationType>
   </PropertyGroup>
   <Import Project="$(SolutionDir)src\common.build.pre.props" />
   <ItemGroup>
-    <ClCompile Include="winconpty.cpp" />
-    <ClCompile Include="precomp.cpp">
+    <ClCompile Include="../winconpty.cpp" />
+    <ClCompile Include="../precomp.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="../server/DeviceHandle.cpp" />
-    <ClCompile Include="../server/WinNTControl.cpp" />
-    <None Include="winconpty.def" />
+    <ClCompile Include="../../server/DeviceHandle.cpp" />
+    <ClCompile Include="../../server/WinNTControl.cpp" />
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -25,42 +24,37 @@
   </ItemDefinitionGroup>
   <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
   <Import Project="$(SolutionDir)src\common.build.post.props" />
-  <ItemDefinitionGroup>
-    <Link>
-      <ModuleDefinitionFile>winconpty.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <!-- Override GetPackagingOutputs to roll up our DLL.
-       This is a heavily stripped version of the one in Microsoft.*.AppxPackage.targets.
-  -->
-  <PropertyGroup>
-    <_ContinueOnError Condition="'$(BuildingProject)' == 'true'">true</_ContinueOnError>
-    <_ContinueOnError Condition="'$(BuildingProject)' != 'true'">false</_ContinueOnError>
-  </PropertyGroup>
-  <Target Name="GetPackagingOutputs" Returns="@(PackagingOutputs)">
-    <CallTarget Targets="BuiltProjectOutputGroup">
-      <Output TaskParameter="TargetOutputs" ItemName="_BuiltProjectOutputGroupOutput" />
-    </CallTarget>
-    <ItemGroup>
-      <_PackagingOutputsUnexpanded Include="%(_BuiltProjectOutputGroupOutput.FinalOutputPath)">
-        <TargetPath>%(_BuiltProjectOutputGroupOutput.TargetPath)</TargetPath>
-        <OutputGroup>BuiltProjectOutputGroup</OutputGroup>
-        <ProjectName>$(ProjectName)</ProjectName>
-      </_PackagingOutputsUnexpanded>
-    </ItemGroup>
-    <CallTarget Targets="DebugSymbolsProjectOutputGroup">
-      <Output TaskParameter="TargetOutputs" ItemName="_DebugSymbolsProjectOutputGroupOutput" />
-    </CallTarget>
-    <ItemGroup>
-      <_PackagingOutputsUnexpanded Include="%(_DebugSymbolsProjectOutputGroupOutput.FinalOutputPath)">
-        <OutputGroup>DebugSymbolsProjectOutputGroup</OutputGroup>
-        <ProjectName>$(ProjectName)</ProjectName>
-      </_PackagingOutputsUnexpanded>
-    </ItemGroup>
-    <ItemGroup>
-      <PackagingOutputs Include="@(_PackagingOutputsUnexpanded)">
-        <TargetPath>%(Filename)%(Extension)</TargetPath>
-      </PackagingOutputs>
-    </ItemGroup>
+    <!-- Override GetPackagingOutputs to roll up our DLL.	
+       This is a heavily stripped version of the one in Microsoft.*.AppxPackage.targets.	
+  -->	
+  <PropertyGroup>	
+    <_ContinueOnError Condition="'$(BuildingProject)' == 'true'">true</_ContinueOnError>	
+    <_ContinueOnError Condition="'$(BuildingProject)' != 'true'">false</_ContinueOnError>	
+  </PropertyGroup>	
+  <Target Name="GetPackagingOutputs" Returns="@(PackagingOutputs)">	
+    <CallTarget Targets="BuiltProjectOutputGroup">	
+      <Output TaskParameter="TargetOutputs" ItemName="_BuiltProjectOutputGroupOutput" />	
+    </CallTarget>	
+    <ItemGroup>	
+      <_PackagingOutputsUnexpanded Include="%(_BuiltProjectOutputGroupOutput.FinalOutputPath)">	
+        <TargetPath>%(_BuiltProjectOutputGroupOutput.TargetPath)</TargetPath>	
+        <OutputGroup>BuiltProjectOutputGroup</OutputGroup>	
+        <ProjectName>$(ProjectName)</ProjectName>	
+      </_PackagingOutputsUnexpanded>	
+    </ItemGroup>	
+    <CallTarget Targets="DebugSymbolsProjectOutputGroup">	
+      <Output TaskParameter="TargetOutputs" ItemName="_DebugSymbolsProjectOutputGroupOutput" />	
+    </CallTarget>	
+    <ItemGroup>	
+      <_PackagingOutputsUnexpanded Include="%(_DebugSymbolsProjectOutputGroupOutput.FinalOutputPath)">	
+        <OutputGroup>DebugSymbolsProjectOutputGroup</OutputGroup>	
+        <ProjectName>$(ProjectName)</ProjectName>	
+      </_PackagingOutputsUnexpanded>	
+    </ItemGroup>	
+    <ItemGroup>	
+      <PackagingOutputs Include="@(_PackagingOutputsUnexpanded)">	
+        <TargetPath>%(Filename)%(Extension)</TargetPath>	
+      </PackagingOutputs>	
+    </ItemGroup>	
   </Target>
-</Project>
\ No newline at end of file
+</Project>