diff --git a/src/de/steamwar/lobby/Fightserver.java b/src/de/steamwar/lobby/Fightserver.java
index c973bb9..2cb4ed0 100644
--- a/src/de/steamwar/lobby/Fightserver.java
+++ b/src/de/steamwar/lobby/Fightserver.java
@@ -20,10 +20,8 @@
 package de.steamwar.lobby;
 
 import com.google.common.io.ByteArrayDataInput;
-import de.steamwar.comms.BungeeReceiver;
-import de.steamwar.comms.PacketIdManager;
-import de.steamwar.comms.packets.FightInfoPacket;
 import de.steamwar.lobby.portal.FightserverPortal;
+import de.steamwar.network.packets.common.FightInfoPacket;
 import org.bukkit.Bukkit;
 
 import java.time.Instant;
@@ -36,17 +34,15 @@ public class Fightserver {
     private static final Map<String, Fightserver> servers = new HashMap<>();
 
     public static void init() {
-        BungeeReceiver.registerHandler(PacketIdManager.FIGHT_INFO, Fightserver::newFightInfo);
         Bukkit.getScheduler().runTaskTimer(LobbySystem.getPlugin(), Fightserver::removeStopped, 20, 20);
     }
 
-    private static void newFightInfo(ByteArrayDataInput in) {
-        FightInfoPacket fightInfo = new FightInfoPacket(in);
-        Fightserver server = servers.get(fightInfo.getServerName());
+    public static void newFightInfo(FightInfoPacket in) {
+        Fightserver server = servers.get(in.getServerName());
         if (server == null) {
-            new Fightserver(fightInfo);
+            new Fightserver(in);
         } else {
-            server.update(fightInfo);
+            server.update(in);
         }
     }
 
diff --git a/src/de/steamwar/lobby/LobbyPacketHandler.java b/src/de/steamwar/lobby/LobbyPacketHandler.java
new file mode 100644
index 0000000..1541b26
--- /dev/null
+++ b/src/de/steamwar/lobby/LobbyPacketHandler.java
@@ -0,0 +1,18 @@
+package de.steamwar.lobby;
+
+import de.steamwar.network.packets.PacketHandler;
+import de.steamwar.network.packets.common.FightInfoPacket;
+
+public class LobbyPacketHandler extends PacketHandler {
+
+    public LobbyPacketHandler() {
+        super();
+        this.register();
+    }
+
+    @Handler
+    public void handleFightserver(FightInfoPacket packet) {
+        Fightserver.newFightInfo(packet);
+    }
+
+}
diff --git a/src/de/steamwar/lobby/LobbySystem.java b/src/de/steamwar/lobby/LobbySystem.java
index 0ec117d..e22339c 100644
--- a/src/de/steamwar/lobby/LobbySystem.java
+++ b/src/de/steamwar/lobby/LobbySystem.java
@@ -68,6 +68,7 @@ public class LobbySystem extends JavaPlugin {
         new AlphaWall(l -> l.getX() < 2977, AlphaWall.REFLECT_X);
         new AlphaWall(l -> l.getZ() > 892, AlphaWall.REFLECT_Z);
         new AlphaWall(l -> l.getZ() < 1794, AlphaWall.REFLECT_Z);
+        new LobbyPacketHandler();
     }
 
     @Override
diff --git a/src/de/steamwar/lobby/WaitingHall.java b/src/de/steamwar/lobby/WaitingHall.java
index 26aa716..ea97117 100644
--- a/src/de/steamwar/lobby/WaitingHall.java
+++ b/src/de/steamwar/lobby/WaitingHall.java
@@ -19,19 +19,20 @@
 
 package de.steamwar.lobby;
 
-import com.google.common.io.ByteArrayDataInput;
-import de.steamwar.comms.BungeeReceiver;
-import de.steamwar.comms.PacketIdManager;
+import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.sql.SteamwarUser;
+import de.steamwar.network.packets.server.StartingServerPacket;
 import org.bukkit.Bukkit;
 import org.bukkit.event.player.PlayerTeleportEvent;
 
-public class WaitingHall {
+public class WaitingHall extends PacketHandler {
     public WaitingHall() {
-        BungeeReceiver.registerHandler(PacketIdManager.STARTING_SERVER, this::serverStarting);
+        super();
+        this.register();
     }
 
-    private void serverStarting(ByteArrayDataInput in) {
-        Bukkit.getPlayer(SteamwarUser.get(in.readInt()).getUUID()).teleport(LobbySystem.config().getWaitingHallSpawn(), PlayerTeleportEvent.TeleportCause.PLUGIN);
+    @Handler
+    private void serverStarting(StartingServerPacket in) {
+        Bukkit.getPlayer(SteamwarUser.get(in.getUser()).getUUID()).teleport(LobbySystem.config().getWaitingHallSpawn(), PlayerTeleportEvent.TeleportCause.PLUGIN);
     }
 }
diff --git a/src/de/steamwar/lobby/listener/PlayerSpawn.java b/src/de/steamwar/lobby/listener/PlayerSpawn.java
index b3e70fe..2a5c058 100644
--- a/src/de/steamwar/lobby/listener/PlayerSpawn.java
+++ b/src/de/steamwar/lobby/listener/PlayerSpawn.java
@@ -19,9 +19,10 @@
 
 package de.steamwar.lobby.listener;
 
-import de.steamwar.comms.packets.ImALobbyPacket;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.util.ItemBuilder;
+import de.steamwar.network.NetworkSender;
+import de.steamwar.network.packets.client.ImALobbyPacket;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
@@ -57,7 +58,7 @@ public class PlayerSpawn extends BasicListener {
         player.setFoodLevel(20);
         giveItems(player);
 
-        Bukkit.getScheduler().runTaskLater(LobbySystem.getPlugin(), () ->  new ImALobbyPacket().send(player), 20);
+        Bukkit.getScheduler().runTaskLater(LobbySystem.getPlugin(), () -> NetworkSender.send(new ImALobbyPacket()), 20);
     }
 
     private void giveItems(Player player) {
diff --git a/src/de/steamwar/lobby/portal/CommandPortal.java b/src/de/steamwar/lobby/portal/CommandPortal.java
index 3dfe6ed..64552dd 100644
--- a/src/de/steamwar/lobby/portal/CommandPortal.java
+++ b/src/de/steamwar/lobby/portal/CommandPortal.java
@@ -19,10 +19,12 @@
 
 package de.steamwar.lobby.portal;
 
-import de.steamwar.comms.packets.ExecuteCommandPacket;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.command.ModifyCommand;
 import de.steamwar.lobby.listener.Portals;
+import de.steamwar.network.NetworkSender;
+import de.steamwar.network.packets.client.ExecuteCommandPacket;
+import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
@@ -82,7 +84,7 @@ public class CommandPortal implements PortalHandler {
 
         if(ModifyCommand.modifying(player))
             player.sendMessage("/" + cmd);
-        new ExecuteCommandPacket(player, cmd.toString()).send(player);
+        NetworkSender.send(new ExecuteCommandPacket(SteamwarUser.get(player).getId(), cmd.toString()));
     }
 
     @Override
diff --git a/src/de/steamwar/lobby/portal/FightserverPortal.java b/src/de/steamwar/lobby/portal/FightserverPortal.java
index ab80531..9ae1c3b 100644
--- a/src/de/steamwar/lobby/portal/FightserverPortal.java
+++ b/src/de/steamwar/lobby/portal/FightserverPortal.java
@@ -19,11 +19,11 @@
 
 package de.steamwar.lobby.portal;
 
-import de.steamwar.comms.packets.FightInfoPacket;
 import de.steamwar.lobby.Fightserver;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.display.Hologram;
 import de.steamwar.lobby.display.NPC;
+import de.steamwar.network.packets.common.FightInfoPacket;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;