diff --git a/src/main/java/kamkeel/network/packets/client/GuiClosePacket.java b/src/main/java/kamkeel/network/packets/client/gui/GuiClosePacket.java
similarity index 96%
rename from src/main/java/kamkeel/network/packets/client/GuiClosePacket.java
rename to src/main/java/kamkeel/network/packets/client/gui/GuiClosePacket.java
index 1b76f3e49..883fdd29e 100644
--- a/src/main/java/kamkeel/network/packets/client/GuiClosePacket.java
+++ b/src/main/java/kamkeel/network/packets/client/gui/GuiClosePacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.gui;
 
 import io.netty.buffer.ByteBuf;
 import kamkeel.network.AbstractPacket;
diff --git a/src/main/java/kamkeel/network/packets/client/GuiDataPacket.java b/src/main/java/kamkeel/network/packets/client/gui/GuiDataPacket.java
similarity index 97%
rename from src/main/java/kamkeel/network/packets/client/GuiDataPacket.java
rename to src/main/java/kamkeel/network/packets/client/gui/GuiDataPacket.java
index d75690875..c41427987 100644
--- a/src/main/java/kamkeel/network/packets/client/GuiDataPacket.java
+++ b/src/main/java/kamkeel/network/packets/client/gui/GuiDataPacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.gui;
 
 import io.netty.buffer.ByteBuf;
 import kamkeel.network.AbstractPacket;
diff --git a/src/main/java/kamkeel/network/packets/client/GuiErrorPacket.java b/src/main/java/kamkeel/network/packets/client/gui/GuiErrorPacket.java
similarity index 96%
rename from src/main/java/kamkeel/network/packets/client/GuiErrorPacket.java
rename to src/main/java/kamkeel/network/packets/client/gui/GuiErrorPacket.java
index 474584379..d653e88f8 100644
--- a/src/main/java/kamkeel/network/packets/client/GuiErrorPacket.java
+++ b/src/main/java/kamkeel/network/packets/client/gui/GuiErrorPacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.gui;
 
 import io.netty.buffer.ByteBuf;
 import kamkeel.network.AbstractPacket;
diff --git a/src/main/java/kamkeel/network/packets/client/GuiPacket.java b/src/main/java/kamkeel/network/packets/client/gui/GuiPacket.java
similarity index 96%
rename from src/main/java/kamkeel/network/packets/client/GuiPacket.java
rename to src/main/java/kamkeel/network/packets/client/gui/GuiPacket.java
index ece5bbcfa..a86c8a8fe 100644
--- a/src/main/java/kamkeel/network/packets/client/GuiPacket.java
+++ b/src/main/java/kamkeel/network/packets/client/gui/GuiPacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.gui;
 
 import io.netty.buffer.ByteBuf;
 import kamkeel.network.AbstractPacket;
diff --git a/src/main/java/kamkeel/network/packets/client/GuiRedstonePacket.java b/src/main/java/kamkeel/network/packets/client/gui/GuiRedstonePacket.java
similarity index 95%
rename from src/main/java/kamkeel/network/packets/client/GuiRedstonePacket.java
rename to src/main/java/kamkeel/network/packets/client/gui/GuiRedstonePacket.java
index de0c3bd4c..3acf4e559 100644
--- a/src/main/java/kamkeel/network/packets/client/GuiRedstonePacket.java
+++ b/src/main/java/kamkeel/network/packets/client/gui/GuiRedstonePacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.gui;
 
 import io.netty.buffer.ByteBuf;
 import kamkeel.network.AbstractPacket;
diff --git a/src/main/java/kamkeel/network/packets/client/GuiWaypointPacket.java b/src/main/java/kamkeel/network/packets/client/gui/GuiWaypointPacket.java
similarity index 95%
rename from src/main/java/kamkeel/network/packets/client/GuiWaypointPacket.java
rename to src/main/java/kamkeel/network/packets/client/gui/GuiWaypointPacket.java
index 4553e2040..91a4ad0d4 100644
--- a/src/main/java/kamkeel/network/packets/client/GuiWaypointPacket.java
+++ b/src/main/java/kamkeel/network/packets/client/gui/GuiWaypointPacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.gui;
 
 import io.netty.buffer.ByteBuf;
 import kamkeel.network.AbstractPacket;
diff --git a/src/main/java/kamkeel/network/packets/client/IsGuiOpenPacket.java b/src/main/java/kamkeel/network/packets/client/gui/IsGuiOpenPacket.java
similarity index 95%
rename from src/main/java/kamkeel/network/packets/client/IsGuiOpenPacket.java
rename to src/main/java/kamkeel/network/packets/client/gui/IsGuiOpenPacket.java
index 8f44e2602..54f0c905c 100644
--- a/src/main/java/kamkeel/network/packets/client/IsGuiOpenPacket.java
+++ b/src/main/java/kamkeel/network/packets/client/gui/IsGuiOpenPacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.gui;
 
 import io.netty.buffer.ByteBuf;
 import kamkeel.network.AbstractPacket;
diff --git a/src/main/java/kamkeel/network/packets/client/SyncAddPacket.java b/src/main/java/kamkeel/network/packets/client/sync/SyncAddPacket.java
similarity index 96%
rename from src/main/java/kamkeel/network/packets/client/SyncAddPacket.java
rename to src/main/java/kamkeel/network/packets/client/sync/SyncAddPacket.java
index beb107093..6224bb102 100644
--- a/src/main/java/kamkeel/network/packets/client/SyncAddPacket.java
+++ b/src/main/java/kamkeel/network/packets/client/sync/SyncAddPacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.sync;
 
 import io.netty.buffer.ByteBuf;
 import kamkeel.network.AbstractPacket;
diff --git a/src/main/java/kamkeel/network/packets/client/SyncConfigPacket.java b/src/main/java/kamkeel/network/packets/client/sync/SyncConfigPacket.java
similarity index 95%
rename from src/main/java/kamkeel/network/packets/client/SyncConfigPacket.java
rename to src/main/java/kamkeel/network/packets/client/sync/SyncConfigPacket.java
index b621b36bd..eaf3b419a 100644
--- a/src/main/java/kamkeel/network/packets/client/SyncConfigPacket.java
+++ b/src/main/java/kamkeel/network/packets/client/sync/SyncConfigPacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.sync;
 
 import io.netty.buffer.ByteBuf;
 import kamkeel.network.AbstractPacket;
diff --git a/src/main/java/kamkeel/network/packets/client/SyncEndPacket.java b/src/main/java/kamkeel/network/packets/client/sync/SyncEndPacket.java
similarity index 96%
rename from src/main/java/kamkeel/network/packets/client/SyncEndPacket.java
rename to src/main/java/kamkeel/network/packets/client/sync/SyncEndPacket.java
index 6e6f6a27f..bc5a4e26d 100644
--- a/src/main/java/kamkeel/network/packets/client/SyncEndPacket.java
+++ b/src/main/java/kamkeel/network/packets/client/sync/SyncEndPacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.sync;
 
 import io.netty.buffer.ByteBuf;
 import kamkeel.network.AbstractPacket;
diff --git a/src/main/java/kamkeel/network/packets/client/SyncPlayerPacket.java b/src/main/java/kamkeel/network/packets/client/sync/SyncPlayerPacket.java
similarity index 95%
rename from src/main/java/kamkeel/network/packets/client/SyncPlayerPacket.java
rename to src/main/java/kamkeel/network/packets/client/sync/SyncPlayerPacket.java
index e477ad261..372f26e60 100644
--- a/src/main/java/kamkeel/network/packets/client/SyncPlayerPacket.java
+++ b/src/main/java/kamkeel/network/packets/client/sync/SyncPlayerPacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.sync;
 
 import io.netty.buffer.ByteBuf;
 import kamkeel.network.AbstractPacket;
diff --git a/src/main/java/kamkeel/network/packets/client/SyncRecipesAddPacket.java b/src/main/java/kamkeel/network/packets/client/sync/SyncRecipesAddPacket.java
similarity index 97%
rename from src/main/java/kamkeel/network/packets/client/SyncRecipesAddPacket.java
rename to src/main/java/kamkeel/network/packets/client/sync/SyncRecipesAddPacket.java
index 996b1987c..8460dac7f 100644
--- a/src/main/java/kamkeel/network/packets/client/SyncRecipesAddPacket.java
+++ b/src/main/java/kamkeel/network/packets/client/sync/SyncRecipesAddPacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.sync;
 
 import cpw.mods.fml.relauncher.Side;
 import io.netty.buffer.ByteBuf;
diff --git a/src/main/java/kamkeel/network/packets/client/SyncRecipesCarpentryBenchPacket.java b/src/main/java/kamkeel/network/packets/client/sync/SyncRecipesCarpentryBenchPacket.java
similarity index 96%
rename from src/main/java/kamkeel/network/packets/client/SyncRecipesCarpentryBenchPacket.java
rename to src/main/java/kamkeel/network/packets/client/sync/SyncRecipesCarpentryBenchPacket.java
index ef474ef7d..c49a37dc0 100644
--- a/src/main/java/kamkeel/network/packets/client/SyncRecipesCarpentryBenchPacket.java
+++ b/src/main/java/kamkeel/network/packets/client/sync/SyncRecipesCarpentryBenchPacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.sync;
 
 import io.netty.buffer.ByteBuf;
 import kamkeel.network.AbstractPacket;
diff --git a/src/main/java/kamkeel/network/packets/client/SyncRecipesWorkbenchPacket.java b/src/main/java/kamkeel/network/packets/client/sync/SyncRecipesWorkbenchPacket.java
similarity index 95%
rename from src/main/java/kamkeel/network/packets/client/SyncRecipesWorkbenchPacket.java
rename to src/main/java/kamkeel/network/packets/client/sync/SyncRecipesWorkbenchPacket.java
index 46773c030..bb3a4ab79 100644
--- a/src/main/java/kamkeel/network/packets/client/SyncRecipesWorkbenchPacket.java
+++ b/src/main/java/kamkeel/network/packets/client/sync/SyncRecipesWorkbenchPacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.sync;
 
 import io.netty.buffer.ByteBuf;
 import kamkeel.network.AbstractPacket;
diff --git a/src/main/java/kamkeel/network/packets/client/SyncRemovePacket.java b/src/main/java/kamkeel/network/packets/client/sync/SyncRemovePacket.java
similarity index 95%
rename from src/main/java/kamkeel/network/packets/client/SyncRemovePacket.java
rename to src/main/java/kamkeel/network/packets/client/sync/SyncRemovePacket.java
index f4de94de7..adc7c9ae3 100644
--- a/src/main/java/kamkeel/network/packets/client/SyncRemovePacket.java
+++ b/src/main/java/kamkeel/network/packets/client/sync/SyncRemovePacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.sync;
 
 import io.netty.buffer.ByteBuf;
 import kamkeel.network.AbstractPacket;
diff --git a/src/main/java/kamkeel/network/packets/client/SyncUpdatePacket.java b/src/main/java/kamkeel/network/packets/client/sync/SyncUpdatePacket.java
similarity index 96%
rename from src/main/java/kamkeel/network/packets/client/SyncUpdatePacket.java
rename to src/main/java/kamkeel/network/packets/client/sync/SyncUpdatePacket.java
index 3efa0a982..c95ad6357 100644
--- a/src/main/java/kamkeel/network/packets/client/SyncUpdatePacket.java
+++ b/src/main/java/kamkeel/network/packets/client/sync/SyncUpdatePacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.sync;
 
 import io.netty.buffer.ByteBuf;
 import kamkeel.network.AbstractPacket;
diff --git a/src/main/java/kamkeel/network/packets/client/SyncWeaponPacket.java b/src/main/java/kamkeel/network/packets/client/sync/SyncWeaponPacket.java
similarity index 96%
rename from src/main/java/kamkeel/network/packets/client/SyncWeaponPacket.java
rename to src/main/java/kamkeel/network/packets/client/sync/SyncWeaponPacket.java
index 71886c043..59be33b6e 100644
--- a/src/main/java/kamkeel/network/packets/client/SyncWeaponPacket.java
+++ b/src/main/java/kamkeel/network/packets/client/sync/SyncWeaponPacket.java
@@ -1,4 +1,4 @@
-package kamkeel.network.packets.client;
+package kamkeel.network.packets.client.sync;
 
 import io.netty.buffer.ByteBuf;
 import kamkeel.network.AbstractPacket;