diff --git a/run.sh b/run.sh
index e9adf39..65e2dd8 100755
--- a/run.sh
+++ b/run.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
-dotnet run --project src/Nub.Lang.CLI/ example
+set -e
+dotnet run --project src/cli/cli.csproj example
 ./bin/out
\ No newline at end of file
diff --git a/src/.idea/.idea.Nub.Lang/.idea/.name b/src/.idea/.idea.Nub.Lang/.idea/.name
deleted file mode 100644
index 56aaa3a..0000000
--- a/src/.idea/.idea.Nub.Lang/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-Nub.Lang
\ No newline at end of file
diff --git a/src/.idea/.idea.Nub.Lang/.idea/codeStyles/codeStyleConfig.xml b/src/.idea/.idea.Nub.Lang/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/src/.idea/.idea.Nub.Lang/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/src/.idea/.idea.Nub.Lang/.idea/vcs.xml b/src/.idea/.idea.Nub.Lang/.idea/vcs.xml
deleted file mode 100644
index 64713b8..0000000
--- a/src/.idea/.idea.Nub.Lang/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/.idea/.idea.Nub.Lang/.idea/.gitignore b/src/.idea/.idea.compiler/.idea/.gitignore
similarity index 92%
rename from src/.idea/.idea.Nub.Lang/.idea/.gitignore
rename to src/.idea/.idea.compiler/.idea/.gitignore
index 79fd601..c60a61f 100644
--- a/src/.idea/.idea.Nub.Lang/.idea/.gitignore
+++ b/src/.idea/.idea.compiler/.idea/.gitignore
@@ -3,7 +3,7 @@
 /workspace.xml
 # Rider ignored files
 /projectSettingsUpdater.xml
-/.idea.Nub.Lang.iml
+/.idea.compiler.iml
 /modules.xml
 /contentModel.xml
 # Editor-based HTTP Client requests
diff --git a/src/.idea/.idea.compiler/.idea/.name b/src/.idea/.idea.compiler/.idea/.name
new file mode 100644
index 0000000..7f246c0
--- /dev/null
+++ b/src/.idea/.idea.compiler/.idea/.name
@@ -0,0 +1 @@
+compiler
\ No newline at end of file
diff --git a/src/.idea/.idea.Nub.Lang/.idea/encodings.xml b/src/.idea/.idea.compiler/.idea/encodings.xml
similarity index 100%
rename from src/.idea/.idea.Nub.Lang/.idea/encodings.xml
rename to src/.idea/.idea.compiler/.idea/encodings.xml
diff --git a/src/.idea/.idea.Nub.Lang/.idea/indexLayout.xml b/src/.idea/.idea.compiler/.idea/indexLayout.xml
similarity index 58%
rename from src/.idea/.idea.Nub.Lang/.idea/indexLayout.xml
rename to src/.idea/.idea.compiler/.idea/indexLayout.xml
index 4a53b21..7b08163 100644
--- a/src/.idea/.idea.Nub.Lang/.idea/indexLayout.xml
+++ b/src/.idea/.idea.compiler/.idea/indexLayout.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="UserContentModel">
-    <attachedFolders>
-      <Path>../../example</Path>
-      <Path>../core</Path>
-    </attachedFolders>
+    <attachedFolders />
     <explicitIncludes />
     <explicitExcludes />
   </component>
diff --git a/src/Nub.Lang.CLI/Program.cs b/src/cli/Program.cs
similarity index 100%
rename from src/Nub.Lang.CLI/Program.cs
rename to src/cli/Program.cs
diff --git a/src/Nub.Lang.CLI/Runtime/entry.s b/src/cli/Runtime/entry.s
similarity index 100%
rename from src/Nub.Lang.CLI/Runtime/entry.s
rename to src/cli/Runtime/entry.s
diff --git a/src/Nub.Lang.CLI/Runtime/nub_memcpy.s b/src/cli/Runtime/nub_memcpy.s
similarity index 100%
rename from src/Nub.Lang.CLI/Runtime/nub_memcpy.s
rename to src/cli/Runtime/nub_memcpy.s
diff --git a/src/Nub.Lang.CLI/Runtime/nub_memset.s b/src/cli/Runtime/nub_memset.s
similarity index 100%
rename from src/Nub.Lang.CLI/Runtime/nub_memset.s
rename to src/cli/Runtime/nub_memset.s
diff --git a/src/Nub.Lang.CLI/Runtime/nub_panic.s b/src/cli/Runtime/nub_panic.s
similarity index 100%
rename from src/Nub.Lang.CLI/Runtime/nub_panic.s
rename to src/cli/Runtime/nub_panic.s
diff --git a/src/Nub.Lang.CLI/Runtime/nub_strcmp.s b/src/cli/Runtime/nub_strcmp.s
similarity index 100%
rename from src/Nub.Lang.CLI/Runtime/nub_strcmp.s
rename to src/cli/Runtime/nub_strcmp.s
diff --git a/src/Nub.Lang.CLI/Nub.Lang.CLI.csproj b/src/cli/cli.csproj
similarity index 80%
rename from src/Nub.Lang.CLI/Nub.Lang.CLI.csproj
rename to src/cli/cli.csproj
index b06150f..657ebe8 100644
--- a/src/Nub.Lang.CLI/Nub.Lang.CLI.csproj
+++ b/src/cli/cli.csproj
@@ -10,8 +10,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Nub.Lang.Generation\Nub.Lang.Generation.csproj" />
-      <ProjectReference Include="..\Nub.Lang.Syntax\Nub.Lang.Syntax.csproj" />
+      <ProjectReference Include="..\generation\generation.csproj" />
+      <ProjectReference Include="..\syntax\syntax.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Nub.Lang.Common/Optional.cs b/src/common/Optional.cs
similarity index 100%
rename from src/Nub.Lang.Common/Optional.cs
rename to src/common/Optional.cs
diff --git a/src/Nub.Lang.Common/Variant.cs b/src/common/Variant.cs
similarity index 100%
rename from src/Nub.Lang.Common/Variant.cs
rename to src/common/Variant.cs
diff --git a/src/Nub.Lang.Common/Nub.Lang.Common.csproj b/src/common/common.csproj
similarity index 100%
rename from src/Nub.Lang.Common/Nub.Lang.Common.csproj
rename to src/common/common.csproj
diff --git a/src/Nub.Lang.sln b/src/compiler.sln
similarity index 72%
rename from src/Nub.Lang.sln
rename to src/compiler.sln
index 6cc6537..dc64a45 100644
--- a/src/Nub.Lang.sln
+++ b/src/compiler.sln
@@ -1,12 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nub.Lang.Syntax", "Nub.Lang.Syntax\Nub.Lang.Syntax.csproj", "{5047E21F-590D-4CB3-AFF3-064316485009}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "syntax", "syntax\syntax.csproj", "{5047E21F-590D-4CB3-AFF3-064316485009}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nub.Lang.CLI", "Nub.Lang.CLI\Nub.Lang.CLI.csproj", "{A22F17ED-FA17-45AB-92BA-CD02C28B3524}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cli", "cli\cli.csproj", "{A22F17ED-FA17-45AB-92BA-CD02C28B3524}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nub.Lang.Generation", "Nub.Lang.Generation\Nub.Lang.Generation.csproj", "{F903F1B9-69A6-4522-B483-81A4B072C8B1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generation", "generation\generation.csproj", "{F903F1B9-69A6-4522-B483-81A4B072C8B1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nub.Lang.Common", "Nub.Lang.Common\Nub.Lang.Common.csproj", "{91ECE034-32D4-48E6-A905-5F95DB95A3D4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "common", "common\common.csproj", "{91ECE034-32D4-48E6-A905-5F95DB95A3D4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Nub.Lang.Generation/QBE/QBEGenerator.cs b/src/generation/QBE/QBEGenerator.cs
similarity index 100%
rename from src/Nub.Lang.Generation/QBE/QBEGenerator.cs
rename to src/generation/QBE/QBEGenerator.cs
diff --git a/src/Nub.Lang.Generation/Nub.Lang.Generation.csproj b/src/generation/generation.csproj
similarity index 62%
rename from src/Nub.Lang.Generation/Nub.Lang.Generation.csproj
rename to src/generation/generation.csproj
index 2a78ccc..69ce77d 100644
--- a/src/Nub.Lang.Generation/Nub.Lang.Generation.csproj
+++ b/src/generation/generation.csproj
@@ -7,8 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Nub.Lang.Common\Nub.Lang.Common.csproj" />
-      <ProjectReference Include="..\Nub.Lang.Syntax\Nub.Lang.Syntax.csproj" />
+      <ProjectReference Include="..\common\common.csproj" />
+      <ProjectReference Include="..\syntax\syntax.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Nub.Lang.Syntax/DefinitionTable.cs b/src/syntax/DefinitionTable.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/DefinitionTable.cs
rename to src/syntax/DefinitionTable.cs
diff --git a/src/Nub.Lang.Syntax/Diagnostics/ConsoleColors.cs b/src/syntax/Diagnostics/ConsoleColors.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Diagnostics/ConsoleColors.cs
rename to src/syntax/Diagnostics/ConsoleColors.cs
diff --git a/src/Nub.Lang.Syntax/Diagnostics/Diagnostic.cs b/src/syntax/Diagnostics/Diagnostic.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Diagnostics/Diagnostic.cs
rename to src/syntax/Diagnostics/Diagnostic.cs
diff --git a/src/Nub.Lang.Syntax/Diagnostics/DiagnosticsResult.cs b/src/syntax/Diagnostics/DiagnosticsResult.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Diagnostics/DiagnosticsResult.cs
rename to src/syntax/Diagnostics/DiagnosticsResult.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/CompilationUnit.cs b/src/syntax/Parsing/CompilationUnit.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/CompilationUnit.cs
rename to src/syntax/Parsing/CompilationUnit.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Definitions/DefinitionNode.cs b/src/syntax/Parsing/Definitions/DefinitionNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Definitions/DefinitionNode.cs
rename to src/syntax/Parsing/Definitions/DefinitionNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Definitions/FuncDefinitionNode.cs b/src/syntax/Parsing/Definitions/FuncDefinitionNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Definitions/FuncDefinitionNode.cs
rename to src/syntax/Parsing/Definitions/FuncDefinitionNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Definitions/StructDefinitionNode.cs b/src/syntax/Parsing/Definitions/StructDefinitionNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Definitions/StructDefinitionNode.cs
rename to src/syntax/Parsing/Definitions/StructDefinitionNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Expressions/AddressOfNode.cs b/src/syntax/Parsing/Expressions/AddressOfNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Expressions/AddressOfNode.cs
rename to src/syntax/Parsing/Expressions/AddressOfNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Expressions/AnonymousFuncNode.cs b/src/syntax/Parsing/Expressions/AnonymousFuncNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Expressions/AnonymousFuncNode.cs
rename to src/syntax/Parsing/Expressions/AnonymousFuncNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Expressions/ArrayIndexAccessNode.cs b/src/syntax/Parsing/Expressions/ArrayIndexAccessNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Expressions/ArrayIndexAccessNode.cs
rename to src/syntax/Parsing/Expressions/ArrayIndexAccessNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Expressions/ArrayInitializerNode.cs b/src/syntax/Parsing/Expressions/ArrayInitializerNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Expressions/ArrayInitializerNode.cs
rename to src/syntax/Parsing/Expressions/ArrayInitializerNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Expressions/BinaryExpressionNode.cs b/src/syntax/Parsing/Expressions/BinaryExpressionNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Expressions/BinaryExpressionNode.cs
rename to src/syntax/Parsing/Expressions/BinaryExpressionNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Expressions/DereferenceNode.cs b/src/syntax/Parsing/Expressions/DereferenceNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Expressions/DereferenceNode.cs
rename to src/syntax/Parsing/Expressions/DereferenceNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Expressions/ExpressionNode.cs b/src/syntax/Parsing/Expressions/ExpressionNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Expressions/ExpressionNode.cs
rename to src/syntax/Parsing/Expressions/ExpressionNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Expressions/FixedArrayInitializerNode.cs b/src/syntax/Parsing/Expressions/FixedArrayInitializerNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Expressions/FixedArrayInitializerNode.cs
rename to src/syntax/Parsing/Expressions/FixedArrayInitializerNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Expressions/FuncCallNode.cs b/src/syntax/Parsing/Expressions/FuncCallNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Expressions/FuncCallNode.cs
rename to src/syntax/Parsing/Expressions/FuncCallNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Expressions/IdentifierNode.cs b/src/syntax/Parsing/Expressions/IdentifierNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Expressions/IdentifierNode.cs
rename to src/syntax/Parsing/Expressions/IdentifierNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Expressions/LiteralNode.cs b/src/syntax/Parsing/Expressions/LiteralNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Expressions/LiteralNode.cs
rename to src/syntax/Parsing/Expressions/LiteralNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Expressions/MemberAccessNode.cs b/src/syntax/Parsing/Expressions/MemberAccessNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Expressions/MemberAccessNode.cs
rename to src/syntax/Parsing/Expressions/MemberAccessNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Expressions/StructInitializerNode.cs b/src/syntax/Parsing/Expressions/StructInitializerNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Expressions/StructInitializerNode.cs
rename to src/syntax/Parsing/Expressions/StructInitializerNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Expressions/UnaryExpressionNode.cs b/src/syntax/Parsing/Expressions/UnaryExpressionNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Expressions/UnaryExpressionNode.cs
rename to src/syntax/Parsing/Expressions/UnaryExpressionNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Node.cs b/src/syntax/Parsing/Node.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Node.cs
rename to src/syntax/Parsing/Node.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Parser.cs b/src/syntax/Parsing/Parser.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Parser.cs
rename to src/syntax/Parsing/Parser.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Statements/ArrayIndexAssignmentNode.cs b/src/syntax/Parsing/Statements/ArrayIndexAssignmentNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Statements/ArrayIndexAssignmentNode.cs
rename to src/syntax/Parsing/Statements/ArrayIndexAssignmentNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Statements/BlockNode.cs b/src/syntax/Parsing/Statements/BlockNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Statements/BlockNode.cs
rename to src/syntax/Parsing/Statements/BlockNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Statements/BreakNode.cs b/src/syntax/Parsing/Statements/BreakNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Statements/BreakNode.cs
rename to src/syntax/Parsing/Statements/BreakNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Statements/ContinueNode.cs b/src/syntax/Parsing/Statements/ContinueNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Statements/ContinueNode.cs
rename to src/syntax/Parsing/Statements/ContinueNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Statements/DereferenceAssignmentNode.cs b/src/syntax/Parsing/Statements/DereferenceAssignmentNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Statements/DereferenceAssignmentNode.cs
rename to src/syntax/Parsing/Statements/DereferenceAssignmentNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Statements/IfNode.cs b/src/syntax/Parsing/Statements/IfNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Statements/IfNode.cs
rename to src/syntax/Parsing/Statements/IfNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Statements/MemberAssignmentNode.cs b/src/syntax/Parsing/Statements/MemberAssignmentNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Statements/MemberAssignmentNode.cs
rename to src/syntax/Parsing/Statements/MemberAssignmentNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Statements/ReturnNode.cs b/src/syntax/Parsing/Statements/ReturnNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Statements/ReturnNode.cs
rename to src/syntax/Parsing/Statements/ReturnNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Statements/StatementExpressionNode.cs b/src/syntax/Parsing/Statements/StatementExpressionNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Statements/StatementExpressionNode.cs
rename to src/syntax/Parsing/Statements/StatementExpressionNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Statements/StatementNode.cs b/src/syntax/Parsing/Statements/StatementNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Statements/StatementNode.cs
rename to src/syntax/Parsing/Statements/StatementNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Statements/VariableAssignmentNode.cs b/src/syntax/Parsing/Statements/VariableAssignmentNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Statements/VariableAssignmentNode.cs
rename to src/syntax/Parsing/Statements/VariableAssignmentNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Statements/VariableDeclarationNode.cs b/src/syntax/Parsing/Statements/VariableDeclarationNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Statements/VariableDeclarationNode.cs
rename to src/syntax/Parsing/Statements/VariableDeclarationNode.cs
diff --git a/src/Nub.Lang.Syntax/Parsing/Statements/WhileNode.cs b/src/syntax/Parsing/Statements/WhileNode.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Parsing/Statements/WhileNode.cs
rename to src/syntax/Parsing/Statements/WhileNode.cs
diff --git a/src/Nub.Lang.Syntax/Source.cs b/src/syntax/Source.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Source.cs
rename to src/syntax/Source.cs
diff --git a/src/Nub.Lang.Syntax/Tokenization/DocumentationToken.cs b/src/syntax/Tokenization/DocumentationToken.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Tokenization/DocumentationToken.cs
rename to src/syntax/Tokenization/DocumentationToken.cs
diff --git a/src/Nub.Lang.Syntax/Tokenization/IdentifierToken.cs b/src/syntax/Tokenization/IdentifierToken.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Tokenization/IdentifierToken.cs
rename to src/syntax/Tokenization/IdentifierToken.cs
diff --git a/src/Nub.Lang.Syntax/Tokenization/LiteralToken.cs b/src/syntax/Tokenization/LiteralToken.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Tokenization/LiteralToken.cs
rename to src/syntax/Tokenization/LiteralToken.cs
diff --git a/src/Nub.Lang.Syntax/Tokenization/ModifierToken.cs b/src/syntax/Tokenization/ModifierToken.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Tokenization/ModifierToken.cs
rename to src/syntax/Tokenization/ModifierToken.cs
diff --git a/src/Nub.Lang.Syntax/Tokenization/SymbolToken.cs b/src/syntax/Tokenization/SymbolToken.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Tokenization/SymbolToken.cs
rename to src/syntax/Tokenization/SymbolToken.cs
diff --git a/src/Nub.Lang.Syntax/Tokenization/Token.cs b/src/syntax/Tokenization/Token.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Tokenization/Token.cs
rename to src/syntax/Tokenization/Token.cs
diff --git a/src/Nub.Lang.Syntax/Tokenization/Tokenizer.cs b/src/syntax/Tokenization/Tokenizer.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Tokenization/Tokenizer.cs
rename to src/syntax/Tokenization/Tokenizer.cs
diff --git a/src/Nub.Lang.Syntax/Typing/NubType.cs b/src/syntax/Typing/NubType.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Typing/NubType.cs
rename to src/syntax/Typing/NubType.cs
diff --git a/src/Nub.Lang.Syntax/Typing/TypeChecker.cs b/src/syntax/Typing/TypeChecker.cs
similarity index 100%
rename from src/Nub.Lang.Syntax/Typing/TypeChecker.cs
rename to src/syntax/Typing/TypeChecker.cs
diff --git a/src/Nub.Lang.Syntax/Nub.Lang.Syntax.csproj b/src/syntax/syntax.csproj
similarity index 79%
rename from src/Nub.Lang.Syntax/Nub.Lang.Syntax.csproj
rename to src/syntax/syntax.csproj
index ecd1e16..156b747 100644
--- a/src/Nub.Lang.Syntax/Nub.Lang.Syntax.csproj
+++ b/src/syntax/syntax.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Nub.Lang.Common\Nub.Lang.Common.csproj" />
+      <ProjectReference Include="..\common\common.csproj" />
     </ItemGroup>
 
 </Project>