diff --git a/Engine.Serializers/YamlDotNet b/Engine.Serializers/YamlDotNet
new file mode 160000
index 0000000..62048d7
--- /dev/null
+++ b/Engine.Serializers/YamlDotNet
@@ -0,0 +1 @@
+Subproject commit 62048d7abe5b233570d59c7d8043c21a4def2cb6
diff --git a/Engine.Systems/Network/Abstract/INetworkCommunicator.cs b/Engine.Systems/Network/Abstract/INetworkCommunicator.cs
index 6ae2cc7..413eae2 100644
--- a/Engine.Systems/Network/Abstract/INetworkCommunicator.cs
+++ b/Engine.Systems/Network/Abstract/INetworkCommunicator.cs
@@ -16,22 +16,3 @@ public interface INetworkCommunicator
     INetworkCommunicator SubscribeToPackets<T>(Event<IConnection, T>.EventHandler callback);
     INetworkCommunicator UnsubscribeFromPackets<T>(Event<IConnection, T>.EventHandler callback);
 }
-
-public interface INetworkCommunicatorClient : INetworkCommunicator
-{
-    INetworkCommunicatorClient Connect(string address, int port, string? password = null);
-
-    INetworkCommunicatorClient SendToServer<T>(T packet, PacketDelivery packetDelivery = PacketDelivery.ReliableInOrder) where T : class, new();
-}
-
-public interface INetworkCommunicatorServer : INetworkCommunicator
-{
-    string Password { get; }
-    int MaxConnectionCount { get; }
-    int Port { get; }
-
-    INetworkCommunicatorServer Start(int port, int maxConnectionCount, string? password = null);
-
-    INetworkCommunicatorServer SendToClient<T>(IConnection connection, T packet, PacketDelivery packetDelivery = PacketDelivery.ReliableInOrder) where T : class, new();
-    INetworkCommunicatorServer SendToAll<T>(T packet, PacketDelivery packetDelivery = PacketDelivery.ReliableInOrder) where T : class, new();
-}
diff --git a/Engine.Systems/Network/Abstract/INetworkCommunicatorClient.cs b/Engine.Systems/Network/Abstract/INetworkCommunicatorClient.cs
new file mode 100644
index 0000000..414287c
--- /dev/null
+++ b/Engine.Systems/Network/Abstract/INetworkCommunicatorClient.cs
@@ -0,0 +1,8 @@
+namespace Engine.Systems.Network;
+
+public interface INetworkCommunicatorClient : INetworkCommunicator
+{
+    INetworkCommunicatorClient Connect(string address, int port, string? password = null);
+
+    INetworkCommunicatorClient SendToServer<T>(T packet, PacketDelivery packetDelivery = PacketDelivery.ReliableInOrder) where T : class, new();
+}
diff --git a/Engine.Systems/Network/Abstract/INetworkCommunicatorServer.cs b/Engine.Systems/Network/Abstract/INetworkCommunicatorServer.cs
new file mode 100644
index 0000000..73175d4
--- /dev/null
+++ b/Engine.Systems/Network/Abstract/INetworkCommunicatorServer.cs
@@ -0,0 +1,13 @@
+namespace Engine.Systems.Network;
+
+public interface INetworkCommunicatorServer : INetworkCommunicator
+{
+    string Password { get; }
+    int MaxConnectionCount { get; }
+    int Port { get; }
+
+    INetworkCommunicatorServer Start(int port, int maxConnectionCount, string? password = null);
+
+    INetworkCommunicatorServer SendToClient<T>(IConnection connection, T packet, PacketDelivery packetDelivery = PacketDelivery.ReliableInOrder) where T : class, new();
+    INetworkCommunicatorServer SendToAll<T>(T packet, PacketDelivery packetDelivery = PacketDelivery.ReliableInOrder) where T : class, new();
+}