diff --git a/CoreRemoting.Channels.WebsocketSharp/CoreRemoting.Channels.WebsocketSharp.csproj b/CoreRemoting.Channels.WebsocketSharp/CoreRemoting.Channels.WebsocketSharp.csproj
new file mode 100644
index 0000000..62fd3a3
--- /dev/null
+++ b/CoreRemoting.Channels.WebsocketSharp/CoreRemoting.Channels.WebsocketSharp.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+	<RootNamespace>CoreRemoting.Channels.WebsocketSharp</RootNamespace>
+	<AssemblyName>CoreRemoting.Channels.WebsocketSharp</AssemblyName>
+	<PackageVersion>1.2.1</PackageVersion>
+	<Authors>Hagen Siegel</Authors>
+	<Description>WebSocketSharp channels for CoreRemoting</Description>
+	<Copyright>2024 Hagen Siegel</Copyright>
+	<PackageProjectUrl>https://github.com/theRainbird/CoreRemoting</PackageProjectUrl>
+	<PackageLicenseUrl></PackageLicenseUrl>
+	<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+	<Title>CoreRemoting.Channels.WebsocketSharp</Title>
+	<RepositoryUrl>https://github.com/theRainbird/CoreRemoting.git</RepositoryUrl>
+	<RepositoryType>git</RepositoryType>
+	<AssemblyVersion>1.2.1</AssemblyVersion>
+	<LangVersion>8</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="websocketsharp.core" Version="1.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\CoreRemoting\CoreRemoting.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/CoreRemoting/Channels/WebsocketSharp/RpcWebsocketSharpBehavior.cs b/CoreRemoting.Channels.WebsocketSharp/RpcWebsocketSharpBehavior.cs
similarity index 100%
rename from CoreRemoting/Channels/WebsocketSharp/RpcWebsocketSharpBehavior.cs
rename to CoreRemoting.Channels.WebsocketSharp/RpcWebsocketSharpBehavior.cs
diff --git a/CoreRemoting/Channels/WebsocketSharp/WebsocketSharpClientChannel.cs b/CoreRemoting.Channels.WebsocketSharp/WebsocketSharpClientChannel.cs
similarity index 100%
rename from CoreRemoting/Channels/WebsocketSharp/WebsocketSharpClientChannel.cs
rename to CoreRemoting.Channels.WebsocketSharp/WebsocketSharpClientChannel.cs
diff --git a/CoreRemoting/Channels/WebsocketSharp/WebsocketSharpServerChannel.cs b/CoreRemoting.Channels.WebsocketSharp/WebsocketSharpServerChannel.cs
similarity index 100%
rename from CoreRemoting/Channels/WebsocketSharp/WebsocketSharpServerChannel.cs
rename to CoreRemoting.Channels.WebsocketSharp/WebsocketSharpServerChannel.cs
diff --git a/CoreRemoting.Tests/CoreRemoting.Tests.csproj b/CoreRemoting.Tests/CoreRemoting.Tests.csproj
index 2dd2e36..970b352 100644
--- a/CoreRemoting.Tests/CoreRemoting.Tests.csproj
+++ b/CoreRemoting.Tests/CoreRemoting.Tests.csproj
@@ -20,6 +20,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\CoreRemoting.Channels.WebsocketSharp\CoreRemoting.Channels.WebsocketSharp.csproj" />
       <ProjectReference Include="..\CoreRemoting.Tests.ExternalTypes\CoreRemoting.Tests.ExternalTypes.csproj" />
       <ProjectReference Include="..\CoreRemoting\CoreRemoting.csproj" />
     </ItemGroup>
diff --git a/CoreRemoting.sln b/CoreRemoting.sln
index 98abb24..6ad4702 100644
--- a/CoreRemoting.sln
+++ b/CoreRemoting.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30907.101
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34330.188
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreRemoting", "CoreRemoting\CoreRemoting.csproj", "{2E256F93-746B-4417-97E5-5565C684B233}"
 EndProject
@@ -24,11 +24,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitignore = .gitignore
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreRemoting.Authentication.WindowsAuthProvider", "CoreRemoting.Authentication.WindowsAuthProvider\CoreRemoting.Authentication.WindowsAuthProvider.csproj", "{34E0ADAE-B7FF-4811-BBCD-60473E63A3A5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreRemoting.Authentication.WindowsAuthProvider", "CoreRemoting.Authentication.WindowsAuthProvider\CoreRemoting.Authentication.WindowsAuthProvider.csproj", "{34E0ADAE-B7FF-4811-BBCD-60473E63A3A5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreRemoting.Authentication.GenericOsAuthProvider", "CoreRemoting.Authentication.GenericOsAuthProvider\CoreRemoting.Authentication.GenericOsAuthProvider.csproj", "{BC94361A-CA63-4D28-9FD0-BEF492952B6E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreRemoting.Authentication.GenericOsAuthProvider", "CoreRemoting.Authentication.GenericOsAuthProvider\CoreRemoting.Authentication.GenericOsAuthProvider.csproj", "{BC94361A-CA63-4D28-9FD0-BEF492952B6E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreRemoting.Tests.ExternalTypes", "CoreRemoting.Tests.ExternalTypes\CoreRemoting.Tests.ExternalTypes.csproj", "{6A63A1C8-FF93-4E23-BB19-7071BF635174}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreRemoting.Tests.ExternalTypes", "CoreRemoting.Tests.ExternalTypes\CoreRemoting.Tests.ExternalTypes.csproj", "{6A63A1C8-FF93-4E23-BB19-7071BF635174}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreRemoting.Channels.WebsocketSharp", "CoreRemoting.Channels.WebsocketSharp\CoreRemoting.Channels.WebsocketSharp.csproj", "{A2440A47-F1F2-4556-958B-5CA19BF17A59}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -72,6 +74,10 @@ Global
 		{6A63A1C8-FF93-4E23-BB19-7071BF635174}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6A63A1C8-FF93-4E23-BB19-7071BF635174}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A63A1C8-FF93-4E23-BB19-7071BF635174}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2440A47-F1F2-4556-958B-5CA19BF17A59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2440A47-F1F2-4556-958B-5CA19BF17A59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2440A47-F1F2-4556-958B-5CA19BF17A59}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2440A47-F1F2-4556-958B-5CA19BF17A59}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CoreRemoting/CoreRemoting.csproj b/CoreRemoting/CoreRemoting.csproj
index bb93697..0776e0f 100644
--- a/CoreRemoting/CoreRemoting.csproj
+++ b/CoreRemoting/CoreRemoting.csproj
@@ -56,7 +56,6 @@
       <PackageReference Include="System.Security.Cryptography.OpenSsl" Version="5.0.0" />
       <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
       <PackageReference Include="WatsonTcp" Version="6.0.6" />
-      <PackageReference Include="websocketsharp.core" Version="1.0.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/CoreRemoting/DependencyInjection/DependencyInjectionContainerBase.cs b/CoreRemoting/DependencyInjection/DependencyInjectionContainerBase.cs
index 082b3ac..0897b17 100644
--- a/CoreRemoting/DependencyInjection/DependencyInjectionContainerBase.cs
+++ b/CoreRemoting/DependencyInjection/DependencyInjectionContainerBase.cs
@@ -2,7 +2,6 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using WebSocketSharp;
 
 namespace CoreRemoting.DependencyInjection;
 
@@ -94,7 +93,7 @@ public object GetService(string serviceName)
     public TServiceInterface GetService<TServiceInterface>(string serviceName = "")
         where TServiceInterface : class
     {
-        if (serviceName.IsNullOrEmpty())
+        if (string.IsNullOrEmpty(serviceName))
             serviceName = typeof(TServiceInterface).FullName;
         
         var registration = GetServiceRegistration(serviceName);