diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d9a1797..3ea3127 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,4 +37,4 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: UnionPatcher-${{ matrix.os.prettyName }}
-          path: ${{ github.workspace }}/UnionPatcher.Gui.${{ matrix.os.prettyName }}/bin/${{ matrix.os.buildPath }}
\ No newline at end of file
+          path: ${{ github.workspace }}/UnionPatcher.UI.${{ matrix.os.prettyName }}/bin/${{ matrix.os.buildPath }}
diff --git a/UnionPatcher/Program.cs b/UnionPatcher.Cli/Program.cs
similarity index 97%
rename from UnionPatcher/Program.cs
rename to UnionPatcher.Cli/Program.cs
index 6cd7fb4..85ece50 100644
--- a/UnionPatcher/Program.cs
+++ b/UnionPatcher.Cli/Program.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 
-namespace LBPUnion.UnionPatcher {
+namespace LBPUnion.UnionPatcher.Cli {
     public static class Program {
         public const string Version = "1.0";
 
@@ -51,4 +51,4 @@ namespace LBPUnion.UnionPatcher {
             Console.WriteLine($"    Usage: {FileName} <Input EBOOT.elf> <Server URL> <Output filename>");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/UnionPatcher.Cli/UnionPatcher.Cli.csproj b/UnionPatcher.Cli/UnionPatcher.Cli.csproj
new file mode 100644
index 0000000..7d578ad
--- /dev/null
+++ b/UnionPatcher.Cli/UnionPatcher.Cli.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <AssemblyName>UnionPatcher</AssemblyName>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\UnionPatcher\UnionPatcher.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/UnionPatcher.sln b/UnionPatcher.sln
index ed35680..2ded59b 100644
--- a/UnionPatcher.sln
+++ b/UnionPatcher.sln
@@ -6,12 +6,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnionPatcher.Gui.Windows",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnionPatcher.Gui.Linux", "UnionPatcher.Gui.Linux\UnionPatcher.Gui.Linux.csproj", "{55DFA962-3EC5-44E4-9F93-FACF3E7EEBB2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Gui", "Gui", "{59194212-45BB-4A27-A08F-54DB6ADA26B3}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{59194212-45BB-4A27-A08F-54DB6ADA26B3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnionPatcher", "UnionPatcher\UnionPatcher.csproj", "{1CEC657B-5C05-44FB-941B-3C41411A7BB8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnionPatcher.Gui.MacOS", "UnionPatcher.Gui.MacOS\UnionPatcher.Gui.MacOS.csproj", "{DF1F0B76-FC45-41D5-B11C-9DDC620BE0F3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnionPatcher.Cli", "UnionPatcher.Cli\UnionPatcher.Cli.csproj", "{848F551E-C759-4F6F-B991-A27EFAC36754}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -65,11 +67,22 @@ Global
 		{DF1F0B76-FC45-41D5-B11C-9DDC620BE0F3}.MacOS|Any CPU.ActiveCfg = Release|Any CPU
 		{DF1F0B76-FC45-41D5-B11C-9DDC620BE0F3}.MacOS|Any CPU.Build.0 = Release|Any CPU
 		{DF1F0B76-FC45-41D5-B11C-9DDC620BE0F3}.Windows|Any CPU.ActiveCfg = Release|Any CPU
+		{848F551E-C759-4F6F-B991-A27EFAC36754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{848F551E-C759-4F6F-B991-A27EFAC36754}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{848F551E-C759-4F6F-B991-A27EFAC36754}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{848F551E-C759-4F6F-B991-A27EFAC36754}.Release|Any CPU.Build.0 = Release|Any CPU
+		{848F551E-C759-4F6F-B991-A27EFAC36754}.Linux|Any CPU.ActiveCfg = Debug|Any CPU
+		{848F551E-C759-4F6F-B991-A27EFAC36754}.Linux|Any CPU.Build.0 = Debug|Any CPU
+		{848F551E-C759-4F6F-B991-A27EFAC36754}.MacOS|Any CPU.ActiveCfg = Debug|Any CPU
+		{848F551E-C759-4F6F-B991-A27EFAC36754}.MacOS|Any CPU.Build.0 = Debug|Any CPU
+		{848F551E-C759-4F6F-B991-A27EFAC36754}.Windows|Any CPU.ActiveCfg = Debug|Any CPU
+		{848F551E-C759-4F6F-B991-A27EFAC36754}.Windows|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{235B4DEC-11A0-42EF-9B8D-16529869ED1A} = {59194212-45BB-4A27-A08F-54DB6ADA26B3}
 		{55DFA962-3EC5-44E4-9F93-FACF3E7EEBB2} = {59194212-45BB-4A27-A08F-54DB6ADA26B3}
 		{5F8CDEA2-B483-40D1-B1FB-EF8EC667185A} = {59194212-45BB-4A27-A08F-54DB6ADA26B3}
 		{DF1F0B76-FC45-41D5-B11C-9DDC620BE0F3} = {59194212-45BB-4A27-A08F-54DB6ADA26B3}
+		{848F551E-C759-4F6F-B991-A27EFAC36754} = {59194212-45BB-4A27-A08F-54DB6ADA26B3}
 	EndGlobalSection
 EndGlobal
diff --git a/UnionPatcher/UnionPatcher.csproj b/UnionPatcher/UnionPatcher.csproj
index 18b8491..41f5b48 100644
--- a/UnionPatcher/UnionPatcher.csproj
+++ b/UnionPatcher/UnionPatcher.csproj
@@ -7,7 +7,6 @@
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' != 'Windows' ">
-        <OutputType>Exe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>