diff --git a/Server/SharpCAT.Server/Controllers/CatController.cs b/Server/Controllers/CatController.cs
similarity index 99%
rename from Server/SharpCAT.Server/Controllers/CatController.cs
rename to Server/Controllers/CatController.cs
index 7907353..77f535e 100644
--- a/Server/SharpCAT.Server/Controllers/CatController.cs
+++ b/Server/Controllers/CatController.cs
@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
-using SharpCAT.Server.Models;
-using SharpCAT.Server.Services;
+using Server.Models;
+using Server.Services;
 
-namespace SharpCAT.Server.Controllers
+namespace Server.Controllers
 {
     /// <summary>
     /// Controller for CAT (Computer Aided Transceiver) operations
diff --git a/Server/SharpCAT.Server/Models/ApiModels.cs b/Server/Models/ApiModels.cs
similarity index 99%
rename from Server/SharpCAT.Server/Models/ApiModels.cs
rename to Server/Models/ApiModels.cs
index 06b7109..77a5238 100644
--- a/Server/SharpCAT.Server/Models/ApiModels.cs
+++ b/Server/Models/ApiModels.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.IO.Ports;
 
-namespace SharpCAT.Server.Models
+namespace Server.Models
 {
     /// <summary>
     /// Response model for listing available serial ports
diff --git a/Server/SharpCAT.Server/Program.cs b/Server/Program.cs
similarity index 98%
rename from Server/SharpCAT.Server/Program.cs
rename to Server/Program.cs
index 25070fc..73b2997 100644
--- a/Server/SharpCAT.Server/Program.cs
+++ b/Server/Program.cs
@@ -1,4 +1,4 @@
-using SharpCAT.Server.Services;
+using Server.Services;
 
 var builder = WebApplication.CreateBuilder(args);
 
diff --git a/Server/SharpCAT.Server/Properties/launchSettings.json b/Server/Properties/launchSettings.json
similarity index 100%
rename from Server/SharpCAT.Server/Properties/launchSettings.json
rename to Server/Properties/launchSettings.json
diff --git a/Server/SharpCAT.Server/README.md b/Server/README.md
similarity index 100%
rename from Server/SharpCAT.Server/README.md
rename to Server/README.md
diff --git a/Server/SharpCAT.Server/SharpCAT.Server.csproj b/Server/Server.csproj
similarity index 89%
rename from Server/SharpCAT.Server/SharpCAT.Server.csproj
rename to Server/Server.csproj
index da0439c..735d951 100644
--- a/Server/SharpCAT.Server/SharpCAT.Server.csproj
+++ b/Server/Server.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Library\Library.csproj" />
+    <ProjectReference Include="..\Library\Library.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Server/SharpCAT.Server/Services/ISerialCommunicationService.cs b/Server/Services/ISerialCommunicationService.cs
similarity index 98%
rename from Server/SharpCAT.Server/Services/ISerialCommunicationService.cs
rename to Server/Services/ISerialCommunicationService.cs
index e8b4c17..5df9c31 100644
--- a/Server/SharpCAT.Server/Services/ISerialCommunicationService.cs
+++ b/Server/Services/ISerialCommunicationService.cs
@@ -1,6 +1,6 @@
 using System.IO.Ports;
 
-namespace SharpCAT.Server.Services
+namespace Server.Services
 {
     /// <summary>
     /// Interface for serial communication services
diff --git a/Server/SharpCAT.Server/Services/SerialCommunicationService.cs b/Server/Services/SerialCommunicationService.cs
similarity index 97%
rename from Server/SharpCAT.Server/Services/SerialCommunicationService.cs
rename to Server/Services/SerialCommunicationService.cs
index 96193fb..0e86901 100644
--- a/Server/SharpCAT.Server/Services/SerialCommunicationService.cs
+++ b/Server/Services/SerialCommunicationService.cs
@@ -1,7 +1,7 @@
 using System.IO.Ports;
 using System.Text;
 
-namespace SharpCAT.Server.Services
+namespace Server.Services
 {
     /// <summary>
     /// Service for managing serial communication with radios using SharpCAT library
@@ -9,7 +9,7 @@ namespace SharpCAT.Server.Services
     public class SerialCommunicationService : ISerialCommunicationService, IDisposable
     {
         private readonly ILogger<SerialCommunicationService> _logger;
-        private Serial? _serialConnection;
+        private SharpCAT.Serial? _serialConnection;
         private SerialPort? _directSerialPort;
         private string? _currentPortName;
         private readonly SemaphoreSlim _semaphore = new(1, 1);
@@ -25,7 +25,7 @@ namespace SharpCAT.Server.Services
         {
             try
             {
-                var sharpCat = new SharpCAT();
+                var sharpCat = new SharpCAT.SharpCAT();
                 var ports = sharpCat.PortNames;
                 _logger.LogInformation("Found {PortCount} available serial ports", ports?.Length ?? 0);
                 return ports ?? Array.Empty<string>();
diff --git a/Server/SharpCAT.Server/SharpCAT.Server.http b/Server/SharpCAT.Server.http
similarity index 100%
rename from Server/SharpCAT.Server/SharpCAT.Server.http
rename to Server/SharpCAT.Server.http
diff --git a/Server/SharpCAT.Server/appsettings.Development.json b/Server/appsettings.Development.json
similarity index 100%
rename from Server/SharpCAT.Server/appsettings.Development.json
rename to Server/appsettings.Development.json
diff --git a/Server/SharpCAT.Server/appsettings.json b/Server/appsettings.json
similarity index 100%
rename from Server/SharpCAT.Server/appsettings.json
rename to Server/appsettings.json
diff --git a/SharpCAT.sln b/SharpCAT.sln
index f7857a8..02ee0d1 100644
--- a/SharpCAT.sln
+++ b/SharpCAT.sln
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Library", "Library\Library.
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{43CFF66C-84E6-4EC2-AE4F-005FB80D74D5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCAT.Server", "Server\SharpCAT.Server\SharpCAT.Server.csproj", "{22E4F655-252E-42DB-ADD5-494BC825A97C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{22E4F655-252E-42DB-ADD5-494BC825A97C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution