diff --git a/OpenConsole.sln b/OpenConsole.sln
index b0934815d..a07510593 100644
--- a/OpenConsole.sln
+++ b/OpenConsole.sln
@@ -307,7 +307,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAzBridge", "src\cas
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "src\dep\fmt\fmt.vcxproj", "{6BAE5851-50D5-4934-8D5E-30361A8A40F3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTerminalTestNetCore", "src\cascadia\WpfTerminalTestNetCore\WpfTerminalTestNetCore\WpfTerminalTestNetCore.csproj", "{1588FD7C-241E-4E7D-9113-43735F3E6BAD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTerminalTestNetCore", "src\cascadia\WpfTerminalTestNetCore\WpfTerminalTestNetCore.csproj", "{1588FD7C-241E-4E7D-9113-43735F3E6BAD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A22EC5F6-7851-4B88-AC52-47249D437A52} = {A22EC5F6-7851-4B88-AC52-47249D437A52}
 		{84848BFA-931D-42CE-9ADF-01EE54DE7890} = {84848BFA-931D-42CE-9ADF-01EE54DE7890}
diff --git a/src/cascadia/WpfTerminalControl/WpfTerminalControl.csproj b/src/cascadia/WpfTerminalControl/WpfTerminalControl.csproj
index 3203dfb9d..f07e05743 100644
--- a/src/cascadia/WpfTerminalControl/WpfTerminalControl.csproj
+++ b/src/cascadia/WpfTerminalControl/WpfTerminalControl.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     
-    <TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
     <RootNamespace>Microsoft.Terminal.Wpf</RootNamespace>
     <AssemblyName>Microsoft.Terminal.Wpf</AssemblyName>
     <UseWpf>true</UseWpf>
diff --git a/src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore/App.xaml b/src/cascadia/WpfTerminalTestNetCore/App.xaml
similarity index 100%
rename from src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore/App.xaml
rename to src/cascadia/WpfTerminalTestNetCore/App.xaml
diff --git a/src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore/App.xaml.cs b/src/cascadia/WpfTerminalTestNetCore/App.xaml.cs
similarity index 100%
rename from src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore/App.xaml.cs
rename to src/cascadia/WpfTerminalTestNetCore/App.xaml.cs
diff --git a/src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore/AssemblyInfo.cs b/src/cascadia/WpfTerminalTestNetCore/AssemblyInfo.cs
similarity index 100%
rename from src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore/AssemblyInfo.cs
rename to src/cascadia/WpfTerminalTestNetCore/AssemblyInfo.cs
diff --git a/src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore/MainWindow.xaml b/src/cascadia/WpfTerminalTestNetCore/MainWindow.xaml
similarity index 100%
rename from src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore/MainWindow.xaml
rename to src/cascadia/WpfTerminalTestNetCore/MainWindow.xaml
diff --git a/src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore/MainWindow.xaml.cs b/src/cascadia/WpfTerminalTestNetCore/MainWindow.xaml.cs
similarity index 100%
rename from src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore/MainWindow.xaml.cs
rename to src/cascadia/WpfTerminalTestNetCore/MainWindow.xaml.cs
diff --git a/src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore/Properties/launchSettings.json b/src/cascadia/WpfTerminalTestNetCore/Properties/launchSettings.json
similarity index 100%
rename from src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore/Properties/launchSettings.json
rename to src/cascadia/WpfTerminalTestNetCore/Properties/launchSettings.json
diff --git a/src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore/WpfTerminalTestNetCore.csproj b/src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore.csproj
similarity index 100%
rename from src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore/WpfTerminalTestNetCore.csproj
rename to src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore.csproj
diff --git a/src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore/app.manifest b/src/cascadia/WpfTerminalTestNetCore/app.manifest
similarity index 100%
rename from src/cascadia/WpfTerminalTestNetCore/WpfTerminalTestNetCore/app.manifest
rename to src/cascadia/WpfTerminalTestNetCore/app.manifest