diff --git a/core/build.gradle b/core/build.gradle
index 9d08b223..3bd87953 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -22,7 +22,7 @@ eclipse.project {
 }
 
 task createFlatBuffers(type: FlatBuffers) {
-    inputDir = file("src/com/riiablo/net/packet")
+    inputDir = file("src/com/riiablo/net/")
     outputDir = file("gen/")
     language = 'java'
 }
diff --git a/core/src/com/riiablo/net/packet/Connection.fbs b/core/src/com/riiablo/net/d2gs/Connection.fbs
similarity index 79%
rename from core/src/com/riiablo/net/packet/Connection.fbs
rename to core/src/com/riiablo/net/d2gs/Connection.fbs
index 88848691..be4b6c4c 100644
--- a/core/src/com/riiablo/net/packet/Connection.fbs
+++ b/core/src/com/riiablo/net/d2gs/Connection.fbs
@@ -1,4 +1,4 @@
-namespace com.riiablo.net.packet;
+namespace com.riiablo.net.packet.d2gs;
 
 table Connection {
   MCPCookie:uint32;
diff --git a/core/src/com/riiablo/net/packet/Packet.fbs b/core/src/com/riiablo/net/d2gs/D2GS.fbs
similarity index 68%
rename from core/src/com/riiablo/net/packet/Packet.fbs
rename to core/src/com/riiablo/net/d2gs/D2GS.fbs
index bc6e290e..59e5132e 100644
--- a/core/src/com/riiablo/net/packet/Packet.fbs
+++ b/core/src/com/riiablo/net/d2gs/D2GS.fbs
@@ -4,9 +4,9 @@ include "RunToLocation.fbs";
 include "RunToEntity.fbs";
 include "Connection.fbs";
 
-namespace com.riiablo.net.packet;
+namespace com.riiablo.net.packet.d2gs;
 
-union PacketData {
+union D2GSData {
   WalkToLocation,
   WalkToEntity,
   RunToLocation,
@@ -14,8 +14,8 @@ union PacketData {
   Connection
 }
 
-table Packet {
-  data:PacketData;
+table D2GS {
+  data:D2GSData;
 }
 
-root_type Packet;
\ No newline at end of file
+root_type D2GS;
\ No newline at end of file
diff --git a/core/src/com/riiablo/net/packet/RunToEntity.fbs b/core/src/com/riiablo/net/d2gs/RunToEntity.fbs
similarity index 55%
rename from core/src/com/riiablo/net/packet/RunToEntity.fbs
rename to core/src/com/riiablo/net/d2gs/RunToEntity.fbs
index 56e47107..e3adbf15 100644
--- a/core/src/com/riiablo/net/packet/RunToEntity.fbs
+++ b/core/src/com/riiablo/net/d2gs/RunToEntity.fbs
@@ -1,4 +1,4 @@
-namespace com.riiablo.net.packet;
+namespace com.riiablo.net.packet.d2gs;
 
 table RunToEntity {
   type:int32;
diff --git a/core/src/com/riiablo/net/packet/RunToLocation.fbs b/core/src/com/riiablo/net/d2gs/RunToLocation.fbs
similarity index 54%
rename from core/src/com/riiablo/net/packet/RunToLocation.fbs
rename to core/src/com/riiablo/net/d2gs/RunToLocation.fbs
index 2d423619..4a0c7d75 100644
--- a/core/src/com/riiablo/net/packet/RunToLocation.fbs
+++ b/core/src/com/riiablo/net/d2gs/RunToLocation.fbs
@@ -1,4 +1,4 @@
-namespace com.riiablo.net.packet;
+namespace com.riiablo.net.packet.d2gs;
 
 table RunToLocation {
   x:int16;
diff --git a/core/src/com/riiablo/net/packet/WalkToEntity.fbs b/core/src/com/riiablo/net/d2gs/WalkToEntity.fbs
similarity index 55%
rename from core/src/com/riiablo/net/packet/WalkToEntity.fbs
rename to core/src/com/riiablo/net/d2gs/WalkToEntity.fbs
index 39751ddc..05f0e463 100644
--- a/core/src/com/riiablo/net/packet/WalkToEntity.fbs
+++ b/core/src/com/riiablo/net/d2gs/WalkToEntity.fbs
@@ -1,4 +1,4 @@
-namespace com.riiablo.net.packet;
+namespace com.riiablo.net.packet.d2gs;
 
 table WalkToEntity {
   type:int32;
diff --git a/core/src/com/riiablo/net/packet/WalkToLocation.fbs b/core/src/com/riiablo/net/d2gs/WalkToLocation.fbs
similarity index 54%
rename from core/src/com/riiablo/net/packet/WalkToLocation.fbs
rename to core/src/com/riiablo/net/d2gs/WalkToLocation.fbs
index 07b29602..adf8a453 100644
--- a/core/src/com/riiablo/net/packet/WalkToLocation.fbs
+++ b/core/src/com/riiablo/net/d2gs/WalkToLocation.fbs
@@ -1,4 +1,4 @@
-namespace com.riiablo.net.packet;
+namespace com.riiablo.net.packet.d2gs;
 
 table WalkToLocation {
   x:int16;