diff --git a/samples/AspNetSample/AspNetSample.csproj b/samples/AspNetSample/AspNetSample.csproj
index 246cb21df..8c2d0e9f2 100644
--- a/samples/AspNetSample/AspNetSample.csproj
+++ b/samples/AspNetSample/AspNetSample.csproj
@@ -5,6 +5,5 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\src\SuperSocket.Server\SuperSocket.Server.csproj" />
-		<ProjectReference Include="..\..\src\SuperSocket.SessionContainer\SuperSocket.SessionContainer.csproj" />
 	</ItemGroup>
 </Project>
diff --git a/samples/AspNetSample/Program.cs b/samples/AspNetSample/Program.cs
index b1eef1db8..bc9679d8b 100644
--- a/samples/AspNetSample/Program.cs
+++ b/samples/AspNetSample/Program.cs
@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Hosting;
-using SuperSocket;
 using SuperSocket.Server;
 using SuperSocket.Server.Host;
 using SuperSocket.Server.Abstractions.Session;
diff --git a/samples/CommandServer/Program.cs b/samples/CommandServer/Program.cs
index 6b419630b..77f5126de 100644
--- a/samples/CommandServer/Program.cs
+++ b/samples/CommandServer/Program.cs
@@ -4,10 +4,8 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using SuperSocket;
 using SuperSocket.Server;
 using SuperSocket.Server.Host;
-using SuperSocket.Server.Abstractions.Session;
 using SuperSocket.Command;
 using SuperSocket.ProtoBase;
 
diff --git a/samples/ConfigSample/Program.cs b/samples/ConfigSample/Program.cs
index ad8d1d9b3..6a0fe4f6c 100644
--- a/samples/ConfigSample/Program.cs
+++ b/samples/ConfigSample/Program.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using SuperSocket;
+using SuperSocket.Server;
 using SuperSocket.Server.Host;
 using SuperSocket.ProtoBase;
 
diff --git a/samples/CustomProtocol/Program.cs b/samples/CustomProtocol/Program.cs
index da8d9525c..8618baf7f 100644
--- a/samples/CustomProtocol/Program.cs
+++ b/samples/CustomProtocol/Program.cs
@@ -3,11 +3,9 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using SuperSocket;
 using SuperSocket.Server;
 using SuperSocket.Server.Abstractions;
 using SuperSocket.Server.Host;
-using SuperSocket.ProtoBase;
 
 namespace CustomProtocol
 {
diff --git a/samples/EchoServer/Program.cs b/samples/EchoServer/Program.cs
index 20f98d7c5..8e44b4006 100644
--- a/samples/EchoServer/Program.cs
+++ b/samples/EchoServer/Program.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using SuperSocket;
 using SuperSocket.Server;
 using SuperSocket.Server.Abstractions;
 using SuperSocket.Server.Host;
diff --git a/samples/WebSocketPushServer/Program.cs b/samples/WebSocketPushServer/Program.cs
index 14b6b1323..3ec84b70b 100644
--- a/samples/WebSocketPushServer/Program.cs
+++ b/samples/WebSocketPushServer/Program.cs
@@ -4,7 +4,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using SuperSocket;
 using SuperSocket.Server;
 using SuperSocket.Server.Abstractions;
 using SuperSocket.Server.Abstractions.Host;
diff --git a/src/SuperSocket.Command/CommandMiddlewareExtensions.cs b/src/SuperSocket.Command/CommandMiddlewareExtensions.cs
index 1ead81e12..df04b457d 100644
--- a/src/SuperSocket.Command/CommandMiddlewareExtensions.cs
+++ b/src/SuperSocket.Command/CommandMiddlewareExtensions.cs
@@ -7,7 +7,7 @@
 using SuperSocket.Server.Abstractions.Host;
 using SuperSocket.Server.Abstractions.Middleware;
 
-namespace SuperSocket
+namespace SuperSocket.Server
 {
     public static class CommandMiddlewareExtensions
     {
diff --git a/src/SuperSocket.Server.Abstractions/Host/HostBuilderExtensions.cs b/src/SuperSocket.Server.Abstractions/Host/HostBuilderExtensions.cs
index d49e85793..b08199a29 100644
--- a/src/SuperSocket.Server.Abstractions/Host/HostBuilderExtensions.cs
+++ b/src/SuperSocket.Server.Abstractions/Host/HostBuilderExtensions.cs
@@ -3,10 +3,11 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using SuperSocket.Server.Abstractions.Connections;
+using SuperSocket.Server.Abstractions.Host;
 using SuperSocket.Server.Abstractions.Middleware;
 
 
-namespace SuperSocket.Server.Abstractions.Host
+namespace SuperSocket.Server
 {
     public static class HostBuilderExtensions
     {
diff --git a/src/SuperSocket.Server.Abstractions/Session/InProcSessionContainerMiddleware.cs b/src/SuperSocket.Server.Abstractions/Session/InProcSessionContainerMiddleware.cs
index 446a6098e..35b31b0b8 100644
--- a/src/SuperSocket.Server.Abstractions/Session/InProcSessionContainerMiddleware.cs
+++ b/src/SuperSocket.Server.Abstractions/Session/InProcSessionContainerMiddleware.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
-using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using SuperSocket.Server.Abstractions.Middleware;
 
 namespace SuperSocket.Server.Abstractions.Session
diff --git a/src/SuperSocket.Server.Abstractions/Session/InProcSessionContainerMiddlewareExtensions.cs b/src/SuperSocket.Server.Abstractions/Session/InProcSessionContainerMiddlewareExtensions.cs
index fa5174d92..d5adeb474 100644
--- a/src/SuperSocket.Server.Abstractions/Session/InProcSessionContainerMiddlewareExtensions.cs
+++ b/src/SuperSocket.Server.Abstractions/Session/InProcSessionContainerMiddlewareExtensions.cs
@@ -1,10 +1,9 @@
 using System;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 using SuperSocket.Server.Abstractions.Host;
+using SuperSocket.Server.Abstractions.Session;
 
-namespace SuperSocket.Server.Abstractions.Session
+namespace SuperSocket.Server
 {
     public static class InProcSessionContainerMiddlewareExtensions
     {
diff --git a/src/SuperSocket.Server/SuperSocketExtensions.cs b/src/SuperSocket.Server/SuperSocketExtensions.cs
index dc573d861..5548699f1 100644
--- a/src/SuperSocket.Server/SuperSocketExtensions.cs
+++ b/src/SuperSocket.Server/SuperSocketExtensions.cs
@@ -1,14 +1,8 @@
 using System;
-using System.Linq;
 using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
-using SuperSocket;
-using SuperSocket.ProtoBase;
-using SuperSocket.Server;
 using System.Net;
 using System.Net.Sockets;
 using Microsoft.Extensions.Logging;
@@ -17,7 +11,7 @@
 using SuperSocket.Server.Abstractions.Session;
 using SuperSocket.Server.Host;
 
-namespace SuperSocket
+namespace SuperSocket.Server
 {
     public static class SuperSocketExtensions
     {
diff --git a/src/SuperSocket.Udp/UdpConnectionListenerFactory.cs b/src/SuperSocket.Udp/UdpConnectionListenerFactory.cs
index b5ad87bc0..658724315 100644
--- a/src/SuperSocket.Udp/UdpConnectionListenerFactory.cs
+++ b/src/SuperSocket.Udp/UdpConnectionListenerFactory.cs
@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using SuperSocket.Connection;
-using SuperSocket.ProtoBase;
 using SuperSocket.Server.Abstractions;
 using SuperSocket.Server.Abstractions.Connections;
 using SuperSocket.Server.Abstractions.Session;
diff --git a/src/SuperSocket.Udp/UdpServerHostBuilderExtensions.cs b/src/SuperSocket.Udp/UdpServerHostBuilderExtensions.cs
index efcbf076d..3348cfa78 100644
--- a/src/SuperSocket.Udp/UdpServerHostBuilderExtensions.cs
+++ b/src/SuperSocket.Udp/UdpServerHostBuilderExtensions.cs
@@ -2,8 +2,6 @@
 using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using SuperSocket.Connection;
-using SuperSocket.Server.Abstractions;
 using SuperSocket.Server.Abstractions.Connections;
 using SuperSocket.Server.Abstractions.Host;
 using SuperSocket.Server.Abstractions.Middleware;
@@ -11,7 +9,7 @@
 using SuperSocket.Udp;
 
 
-namespace SuperSocket
+namespace SuperSocket.Server
 {
     public static class UdpServerHostBuilderExtensions
     {