...

src/compiler/Compiler.sln

@@ -4,8 +4,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NubLang", "NubLang\NubLang.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NubLang.CLI", "NubLang.CLI\NubLang.CLI.csproj", "{A22F17ED-FA17-45AB-92BA-CD02C28B3524}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NubLang.Common", "NubLang.Common\NubLang.Common.csproj", "{91ECE034-32D4-48E6-A905-5F95DB95A3D4}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -20,9 +18,5 @@ Global
 		{A22F17ED-FA17-45AB-92BA-CD02C28B3524}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A22F17ED-FA17-45AB-92BA-CD02C28B3524}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A22F17ED-FA17-45AB-92BA-CD02C28B3524}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91ECE034-32D4-48E6-A905-5F95DB95A3D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91ECE034-32D4-48E6-A905-5F95DB95A3D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91ECE034-32D4-48E6-A905-5F95DB95A3D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91ECE034-32D4-48E6-A905-5F95DB95A3D4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

src/compiler/NubLang.CLI/NubLang.CLI.csproj

@@ -13,10 +13,6 @@
       <ProjectReference Include="..\NubLang\NubLang.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <None Remove="runtime\libruntime_x64.a" />
-    </ItemGroup>
-
     <ItemGroup>
       <None Remove="assets\libruntime_x64.a" />
       <EmbeddedResource Include="assets\libruntime_x64.a" />

src/compiler/NubLang.CLI/Program.cs

@@ -1,7 +1,7 @@
 using System.Reflection;
+using NubLang;
 using NubLang.CLI;
 using NubLang.Code;
-using NubLang.Common;
 using NubLang.Diagnostics;
 using NubLang.Generation;
 using NubLang.Generation.QBE;

src/compiler/NubLang.Common/NubLang.Common.csproj

@@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <IsAotCompatible>true</IsAotCompatible>
-    </PropertyGroup>
-
-</Project>

src/compiler/NubLang/HexString.cs

@@ -1,4 +1,4 @@
-namespace NubLang.Common;
+namespace NubLang;
 
 public static class HexString
 {

src/compiler/NubLang/NubLang.csproj

@@ -7,8 +7,4 @@
         <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\NubLang.Common\NubLang.Common.csproj" />
-    </ItemGroup>
-
 </Project>

src/compiler/NubLang/Optional.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace NubLang.Common;
+namespace NubLang;
 
 public static class Optional
 {

src/compiler/NubLang/Parsing/Parser.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics.CodeAnalysis;
-using NubLang.Common;
 using NubLang.Diagnostics;
 using NubLang.Parsing.Syntax;
 using NubLang.Tokenization;

src/compiler/NubLang/Parsing/Syntax/DefinitionSyntax.cs

@@ -1,5 +1,3 @@
-using NubLang.Common;
-
 namespace NubLang.Parsing.Syntax;
 
 public abstract record DefinitionSyntax : SyntaxNode;

src/compiler/NubLang/Parsing/Syntax/StatementSyntax.cs

@@ -1,5 +1,3 @@
-using NubLang.Common;
-
 namespace NubLang.Parsing.Syntax;
 
 public abstract record StatementSyntax : SyntaxNode;

src/compiler/NubLang/Tokenization/Tokenizer.cs

@@ -1,6 +1,4 @@
-using NubLang.Common;
+namespace NubLang.Tokenization;
-
-namespace NubLang.Tokenization;
 
 public sealed class Tokenizer
 {

src/compiler/NubLang/TypeChecking/Node/Definition.cs

@@ -1,6 +1,4 @@
-using NubLang.Common;
+namespace NubLang.TypeChecking.Node;
-
-namespace NubLang.TypeChecking.Node;
 
 public abstract record Definition : Node;
 

src/compiler/NubLang/TypeChecking/Node/Statement.cs

@@ -1,6 +1,4 @@
-using NubLang.Common;
+namespace NubLang.TypeChecking.Node;
-
-namespace NubLang.TypeChecking.Node;
 
 public record Statement : Node;
 

src/compiler/NubLang/TypeChecking/TypeChecker.cs

@@ -1,4 +1,3 @@
-using NubLang.Common;
 using NubLang.Diagnostics;
 using NubLang.Parsing.Syntax;
 using NubLang.Tokenization;

src/compiler/NubLang/Variant.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace NubLang.Common;
+namespace NubLang;
 
 public readonly struct Variant<T1, T2> where T1 : notnull where T2 : notnull
 {