diff --git a/core/gen/com/riiablo/net/packet/d2gs/D2GSData.java b/core/gen/com/riiablo/net/packet/d2gs/D2GSData.java
index f26e6695..42917d4d 100644
--- a/core/gen/com/riiablo/net/packet/d2gs/D2GSData.java
+++ b/core/gen/com/riiablo/net/packet/d2gs/D2GSData.java
@@ -10,8 +10,8 @@ public final class D2GSData {
   public static final byte RunToLocation = 3;
   public static final byte RunToEntity = 4;
   public static final byte Connection = 5;
-  public static final byte EntitySync = 6;
-  public static final byte Disconnect = 7;
+  public static final byte Disconnect = 6;
+  public static final byte EntitySync = 7;
   public static final byte GroundToCursor = 8;
   public static final byte CursorToGround = 9;
   public static final byte StoreToCursor = 10;
@@ -24,7 +24,7 @@ public final class D2GSData {
   public static final byte CursorToBelt = 17;
   public static final byte SwapBeltItem = 18;
 
-  public static final String[] names = { "NONE", "WalkToLocation", "WalkToEntity", "RunToLocation", "RunToEntity", "Connection", "EntitySync", "Disconnect", "GroundToCursor", "CursorToGround", "StoreToCursor", "CursorToStore", "SwapStoreItem", "BodyToCursor", "CursorToBody", "SwapBodyItem", "BeltToCursor", "CursorToBelt", "SwapBeltItem", };
+  public static final String[] names = { "NONE", "WalkToLocation", "WalkToEntity", "RunToLocation", "RunToEntity", "Connection", "Disconnect", "EntitySync", "GroundToCursor", "CursorToGround", "StoreToCursor", "CursorToStore", "SwapStoreItem", "BodyToCursor", "CursorToBody", "SwapBodyItem", "BeltToCursor", "CursorToBelt", "SwapBeltItem", };
 
   public static String name(int e) { return names[e]; }
 }
diff --git a/core/src/com/riiablo/net/d2gs/D2GS.fbs b/core/src/com/riiablo/net/d2gs/D2GS.fbs
index 48246de4..8e6d6382 100644
--- a/core/src/com/riiablo/net/d2gs/D2GS.fbs
+++ b/core/src/com/riiablo/net/d2gs/D2GS.fbs
@@ -1,5 +1,4 @@
-include "Connection.fbs";
-include "Disconnect.fbs";
+include "Networking.fbs";
 include "PlayerController.fbs";
 include "Sync.fbs";
 include "ItemManagement.fbs";
@@ -12,8 +11,8 @@ union D2GSData {
   RunToLocation,
   RunToEntity,
   Connection,
-  EntitySync,
   Disconnect,
+  EntitySync,
   GroundToCursor,
   CursorToGround,
   StoreToCursor,
diff --git a/core/src/com/riiablo/net/d2gs/Disconnect.fbs b/core/src/com/riiablo/net/d2gs/Disconnect.fbs
deleted file mode 100644
index 847c9c44..00000000
--- a/core/src/com/riiablo/net/d2gs/Disconnect.fbs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace com.riiablo.net.packet.d2gs;
-
-table Disconnect {
-  // request
-  entityId:int32;
-
-  // response
-}
\ No newline at end of file
diff --git a/core/src/com/riiablo/net/d2gs/Connection.fbs b/core/src/com/riiablo/net/d2gs/Networking.fbs
similarity index 77%
rename from core/src/com/riiablo/net/d2gs/Connection.fbs
rename to core/src/com/riiablo/net/d2gs/Networking.fbs
index 1dcb5081..819be16d 100644
--- a/core/src/com/riiablo/net/d2gs/Connection.fbs
+++ b/core/src/com/riiablo/net/d2gs/Networking.fbs
@@ -11,4 +11,11 @@ table Connection {
 
   // response
   entityId:int32;
+}
+
+table Disconnect {
+  // request
+  entityId:int32;
+
+  // response
 }
\ No newline at end of file