diff --git a/src/LiveStreamingServerNet.Networking.Client/Internal/ClientEventDispatcher.cs b/src/LiveStreamingServerNet.Networking.Client/Internal/ClientEventDispatcher.cs
index ca59276a..5079d16d 100644
--- a/src/LiveStreamingServerNet.Networking.Client/Internal/ClientEventDispatcher.cs
+++ b/src/LiveStreamingServerNet.Networking.Client/Internal/ClientEventDispatcher.cs
@@ -1,7 +1,7 @@
-using LiveStreamingServerNet.Networking.Contracts;
-using LiveStreamingServerNet.Networking.Client.Contracts;
+using LiveStreamingServerNet.Networking.Client.Contracts;
 using LiveStreamingServerNet.Networking.Client.Internal.Contracts;
 using LiveStreamingServerNet.Networking.Client.Internal.Logging;
+using LiveStreamingServerNet.Networking.Contracts;
 using LiveStreamingServerNet.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
diff --git a/src/LiveStreamingServerNet.Rtmp.Client/Installer/RtmpClientInstaller.cs b/src/LiveStreamingServerNet.Rtmp.Client/Installer/RtmpClientInstaller.cs
index b19272d0..16aab32d 100644
--- a/src/LiveStreamingServerNet.Rtmp.Client/Installer/RtmpClientInstaller.cs
+++ b/src/LiveStreamingServerNet.Rtmp.Client/Installer/RtmpClientInstaller.cs
@@ -1,18 +1,18 @@
 using LiveStreamingClientNet.Rtmp.Client.Internal;
+using LiveStreamingServerNet.Networking.Client.Contracts;
 using LiveStreamingServerNet.Networking.Client.Installer;
 using LiveStreamingServerNet.Networking.Client.Installer.Contracts;
+using LiveStreamingServerNet.Rtmp.Client.Contracts;
 using LiveStreamingServerNet.Rtmp.Client.Installer.Contracts;
 using LiveStreamingServerNet.Rtmp.Client.Internal;
 using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
-using LiveStreamingServerNet.Rtmp.Client.Internal.Services.Contracts;
 using LiveStreamingServerNet.Rtmp.Client.Internal.Services;
+using LiveStreamingServerNet.Rtmp.Client.Internal.Services.Contracts;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Commands.Dispatcher;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Dispatcher;
 using LiveStreamingServerNet.Rtmp.Internal.Services;
 using LiveStreamingServerNet.Rtmp.Internal.Services.Contracts;
 using Microsoft.Extensions.DependencyInjection;
-using LiveStreamingServerNet.Rtmp.Client.Contracts;
-using LiveStreamingServerNet.Networking.Client.Contracts;
 
 namespace LiveStreamingServerNet.Rtmp.Client.Installer
 {
diff --git a/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/Commands/RtmpCommandMessageHandler.cs b/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/Commands/RtmpCommandMessageHandler.cs
index 3ffa1e66..2879c608 100644
--- a/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/Commands/RtmpCommandMessageHandler.cs
+++ b/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/Commands/RtmpCommandMessageHandler.cs
@@ -1,9 +1,9 @@
-using LiveStreamingServerNet.Rtmp.Internal.Contracts;
+using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
+using LiveStreamingServerNet.Rtmp.Internal.Contracts;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Commands.Dispatcher.Contracts;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Dispatcher.Attributes;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Dispatcher.Contracts;
-using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
 using LiveStreamingServerNet.Utilities.Buffers.Contracts;
 
 namespace LiveStreamingServerNet.Rtmp.Client.Internal.RtmpEventHandlers.Commands
diff --git a/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/Data/RtmpDataMessageHandler.cs b/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/Data/RtmpDataMessageHandler.cs
index 62bede02..c7ccd1d7 100644
--- a/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/Data/RtmpDataMessageHandler.cs
+++ b/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/Data/RtmpDataMessageHandler.cs
@@ -1,10 +1,10 @@
-using LiveStreamingServerNet.Rtmp.Internal;
+using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
+using LiveStreamingServerNet.Rtmp.Internal;
 using LiveStreamingServerNet.Rtmp.Internal.Contracts;
 using LiveStreamingServerNet.Rtmp.Internal.Extensions;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Dispatcher.Attributes;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Dispatcher.Contracts;
-using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
 using LiveStreamingServerNet.Utilities.Buffers.Contracts;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/ProtocolControls/RtmpAcknowledgementHandler.cs b/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/ProtocolControls/RtmpAcknowledgementHandler.cs
index 5f600838..a9a497eb 100644
--- a/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/ProtocolControls/RtmpAcknowledgementHandler.cs
+++ b/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/ProtocolControls/RtmpAcknowledgementHandler.cs
@@ -1,9 +1,9 @@
-using LiveStreamingServerNet.Rtmp.Internal.Contracts;
+using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
+using LiveStreamingServerNet.Rtmp.Client.Internal.Logging;
+using LiveStreamingServerNet.Rtmp.Internal.Contracts;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Dispatcher.Attributes;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Dispatcher.Contracts;
-using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
-using LiveStreamingServerNet.Rtmp.Client.Internal.Logging;
 using LiveStreamingServerNet.Utilities.Buffers.Contracts;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/ProtocolControls/RtmpSetChunkSizeHandler.cs b/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/ProtocolControls/RtmpSetChunkSizeHandler.cs
index 5315dc2f..4debb521 100644
--- a/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/ProtocolControls/RtmpSetChunkSizeHandler.cs
+++ b/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/ProtocolControls/RtmpSetChunkSizeHandler.cs
@@ -1,9 +1,9 @@
-using LiveStreamingServerNet.Rtmp.Internal.Contracts;
+using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
+using LiveStreamingServerNet.Rtmp.Client.Internal.Logging;
+using LiveStreamingServerNet.Rtmp.Internal.Contracts;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Dispatcher.Attributes;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Dispatcher.Contracts;
-using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
-using LiveStreamingServerNet.Rtmp.Client.Internal.Logging;
 using LiveStreamingServerNet.Utilities.Buffers.Contracts;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/ProtocolControls/RtmpSetPeerBandwidthSizeHandler.cs b/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/ProtocolControls/RtmpSetPeerBandwidthSizeHandler.cs
index 20aa4f90..59e82b0d 100644
--- a/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/ProtocolControls/RtmpSetPeerBandwidthSizeHandler.cs
+++ b/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/ProtocolControls/RtmpSetPeerBandwidthSizeHandler.cs
@@ -1,8 +1,8 @@
-using LiveStreamingServerNet.Rtmp.Internal.Contracts;
+using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
+using LiveStreamingServerNet.Rtmp.Internal.Contracts;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Dispatcher.Attributes;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Dispatcher.Contracts;
-using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
 using LiveStreamingServerNet.Utilities.Buffers.Contracts;
 
 namespace LiveStreamingServerNet.Rtmp.Client.Internal.RtmpEventHandlers.ProtocolControls
diff --git a/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/ProtocolControls/RtmpWindowAcknowledgementSizeHandler.cs b/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/ProtocolControls/RtmpWindowAcknowledgementSizeHandler.cs
index 57a42720..b81203a0 100644
--- a/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/ProtocolControls/RtmpWindowAcknowledgementSizeHandler.cs
+++ b/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/ProtocolControls/RtmpWindowAcknowledgementSizeHandler.cs
@@ -1,9 +1,9 @@
-using LiveStreamingServerNet.Rtmp.Internal.Contracts;
+using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
+using LiveStreamingServerNet.Rtmp.Client.Internal.Logging;
+using LiveStreamingServerNet.Rtmp.Internal.Contracts;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Dispatcher.Attributes;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Dispatcher.Contracts;
-using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
-using LiveStreamingServerNet.Rtmp.Client.Internal.Logging;
 using LiveStreamingServerNet.Utilities.Buffers.Contracts;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/RtmpChunkEventHandler.cs b/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/RtmpChunkEventHandler.cs
index 63087b89..b219b587 100644
--- a/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/RtmpChunkEventHandler.cs
+++ b/src/LiveStreamingServerNet.Rtmp.Client/Internal/RtmpEventHandlers/RtmpChunkEventHandler.cs
@@ -1,11 +1,11 @@
-using LiveStreamingServerNet.Rtmp.Internal;
-using LiveStreamingServerNet.Rtmp.Internal.Contracts;
-using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Dispatcher.Contracts;
-using LiveStreamingServerNet.Rtmp.Internal.Services.Contracts;
-using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
+using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
 using LiveStreamingServerNet.Rtmp.Client.Internal.Logging;
 using LiveStreamingServerNet.Rtmp.Client.Internal.RtmpEvents;
 using LiveStreamingServerNet.Rtmp.Client.Internal.Services.Contracts;
+using LiveStreamingServerNet.Rtmp.Internal;
+using LiveStreamingServerNet.Rtmp.Internal.Contracts;
+using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Dispatcher.Contracts;
+using LiveStreamingServerNet.Rtmp.Internal.Services.Contracts;
 using Mediator;
 using Microsoft.Extensions.Logging;
 using System.Diagnostics;
diff --git a/src/LiveStreamingServerNet.Rtmp.Client/Internal/Services/Extensions/RtmpCommandMessageSenderServiceExtensions.cs b/src/LiveStreamingServerNet.Rtmp.Client/Internal/Services/Extensions/RtmpCommandMessageSenderServiceExtensions.cs
deleted file mode 100644
index ee2393e6..00000000
--- a/src/LiveStreamingServerNet.Rtmp.Client/Internal/Services/Extensions/RtmpCommandMessageSenderServiceExtensions.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using LiveStreamingServerNet.Rtmp.Internal;
-using LiveStreamingServerNet.Rtmp.Internal.Extensions;
-using LiveStreamingServerNet.Rtmp.Client.Internal.Services.Contracts;
-
-namespace LiveStreamingServerNet.Rtmp.Client.Internal.Services.Extensions
-{
-    internal static class RtmpCommandMessageSenderServiceExtensions
-    {
-        //public static void SendConnectCommandMessage(
-        //    this IRtmpCommandMessageSenderService sender,
-        //    string appName,
-        //    AmfEncodingType amfEncodingType = AmfEncodingType.Amf0,
-        //    Action<bool>? callback = null)
-        //{
-        //    var properties = new Dictionary<string, object?>
-        //    {
-        //        { RtmpArgumentNames.Level, level },
-        //        { RtmpArgumentNames.Code, code },
-        //        { RtmpArgumentNames.Description, description }
-        //    };
-
-        //    sender.SendCommandMessage(3, "connect", 0, null, new List<object?> { properties }, amfEncodingType, callback);
-        //}
-    }
-}
diff --git a/src/LiveStreamingServerNet.Rtmp.Client/Internal/Services/RtmpProtocolControlService.cs b/src/LiveStreamingServerNet.Rtmp.Client/Internal/Services/RtmpProtocolControlService.cs
index e5f76d69..b75eab15 100644
--- a/src/LiveStreamingServerNet.Rtmp.Client/Internal/Services/RtmpProtocolControlService.cs
+++ b/src/LiveStreamingServerNet.Rtmp.Client/Internal/Services/RtmpProtocolControlService.cs
@@ -1,8 +1,8 @@
-using LiveStreamingServerNet.Rtmp.Internal;
+using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
+using LiveStreamingServerNet.Rtmp.Client.Internal.Services.Contracts;
+using LiveStreamingServerNet.Rtmp.Internal;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpHeaders;
-using LiveStreamingServerNet.Rtmp.Client.Internal.Services.Contracts;
-using LiveStreamingServerNet.Rtmp.Client.Internal.Contracts;
 using System.Diagnostics;
 
 namespace LiveStreamingServerNet.Rtmp.Client.Internal.Services
diff --git a/test/LiveStreamingServerNet.Rtmp.Server.Test/RtmpEventHandlers/RtmpChunkEventHandler.Test.cs b/test/LiveStreamingServerNet.Rtmp.Server.Test/RtmpEventHandlers/RtmpChunkEventHandler.Test.cs
index 5dacd609..9a4267f9 100644
--- a/test/LiveStreamingServerNet.Rtmp.Server.Test/RtmpEventHandlers/RtmpChunkEventHandler.Test.cs
+++ b/test/LiveStreamingServerNet.Rtmp.Server.Test/RtmpEventHandlers/RtmpChunkEventHandler.Test.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using FluentAssertions;
-using LiveStreamingServerNet.Networking.Server.Internal;
 using LiveStreamingServerNet.Rtmp.Internal;
 using LiveStreamingServerNet.Rtmp.Internal.Contracts;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpEventHandlers.Dispatcher.Contracts;
diff --git a/test/LiveStreamingServerNet.Rtmp.Server.Test/Services/RtmpCommandMessageSenderService.Test.cs b/test/LiveStreamingServerNet.Rtmp.Server.Test/Services/RtmpCommandMessageSenderService.Test.cs
index 43d9e99b..e10b184a 100644
--- a/test/LiveStreamingServerNet.Rtmp.Server.Test/Services/RtmpCommandMessageSenderService.Test.cs
+++ b/test/LiveStreamingServerNet.Rtmp.Server.Test/Services/RtmpCommandMessageSenderService.Test.cs
@@ -6,7 +6,6 @@
 using LiveStreamingServerNet.Rtmp.Server.Internal.Contracts;
 using LiveStreamingServerNet.Rtmp.Server.Internal.Services;
 using LiveStreamingServerNet.Rtmp.Server.Internal.Services.Contracts;
-using LiveStreamingServerNet.Rtmp.Test.Utilities;
 using LiveStreamingServerNet.Utilities.Buffers;
 using LiveStreamingServerNet.Utilities.Buffers.Contracts;
 using NSubstitute;
diff --git a/test/LiveStreamingServerNet.Rtmp.Test/Services/RtmpChunkMessageWriterService.Test.cs b/test/LiveStreamingServerNet.Rtmp.Test/Services/RtmpChunkMessageWriterService.Test.cs
index b14d1446..af417b2e 100644
--- a/test/LiveStreamingServerNet.Rtmp.Test/Services/RtmpChunkMessageWriterService.Test.cs
+++ b/test/LiveStreamingServerNet.Rtmp.Test/Services/RtmpChunkMessageWriterService.Test.cs
@@ -1,7 +1,6 @@
 using AutoFixture;
 using FluentAssertions;
 using LiveStreamingServerNet.Networking.Contracts;
-using LiveStreamingServerNet.Networking.Server.Internal;
 using LiveStreamingServerNet.Rtmp.Internal.RtmpHeaders;
 using LiveStreamingServerNet.Rtmp.Internal.Services;
 using LiveStreamingServerNet.Rtmp.Test.Utilities;