diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f817df1d..a8508a66 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,11 +1,6 @@
 name: CI
 on:
   push:
-    paths-ignore:
-      - "**/*.md"
-      - "**/*.gitignore"
-      - "**/*.gitattributes"
-      - "**/*.yml"
 env:
   DOTNET_NOLOGO: 1
   Configuration: Release
@@ -25,7 +20,6 @@ jobs:
       - run: dotnet build --no-restore
       - run: dotnet test --no-build
       - run: dotnet format --no-restore --verify-no-changes --verbosity normal
-        continue-on-error: true # this is temporary until https://github.com/dotnet/sdk/issues/32598
 
   deploy_main:
     if: github.ref == 'refs/heads/main'
diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml
index e8eaad6e..219e1fd1 100644
--- a/.github/workflows/pr-ci.yml
+++ b/.github/workflows/pr-ci.yml
@@ -28,7 +28,6 @@ jobs:
       - run: dotnet build --no-restore
       - run: dotnet test --no-build
       - run: dotnet format --no-restore --verify-no-changes --verbosity normal
-        continue-on-error: true # this is temporary until https://github.com/dotnet/sdk/issues/32598
 
       - name: Publish
         run: dotnet publish src/Phalanx.App --output ./.build/pub --version-suffix "beta.pr.${{ github.run_number }}"
diff --git a/Directory.Packages.props b/Directory.Packages.props
index cc5e0421..df493f40 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,13 +1,13 @@
 <Project>
   <ItemGroup>
     <PackageVersion Include="Handlebars.Net" Version="2.1.4" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.5" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.5" PrivateAssets="all" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.8" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.8" PrivateAssets="all" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Fast.Components.FluentUI" Version="2.3.6" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="NuGet.Versioning" Version="6.6.0" />
+    <PackageVersion Include="NuGet.Versioning" Version="6.6.1" />
     <PackageVersion Include="PublishSPAforGitHubPages.Build" Version="2.0.2" />
     <PackageVersion Include="WarHub.ArmouryModel.Source" Version="0.13.0" />
     <PackageVersion Include="WarHub.ArmouryModel.Workspaces.BattleScribe" Version="0.13.0" />
@@ -17,7 +17,7 @@
   <ItemGroup Label="Tests">
     <PackageVersion Include="coverlet.collector" Version="6.0.0" PrivateAssets="all" />
     <PackageVersion Include="FluentAssertions" Version="6.11.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageVersion Include="xunit" Version="2.4.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
   </ItemGroup>
diff --git a/src/WarHub.ArmouryModel.Extensions/BindingDiagnosticBag.cs b/src/WarHub.ArmouryModel.Extensions/Binding/BindingDiagnosticBag.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/BindingDiagnosticBag.cs
rename to src/WarHub.ArmouryModel.Extensions/Binding/BindingDiagnosticBag.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/CandidateReason.cs b/src/WarHub.ArmouryModel.Extensions/Binding/CandidateReason.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/CandidateReason.cs
rename to src/WarHub.ArmouryModel.Extensions/Binding/CandidateReason.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/LookupOptions.cs b/src/WarHub.ArmouryModel.Extensions/Binding/LookupOptions.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/LookupOptions.cs
rename to src/WarHub.ArmouryModel.Extensions/Binding/LookupOptions.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/LookupResult.cs b/src/WarHub.ArmouryModel.Extensions/Binding/LookupResult.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/LookupResult.cs
rename to src/WarHub.ArmouryModel.Extensions/Binding/LookupResult.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/LookupResultKind.cs b/src/WarHub.ArmouryModel.Extensions/Binding/LookupResultKind.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/LookupResultKind.cs
rename to src/WarHub.ArmouryModel.Extensions/Binding/LookupResultKind.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/LookupResultKindExtensions.cs b/src/WarHub.ArmouryModel.Extensions/Binding/LookupResultKindExtensions.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/LookupResultKindExtensions.cs
rename to src/WarHub.ArmouryModel.Extensions/Binding/LookupResultKindExtensions.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/SingleLookupResult.cs b/src/WarHub.ArmouryModel.Extensions/Binding/SingleLookupResult.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/SingleLookupResult.cs
rename to src/WarHub.ArmouryModel.Extensions/Binding/SingleLookupResult.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/Compilation.cs b/src/WarHub.ArmouryModel.Extensions/Compilation/Compilation.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/Compilation.cs
rename to src/WarHub.ArmouryModel.Extensions/Compilation/Compilation.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/CompilationOptions.cs b/src/WarHub.ArmouryModel.Extensions/Compilation/CompilationOptions.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/CompilationOptions.cs
rename to src/WarHub.ArmouryModel.Extensions/Compilation/CompilationOptions.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/CommonMessageProvider.cs b/src/WarHub.ArmouryModel.Extensions/Diagnostics/CommonMessageProvider.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/CommonMessageProvider.cs
rename to src/WarHub.ArmouryModel.Extensions/Diagnostics/CommonMessageProvider.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/Diagnostic.SimpleDiagnostic.cs b/src/WarHub.ArmouryModel.Extensions/Diagnostics/Diagnostic.SimpleDiagnostic.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/Diagnostic.SimpleDiagnostic.cs
rename to src/WarHub.ArmouryModel.Extensions/Diagnostics/Diagnostic.SimpleDiagnostic.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/Diagnostic.cs b/src/WarHub.ArmouryModel.Extensions/Diagnostics/Diagnostic.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/Diagnostic.cs
rename to src/WarHub.ArmouryModel.Extensions/Diagnostics/Diagnostic.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/DiagnosticBag.cs b/src/WarHub.ArmouryModel.Extensions/Diagnostics/DiagnosticBag.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/DiagnosticBag.cs
rename to src/WarHub.ArmouryModel.Extensions/Diagnostics/DiagnosticBag.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/DiagnosticDescriptor.cs b/src/WarHub.ArmouryModel.Extensions/Diagnostics/DiagnosticDescriptor.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/DiagnosticDescriptor.cs
rename to src/WarHub.ArmouryModel.Extensions/Diagnostics/DiagnosticDescriptor.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/DiagnosticFormatter.cs b/src/WarHub.ArmouryModel.Extensions/Diagnostics/DiagnosticFormatter.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/DiagnosticFormatter.cs
rename to src/WarHub.ArmouryModel.Extensions/Diagnostics/DiagnosticFormatter.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/DiagnosticInfo.cs b/src/WarHub.ArmouryModel.Extensions/Diagnostics/DiagnosticInfo.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/DiagnosticInfo.cs
rename to src/WarHub.ArmouryModel.Extensions/Diagnostics/DiagnosticInfo.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/DiagnosticSeverity.cs b/src/WarHub.ArmouryModel.Extensions/Diagnostics/DiagnosticSeverity.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/DiagnosticSeverity.cs
rename to src/WarHub.ArmouryModel.Extensions/Diagnostics/DiagnosticSeverity.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/DiagnosticWithInfo.cs b/src/WarHub.ArmouryModel.Extensions/Diagnostics/DiagnosticWithInfo.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/DiagnosticWithInfo.cs
rename to src/WarHub.ArmouryModel.Extensions/Diagnostics/DiagnosticWithInfo.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ReportDiagnostic.cs b/src/WarHub.ArmouryModel.Extensions/Diagnostics/ReportDiagnostic.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ReportDiagnostic.cs
rename to src/WarHub.ArmouryModel.Extensions/Diagnostics/ReportDiagnostic.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/UseSiteInfo.cs b/src/WarHub.ArmouryModel.Extensions/Diagnostics/UseSiteInfo.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/UseSiteInfo.cs
rename to src/WarHub.ArmouryModel.Extensions/Diagnostics/UseSiteInfo.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/WellKnownDiagnosticTags.cs b/src/WarHub.ArmouryModel.Extensions/Diagnostics/WellKnownDiagnosticTags.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/WellKnownDiagnosticTags.cs
rename to src/WarHub.ArmouryModel.Extensions/Diagnostics/WellKnownDiagnosticTags.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ContainerKind.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/ContainerKind.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ContainerKind.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/ContainerKind.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/EffectOperation.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/EffectOperation.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/EffectOperation.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/EffectOperation.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/EffectTargetKind.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/EffectTargetKind.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/EffectTargetKind.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/EffectTargetKind.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ICatalogueReferenceSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/ICatalogueReferenceSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ICatalogueReferenceSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/ICatalogueReferenceSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ICatalogueSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/ICatalogueSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ICatalogueSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/ICatalogueSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ICategoryEntrySymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/ICategoryEntrySymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ICategoryEntrySymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/ICategoryEntrySymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ICategorySymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/ICategorySymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ICategorySymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/ICategorySymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ICharacteristicSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/ICharacteristicSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ICharacteristicSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/ICharacteristicSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IConditionSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IConditionSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IConditionSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IConditionSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IConstraintSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IConstraintSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IConstraintSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IConstraintSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IContainerEntryInstanceSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IContainerEntryInstanceSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IContainerEntryInstanceSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IContainerEntryInstanceSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IContainerEntrySymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IContainerEntrySymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IContainerEntrySymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IContainerEntrySymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ICostSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/ICostSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ICostSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/ICostSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IEffectSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IEffectSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IEffectSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IEffectSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IEntryInstanceSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IEntryInstanceSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IEntryInstanceSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IEntryInstanceSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IEntryReferencePathSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IEntryReferencePathSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IEntryReferencePathSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IEntryReferencePathSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IEntrySymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IEntrySymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IEntrySymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IEntrySymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IErrorSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IErrorSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IErrorSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IErrorSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IForceContainerSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IForceContainerSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IForceContainerSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IForceContainerSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IForceEntrySymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IForceEntrySymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IForceEntrySymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IForceEntrySymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IForceSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IForceSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IForceSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IForceSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IGamesystemNamespaceSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IGamesystemNamespaceSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IGamesystemNamespaceSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IGamesystemNamespaceSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ILogicSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/ILogicSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ILogicSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/ILogicSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IModuleSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IModuleSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IModuleSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IModuleSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IProfileSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IProfileSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IProfileSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IProfileSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IPublicationReferenceSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IPublicationReferenceSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IPublicationReferenceSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IPublicationReferenceSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IPublicationSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IPublicationSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IPublicationSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IPublicationSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IQuerySymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IQuerySymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IQuerySymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IQuerySymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IResourceDefinitionSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IResourceDefinitionSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IResourceDefinitionSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IResourceDefinitionSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IResourceEntrySymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IResourceEntrySymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IResourceEntrySymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IResourceEntrySymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IResourceSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IResourceSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IResourceSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IResourceSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IRosterCostSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IRosterCostSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IRosterCostSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IRosterCostSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IRosterProfileSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IRosterProfileSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IRosterProfileSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IRosterProfileSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IRosterRuleSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IRosterRuleSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IRosterRuleSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IRosterRuleSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IRosterSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IRosterSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IRosterSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IRosterSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/IRuleSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/IRuleSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/IRuleSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/IRuleSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ISelectionContainerSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/ISelectionContainerSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ISelectionContainerSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/ISelectionContainerSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ISelectionEntryContainerSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/ISelectionEntryContainerSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ISelectionEntryContainerSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/ISelectionEntryContainerSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ISelectionEntryGroupSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/ISelectionEntryGroupSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ISelectionEntryGroupSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/ISelectionEntryGroupSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ISelectionEntrySymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/ISelectionEntrySymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ISelectionEntrySymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/ISelectionEntrySymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ISelectionSymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/ISelectionSymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ISelectionSymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/ISelectionSymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ISymbol.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/ISymbol.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ISymbol.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/ISymbol.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ISymbolExtensions.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/ISymbolExtensions.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ISymbolExtensions.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/ISymbolExtensions.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/LogicalOperator.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/LogicalOperator.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/LogicalOperator.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/LogicalOperator.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/QueryComparisonType.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/QueryComparisonType.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/QueryComparisonType.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/QueryComparisonType.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/QueryFilterKind.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/QueryFilterKind.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/QueryFilterKind.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/QueryFilterKind.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/QueryOptions.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/QueryOptions.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/QueryOptions.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/QueryOptions.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/QueryScopeKind.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/QueryScopeKind.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/QueryScopeKind.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/QueryScopeKind.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/QueryValueKind.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/QueryValueKind.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/QueryValueKind.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/QueryValueKind.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ResourceKind.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/ResourceKind.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ResourceKind.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/ResourceKind.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/SymbolKind.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/SymbolKind.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/SymbolKind.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/SymbolKind.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/SymbolVisitor.cs b/src/WarHub.ArmouryModel.Extensions/Symbols/SymbolVisitor.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/SymbolVisitor.cs
rename to src/WarHub.ArmouryModel.Extensions/Symbols/SymbolVisitor.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/FileLinePositionSpan.cs b/src/WarHub.ArmouryModel.Extensions/Text/FileLinePositionSpan.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/FileLinePositionSpan.cs
rename to src/WarHub.ArmouryModel.Extensions/Text/FileLinePositionSpan.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/LinePosition.cs b/src/WarHub.ArmouryModel.Extensions/Text/LinePosition.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/LinePosition.cs
rename to src/WarHub.ArmouryModel.Extensions/Text/LinePosition.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/LinePositionSpan.cs b/src/WarHub.ArmouryModel.Extensions/Text/LinePositionSpan.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/LinePositionSpan.cs
rename to src/WarHub.ArmouryModel.Extensions/Text/LinePositionSpan.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/LocalizableString.FixedLocalizableString.cs b/src/WarHub.ArmouryModel.Extensions/Text/LocalizableString.FixedLocalizableString.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/LocalizableString.FixedLocalizableString.cs
rename to src/WarHub.ArmouryModel.Extensions/Text/LocalizableString.FixedLocalizableString.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/LocalizableString.cs b/src/WarHub.ArmouryModel.Extensions/Text/LocalizableString.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/LocalizableString.cs
rename to src/WarHub.ArmouryModel.Extensions/Text/LocalizableString.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/Location.cs b/src/WarHub.ArmouryModel.Extensions/Text/Location.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/Location.cs
rename to src/WarHub.ArmouryModel.Extensions/Text/Location.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/LocationKind.cs b/src/WarHub.ArmouryModel.Extensions/Text/LocationKind.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/LocationKind.cs
rename to src/WarHub.ArmouryModel.Extensions/Text/LocationKind.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/NoLocation.cs b/src/WarHub.ArmouryModel.Extensions/Text/NoLocation.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/NoLocation.cs
rename to src/WarHub.ArmouryModel.Extensions/Text/NoLocation.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/SourceLocation.cs b/src/WarHub.ArmouryModel.Extensions/Text/SourceLocation.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/SourceLocation.cs
rename to src/WarHub.ArmouryModel.Extensions/Text/SourceLocation.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/TextSpan.cs b/src/WarHub.ArmouryModel.Extensions/Text/TextSpan.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/TextSpan.cs
rename to src/WarHub.ArmouryModel.Extensions/Text/TextSpan.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/CollectionsExtensions.cs b/src/WarHub.ArmouryModel.Extensions/Utilities/CollectionsExtensions.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/CollectionsExtensions.cs
rename to src/WarHub.ArmouryModel.Extensions/Utilities/CollectionsExtensions.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/EnumerableExtensions.cs b/src/WarHub.ArmouryModel.Extensions/Utilities/EnumerableExtensions.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/EnumerableExtensions.cs
rename to src/WarHub.ArmouryModel.Extensions/Utilities/EnumerableExtensions.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/HashSetExtensions.cs b/src/WarHub.ArmouryModel.Extensions/Utilities/HashSetExtensions.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/HashSetExtensions.cs
rename to src/WarHub.ArmouryModel.Extensions/Utilities/HashSetExtensions.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ISetExtensions.cs b/src/WarHub.ArmouryModel.Extensions/Utilities/ISetExtensions.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ISetExtensions.cs
rename to src/WarHub.ArmouryModel.Extensions/Utilities/ISetExtensions.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ImmutableArrayExtensions.cs b/src/WarHub.ArmouryModel.Extensions/Utilities/ImmutableArrayExtensions.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ImmutableArrayExtensions.cs
rename to src/WarHub.ArmouryModel.Extensions/Utilities/ImmutableArrayExtensions.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/InterlockedOperations.cs b/src/WarHub.ArmouryModel.Extensions/Utilities/InterlockedOperations.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/InterlockedOperations.cs
rename to src/WarHub.ArmouryModel.Extensions/Utilities/InterlockedOperations.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/PooledHashSet.cs b/src/WarHub.ArmouryModel.Extensions/Utilities/PooledHashSet.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/PooledHashSet.cs
rename to src/WarHub.ArmouryModel.Extensions/Utilities/PooledHashSet.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/SourceNodeExtensions.cs b/src/WarHub.ArmouryModel.Extensions/Utilities/SourceNodeExtensions.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/SourceNodeExtensions.cs
rename to src/WarHub.ArmouryModel.Extensions/Utilities/SourceNodeExtensions.cs
diff --git a/src/WarHub.ArmouryModel.Extensions/ThreadSafeFlagOperations.cs b/src/WarHub.ArmouryModel.Extensions/Utilities/ThreadSafeFlagOperations.cs
similarity index 100%
rename from src/WarHub.ArmouryModel.Extensions/ThreadSafeFlagOperations.cs
rename to src/WarHub.ArmouryModel.Extensions/Utilities/ThreadSafeFlagOperations.cs