diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1138ea0a..dba94875 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,27 +27,12 @@ jobs:
     - name: Setup MSBuild.exe
       uses: microsoft/setup-msbuild@v2
 
-    - name: Build CLI
-      run: dotnet publish --maxCpuCount /p:DebugType=None /p:DebugSymbols=false --self-contained --configuration Release --runtime win-x64 -f net8.0 -p:WindowsPackageType=None .\CLI\CLI.csproj
+    - name: Build
+      run: dotnet publish --maxCpuCount -f net8.0-windows10.0.19041.0 -c Release -p:RuntimeIdentifierOverride=win10-x64 -p:WindowsPackageType=None .\Drill\Drill.csproj
 
-    - name: Test CLI
-      run: DrillCLI.exe "drill"
-      shell: cmd
-      working-directory: CLI\bin\Release\net8.0\win-x64\publish
-
-    - name: Upload CLI
-      uses: actions/upload-artifact@v4
-      with:
-        name: DrillCLI_win-x64
-        path: CLI\bin\Release\net8.0\win-x64\publish
-        if-no-files-found: error
-
-    - name: Build UI
-      run: dotnet publish --maxCpuCount -f net8.0-windows10.0.19041.0 -c Release -p:RuntimeIdentifierOverride=win10-x64 -p:WindowsPackageType=None .\UI\UI.csproj
-
-    - name: Upload UI
+    - name: Upload
       uses: actions/upload-artifact@v4
       with:
         name: Drill_win10-x64
-        path: UI\bin\Release\net8.0-windows10.0.19041.0\win10-x64\publish
+        path: Drill\bin\Release\net8.0-windows10.0.19041.0\win10-x64\publish
         if-no-files-found: error
diff --git a/CLI/CLI.csproj b/CLI/CLI.csproj
deleted file mode 100644
index 4ad32144..00000000
--- a/CLI/CLI.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-  	<AssemblyName>DrillCLI</AssemblyName>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <Platforms>AnyCPU;x64</Platforms>
-  </PropertyGroup>
-
-</Project>
diff --git a/CLI/Program.cs b/CLI/Program.cs
deleted file mode 100644
index 365ac7b0..00000000
--- a/CLI/Program.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace CLI;
-
-public class Class1
-{
-    static void Main()
-    {
-        
-    }
-}
diff --git a/Core/Core.csproj b/Core/Core.csproj
deleted file mode 100644
index 28a9fabb..00000000
--- a/Core/Core.csproj
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <Platforms>AnyCPU;x64</Platforms>
-  </PropertyGroup>
-
-</Project>
diff --git a/Drill.sln b/Drill.sln
index f1402fda..8c233ea3 100644
--- a/Drill.sln
+++ b/Drill.sln
@@ -3,18 +3,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UI", "UI\UI.csproj", "{26E82371-EBDD-4829-81AE-AA13D272048E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CLI", "CLI\CLI.csproj", "{838E0C3A-DD62-4EB1-A85E-388F3CB36BE0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core.csproj", "{26C909B8-6895-447B-B94C-FD43DB8C972F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Drill", "Drill\Drill.csproj", "{26E82371-EBDD-4829-81AE-AA13D272048E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{26E82371-EBDD-4829-81AE-AA13D272048E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -29,22 +23,6 @@ Global
 		{26E82371-EBDD-4829-81AE-AA13D272048E}.Release|x64.ActiveCfg = Release|Any CPU
 		{26E82371-EBDD-4829-81AE-AA13D272048E}.Release|x64.Build.0 = Release|Any CPU
 		{26E82371-EBDD-4829-81AE-AA13D272048E}.Release|x64.Deploy.0 = Release|Any CPU
-		{838E0C3A-DD62-4EB1-A85E-388F3CB36BE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{838E0C3A-DD62-4EB1-A85E-388F3CB36BE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{838E0C3A-DD62-4EB1-A85E-388F3CB36BE0}.Debug|x64.ActiveCfg = Debug|x64
-		{838E0C3A-DD62-4EB1-A85E-388F3CB36BE0}.Debug|x64.Build.0 = Debug|x64
-		{838E0C3A-DD62-4EB1-A85E-388F3CB36BE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{838E0C3A-DD62-4EB1-A85E-388F3CB36BE0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{838E0C3A-DD62-4EB1-A85E-388F3CB36BE0}.Release|x64.ActiveCfg = Release|x64
-		{838E0C3A-DD62-4EB1-A85E-388F3CB36BE0}.Release|x64.Build.0 = Release|x64
-		{26C909B8-6895-447B-B94C-FD43DB8C972F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26C909B8-6895-447B-B94C-FD43DB8C972F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26C909B8-6895-447B-B94C-FD43DB8C972F}.Debug|x64.ActiveCfg = Debug|x64
-		{26C909B8-6895-447B-B94C-FD43DB8C972F}.Debug|x64.Build.0 = Debug|x64
-		{26C909B8-6895-447B-B94C-FD43DB8C972F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26C909B8-6895-447B-B94C-FD43DB8C972F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26C909B8-6895-447B-B94C-FD43DB8C972F}.Release|x64.ActiveCfg = Release|x64
-		{26C909B8-6895-447B-B94C-FD43DB8C972F}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/UI/App.xaml b/Drill/App.xaml
similarity index 100%
rename from UI/App.xaml
rename to Drill/App.xaml
diff --git a/UI/App.xaml.cs b/Drill/App.xaml.cs
similarity index 100%
rename from UI/App.xaml.cs
rename to Drill/App.xaml.cs
diff --git a/UI/AppShell.xaml b/Drill/AppShell.xaml
similarity index 100%
rename from UI/AppShell.xaml
rename to Drill/AppShell.xaml
diff --git a/UI/AppShell.xaml.cs b/Drill/AppShell.xaml.cs
similarity index 100%
rename from UI/AppShell.xaml.cs
rename to Drill/AppShell.xaml.cs
diff --git a/UI/CursorExtensions.cs b/Drill/CursorExtensions.cs
similarity index 100%
rename from UI/CursorExtensions.cs
rename to Drill/CursorExtensions.cs
diff --git a/UI/UI.csproj b/Drill/Drill.csproj
similarity index 96%
rename from UI/UI.csproj
rename to Drill/Drill.csproj
index 83f9ee0f..7df328d4 100644
--- a/UI/UI.csproj
+++ b/Drill/Drill.csproj
@@ -107,7 +107,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="../Core/Core.csproj" />
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
diff --git a/UI/UI.csproj.user b/Drill/Drill.csproj.user
similarity index 100%
rename from UI/UI.csproj.user
rename to Drill/Drill.csproj.user
diff --git a/Core/DrillResult.cs b/Drill/DrillResult.cs
similarity index 100%
rename from Core/DrillResult.cs
rename to Drill/DrillResult.cs
diff --git a/UI/MainPage.xaml b/Drill/MainPage.xaml
similarity index 100%
rename from UI/MainPage.xaml
rename to Drill/MainPage.xaml
diff --git a/UI/MainPage.xaml.cs b/Drill/MainPage.xaml.cs
similarity index 100%
rename from UI/MainPage.xaml.cs
rename to Drill/MainPage.xaml.cs
diff --git a/UI/MauiProgram.cs b/Drill/MauiProgram.cs
similarity index 100%
rename from UI/MauiProgram.cs
rename to Drill/MauiProgram.cs
diff --git a/UI/Platforms/MacCatalyst/AppDelegate.cs b/Drill/Platforms/MacCatalyst/AppDelegate.cs
similarity index 100%
rename from UI/Platforms/MacCatalyst/AppDelegate.cs
rename to Drill/Platforms/MacCatalyst/AppDelegate.cs
diff --git a/UI/Platforms/MacCatalyst/Entitlements.plist b/Drill/Platforms/MacCatalyst/Entitlements.plist
similarity index 100%
rename from UI/Platforms/MacCatalyst/Entitlements.plist
rename to Drill/Platforms/MacCatalyst/Entitlements.plist
diff --git a/UI/Platforms/MacCatalyst/Info.plist b/Drill/Platforms/MacCatalyst/Info.plist
similarity index 100%
rename from UI/Platforms/MacCatalyst/Info.plist
rename to Drill/Platforms/MacCatalyst/Info.plist
diff --git a/UI/Platforms/MacCatalyst/Program.cs b/Drill/Platforms/MacCatalyst/Program.cs
similarity index 100%
rename from UI/Platforms/MacCatalyst/Program.cs
rename to Drill/Platforms/MacCatalyst/Program.cs
diff --git a/UI/Platforms/Windows/App.xaml b/Drill/Platforms/Windows/App.xaml
similarity index 100%
rename from UI/Platforms/Windows/App.xaml
rename to Drill/Platforms/Windows/App.xaml
diff --git a/UI/Platforms/Windows/App.xaml.cs b/Drill/Platforms/Windows/App.xaml.cs
similarity index 100%
rename from UI/Platforms/Windows/App.xaml.cs
rename to Drill/Platforms/Windows/App.xaml.cs
diff --git a/UI/Platforms/Windows/Package.appxmanifest b/Drill/Platforms/Windows/Package.appxmanifest
similarity index 100%
rename from UI/Platforms/Windows/Package.appxmanifest
rename to Drill/Platforms/Windows/Package.appxmanifest
diff --git a/UI/Platforms/Windows/app.manifest b/Drill/Platforms/Windows/app.manifest
similarity index 100%
rename from UI/Platforms/Windows/app.manifest
rename to Drill/Platforms/Windows/app.manifest
diff --git a/UI/Properties/launchSettings.json b/Drill/Properties/launchSettings.json
similarity index 100%
rename from UI/Properties/launchSettings.json
rename to Drill/Properties/launchSettings.json
diff --git a/UI/Resources/AppIcon/appicon.svg b/Drill/Resources/AppIcon/appicon.svg
similarity index 100%
rename from UI/Resources/AppIcon/appicon.svg
rename to Drill/Resources/AppIcon/appicon.svg
diff --git a/UI/Resources/AppIcon/appiconfg.svg b/Drill/Resources/AppIcon/appiconfg.svg
similarity index 100%
rename from UI/Resources/AppIcon/appiconfg.svg
rename to Drill/Resources/AppIcon/appiconfg.svg
diff --git a/UI/Resources/Fonts/OpenSans-Regular.ttf b/Drill/Resources/Fonts/OpenSans-Regular.ttf
similarity index 100%
rename from UI/Resources/Fonts/OpenSans-Regular.ttf
rename to Drill/Resources/Fonts/OpenSans-Regular.ttf
diff --git a/UI/Resources/Fonts/OpenSans-Semibold.ttf b/Drill/Resources/Fonts/OpenSans-Semibold.ttf
similarity index 100%
rename from UI/Resources/Fonts/OpenSans-Semibold.ttf
rename to Drill/Resources/Fonts/OpenSans-Semibold.ttf
diff --git a/UI/Resources/Images/dotnet_bot.png b/Drill/Resources/Images/dotnet_bot.png
similarity index 100%
rename from UI/Resources/Images/dotnet_bot.png
rename to Drill/Resources/Images/dotnet_bot.png
diff --git a/UI/Resources/Raw/AboutAssets.txt b/Drill/Resources/Raw/AboutAssets.txt
similarity index 100%
rename from UI/Resources/Raw/AboutAssets.txt
rename to Drill/Resources/Raw/AboutAssets.txt
diff --git a/UI/Resources/Splash/splash.svg b/Drill/Resources/Splash/splash.svg
similarity index 100%
rename from UI/Resources/Splash/splash.svg
rename to Drill/Resources/Splash/splash.svg
diff --git a/UI/Resources/Styles/Colors.xaml b/Drill/Resources/Styles/Colors.xaml
similarity index 100%
rename from UI/Resources/Styles/Colors.xaml
rename to Drill/Resources/Styles/Colors.xaml
diff --git a/UI/Resources/Styles/Styles.xaml b/Drill/Resources/Styles/Styles.xaml
similarity index 100%
rename from UI/Resources/Styles/Styles.xaml
rename to Drill/Resources/Styles/Styles.xaml