diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 286a5c8..530c9d4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,14 +20,14 @@ jobs:
         fetch-depth: 0
         ref: release
     - name: Build
-      run: dotnet build Needlework.Net.Desktop -c Release
+      run: dotnet build Needlework.Net -c Release
     - name: Publish
-      run: dotnet publish Needlework.Net.Desktop -c Release -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:DebugType=None -p:DebugSymbols=false -o publish -r win-x64 --self-contained=false
+      run: dotnet publish Needlework.Net -c Release -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:DebugType=None -p:DebugSymbols=false -o publish -r win-x64 --self-contained=false
     - name: Get Version
       id: version
       shell: powershell
       run: |
-        $xml=[xml](Get-Content .\Needlework.Net.Desktop\Needlework.Net.Desktop.csproj)
+        $xml=[xml](Get-Content .\Needlework.Net\Needlework.Net.csproj)
         $ver=($xml.Project.PropertyGroup).AssemblyVersion
         $ver="VERSION=$ver"
         $ver=$ver -replace '\s',''
diff --git a/Needlework.Net.sln b/Needlework.Net.sln
index 03b71a2..44bbbb1 100644
--- a/Needlework.Net.sln
+++ b/Needlework.Net.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Needlework.Net.Core", "Needlework.Net.Core\Needlework.Net.Core.csproj", "{B14E1B39-3C5A-400F-8148-CC3A4833CBC4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Needlework.Net.Desktop", "Needlework.Net.Desktop\Needlework.Net.Desktop.csproj", "{7388B579-2DC0-46D6-957A-6683D0FCF5D3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Needlework.Net", "Needlework.Net\Needlework.Net.csproj", "{7388B579-2DC0-46D6-957A-6683D0FCF5D3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Needlework.Net.Core.Tests", "Needlework.Net.Core.Tests\Needlework.Net.Core.Tests.csproj", "{0E08542E-6E3F-4825-9F9C-7D6275D6AEC5}"
 EndProject
diff --git a/Needlework.Net.Desktop/App.axaml b/Needlework.Net/App.axaml
similarity index 87%
rename from Needlework.Net.Desktop/App.axaml
rename to Needlework.Net/App.axaml
index 55e49e6..02d7a64 100644
--- a/Needlework.Net.Desktop/App.axaml
+++ b/Needlework.Net/App.axaml
@@ -1,8 +1,8 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="Needlework.Net.Desktop.App"
-			 xmlns:local="using:Needlework.Net.Desktop"
-			 xmlns:converters="using:Needlework.Net.Desktop.Converters"
+             x:Class="Needlework.Net.App"
+			 xmlns:local="using:Needlework.Net"
+			 xmlns:converters="using:Needlework.Net.Converters"
 			 xmlns:sty="using:FluentAvalonia.Styling"
 			 xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
 			 RequestedThemeVariant="Dark">
diff --git a/Needlework.Net.Desktop/App.axaml.cs b/Needlework.Net/App.axaml.cs
similarity index 91%
rename from Needlework.Net.Desktop/App.axaml.cs
rename to Needlework.Net/App.axaml.cs
index 2ec30c9..2ee5261 100644
--- a/Needlework.Net.Desktop/App.axaml.cs
+++ b/Needlework.Net/App.axaml.cs
@@ -3,12 +3,12 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Microsoft.Extensions.DependencyInjection;
-using Needlework.Net.Desktop.ViewModels;
-using Needlework.Net.Desktop.Views;
+using Needlework.Net.ViewModels;
+using Needlework.Net.Views;
 using System;
 using System.Text.Json;
 
-namespace Needlework.Net.Desktop;
+namespace Needlework.Net;
 
 public partial class App(IServiceProvider serviceProvider) : Application
 {
diff --git a/Needlework.Net.Desktop/Assets/Icons/home.png b/Needlework.Net/Assets/Icons/home.png
similarity index 100%
rename from Needlework.Net.Desktop/Assets/Icons/home.png
rename to Needlework.Net/Assets/Icons/home.png
diff --git a/Needlework.Net.Desktop/Assets/Icons/info-circle.png b/Needlework.Net/Assets/Icons/info-circle.png
similarity index 100%
rename from Needlework.Net.Desktop/Assets/Icons/info-circle.png
rename to Needlework.Net/Assets/Icons/info-circle.png
diff --git a/Needlework.Net.Desktop/Assets/Icons/list-alt.png b/Needlework.Net/Assets/Icons/list-alt.png
similarity index 100%
rename from Needlework.Net.Desktop/Assets/Icons/list-alt.png
rename to Needlework.Net/Assets/Icons/list-alt.png
diff --git a/Needlework.Net.Desktop/Assets/Icons/plug.png b/Needlework.Net/Assets/Icons/plug.png
similarity index 100%
rename from Needlework.Net.Desktop/Assets/Icons/plug.png
rename to Needlework.Net/Assets/Icons/plug.png
diff --git a/Needlework.Net.Desktop/Assets/Icons/terminal.png b/Needlework.Net/Assets/Icons/terminal.png
similarity index 100%
rename from Needlework.Net.Desktop/Assets/Icons/terminal.png
rename to Needlework.Net/Assets/Icons/terminal.png
diff --git a/Needlework.Net.Desktop/Assets/about.png b/Needlework.Net/Assets/about.png
similarity index 100%
rename from Needlework.Net.Desktop/Assets/about.png
rename to Needlework.Net/Assets/about.png
diff --git a/Needlework.Net.Desktop/Assets/app.ico b/Needlework.Net/Assets/app.ico
similarity index 100%
rename from Needlework.Net.Desktop/Assets/app.ico
rename to Needlework.Net/Assets/app.ico
diff --git a/Needlework.Net.Desktop/Assets/app.png b/Needlework.Net/Assets/app.png
similarity index 100%
rename from Needlework.Net.Desktop/Assets/app.png
rename to Needlework.Net/Assets/app.png
diff --git a/Needlework.Net.Desktop/Controls/BusyArea.axaml b/Needlework.Net/Controls/BusyArea.axaml
similarity index 94%
rename from Needlework.Net.Desktop/Controls/BusyArea.axaml
rename to Needlework.Net/Controls/BusyArea.axaml
index 51056a7..4b6ad74 100644
--- a/Needlework.Net.Desktop/Controls/BusyArea.axaml
+++ b/Needlework.Net/Controls/BusyArea.axaml
@@ -2,9 +2,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-			 xmlns:controls="using:Needlework.Net.Desktop.Controls"
+			 xmlns:controls="using:Needlework.Net.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Needlework.Net.Desktop.Controls.BusyArea">
+             x:Class="Needlework.Net.Controls.BusyArea">
 	<UserControl.Styles>
 		<Style Selector="controls|BusyArea">
 			<Setter Property="Template">
diff --git a/Needlework.Net.Desktop/Controls/BusyArea.axaml.cs b/Needlework.Net/Controls/BusyArea.axaml.cs
similarity index 94%
rename from Needlework.Net.Desktop/Controls/BusyArea.axaml.cs
rename to Needlework.Net/Controls/BusyArea.axaml.cs
index e6696b8..71e68fe 100644
--- a/Needlework.Net.Desktop/Controls/BusyArea.axaml.cs
+++ b/Needlework.Net/Controls/BusyArea.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 
-namespace Needlework.Net.Desktop.Controls;
+namespace Needlework.Net.Controls;
 
 public partial class BusyArea : UserControl
 {
diff --git a/Needlework.Net.Desktop/Controls/Card.axaml b/Needlework.Net/Controls/Card.axaml
similarity index 89%
rename from Needlework.Net.Desktop/Controls/Card.axaml
rename to Needlework.Net/Controls/Card.axaml
index 48a01eb..bdb34bd 100644
--- a/Needlework.Net.Desktop/Controls/Card.axaml
+++ b/Needlework.Net/Controls/Card.axaml
@@ -1,6 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="using:Needlework.Net.Desktop.Controls">
+        xmlns:controls="using:Needlework.Net.Controls">
 	<Design.PreviewWith>
 		<controls:Card />
 	</Design.PreviewWith>
diff --git a/Needlework.Net.Desktop/Controls/Card.axaml.cs b/Needlework.Net/Controls/Card.axaml.cs
similarity index 68%
rename from Needlework.Net.Desktop/Controls/Card.axaml.cs
rename to Needlework.Net/Controls/Card.axaml.cs
index 3c106bb..e1d6239 100644
--- a/Needlework.Net.Desktop/Controls/Card.axaml.cs
+++ b/Needlework.Net/Controls/Card.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Needlework.Net.Desktop.Controls;
+namespace Needlework.Net.Controls;
 
 public class Card : ContentControl
 {
diff --git a/Needlework.Net.Desktop/Converters/EnumerableBoolConverter.cs b/Needlework.Net/Converters/EnumerableBoolConverter.cs
similarity index 93%
rename from Needlework.Net.Desktop/Converters/EnumerableBoolConverter.cs
rename to Needlework.Net/Converters/EnumerableBoolConverter.cs
index 0a0a19b..b1231a9 100644
--- a/Needlework.Net.Desktop/Converters/EnumerableBoolConverter.cs
+++ b/Needlework.Net/Converters/EnumerableBoolConverter.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 
-namespace Needlework.Net.Desktop.Converters
+namespace Needlework.Net.Converters
 {
     public class EnumerableBoolConverter : IValueConverter
     {
diff --git a/Needlework.Net.Desktop/Converters/NullBoolConverter.cs b/Needlework.Net/Converters/NullBoolConverter.cs
similarity index 91%
rename from Needlework.Net.Desktop/Converters/NullBoolConverter.cs
rename to Needlework.Net/Converters/NullBoolConverter.cs
index 6fda3d2..d105d03 100644
--- a/Needlework.Net.Desktop/Converters/NullBoolConverter.cs
+++ b/Needlework.Net/Converters/NullBoolConverter.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Globalization;
 
-namespace Needlework.Net.Desktop.Converters
+namespace Needlework.Net.Converters
 {
     public class NullBoolConverter : IValueConverter
     {
diff --git a/Needlework.Net.Desktop/Extensions/TextEditorExtensions.cs b/Needlework.Net/Extensions/TextEditorExtensions.cs
similarity index 97%
rename from Needlework.Net.Desktop/Extensions/TextEditorExtensions.cs
rename to Needlework.Net/Extensions/TextEditorExtensions.cs
index 273a6d3..3cd5ded 100644
--- a/Needlework.Net.Desktop/Extensions/TextEditorExtensions.cs
+++ b/Needlework.Net/Extensions/TextEditorExtensions.cs
@@ -3,7 +3,7 @@ using AvaloniaEdit;
 using AvaloniaEdit.Highlighting;
 using AvaloniaEdit.Indentation.CSharp;
 
-namespace Needlework.Net.Desktop.Extensions
+namespace Needlework.Net.Extensions
 {
     public static class TextEditorExtensions
     {
diff --git a/Needlework.Net.Desktop/GithubRelease.cs b/Needlework.Net/GithubRelease.cs
similarity index 89%
rename from Needlework.Net.Desktop/GithubRelease.cs
rename to Needlework.Net/GithubRelease.cs
index 4060c94..d1bb256 100644
--- a/Needlework.Net.Desktop/GithubRelease.cs
+++ b/Needlework.Net/GithubRelease.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Needlework.Net.Desktop
+namespace Needlework.Net
 {
     public class GithubRelease
     {
diff --git a/Needlework.Net.Desktop/Messages/ContentRequestMessage.cs b/Needlework.Net/Messages/ContentRequestMessage.cs
similarity index 75%
rename from Needlework.Net.Desktop/Messages/ContentRequestMessage.cs
rename to Needlework.Net/Messages/ContentRequestMessage.cs
index d4180d9..0031f88 100644
--- a/Needlework.Net.Desktop/Messages/ContentRequestMessage.cs
+++ b/Needlework.Net/Messages/ContentRequestMessage.cs
@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.Messaging.Messages;
 
-namespace Needlework.Net.Desktop.Messages
+namespace Needlework.Net.Messages
 {
     public class ContentRequestMessage : RequestMessage<string>
     {
diff --git a/Needlework.Net.Desktop/Messages/DataReadyMessage.cs b/Needlework.Net/Messages/DataReadyMessage.cs
similarity index 82%
rename from Needlework.Net.Desktop/Messages/DataReadyMessage.cs
rename to Needlework.Net/Messages/DataReadyMessage.cs
index 4e27679..5505fab 100644
--- a/Needlework.Net.Desktop/Messages/DataReadyMessage.cs
+++ b/Needlework.Net/Messages/DataReadyMessage.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.Messaging.Messages;
 using Needlework.Net.Core;
 
-namespace Needlework.Net.Desktop.Messages
+namespace Needlework.Net.Messages
 {
     public class DataReadyMessage(LcuSchemaHandler handler) : ValueChangedMessage<LcuSchemaHandler>(handler)
     {
diff --git a/Needlework.Net.Desktop/Messages/DataRequestMessage.cs b/Needlework.Net/Messages/DataRequestMessage.cs
similarity index 79%
rename from Needlework.Net.Desktop/Messages/DataRequestMessage.cs
rename to Needlework.Net/Messages/DataRequestMessage.cs
index 235f73f..fb248bf 100644
--- a/Needlework.Net.Desktop/Messages/DataRequestMessage.cs
+++ b/Needlework.Net/Messages/DataRequestMessage.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.Messaging.Messages;
 using Needlework.Net.Core;
 
-namespace Needlework.Net.Desktop.Messages
+namespace Needlework.Net.Messages
 {
     public class DataRequestMessage : RequestMessage<LcuSchemaHandler>
     {
diff --git a/Needlework.Net.Desktop/Messages/EditorUpdateMessage.cs b/Needlework.Net/Messages/EditorUpdateMessage.cs
similarity index 90%
rename from Needlework.Net.Desktop/Messages/EditorUpdateMessage.cs
rename to Needlework.Net/Messages/EditorUpdateMessage.cs
index c201985..d0e81b6 100644
--- a/Needlework.Net.Desktop/Messages/EditorUpdateMessage.cs
+++ b/Needlework.Net/Messages/EditorUpdateMessage.cs
@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.Messaging.Messages;
 
-namespace Needlework.Net.Desktop.Messages
+namespace Needlework.Net.Messages
 {
     public class EditorUpdateMessage(EditorUpdate editorUpdate) : ValueChangedMessage<EditorUpdate>(editorUpdate)
     {
diff --git a/Needlework.Net.Desktop/Messages/HostDocumentRequestMessage.cs b/Needlework.Net/Messages/HostDocumentRequestMessage.cs
similarity index 80%
rename from Needlework.Net.Desktop/Messages/HostDocumentRequestMessage.cs
rename to Needlework.Net/Messages/HostDocumentRequestMessage.cs
index de7f98b..d6a105b 100644
--- a/Needlework.Net.Desktop/Messages/HostDocumentRequestMessage.cs
+++ b/Needlework.Net/Messages/HostDocumentRequestMessage.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.Messaging.Messages;
 using Microsoft.OpenApi.Models;
 
-namespace Needlework.Net.Desktop.Messages
+namespace Needlework.Net.Messages
 {
     public class HostDocumentRequestMessage : RequestMessage<OpenApiDocument>
     {
diff --git a/Needlework.Net.Desktop/Messages/InfoBarUpdateMessage.cs b/Needlework.Net/Messages/InfoBarUpdateMessage.cs
similarity index 67%
rename from Needlework.Net.Desktop/Messages/InfoBarUpdateMessage.cs
rename to Needlework.Net/Messages/InfoBarUpdateMessage.cs
index cd99847..39a8965 100644
--- a/Needlework.Net.Desktop/Messages/InfoBarUpdateMessage.cs
+++ b/Needlework.Net/Messages/InfoBarUpdateMessage.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.Messaging.Messages;
-using Needlework.Net.Desktop.ViewModels;
+using Needlework.Net.ViewModels;
 
-namespace Needlework.Net.Desktop.Messages
+namespace Needlework.Net.Messages
 {
     public class InfoBarUpdateMessage(InfoBarViewModel vm) : ValueChangedMessage<InfoBarViewModel>(vm)
     {
diff --git a/Needlework.Net.Desktop/Messages/OopsiesWindowCanceledMessage.cs b/Needlework.Net/Messages/OopsiesWindowCanceledMessage.cs
similarity index 79%
rename from Needlework.Net.Desktop/Messages/OopsiesWindowCanceledMessage.cs
rename to Needlework.Net/Messages/OopsiesWindowCanceledMessage.cs
index 9b766ff..bf17266 100644
--- a/Needlework.Net.Desktop/Messages/OopsiesWindowCanceledMessage.cs
+++ b/Needlework.Net/Messages/OopsiesWindowCanceledMessage.cs
@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.Messaging.Messages;
 
-namespace Needlework.Net.Desktop.Messages
+namespace Needlework.Net.Messages
 {
     public class OopsiesWindowCanceledMessage(object? data) : ValueChangedMessage<object?>(data)
     {
diff --git a/Needlework.Net.Desktop/Messages/OopsiesWindowRequestedMessage.cs b/Needlework.Net/Messages/OopsiesWindowRequestedMessage.cs
similarity index 79%
rename from Needlework.Net.Desktop/Messages/OopsiesWindowRequestedMessage.cs
rename to Needlework.Net/Messages/OopsiesWindowRequestedMessage.cs
index 8288e7a..15211ef 100644
--- a/Needlework.Net.Desktop/Messages/OopsiesWindowRequestedMessage.cs
+++ b/Needlework.Net/Messages/OopsiesWindowRequestedMessage.cs
@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.Messaging.Messages;
 
-namespace Needlework.Net.Desktop.Messages
+namespace Needlework.Net.Messages
 {
     public class OopsiesWindowRequestedMessage(string text) : ValueChangedMessage<string>(text)
     {
diff --git a/Needlework.Net.Desktop/Messages/ResponseUpdatedMessage.cs b/Needlework.Net/Messages/ResponseUpdatedMessage.cs
similarity index 78%
rename from Needlework.Net.Desktop/Messages/ResponseUpdatedMessage.cs
rename to Needlework.Net/Messages/ResponseUpdatedMessage.cs
index 9ff78f3..847a4c7 100644
--- a/Needlework.Net.Desktop/Messages/ResponseUpdatedMessage.cs
+++ b/Needlework.Net/Messages/ResponseUpdatedMessage.cs
@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.Messaging.Messages;
 
-namespace Needlework.Net.Desktop.Messages
+namespace Needlework.Net.Messages
 {
     public class ResponseUpdatedMessage(string data) : ValueChangedMessage<string>(data)
     {
diff --git a/Needlework.Net.Desktop/Needlework.Net.Desktop.csproj b/Needlework.Net/Needlework.Net.csproj
similarity index 100%
rename from Needlework.Net.Desktop/Needlework.Net.Desktop.csproj
rename to Needlework.Net/Needlework.Net.csproj
diff --git a/Needlework.Net.Desktop/Program.cs b/Needlework.Net/Program.cs
similarity index 93%
rename from Needlework.Net.Desktop/Program.cs
rename to Needlework.Net/Program.cs
index d18f44a..3a05ce1 100644
--- a/Needlework.Net.Desktop/Program.cs
+++ b/Needlework.Net/Program.cs
@@ -1,13 +1,13 @@
 using Avalonia;
 using Microsoft.Extensions.DependencyInjection;
-using Needlework.Net.Desktop.Services;
-using Needlework.Net.Desktop.ViewModels;
+using Needlework.Net.Services;
+using Needlework.Net.ViewModels;
 using Projektanker.Icons.Avalonia;
 using Projektanker.Icons.Avalonia.FontAwesome;
 using System;
 using System.Linq;
 
-namespace Needlework.Net.Desktop;
+namespace Needlework.Net;
 
 class Program
 {
diff --git a/Needlework.Net.Desktop/Services/WindowService.cs b/Needlework.Net/Services/WindowService.cs
similarity index 89%
rename from Needlework.Net.Desktop/Services/WindowService.cs
rename to Needlework.Net/Services/WindowService.cs
index 0d331e4..fdb28c2 100644
--- a/Needlework.Net.Desktop/Services/WindowService.cs
+++ b/Needlework.Net/Services/WindowService.cs
@@ -1,10 +1,10 @@
 using CommunityToolkit.Mvvm.Messaging;
-using Needlework.Net.Desktop.Messages;
-using Needlework.Net.Desktop.ViewModels;
-using Needlework.Net.Desktop.Views;
+using Needlework.Net.Messages;
+using Needlework.Net.ViewModels;
+using Needlework.Net.Views;
 using System;
 
-namespace Needlework.Net.Desktop.Services
+namespace Needlework.Net.Services
 {
     public class WindowService : IRecipient<OopsiesWindowCanceledMessage>
     {
diff --git a/Needlework.Net.Desktop/ViewLocator.cs b/Needlework.Net/ViewLocator.cs
similarity index 95%
rename from Needlework.Net.Desktop/ViewLocator.cs
rename to Needlework.Net/ViewLocator.cs
index 6d14bf6..96e0e11 100644
--- a/Needlework.Net.Desktop/ViewLocator.cs
+++ b/Needlework.Net/ViewLocator.cs
@@ -3,7 +3,7 @@ using Avalonia.Controls.Templates;
 using System;
 using System.ComponentModel;
 
-namespace Needlework.Net.Desktop
+namespace Needlework.Net
 {
     public class ViewLocator : IDataTemplate
     {
diff --git a/Needlework.Net.Desktop/ViewModels/AboutViewModel.cs b/Needlework.Net/ViewModels/AboutViewModel.cs
similarity index 75%
rename from Needlework.Net.Desktop/ViewModels/AboutViewModel.cs
rename to Needlework.Net/ViewModels/AboutViewModel.cs
index d9f09a0..ebf0eae 100644
--- a/Needlework.Net.Desktop/ViewModels/AboutViewModel.cs
+++ b/Needlework.Net/ViewModels/AboutViewModel.cs
@@ -1,4 +1,4 @@
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
     public class AboutViewModel : PageBase
     {
diff --git a/Needlework.Net.Desktop/ViewModels/ConsoleViewModel.cs b/Needlework.Net/ViewModels/ConsoleViewModel.cs
similarity index 97%
rename from Needlework.Net.Desktop/ViewModels/ConsoleViewModel.cs
rename to Needlework.Net/ViewModels/ConsoleViewModel.cs
index 0a2d1ec..fe46602 100644
--- a/Needlework.Net.Desktop/ViewModels/ConsoleViewModel.cs
+++ b/Needlework.Net/ViewModels/ConsoleViewModel.cs
@@ -3,14 +3,14 @@ using BlossomiShymae.GrrrLCU;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
-using Needlework.Net.Desktop.Messages;
-using Needlework.Net.Desktop.Services;
+using Needlework.Net.Messages;
+using Needlework.Net.Services;
 using System;
 using System.Net.Http;
 using System.Text.Json;
 using System.Threading.Tasks;
 
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
     public partial class ConsoleViewModel : PageBase, IRecipient<DataReadyMessage>
     {
diff --git a/Needlework.Net.Desktop/ViewModels/EndpointViewModel.cs b/Needlework.Net/ViewModels/EndpointViewModel.cs
similarity index 95%
rename from Needlework.Net.Desktop/ViewModels/EndpointViewModel.cs
rename to Needlework.Net/ViewModels/EndpointViewModel.cs
index 81353fe..33765d9 100644
--- a/Needlework.Net.Desktop/ViewModels/EndpointViewModel.cs
+++ b/Needlework.Net/ViewModels/EndpointViewModel.cs
@@ -1,12 +1,12 @@
 using Avalonia.Collections;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
-using Needlework.Net.Desktop.Messages;
+using Needlework.Net.Messages;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
     public partial class EndpointViewModel : ObservableObject
     {
diff --git a/Needlework.Net.Desktop/ViewModels/EndpointsContainerViewModel.cs b/Needlework.Net/ViewModels/EndpointsContainerViewModel.cs
similarity index 95%
rename from Needlework.Net.Desktop/ViewModels/EndpointsContainerViewModel.cs
rename to Needlework.Net/ViewModels/EndpointsContainerViewModel.cs
index c5a8b01..626f665 100644
--- a/Needlework.Net.Desktop/ViewModels/EndpointsContainerViewModel.cs
+++ b/Needlework.Net/ViewModels/EndpointsContainerViewModel.cs
@@ -2,7 +2,7 @@
 using CommunityToolkit.Mvvm.Input;
 using System.Net.Http;
 
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
     public partial class EndpointsContainerViewModel : PageBase
     {
diff --git a/Needlework.Net.Desktop/ViewModels/EndpointsViewModel.cs b/Needlework.Net/ViewModels/EndpointsViewModel.cs
similarity index 95%
rename from Needlework.Net.Desktop/ViewModels/EndpointsViewModel.cs
rename to Needlework.Net/ViewModels/EndpointsViewModel.cs
index 2ed28e4..c04c3b9 100644
--- a/Needlework.Net.Desktop/ViewModels/EndpointsViewModel.cs
+++ b/Needlework.Net/ViewModels/EndpointsViewModel.cs
@@ -2,12 +2,12 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
-using Needlework.Net.Desktop.Messages;
+using Needlework.Net.Messages;
 using System;
 using System.Linq;
 using System.Net.Http;
 
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
     public partial class EndpointsViewModel : ObservableObject, IRecipient<DataReadyMessage>
     {
diff --git a/Needlework.Net.Desktop/ViewModels/HomeViewModel.cs b/Needlework.Net/ViewModels/HomeViewModel.cs
similarity index 91%
rename from Needlework.Net.Desktop/ViewModels/HomeViewModel.cs
rename to Needlework.Net/ViewModels/HomeViewModel.cs
index d305639..6ca93f5 100644
--- a/Needlework.Net.Desktop/ViewModels/HomeViewModel.cs
+++ b/Needlework.Net/ViewModels/HomeViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.Input;
 using System.Diagnostics;
 
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
     public partial class HomeViewModel : PageBase
     {
diff --git a/Needlework.Net.Desktop/ViewModels/InfoBarViewModel.cs b/Needlework.Net/ViewModels/InfoBarViewModel.cs
similarity index 95%
rename from Needlework.Net.Desktop/ViewModels/InfoBarViewModel.cs
rename to Needlework.Net/ViewModels/InfoBarViewModel.cs
index 585f6e5..91c54c6 100644
--- a/Needlework.Net.Desktop/ViewModels/InfoBarViewModel.cs
+++ b/Needlework.Net/ViewModels/InfoBarViewModel.cs
@@ -3,7 +3,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using FluentAvalonia.UI.Controls;
 using System;
 
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
     public partial class InfoBarViewModel : ObservableObject
     {
diff --git a/Needlework.Net.Desktop/ViewModels/MainWindowViewModel.cs b/Needlework.Net/ViewModels/MainWindowViewModel.cs
similarity index 97%
rename from Needlework.Net.Desktop/ViewModels/MainWindowViewModel.cs
rename to Needlework.Net/ViewModels/MainWindowViewModel.cs
index 87d2293..3dc7e95 100644
--- a/Needlework.Net.Desktop/ViewModels/MainWindowViewModel.cs
+++ b/Needlework.Net/ViewModels/MainWindowViewModel.cs
@@ -5,8 +5,8 @@ using CommunityToolkit.Mvvm.Messaging;
 using FluentAvalonia.UI.Controls;
 using Microsoft.OpenApi.Models;
 using Needlework.Net.Core;
-using Needlework.Net.Desktop.Messages;
-using Needlework.Net.Desktop.Services;
+using Needlework.Net.Messages;
+using Needlework.Net.Services;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -18,7 +18,7 @@ using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
     public partial class MainWindowViewModel : ObservableObject, IRecipient<DataRequestMessage>, IRecipient<HostDocumentRequestMessage>, IRecipient<OopsiesWindowRequestedMessage>, IRecipient<InfoBarUpdateMessage>
     {
diff --git a/Needlework.Net.Desktop/ViewModels/OopsiesWindowViewModel.cs b/Needlework.Net/ViewModels/OopsiesWindowViewModel.cs
similarity index 90%
rename from Needlework.Net.Desktop/ViewModels/OopsiesWindowViewModel.cs
rename to Needlework.Net/ViewModels/OopsiesWindowViewModel.cs
index 71c1915..10ad622 100644
--- a/Needlework.Net.Desktop/ViewModels/OopsiesWindowViewModel.cs
+++ b/Needlework.Net/ViewModels/OopsiesWindowViewModel.cs
@@ -1,11 +1,11 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
-using Needlework.Net.Desktop.Messages;
+using Needlework.Net.Messages;
 using System.Diagnostics;
 using System.IO;
 
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
     public partial class OopsiesWindowViewModel(string text) : ObservableObject
     {
diff --git a/Needlework.Net.Desktop/ViewModels/OperationViewModel.cs b/Needlework.Net/ViewModels/OperationViewModel.cs
similarity index 99%
rename from Needlework.Net.Desktop/ViewModels/OperationViewModel.cs
rename to Needlework.Net/ViewModels/OperationViewModel.cs
index f755392..8efb1db 100644
--- a/Needlework.Net.Desktop/ViewModels/OperationViewModel.cs
+++ b/Needlework.Net/ViewModels/OperationViewModel.cs
@@ -2,12 +2,12 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.OpenApi.Models;
-using Needlework.Net.Desktop.Messages;
+using Needlework.Net.Messages;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
     public partial class OperationViewModel : ObservableObject
     {
diff --git a/Needlework.Net.Desktop/ViewModels/PageBase.cs b/Needlework.Net/ViewModels/PageBase.cs
similarity index 89%
rename from Needlework.Net.Desktop/ViewModels/PageBase.cs
rename to Needlework.Net/ViewModels/PageBase.cs
index 3bf4a4d..d88d8ed 100644
--- a/Needlework.Net.Desktop/ViewModels/PageBase.cs
+++ b/Needlework.Net/ViewModels/PageBase.cs
@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
 
     public abstract partial class PageBase(string displayName, string icon, int index = 0) : ObservableValidator
diff --git a/Needlework.Net.Desktop/ViewModels/ParameterViewModel.cs b/Needlework.Net/ViewModels/ParameterViewModel.cs
similarity index 92%
rename from Needlework.Net.Desktop/ViewModels/ParameterViewModel.cs
rename to Needlework.Net/ViewModels/ParameterViewModel.cs
index a574d7a..c0fad5b 100644
--- a/Needlework.Net.Desktop/ViewModels/ParameterViewModel.cs
+++ b/Needlework.Net/ViewModels/ParameterViewModel.cs
@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
     public partial class ParameterViewModel : ObservableObject
     {
diff --git a/Needlework.Net.Desktop/ViewModels/PathOperationViewModel.cs b/Needlework.Net/ViewModels/PathOperationViewModel.cs
similarity index 98%
rename from Needlework.Net.Desktop/ViewModels/PathOperationViewModel.cs
rename to Needlework.Net/ViewModels/PathOperationViewModel.cs
index 1dae565..5eaf7e7 100644
--- a/Needlework.Net.Desktop/ViewModels/PathOperationViewModel.cs
+++ b/Needlework.Net/ViewModels/PathOperationViewModel.cs
@@ -4,14 +4,14 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using Needlework.Net.Core;
-using Needlework.Net.Desktop.Messages;
+using Needlework.Net.Messages;
 using System;
 using System.Net.Http;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
     public partial class PathOperationViewModel : ObservableObject
     {
diff --git a/Needlework.Net.Desktop/ViewModels/PropertyClassViewModel.cs b/Needlework.Net/ViewModels/PropertyClassViewModel.cs
similarity index 97%
rename from Needlework.Net.Desktop/ViewModels/PropertyClassViewModel.cs
rename to Needlework.Net/ViewModels/PropertyClassViewModel.cs
index 23f4b15..6d3df9f 100644
--- a/Needlework.Net.Desktop/ViewModels/PropertyClassViewModel.cs
+++ b/Needlework.Net/ViewModels/PropertyClassViewModel.cs
@@ -5,7 +5,7 @@ using Microsoft.OpenApi.Models;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
     public class PropertyClassViewModel : ObservableObject
     {
diff --git a/Needlework.Net.Desktop/ViewModels/PropertyEnumViewModel.cs b/Needlework.Net/ViewModels/PropertyEnumViewModel.cs
similarity index 90%
rename from Needlework.Net.Desktop/ViewModels/PropertyEnumViewModel.cs
rename to Needlework.Net/ViewModels/PropertyEnumViewModel.cs
index c7be32a..9cb9bc0 100644
--- a/Needlework.Net.Desktop/ViewModels/PropertyEnumViewModel.cs
+++ b/Needlework.Net/ViewModels/PropertyEnumViewModel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
     public class PropertyEnumViewModel
     {
diff --git a/Needlework.Net.Desktop/ViewModels/PropertyFieldViewModel.cs b/Needlework.Net/ViewModels/PropertyFieldViewModel.cs
similarity index 84%
rename from Needlework.Net.Desktop/ViewModels/PropertyFieldViewModel.cs
rename to Needlework.Net/ViewModels/PropertyFieldViewModel.cs
index 8a448e0..5631598 100644
--- a/Needlework.Net.Desktop/ViewModels/PropertyFieldViewModel.cs
+++ b/Needlework.Net/ViewModels/PropertyFieldViewModel.cs
@@ -1,4 +1,4 @@
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
     public class PropertyFieldViewModel
     {
diff --git a/Needlework.Net.Desktop/ViewModels/WebsocketViewModel.cs b/Needlework.Net/ViewModels/WebsocketViewModel.cs
similarity index 97%
rename from Needlework.Net.Desktop/ViewModels/WebsocketViewModel.cs
rename to Needlework.Net/ViewModels/WebsocketViewModel.cs
index 69a162b..974deb0 100644
--- a/Needlework.Net.Desktop/ViewModels/WebsocketViewModel.cs
+++ b/Needlework.Net/ViewModels/WebsocketViewModel.cs
@@ -2,8 +2,8 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
-using Needlework.Net.Desktop.Messages;
-using Needlework.Net.Desktop.Services;
+using Needlework.Net.Messages;
+using Needlework.Net.Services;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -13,7 +13,7 @@ using System.Text.Json;
 using System.Threading;
 using Websocket.Client;
 
-namespace Needlework.Net.Desktop.ViewModels
+namespace Needlework.Net.ViewModels
 {
     public partial class WebsocketViewModel : PageBase
     {
diff --git a/Needlework.Net.Desktop/Views/AboutView.axaml b/Needlework.Net/Views/AboutView.axaml
similarity index 89%
rename from Needlework.Net.Desktop/Views/AboutView.axaml
rename to Needlework.Net/Views/AboutView.axaml
index 37a811f..4b3885c 100644
--- a/Needlework.Net.Desktop/Views/AboutView.axaml
+++ b/Needlework.Net/Views/AboutView.axaml
@@ -2,10 +2,10 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-			 xmlns:vm="using:Needlework.Net.Desktop.ViewModels"
-			 xmlns:controls="using:Needlework.Net.Desktop.Controls"
+			 xmlns:vm="using:Needlework.Net.ViewModels"
+			 xmlns:controls="using:Needlework.Net.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Needlework.Net.Desktop.Views.AboutView"
+             x:Class="Needlework.Net.Views.AboutView"
 			 x:DataType="vm:AboutViewModel">
 	<Grid Margin="8"
 			VerticalAlignment="Center"
diff --git a/Needlework.Net.Desktop/Views/AboutView.axaml.cs b/Needlework.Net/Views/AboutView.axaml.cs
similarity index 77%
rename from Needlework.Net.Desktop/Views/AboutView.axaml.cs
rename to Needlework.Net/Views/AboutView.axaml.cs
index 6b9dfa0..c76374d 100644
--- a/Needlework.Net.Desktop/Views/AboutView.axaml.cs
+++ b/Needlework.Net/Views/AboutView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Needlework.Net.Desktop.Views;
+namespace Needlework.Net.Views;
 
 public partial class AboutView : UserControl
 {
diff --git a/Needlework.Net.Desktop/Views/ConsoleView.axaml b/Needlework.Net/Views/ConsoleView.axaml
similarity index 93%
rename from Needlework.Net.Desktop/Views/ConsoleView.axaml
rename to Needlework.Net/Views/ConsoleView.axaml
index 76f5097..5e7269d 100644
--- a/Needlework.Net.Desktop/Views/ConsoleView.axaml
+++ b/Needlework.Net/Views/ConsoleView.axaml
@@ -3,10 +3,10 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 			 xmlns:avaloniaEdit="https://github.com/avaloniaui/avaloniaedit"
-			 xmlns:vm="using:Needlework.Net.Desktop.ViewModels"
-			 xmlns:controls="using:Needlework.Net.Desktop.Controls"
+			 xmlns:vm="using:Needlework.Net.ViewModels"
+			 xmlns:controls="using:Needlework.Net.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Needlework.Net.Desktop.Views.ConsoleView"
+             x:Class="Needlework.Net.Views.ConsoleView"
 			 x:DataType="vm:ConsoleViewModel">
 	<controls:BusyArea IsBusy="{Binding IsBusy}"
 					   BusyText="Loading...">
diff --git a/Needlework.Net.Desktop/Views/ConsoleView.axaml.cs b/Needlework.Net/Views/ConsoleView.axaml.cs
similarity index 91%
rename from Needlework.Net.Desktop/Views/ConsoleView.axaml.cs
rename to Needlework.Net/Views/ConsoleView.axaml.cs
index 6c9ed0d..6aacf54 100644
--- a/Needlework.Net.Desktop/Views/ConsoleView.axaml.cs
+++ b/Needlework.Net/Views/ConsoleView.axaml.cs
@@ -4,12 +4,12 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Styling;
 using AvaloniaEdit;
 using CommunityToolkit.Mvvm.Messaging;
-using Needlework.Net.Desktop.Extensions;
-using Needlework.Net.Desktop.Messages;
-using Needlework.Net.Desktop.ViewModels;
+using Needlework.Net.Extensions;
+using Needlework.Net.Messages;
+using Needlework.Net.ViewModels;
 using TextMateSharp.Grammars;
 
-namespace Needlework.Net.Desktop.Views;
+namespace Needlework.Net.Views;
 
 public partial class ConsoleView : UserControl, IRecipient<ResponseUpdatedMessage>, IRecipient<ContentRequestMessage>
 {
diff --git a/Needlework.Net.Desktop/Views/EndpointView.axaml b/Needlework.Net/Views/EndpointView.axaml
similarity index 98%
rename from Needlework.Net.Desktop/Views/EndpointView.axaml
rename to Needlework.Net/Views/EndpointView.axaml
index d0fbf1f..1bcc3bd 100644
--- a/Needlework.Net.Desktop/Views/EndpointView.axaml
+++ b/Needlework.Net/Views/EndpointView.axaml
@@ -3,11 +3,11 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 		xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-		xmlns:vm="using:Needlework.Net.Desktop.ViewModels"
+		xmlns:vm="using:Needlework.Net.ViewModels"
 		xmlns:avalonEdit="https://github.com/avaloniaui/avaloniaedit"
-		xmlns:controls="using:Needlework.Net.Desktop.Controls"
+		xmlns:controls="using:Needlework.Net.Controls"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="Needlework.Net.Desktop.Views.EndpointView"
+        x:Class="Needlework.Net.Views.EndpointView"
 		x:DataType="vm:EndpointViewModel">
 	<UserControl.Styles>
 		<Style Selector="DataGrid">
diff --git a/Needlework.Net.Desktop/Views/EndpointView.axaml.cs b/Needlework.Net/Views/EndpointView.axaml.cs
similarity index 92%
rename from Needlework.Net.Desktop/Views/EndpointView.axaml.cs
rename to Needlework.Net/Views/EndpointView.axaml.cs
index 3915703..f436c95 100644
--- a/Needlework.Net.Desktop/Views/EndpointView.axaml.cs
+++ b/Needlework.Net/Views/EndpointView.axaml.cs
@@ -4,12 +4,12 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Styling;
 using AvaloniaEdit;
 using CommunityToolkit.Mvvm.Messaging;
-using Needlework.Net.Desktop.Extensions;
-using Needlework.Net.Desktop.Messages;
-using Needlework.Net.Desktop.ViewModels;
+using Needlework.Net.Extensions;
+using Needlework.Net.Messages;
+using Needlework.Net.ViewModels;
 using TextMateSharp.Grammars;
 
-namespace Needlework.Net.Desktop.Views;
+namespace Needlework.Net.Views;
 
 public partial class EndpointView : UserControl, IRecipient<EditorUpdateMessage>, IRecipient<ContentRequestMessage>
 {
diff --git a/Needlework.Net.Desktop/Views/EndpointsContainerView.axaml b/Needlework.Net/Views/EndpointsContainerView.axaml
similarity index 90%
rename from Needlework.Net.Desktop/Views/EndpointsContainerView.axaml
rename to Needlework.Net/Views/EndpointsContainerView.axaml
index 31e001f..f6fc4dd 100644
--- a/Needlework.Net.Desktop/Views/EndpointsContainerView.axaml
+++ b/Needlework.Net/Views/EndpointsContainerView.axaml
@@ -2,11 +2,11 @@
 			xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 			xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 			xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-			xmlns:vm="using:Needlework.Net.Desktop.ViewModels"
+			xmlns:vm="using:Needlework.Net.ViewModels"
 			xmlns:avalonEdit="https://github.com/avaloniaui/avaloniaedit"
 			xmlns:i="https://github.com/projektanker/icons.avalonia"
 			mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-			x:Class="Needlework.Net.Desktop.Views.EndpointsContainerView"
+			x:Class="Needlework.Net.Views.EndpointsContainerView"
 			x:DataType="vm:EndpointsContainerViewModel">
 	<Grid RowDefinitions="auto,*"
 		  ColumnDefinitions="*"
diff --git a/Needlework.Net.Desktop/Views/EndpointsContainerView.axaml.cs b/Needlework.Net/Views/EndpointsContainerView.axaml.cs
similarity index 80%
rename from Needlework.Net.Desktop/Views/EndpointsContainerView.axaml.cs
rename to Needlework.Net/Views/EndpointsContainerView.axaml.cs
index 5bc25ca..77f39e2 100644
--- a/Needlework.Net.Desktop/Views/EndpointsContainerView.axaml.cs
+++ b/Needlework.Net/Views/EndpointsContainerView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Needlework.Net.Desktop.Views;
+namespace Needlework.Net.Views;
 
 public partial class EndpointsContainerView : UserControl
 {
diff --git a/Needlework.Net.Desktop/Views/EndpointsView.axaml b/Needlework.Net/Views/EndpointsView.axaml
similarity index 88%
rename from Needlework.Net.Desktop/Views/EndpointsView.axaml
rename to Needlework.Net/Views/EndpointsView.axaml
index 17feecd..b9c301b 100644
--- a/Needlework.Net.Desktop/Views/EndpointsView.axaml
+++ b/Needlework.Net/Views/EndpointsView.axaml
@@ -2,11 +2,11 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-		xmlns:vm="using:Needlework.Net.Desktop.ViewModels"
-		xmlns:controls="using:Needlework.Net.Desktop.Controls"
+		xmlns:vm="using:Needlework.Net.ViewModels"
+		xmlns:controls="using:Needlework.Net.Controls"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
 		Name="EndpointsControl"
-        x:Class="Needlework.Net.Desktop.Views.EndpointsView"
+        x:Class="Needlework.Net.Views.EndpointsView"
 		x:DataType="vm:EndpointsViewModel">
 	<controls:BusyArea IsBusy="{Binding IsBusy}"
 					   BusyText="Loading...">
diff --git a/Needlework.Net.Desktop/Views/EndpointsView.axaml.cs b/Needlework.Net/Views/EndpointsView.axaml.cs
similarity index 82%
rename from Needlework.Net.Desktop/Views/EndpointsView.axaml.cs
rename to Needlework.Net/Views/EndpointsView.axaml.cs
index 9e2e5a0..fa0b3ac 100644
--- a/Needlework.Net.Desktop/Views/EndpointsView.axaml.cs
+++ b/Needlework.Net/Views/EndpointsView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Needlework.Net.Desktop.Views
+namespace Needlework.Net.Views
 {
     public partial class EndpointsView : UserControl
     {
diff --git a/Needlework.Net.Desktop/Views/HomeView.axaml b/Needlework.Net/Views/HomeView.axaml
similarity index 94%
rename from Needlework.Net.Desktop/Views/HomeView.axaml
rename to Needlework.Net/Views/HomeView.axaml
index d8c3709..a58295f 100644
--- a/Needlework.Net.Desktop/Views/HomeView.axaml
+++ b/Needlework.Net/Views/HomeView.axaml
@@ -2,10 +2,10 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-		xmlns:vm="using:Needlework.Net.Desktop.ViewModels"
-		xmlns:controls="using:Needlework.Net.Desktop.Controls"
+		xmlns:vm="using:Needlework.Net.ViewModels"
+		xmlns:controls="using:Needlework.Net.Controls"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="Needlework.Net.Desktop.Views.HomeView"
+        x:Class="Needlework.Net.Views.HomeView"
 		x:DataType="vm:HomeViewModel">
 	<!-- TOP LEVEL -->
 	<ScrollViewer>
diff --git a/Needlework.Net.Desktop/Views/HomeView.axaml.cs b/Needlework.Net/Views/HomeView.axaml.cs
similarity index 81%
rename from Needlework.Net.Desktop/Views/HomeView.axaml.cs
rename to Needlework.Net/Views/HomeView.axaml.cs
index b3be36f..e56972e 100644
--- a/Needlework.Net.Desktop/Views/HomeView.axaml.cs
+++ b/Needlework.Net/Views/HomeView.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace Needlework.Net.Desktop.Views
+namespace Needlework.Net.Views
 {
     public partial class HomeView : UserControl
     {
diff --git a/Needlework.Net.Desktop/Views/MainWindow.axaml b/Needlework.Net/Views/MainWindow.axaml
similarity index 96%
rename from Needlework.Net.Desktop/Views/MainWindow.axaml
rename to Needlework.Net/Views/MainWindow.axaml
index d7fa181..6eebe20 100644
--- a/Needlework.Net.Desktop/Views/MainWindow.axaml
+++ b/Needlework.Net/Views/MainWindow.axaml
@@ -7,9 +7,9 @@
         xmlns:uip="using:FluentAvalonia.UI.Controls.Primitives"
 		xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
 		xmlns:i="https://github.com/projektanker/icons.avalonia"
-		xmlns:vm="using:Needlework.Net.Desktop.ViewModels"
+		xmlns:vm="using:Needlework.Net.ViewModels"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="Needlework.Net.Desktop.Views.MainWindow"
+        x:Class="Needlework.Net.Views.MainWindow"
 		x:DataType="vm:MainWindowViewModel"
         Title="Needlework.Net"
 		Icon="/Assets/app.ico"
diff --git a/Needlework.Net.Desktop/Views/MainWindow.axaml.cs b/Needlework.Net/Views/MainWindow.axaml.cs
similarity index 83%
rename from Needlework.Net.Desktop/Views/MainWindow.axaml.cs
rename to Needlework.Net/Views/MainWindow.axaml.cs
index 74f6b18..80eb8ac 100644
--- a/Needlework.Net.Desktop/Views/MainWindow.axaml.cs
+++ b/Needlework.Net/Views/MainWindow.axaml.cs
@@ -1,6 +1,6 @@
 using FluentAvalonia.UI.Windowing;
 
-namespace Needlework.Net.Desktop.Views;
+namespace Needlework.Net.Views;
 
 public partial class MainWindow : AppWindow
 {
diff --git a/Needlework.Net.Desktop/Views/OopsiesWindow.axaml b/Needlework.Net/Views/OopsiesWindow.axaml
similarity index 94%
rename from Needlework.Net.Desktop/Views/OopsiesWindow.axaml
rename to Needlework.Net/Views/OopsiesWindow.axaml
index d81e1ae..e6f2469 100644
--- a/Needlework.Net.Desktop/Views/OopsiesWindow.axaml
+++ b/Needlework.Net/Views/OopsiesWindow.axaml
@@ -3,9 +3,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-			 xmlns:vm="using:Needlework.Net.Desktop.ViewModels"
+			 xmlns:vm="using:Needlework.Net.ViewModels"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Needlework.Net.Desktop.Views.OopsiesWindow"
+             x:Class="Needlework.Net.Views.OopsiesWindow"
 			 x:DataType="vm:OopsiesWindowViewModel"
 			 Title="Needlework.Net - Oopsies"
 		     WindowStartupLocation="CenterOwner"
diff --git a/Needlework.Net.Desktop/Views/OopsiesWindow.axaml.cs b/Needlework.Net/Views/OopsiesWindow.axaml.cs
similarity index 84%
rename from Needlework.Net.Desktop/Views/OopsiesWindow.axaml.cs
rename to Needlework.Net/Views/OopsiesWindow.axaml.cs
index e77695e..c2f42fc 100644
--- a/Needlework.Net.Desktop/Views/OopsiesWindow.axaml.cs
+++ b/Needlework.Net/Views/OopsiesWindow.axaml.cs
@@ -1,6 +1,6 @@
 using FluentAvalonia.UI.Windowing;
 
-namespace Needlework.Net.Desktop.Views;
+namespace Needlework.Net.Views;
 
 public partial class OopsiesWindow : AppWindow
 {
diff --git a/Needlework.Net.Desktop/Views/WebsocketView.axaml b/Needlework.Net/Views/WebsocketView.axaml
similarity index 93%
rename from Needlework.Net.Desktop/Views/WebsocketView.axaml
rename to Needlework.Net/Views/WebsocketView.axaml
index 3203036..7edd819 100644
--- a/Needlework.Net.Desktop/Views/WebsocketView.axaml
+++ b/Needlework.Net/Views/WebsocketView.axaml
@@ -3,9 +3,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 			 xmlns:avaloniaEdit="https://github.com/avaloniaui/avaloniaedit"
-			 xmlns:vm="using:Needlework.Net.Desktop.ViewModels"
+			 xmlns:vm="using:Needlework.Net.ViewModels"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Needlework.Net.Desktop.Views.WebsocketView"
+             x:Class="Needlework.Net.Views.WebsocketView"
 			 x:DataType="vm:WebsocketViewModel">
 	<Grid RowDefinitions="*,auto,*"  Margin="16">
 		<Border Grid.Row="0"
diff --git a/Needlework.Net.Desktop/Views/WebsocketView.axaml.cs b/Needlework.Net/Views/WebsocketView.axaml.cs
similarity index 92%
rename from Needlework.Net.Desktop/Views/WebsocketView.axaml.cs
rename to Needlework.Net/Views/WebsocketView.axaml.cs
index af1ec95..b30a73c 100644
--- a/Needlework.Net.Desktop/Views/WebsocketView.axaml.cs
+++ b/Needlework.Net/Views/WebsocketView.axaml.cs
@@ -4,13 +4,13 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Styling;
 using AvaloniaEdit;
 using CommunityToolkit.Mvvm.Messaging;
-using Needlework.Net.Desktop.Extensions;
-using Needlework.Net.Desktop.Messages;
-using Needlework.Net.Desktop.ViewModels;
+using Needlework.Net.Extensions;
+using Needlework.Net.Messages;
+using Needlework.Net.ViewModels;
 using System;
 using TextMateSharp.Grammars;
 
-namespace Needlework.Net.Desktop.Views;
+namespace Needlework.Net.Views;
 
 public partial class WebsocketView : UserControl, IRecipient<ResponseUpdatedMessage>
 {
diff --git a/Needlework.Net.Desktop/app.ico b/Needlework.Net/app.ico
similarity index 100%
rename from Needlework.Net.Desktop/app.ico
rename to Needlework.Net/app.ico
diff --git a/Needlework.Net.Desktop/app.manifest b/Needlework.Net/app.manifest
similarity index 91%
rename from Needlework.Net.Desktop/app.manifest
rename to Needlework.Net/app.manifest
index c794cc4..e2cdaaa 100644
--- a/Needlework.Net.Desktop/app.manifest
+++ b/Needlework.Net/app.manifest
@@ -3,7 +3,7 @@
   <!-- This manifest is used on Windows only.
        Don't remove it as it might cause problems with window transparency and embedded controls.
        For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
-  <assemblyIdentity version="1.0.0.0" name="Needlework.Net.Desktop.Desktop"/>
+  <assemblyIdentity version="1.0.0.0" name="Needlework.Net"/>
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>