diff --git a/src/Conjecture.Analyzers.CodeFixes/AssemblyInfo.cs b/src/Conjecture.Analyzers.CodeFixes/AssemblyInfo.cs
new file mode 100644
index 0000000..f9e33cd
--- /dev/null
+++ b/src/Conjecture.Analyzers.CodeFixes/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// Copyright (c) 2026 Kim Ommundsen. Licensed under the MPL-2.0.
+// See LICENSE.txt in the project root or https://mozilla.org/MPL/2.0/
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Conjecture.Analyzers.Tests")]
diff --git a/src/Conjecture.Analyzers/CON102CodeFix.cs b/src/Conjecture.Analyzers.CodeFixes/CON102CodeFix.cs
similarity index 100%
rename from src/Conjecture.Analyzers/CON102CodeFix.cs
rename to src/Conjecture.Analyzers.CodeFixes/CON102CodeFix.cs
diff --git a/src/Conjecture.Analyzers/CON103CodeFix.cs b/src/Conjecture.Analyzers.CodeFixes/CON103CodeFix.cs
similarity index 100%
rename from src/Conjecture.Analyzers/CON103CodeFix.cs
rename to src/Conjecture.Analyzers.CodeFixes/CON103CodeFix.cs
diff --git a/src/Conjecture.Analyzers.CodeFixes/Conjecture.Analyzers.CodeFixes.csproj b/src/Conjecture.Analyzers.CodeFixes/Conjecture.Analyzers.CodeFixes.csproj
new file mode 100644
index 0000000..f9ab952
--- /dev/null
+++ b/src/Conjecture.Analyzers.CodeFixes/Conjecture.Analyzers.CodeFixes.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <IsRoslynComponent>true</IsRoslynComponent>
+    <RootNamespace>Conjecture.Analyzers</RootNamespace>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Conjecture.Analyzers\Conjecture.Analyzers.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Conjecture.Analyzers.Tests/Conjecture.Analyzers.Tests.csproj b/src/Conjecture.Analyzers.Tests/Conjecture.Analyzers.Tests.csproj
index 0157396..2979d27 100644
--- a/src/Conjecture.Analyzers.Tests/Conjecture.Analyzers.Tests.csproj
+++ b/src/Conjecture.Analyzers.Tests/Conjecture.Analyzers.Tests.csproj
@@ -20,6 +20,9 @@
     <ProjectReference Include="..\Conjecture.Analyzers\Conjecture.Analyzers.csproj"
                       OutputItemType="Analyzer"
                       ReferenceOutputAssembly="true" />
+    <ProjectReference Include="..\Conjecture.Analyzers.CodeFixes\Conjecture.Analyzers.CodeFixes.csproj"
+                      OutputItemType="Analyzer"
+                      ReferenceOutputAssembly="true" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Conjecture.Analyzers/AssemblyInfo.cs b/src/Conjecture.Analyzers/AssemblyInfo.cs
index 9622a23..8e91df6 100644
--- a/src/Conjecture.Analyzers/AssemblyInfo.cs
+++ b/src/Conjecture.Analyzers/AssemblyInfo.cs
@@ -3,4 +3,5 @@
 
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Conjecture.Analyzers.Tests")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("Conjecture.Analyzers.Tests")]
+[assembly: InternalsVisibleTo("Conjecture.Analyzers.CodeFixes")]
\ No newline at end of file
diff --git a/src/Conjecture.Analyzers/Conjecture.Analyzers.csproj b/src/Conjecture.Analyzers/Conjecture.Analyzers.csproj
index 93bcf00..d1e210c 100644
--- a/src/Conjecture.Analyzers/Conjecture.Analyzers.csproj
+++ b/src/Conjecture.Analyzers/Conjecture.Analyzers.csproj
@@ -11,7 +11,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Conjecture.slnx b/src/Conjecture.slnx
index 3aa1107..7e467e1 100644
--- a/src/Conjecture.slnx
+++ b/src/Conjecture.slnx
@@ -7,6 +7,7 @@
   <Project Path="Conjecture.Generators/Conjecture.Generators.csproj" />
   <Project Path="Conjecture.Generators.Tests/Conjecture.Generators.Tests.csproj" />
   <Project Path="Conjecture.Analyzers/Conjecture.Analyzers.csproj" />
+  <Project Path="Conjecture.Analyzers.CodeFixes/Conjecture.Analyzers.CodeFixes.csproj" />
   <Project Path="Conjecture.Analyzers.Tests/Conjecture.Analyzers.Tests.csproj" />
   <Project Path="Conjecture.Xunit.V3/Conjecture.Xunit.V3.csproj" />
   <Project Path="Conjecture.Xunit.V3.Tests/Conjecture.Xunit.V3.Tests.csproj" />
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 46e1051..82ae88f 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -17,7 +17,7 @@
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.5" />
 
     <!-- Benchmarking -->
-    <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
 
     <!-- Testing -->
     <PackageVersion Include="coverlet.collector" Version="8.0.1" />
@@ -28,9 +28,9 @@
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
 
     <!-- Source Generator / Analyzer -->
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.3.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.3.0" />
 
     <!-- xUnit v3 -->
     <PackageVersion Include="xunit.v3" Version="2.0.1" />