diff --git a/.github/workflows/dotnet.yaml b/.github/workflows/dotnet.yaml
index 92230b8..f583d9e 100644
--- a/.github/workflows/dotnet.yaml
+++ b/.github/workflows/dotnet.yaml
@@ -57,9 +57,9 @@ jobs:
       - name: Prepare analyzers
         run: nix develop --command dotnet restore analyzers/analyzers.fsproj
       - name: Build project
-        run: nix develop --command dotnet build ./WoofWare.Whippet/WoofWare.Whippet.fsproj
+        run: nix develop --command dotnet build ./WoofWare.Whippet.App/WoofWare.Whippet.App.fsproj
       - name: Run analyzers
-        run: nix run .#fsharp-analyzers -- --project ./WoofWare.Whippet/WoofWare.Whippet.fsproj --analyzers-path ./.analyzerpackages/g-research.fsharp.analyzers/*/ --verbosity detailed --report ./analysis.sarif --treat-as-error GRA-STRING-001 GRA-STRING-002 GRA-STRING-003 GRA-UNIONCASE-001 GRA-INTERPOLATED-001 GRA-TYPE-ANNOTATE-001 GRA-VIRTUALCALL-001 GRA-IMMUTABLECOLLECTIONEQUALITY-001 GRA-JSONOPTS-001 GRA-LOGARGFUNCFULLAPP-001 GRA-DISPBEFOREASYNC-001 --exclude-analyzers PartialAppAnalyzer
+        run: nix run .#fsharp-analyzers -- --project ./WoofWare.Whippet.App/WoofWare.Whippet.App.fsproj --analyzers-path ./.analyzerpackages/g-research.fsharp.analyzers/*/ --verbosity detailed --report ./analysis.sarif --treat-as-error GRA-STRING-001 GRA-STRING-002 GRA-STRING-003 GRA-UNIONCASE-001 GRA-INTERPOLATED-001 GRA-TYPE-ANNOTATE-001 GRA-VIRTUALCALL-001 GRA-IMMUTABLECOLLECTIONEQUALITY-001 GRA-JSONOPTS-001 GRA-LOGARGFUNCFULLAPP-001 GRA-DISPBEFOREASYNC-001 --exclude-analyzers PartialAppAnalyzer
 
 #   build-nix:
 #     runs-on: ubuntu-latest
diff --git a/Plugins/ArgParser/WoofWare.Whippet.Plugin.ArgParser.Consumer/WoofWare.Whippet.Plugin.ArgParser.Consumer.fsproj b/Plugins/ArgParser/WoofWare.Whippet.Plugin.ArgParser.Consumer/WoofWare.Whippet.Plugin.ArgParser.Consumer.fsproj
index 430484e..1ef47cd 100644
--- a/Plugins/ArgParser/WoofWare.Whippet.Plugin.ArgParser.Consumer/WoofWare.Whippet.Plugin.ArgParser.Consumer.fsproj
+++ b/Plugins/ArgParser/WoofWare.Whippet.Plugin.ArgParser.Consumer/WoofWare.Whippet.Plugin.ArgParser.Consumer.fsproj
@@ -19,7 +19,6 @@
       <ProjectReference Include="..\WoofWare.Whippet.Plugin.ArgParser\WoofWare.Whippet.Plugin.ArgParser.fsproj" PrivateAssets="all" WhippetPlugin="true" />
 
       <!-- Dance to get a binary dependency on a locally-built Whippet -->
-      <!-- ProjectReference Include="..\..\..\WoofWare.Whippet\WoofWare.Whippet.fsproj" PrivateAssets="all" -->
       <PackageReference Include="WoofWare.Whippet" Version="*-*" PrivateAssets="all" />
     </ItemGroup>
 
diff --git a/Plugins/InterfaceMock/WoofWare.Whippet.Plugin.InterfaceMock.Consumer/WoofWare.Whippet.Plugin.InterfaceMock.Consumer.fsproj b/Plugins/InterfaceMock/WoofWare.Whippet.Plugin.InterfaceMock.Consumer/WoofWare.Whippet.Plugin.InterfaceMock.Consumer.fsproj
index 5339467..a41f520 100644
--- a/Plugins/InterfaceMock/WoofWare.Whippet.Plugin.InterfaceMock.Consumer/WoofWare.Whippet.Plugin.InterfaceMock.Consumer.fsproj
+++ b/Plugins/InterfaceMock/WoofWare.Whippet.Plugin.InterfaceMock.Consumer/WoofWare.Whippet.Plugin.InterfaceMock.Consumer.fsproj
@@ -38,7 +38,6 @@
   <ItemGroup>
     <ProjectReference Include="..\WoofWare.Whippet.Plugin.InterfaceMock\WoofWare.Whippet.Plugin.InterfaceMock.fsproj" WhippetPlugin="true" PrivateAssets="all" />
     <!-- Dance to get a binary dependency on a locally-built Whippet -->
-    <!-- ProjectReference Include="..\..\..\WoofWare.Whippet\WoofWare.Whippet.fsproj" PrivateAssets="all" -->
     <PackageReference Include="WoofWare.Whippet" Version="*-*" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/Plugins/Json/WoofWare.Whippet.Plugin.Json.Consumer/WoofWare.Whippet.Plugin.Json.Consumer.fsproj b/Plugins/Json/WoofWare.Whippet.Plugin.Json.Consumer/WoofWare.Whippet.Plugin.Json.Consumer.fsproj
index c6966fa..33dde33 100644
--- a/Plugins/Json/WoofWare.Whippet.Plugin.Json.Consumer/WoofWare.Whippet.Plugin.Json.Consumer.fsproj
+++ b/Plugins/Json/WoofWare.Whippet.Plugin.Json.Consumer/WoofWare.Whippet.Plugin.Json.Consumer.fsproj
@@ -24,7 +24,6 @@
   <ItemGroup>
     <ProjectReference Include="..\WoofWare.Whippet.Plugin.Json\WoofWare.Whippet.Plugin.Json.fsproj" WhippetPlugin="true" />
     <!-- Dance to get a binary dependency on a locally-built Whippet -->
-    <!-- ProjectReference Include="..\..\..\WoofWare.Whippet\WoofWare.Whippet.fsproj" PrivateAssets="all" -->
     <PackageReference Include="WoofWare.Whippet" Version="*-*" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/Plugins/Swagger/WoofWare.Whippet.Plugin.Swagger.Consumer/WoofWare.Whippet.Plugin.Swagger.Consumer.fsproj b/Plugins/Swagger/WoofWare.Whippet.Plugin.Swagger.Consumer/WoofWare.Whippet.Plugin.Swagger.Consumer.fsproj
index c76ef27..a44fbf5 100644
--- a/Plugins/Swagger/WoofWare.Whippet.Plugin.Swagger.Consumer/WoofWare.Whippet.Plugin.Swagger.Consumer.fsproj
+++ b/Plugins/Swagger/WoofWare.Whippet.Plugin.Swagger.Consumer/WoofWare.Whippet.Plugin.Swagger.Consumer.fsproj
@@ -14,7 +14,6 @@
     <ProjectReference Include="..\..\InterfaceMock\WoofWare.Whippet.Plugin.InterfaceMock\WoofWare.Whippet.Plugin.InterfaceMock.fsproj" PrivateAssets="all" WhippetPlugin="true" />
     <ProjectReference Include="..\..\HttpClient\WoofWare.Whippet.Plugin.HttpClient\WoofWare.Whippet.Plugin.HttpClient.fsproj" PrivateAssets="all" WhippetPlugin="true" />
     <!-- Dance to get a binary dependency on a locally-built Whippet -->
-    <!-- ProjectReference Include="..\..\..\WoofWare.Whippet\WoofWare.Whippet.fsproj" PrivateAssets="all" -->
     <PackageReference Include="WoofWare.Whippet" Version="*-*" PrivateAssets="all" />
   </ItemGroup>
 
diff --git a/WoofWare.Whippet.sln b/WoofWare.Whippet.sln
index 692b48c..b901c83 100644
--- a/WoofWare.Whippet.sln
+++ b/WoofWare.Whippet.sln
@@ -1,7 +1,5 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WoofWare.Whippet", "WoofWare.Whippet\WoofWare.Whippet.fsproj", "{85B34488-847A-4784-8001-E4D1715F5ADD}"
-EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WoofWare.Whippet.Core", "WoofWare.Whippet.Core\WoofWare.Whippet.Core.fsproj", "{BFBE848C-E9C0-4152-B956-B8A25DFFDA9C}"
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WoofWare.Whippet.Test", "WoofWare.Whippet.Test\WoofWare.Whippet.Test.fsproj", "{A2E2A639-D17D-426D-B424-0139B4DBCF8F}"
@@ -50,16 +48,14 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WoofWare.Whippet.Plugin.Swa
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WoofWare.Whippet.Plugin.InterfaceMock.Attributes", "Plugins\InterfaceMock\WoofWare.Whippet.Plugin.InterfaceMock.Attributes\WoofWare.Whippet.Plugin.InterfaceMock.Attributes.fsproj", "{A3DCC00E-AA51-408B-93C3-5F227CFFCBD3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WoofWare.Whippet", "WoofWare.Whippet\WoofWare.Whippet.csproj", "{BE6189AC-52C2-4AA8-94D7-048A442CC281}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{85B34488-847A-4784-8001-E4D1715F5ADD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85B34488-847A-4784-8001-E4D1715F5ADD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85B34488-847A-4784-8001-E4D1715F5ADD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85B34488-847A-4784-8001-E4D1715F5ADD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BFBE848C-E9C0-4152-B956-B8A25DFFDA9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BFBE848C-E9C0-4152-B956-B8A25DFFDA9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BFBE848C-E9C0-4152-B956-B8A25DFFDA9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -156,5 +152,9 @@ Global
 		{A3DCC00E-AA51-408B-93C3-5F227CFFCBD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3DCC00E-AA51-408B-93C3-5F227CFFCBD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A3DCC00E-AA51-408B-93C3-5F227CFFCBD3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE6189AC-52C2-4AA8-94D7-048A442CC281}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE6189AC-52C2-4AA8-94D7-048A442CC281}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE6189AC-52C2-4AA8-94D7-048A442CC281}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE6189AC-52C2-4AA8-94D7-048A442CC281}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/WoofWare.Whippet/WoofWare.Whippet.fsproj b/WoofWare.Whippet/WoofWare.Whippet.csproj
similarity index 96%
rename from WoofWare.Whippet/WoofWare.Whippet.fsproj
rename to WoofWare.Whippet/WoofWare.Whippet.csproj
index dcb5b21..937f826 100644
--- a/WoofWare.Whippet/WoofWare.Whippet.fsproj
+++ b/WoofWare.Whippet/WoofWare.Whippet.csproj
@@ -17,6 +17,7 @@
       <DevelopmentDependency>true</DevelopmentDependency>
       <NoWarn>NU5118</NoWarn>
       <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+      <EnableDefaultItems>false</EnableDefaultItems>
     </PropertyGroup>
 
     <ItemGroup>
@@ -27,7 +28,7 @@
       <Content Include="build\WoofWare.Whippet.targets" PackagePath="build" />
       <EmbeddedResource Include="version.json" />
     </ItemGroup>
-  
+
     <ItemGroup>
       <ProjectReference Include="..\WoofWare.Whippet.App\WoofWare.Whippet.App.fsproj" PrivateAssets="all" />
     </ItemGroup>