diff --git a/.gitignore b/.gitignore
index c85d6a1..42ad5e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,4 +99,4 @@ obj/
 # Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)
 
 *.glyb
-dist/**
+**/dist/
diff --git a/BuildCommand.cs b/QRScript.Console/BuildCommand.cs
similarity index 98%
rename from BuildCommand.cs
rename to QRScript.Console/BuildCommand.cs
index 2013e67..316ccd4 100644
--- a/BuildCommand.cs
+++ b/QRScript.Console/BuildCommand.cs
@@ -1,4 +1,4 @@
-namespace Glyph;
+namespace QRScript.Console;
 
 [Command("build", Description = "Build Glyph program.")]
 public class BuildCommand : ICommand
diff --git a/GlobalUsing.cs b/QRScript.Console/GlobalUsing.cs
similarity index 67%
rename from GlobalUsing.cs
rename to QRScript.Console/GlobalUsing.cs
index 5cd5a46..21e1a5a 100644
--- a/GlobalUsing.cs
+++ b/QRScript.Console/GlobalUsing.cs
@@ -1,5 +1,5 @@
-global using Glyph;
-global using Glyph.Extensions;
+global using QRScript.Console;
+global using QRScript.Extensions;
 global using QRCoder;
 global using CliFx;
 global using CliFx.Attributes;
diff --git a/Makefile b/QRScript.Console/Makefile
similarity index 98%
rename from Makefile
rename to QRScript.Console/Makefile
index 589bda3..6c60a8b 100644
--- a/Makefile
+++ b/QRScript.Console/Makefile
@@ -1,6 +1,6 @@
 # Makefile for building and packaging the Sims 2 .s2pk CLI tool
 
-APP_NAME = glyph
+APP_NAME = qrscript
 CONFIGURATION = Release
 RUNTIME_LINUX = linux-x64
 RUNTIME_MAC = osx-x64
diff --git a/Program.cs b/QRScript.Console/Program.cs
similarity index 78%
rename from Program.cs
rename to QRScript.Console/Program.cs
index bb02a60..c1bbc7a 100644
--- a/Program.cs
+++ b/QRScript.Console/Program.cs
@@ -1,6 +1,6 @@
 await new CliApplicationBuilder()
             .AddCommand<RunCommand>()
             .AddCommand<BuildCommand>()
-            .SetExecutableName("Glyph")
+            .SetExecutableName("QR Script")
             .Build()
             .RunAsync();
diff --git a/Glyph.csproj b/QRScript.Console/QRScript.csproj
similarity index 75%
rename from Glyph.csproj
rename to QRScript.Console/QRScript.csproj
index 3a788b9..8470075 100644
--- a/Glyph.csproj
+++ b/QRScript.Console/QRScript.csproj
@@ -4,15 +4,18 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <AssemblyName>glyph</AssemblyName>
+    <AssemblyName>qrscript</AssemblyName>
     <Nullable>enable</Nullable>
     <Version>0.2.104</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="CliFx" Version="2.3.5" />
-    <PackageReference Include="DynamicExpresso.Core" Version="2.19.0" />
     <PackageReference Include="QRCoder" Version="1.6.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\QRScript\QRScript.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/RunCommand.cs b/QRScript.Console/RunCommand.cs
similarity index 98%
rename from RunCommand.cs
rename to QRScript.Console/RunCommand.cs
index fc03700..45d3754 100644
--- a/RunCommand.cs
+++ b/QRScript.Console/RunCommand.cs
@@ -1,4 +1,4 @@
-namespace Glyph;
+namespace QRScript.Console;
 
 [Command("run", Description = "Run a Glyph program.")]
 public class RunCommand : ICommand
diff --git a/install.sh b/QRScript.Console/install.sh
similarity index 52%
rename from install.sh
rename to QRScript.Console/install.sh
index e9b7936..773caf7 100755
--- a/install.sh
+++ b/QRScript.Console/install.sh
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-# Install glyph locally for current user (no sudo)
-# Usage: ./install.sh ./dist/glyph-linux/glyph
+# Install qrscript locally for current user (no sudo)
+# Usage: ./install.sh ./dist/qrscript-linux/qrscript
 
 set -e
 
 PLATFORM="$1"
-SOURCE_BIN="./dist/glyph-$PLATFORM/glyph"
+SOURCE_BIN="./dist/qrscript-$PLATFORM/qrscript"
 INSTALL_DIR="$HOME/.local/bin"
-TARGET="$INSTALL_DIR/glyph"
+TARGET="$INSTALL_DIR/qrscript"
 
 if [[ ! -x "$SOURCE_BIN" ]]; then
-    echo "❌ Error: Provide a valid built glyph binary as the first argument."
+    echo "❌ Error: Provide a valid built qrscript binary as the first argument."
     exit 1
 fi
 
@@ -23,6 +23,6 @@ if [[ ":$PATH:" != *":$INSTALL_DIR:"* ]]; then
     echo "⚠️  $INSTALL_DIR is not in your PATH. Consider adding this to your shell profile:"
     echo "    export PATH=\"\$HOME/.local/bin:\$PATH\""
 else
-    echo "✅ Installed glyph to $TARGET"
-    echo "Run 'glyph --help' to get started."
+    echo "✅ Installed qrscript to $TARGET"
+    echo "Run 'qrscript --help' to get started."
 fi
diff --git a/QRScript.Test/GlobalUsing.cs b/QRScript.Test/GlobalUsing.cs
new file mode 100644
index 0000000..daac994
--- /dev/null
+++ b/QRScript.Test/GlobalUsing.cs
@@ -0,0 +1,2 @@
+global using QRScript;
+global using QRScript.Extensions;
diff --git a/QRScript.Test/QRScript.Test.csproj b/QRScript.Test/QRScript.Test.csproj
new file mode 100644
index 0000000..667644e
--- /dev/null
+++ b/QRScript.Test/QRScript.Test.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="NUnit.Framework" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\QRScript\QRScript.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/QRScript.Test/UnitTest1.cs b/QRScript.Test/UnitTest1.cs
new file mode 100644
index 0000000..a09857f
--- /dev/null
+++ b/QRScript.Test/UnitTest1.cs
@@ -0,0 +1,15 @@
+namespace QRScript.Test;
+
+public class Tests
+{
+    [SetUp]
+    public void Setup()
+    {
+    }
+
+    [Test]
+    public void Test1()
+    {
+        Assert.Pass();
+    }
+}
\ No newline at end of file
diff --git a/QRScript/QRScript.csproj b/QRScript/QRScript.csproj
new file mode 100644
index 0000000..6ac6b7d
--- /dev/null
+++ b/QRScript/QRScript.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <AssemblyName>QRScript.Interpreter</AssemblyName>
+  </PropertyGroup>
+
+<ItemGroup>
+    <PackageReference Include="DynamicExpresso.Core" Version="2.19.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/Runner.cs b/QRScript/Runner.cs
similarity index 99%
rename from Runner.cs
rename to QRScript/Runner.cs
index 4443316..ec3737f 100644
--- a/Runner.cs
+++ b/QRScript/Runner.cs
@@ -1,4 +1,4 @@
-namespace Glyph;
+namespace QRScript;
 
 using DynamicExpresso;
 
diff --git a/StringExtensions.cs b/QRScript/StringExtensions.cs
similarity index 98%
rename from StringExtensions.cs
rename to QRScript/StringExtensions.cs
index 884c162..b9f05a0 100644
--- a/StringExtensions.cs
+++ b/QRScript/StringExtensions.cs
@@ -1,4 +1,4 @@
-namespace Glyph.Extensions;
+namespace QRScript.Extensions;
 
 using System.Text;
 
diff --git a/README.md b/README.md
index 63e48be..2806450 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# 💾 Glyph
+# 💾 QR Script
 
-Glyph is a human-readable esoteric programming language that is designed to fit into a 57x57 QR code (~1,187 characters). With the initial interpreter scaffold together using GPT, it is written C# with the interpreter based on Dynamic Expresso.
+QR Script is a human-readable esoteric programming language that is designed to fit into a 57x57 QR code (~1,187 characters). With the initial interpreter scaffold together using GPT, it is written C# with the interpreter based on Dynamic Expresso.
 
 ## 🎛️ Features
 
diff --git a/sample.glif b/sample.qrs
similarity index 100%
rename from sample.glif
rename to sample.qrs