diff --git a/Ragon.Relay/Sources/Relay.cs b/Ragon.Relay/Sources/Relay.cs
index de307ed..a5d8a55 100644
--- a/Ragon.Relay/Sources/Relay.cs
+++ b/Ragon.Relay/Sources/Relay.cs
@@ -18,6 +18,8 @@ using NLog;
 using Ragon.Server;
 using Ragon.Server.ENet;
 using Ragon.Server.DotNetWebsockets;
+using Ragon.Server.IO;
+using Ragon.Server.Plugin;
 
 namespace Ragon.Relay;
 
diff --git a/Ragon.Relay/Sources/RelayRoomPlugin.cs b/Ragon.Relay/Sources/RelayRoomPlugin.cs
index 950b0ed..5a99cd3 100644
--- a/Ragon.Relay/Sources/RelayRoomPlugin.cs
+++ b/Ragon.Relay/Sources/RelayRoomPlugin.cs
@@ -1,5 +1,8 @@
 using System;
 using Ragon.Server;
+using Ragon.Server.Entity;
+using Ragon.Server.Plugin;
+using Ragon.Server.Room;
 
 namespace Ragon.Relay;
 
diff --git a/Ragon.Relay/Sources/RelayServerPlugin.cs b/Ragon.Relay/Sources/RelayServerPlugin.cs
index 266128b..f8eee07 100644
--- a/Ragon.Relay/Sources/RelayServerPlugin.cs
+++ b/Ragon.Relay/Sources/RelayServerPlugin.cs
@@ -1,6 +1,8 @@
-using System;
 using System.Net.Http;
 using Ragon.Server;
+using Ragon.Server.Lobby;
+using Ragon.Server.Plugin;
+using Ragon.Server.Room;
 
 namespace Ragon.Relay;
 
diff --git a/Ragon.Server.DotNetWebSockets/Sources/WebSocketConnection.cs b/Ragon.Server.DotNetWebSockets/Sources/WebSocketConnection.cs
index 88abcb0..59182c8 100644
--- a/Ragon.Server.DotNetWebSockets/Sources/WebSocketConnection.cs
+++ b/Ragon.Server.DotNetWebSockets/Sources/WebSocketConnection.cs
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-using System.Net.WebSockets;
 using NLog;
+using System.Net.WebSockets;
+using Ragon.Server.IO;
 
 namespace Ragon.Server.DotNetWebsockets;
 
diff --git a/Ragon.Server.DotNetWebSockets/Sources/WebSocketReliableChannel.cs b/Ragon.Server.DotNetWebSockets/Sources/WebSocketReliableChannel.cs
index 79454df..b310b73 100644
--- a/Ragon.Server.DotNetWebSockets/Sources/WebSocketReliableChannel.cs
+++ b/Ragon.Server.DotNetWebSockets/Sources/WebSocketReliableChannel.cs
@@ -15,7 +15,7 @@
  */
 
 using System.Net.WebSockets;
-using Ragon.Server;
+using Ragon.Server.IO;
 
 namespace Ragon.Server.DotNetWebsockets;
 
diff --git a/Ragon.Server.DotNetWebSockets/Sources/WebSocketServer.cs b/Ragon.Server.DotNetWebSockets/Sources/WebSocketServer.cs
index 8e98712..4e94d90 100644
--- a/Ragon.Server.DotNetWebSockets/Sources/WebSocketServer.cs
+++ b/Ragon.Server.DotNetWebSockets/Sources/WebSocketServer.cs
@@ -18,6 +18,7 @@ using System.Net;
 using System.Net.WebSockets;
 using NLog;
 using Ragon.Protocol;
+using Ragon.Server.IO;
 
 namespace Ragon.Server.DotNetWebsockets;
 
diff --git a/Ragon.Server.ENet/Sources/ENetConnection.cs b/Ragon.Server.ENet/Sources/ENetConnection.cs
index 6f02a18..20b7aba 100644
--- a/Ragon.Server.ENet/Sources/ENetConnection.cs
+++ b/Ragon.Server.ENet/Sources/ENetConnection.cs
@@ -15,6 +15,7 @@
  */
 
 using ENet;
+using Ragon.Server.IO;
 
 namespace Ragon.Server.ENet;
 
diff --git a/Ragon.Server.ENet/Sources/ENetReliableChannel.cs b/Ragon.Server.ENet/Sources/ENetReliableChannel.cs
index 822ba3a..762ae3e 100644
--- a/Ragon.Server.ENet/Sources/ENetReliableChannel.cs
+++ b/Ragon.Server.ENet/Sources/ENetReliableChannel.cs
@@ -15,6 +15,7 @@
  */
 
 using ENet;
+using Ragon.Server.IO;
 
 namespace Ragon.Server.ENet;
 
diff --git a/Ragon.Server.ENet/Sources/ENetServer.cs b/Ragon.Server.ENet/Sources/ENetServer.cs
index 853d934..c953a3d 100644
--- a/Ragon.Server.ENet/Sources/ENetServer.cs
+++ b/Ragon.Server.ENet/Sources/ENetServer.cs
@@ -17,6 +17,7 @@
 using ENet;
 using NLog;
 using Ragon.Protocol;
+using Ragon.Server.IO;
 
 namespace Ragon.Server.ENet
 {
diff --git a/Ragon.Server.ENet/Sources/ENetUnreliableChannel.cs b/Ragon.Server.ENet/Sources/ENetUnreliableChannel.cs
index 995fe7c..268128e 100644
--- a/Ragon.Server.ENet/Sources/ENetUnreliableChannel.cs
+++ b/Ragon.Server.ENet/Sources/ENetUnreliableChannel.cs
@@ -15,6 +15,7 @@
  */
 
 using ENet;
+using Ragon.Server.IO;
 
 namespace Ragon.Server.ENet;
 
diff --git a/Ragon.Server/Sources/Handler/AuthorizationOperation.cs b/Ragon.Server/Sources/Handler/AuthorizationOperation.cs
index 1b5dc0c..009681c 100644
--- a/Ragon.Server/Sources/Handler/AuthorizationOperation.cs
+++ b/Ragon.Server/Sources/Handler/AuthorizationOperation.cs
@@ -16,9 +16,9 @@
 
 using NLog;
 using Ragon.Protocol;
-using Ragon.Server.Hander;
 using Ragon.Server.Lobby;
 using Ragon.Server.Plugin;
+using Ragon.Server.Plugin.Web;
 
 
 namespace Ragon.Server.Handler;
diff --git a/Ragon.Server/Sources/Handler/EntityEventOperation.cs b/Ragon.Server/Sources/Handler/EntityEventOperation.cs
index 7eb0fad..18192b8 100644
--- a/Ragon.Server/Sources/Handler/EntityEventOperation.cs
+++ b/Ragon.Server/Sources/Handler/EntityEventOperation.cs
@@ -16,7 +16,7 @@
 
 using NLog;
 using Ragon.Protocol;
-using Ragon.Server.Hander;
+using Ragon.Server.Entity;
 
 namespace Ragon.Server.Handler;
 
diff --git a/Ragon.Server/Sources/Handler/EntityRemoveOperation.cs b/Ragon.Server/Sources/Handler/EntityRemoveOperation.cs
index d9d2326..e3ec76a 100644
--- a/Ragon.Server/Sources/Handler/EntityRemoveOperation.cs
+++ b/Ragon.Server/Sources/Handler/EntityRemoveOperation.cs
@@ -16,7 +16,7 @@
 
 using NLog;
 using Ragon.Protocol;
-using Ragon.Server.Hander;
+using Ragon.Server.Entity;
 
 namespace Ragon.Server.Handler;
 
diff --git a/Ragon.Server/Sources/Handler/RoomCreateOperation.cs b/Ragon.Server/Sources/Handler/RoomCreateOperation.cs
index f375a35..b4673b6 100644
--- a/Ragon.Server/Sources/Handler/RoomCreateOperation.cs
+++ b/Ragon.Server/Sources/Handler/RoomCreateOperation.cs
@@ -18,9 +18,10 @@ using NLog;
 using Ragon.Protocol;
 using Ragon.Server.Lobby;
 using Ragon.Server.Plugin;
+using Ragon.Server.Plugin.Web;
 using Ragon.Server.Room;
 
-namespace Ragon.Server.Hander;
+namespace Ragon.Server.Handler;
 
 public sealed class RoomCreateOperation: IRagonOperation
 {
diff --git a/Ragon.Server/Sources/Handler/RoomJoinOperation.cs b/Ragon.Server/Sources/Handler/RoomJoinOperation.cs
index 08039f8..f023dc2 100644
--- a/Ragon.Server/Sources/Handler/RoomJoinOperation.cs
+++ b/Ragon.Server/Sources/Handler/RoomJoinOperation.cs
@@ -16,7 +16,9 @@
 
 using NLog;
 using Ragon.Protocol;
-using Ragon.Server.Web;
+using Ragon.Server.Plugin;
+using Ragon.Server.Plugin.Web;
+using Ragon.Server.Room;
 
 namespace Ragon.Server.Handler;
 
diff --git a/Ragon.Server/Sources/Handler/RoomJoinOrCreateOperation.cs b/Ragon.Server/Sources/Handler/RoomJoinOrCreateOperation.cs
index 192ea60..4d409c6 100644
--- a/Ragon.Server/Sources/Handler/RoomJoinOrCreateOperation.cs
+++ b/Ragon.Server/Sources/Handler/RoomJoinOrCreateOperation.cs
@@ -16,7 +16,10 @@
 
 using NLog;
 using Ragon.Protocol;
-using Ragon.Server.Web;
+using Ragon.Server.Lobby;
+using Ragon.Server.Plugin;
+using Ragon.Server.Plugin.Web;
+using Ragon.Server.Room;
 
 namespace Ragon.Server.Handler;
 
diff --git a/Ragon.Server/Sources/Handler/RoomLeaveOperation.cs b/Ragon.Server/Sources/Handler/RoomLeaveOperation.cs
index 1f1bf06..a2b1960 100644
--- a/Ragon.Server/Sources/Handler/RoomLeaveOperation.cs
+++ b/Ragon.Server/Sources/Handler/RoomLeaveOperation.cs
@@ -17,6 +17,7 @@
 using NLog;
 using Ragon.Protocol;
 using Ragon.Server.Plugin;
+using Ragon.Server.Plugin.Web;
 
 namespace Ragon.Server.Handler;
 
diff --git a/Ragon.Server/Sources/Handler/SceneLoadedOperation.cs b/Ragon.Server/Sources/Handler/SceneLoadedOperation.cs
index 0350fd6..f489887 100644
--- a/Ragon.Server/Sources/Handler/SceneLoadedOperation.cs
+++ b/Ragon.Server/Sources/Handler/SceneLoadedOperation.cs
@@ -17,6 +17,7 @@
 using NLog;
 using Ragon.Protocol;
 using Ragon.Server.Entity;
+using Ragon.Server.Lobby;
 using Ragon.Server.Room;
 
 namespace Ragon.Server.Handler;
diff --git a/Ragon.Server/Sources/Plugin/IRoomPlugin.cs b/Ragon.Server/Sources/Plugin/IRoomPlugin.cs
index 7c85edb..6b261a4 100644
--- a/Ragon.Server/Sources/Plugin/IRoomPlugin.cs
+++ b/Ragon.Server/Sources/Plugin/IRoomPlugin.cs
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+using Ragon.Server.Entity;
+using Ragon.Server.Room;
+
 namespace Ragon.Server.Plugin;
 
 public interface IRoomPlugin
diff --git a/Ragon.Server/Sources/Plugin/Web/WebHookPlugin.cs b/Ragon.Server/Sources/Plugin/Web/WebHookPlugin.cs
index 0a8190f..980bb18 100644
--- a/Ragon.Server/Sources/Plugin/Web/WebHookPlugin.cs
+++ b/Ragon.Server/Sources/Plugin/Web/WebHookPlugin.cs
@@ -2,11 +2,11 @@ using System.Net;
 using System.Net.Http.Json;
 using Newtonsoft.Json;
 using Ragon.Protocol;
+using Ragon.Server.Handler;
 using Ragon.Server.Lobby;
-using Ragon.Server.Plugin.Web;
 using Ragon.Server.Room;
 
-namespace Ragon.Server.Plugin;
+namespace Ragon.Server.Plugin.Web;
 
 public class WebHookPlugin
 {
diff --git a/Ragon.Server/Sources/RagonEntityCache.cs b/Ragon.Server/Sources/RagonEntityCache.cs
index 9a55352..53f091b 100644
--- a/Ragon.Server/Sources/RagonEntityCache.cs
+++ b/Ragon.Server/Sources/RagonEntityCache.cs
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+using Ragon.Server.Entity;
+
 namespace Ragon.Server;
 
 public class RagonEntityCache
diff --git a/Ragon.Server/Sources/RagonServer.cs b/Ragon.Server/Sources/RagonServer.cs
index 0b87e3b..d47955c 100644
--- a/Ragon.Server/Sources/RagonServer.cs
+++ b/Ragon.Server/Sources/RagonServer.cs
@@ -17,7 +17,11 @@
 using System.Diagnostics;
 using NLog;
 using Ragon.Protocol;
+using Ragon.Server.Handler;
+using Ragon.Server.IO;
+using Ragon.Server.Lobby;
 using Ragon.Server.Plugin;
+using Ragon.Server.Plugin.Web;
 using Ragon.Server.Time;
 
 namespace Ragon.Server;
diff --git a/Ragon.Server/Sources/RagonServerConfiguration.cs b/Ragon.Server/Sources/RagonServerConfiguration.cs
index 2a327aa..5b14c50 100644
--- a/Ragon.Server/Sources/RagonServerConfiguration.cs
+++ b/Ragon.Server/Sources/RagonServerConfiguration.cs
@@ -44,7 +44,7 @@ public struct Configuration
   public Dictionary<string, string> WebHooks;
 
   private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
-  private static readonly string ServerVersion = "1.1.3-rc";
+  private static readonly string ServerVersion = "1.2.0-rc";
   private static Dictionary<string, ServerType> _serverTypes = new Dictionary<string, ServerType>()
   {
     {"enet", Server.ServerType.ENET},
diff --git a/Ragon.Server/Sources/Room/RagonRoom.cs b/Ragon.Server/Sources/Room/RagonRoom.cs
index 039d438..af65d47 100644
--- a/Ragon.Server/Sources/Room/RagonRoom.cs
+++ b/Ragon.Server/Sources/Room/RagonRoom.cs
@@ -15,6 +15,7 @@
  */
 
 using Ragon.Protocol;
+using Ragon.Server.Entity;
 using Ragon.Server.Plugin;
 using Ragon.Server.Time;
 
diff --git a/Ragon.Server/Sources/Room/RagonRoomPlayer.cs b/Ragon.Server/Sources/Room/RagonRoomPlayer.cs
index e034f2a..5cc2c32 100644
--- a/Ragon.Server/Sources/Room/RagonRoomPlayer.cs
+++ b/Ragon.Server/Sources/Room/RagonRoomPlayer.cs
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+using Ragon.Server.Entity;
 using Ragon.Server.IO;
 
 namespace Ragon.Server.Room;