From 90114e2e197c0bf1047bfd2978d5e0ef4a6fb553 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 3 Apr 2018 14:55:07 +0000
Subject: [PATCH] Base packets moved to commons network.

---
 .../{util => }/network/BaseRecievePacket.java |   2 +-
 .../commons}/network/BaseSendablePacket.java  |   2 +-
 .../gameserver/LoginServerThread.java         |   2 +-
 .../loginserverpackets/game/AuthRequest.java  |   2 +-
 .../loginserverpackets/game/BlowFishKey.java  |   2 +-
 .../game/ChangeAccessLevel.java               |   2 +-
 .../game/ChangePassword.java                  |   2 +-
 .../game/PlayerAuthRequest.java               |   2 +-
 .../loginserverpackets/game/PlayerInGame.java |   2 +-
 .../loginserverpackets/game/PlayerLogout.java |   2 +-
 .../game/PlayerTracert.java                   |   2 +-
 .../game/ReplyCharacters.java                 |   2 +-
 .../loginserverpackets/game/SendMail.java     |   2 +-
 .../loginserverpackets/game/ServerStatus.java |   2 +-
 .../loginserverpackets/game/TempBan.java      |   2 +-
 .../login/AuthResponse.java                   |   2 +-
 .../login/ChangePasswordResponse.java         |   2 +-
 .../loginserverpackets/login/InitLS.java      |   2 +-
 .../loginserverpackets/login/KickPlayer.java  |   2 +-
 .../login/LoginServerFail.java                |   2 +-
 .../login/PlayerAuthResponse.java             |   2 +-
 .../login/RequestCharacters.java              |   2 +-
 .../loginserver/GameServerThread.java         |   2 +-
 .../network/L2JGameServerPacketHandler.java   |   2 +-
 .../gameserverpackets/BlowFishKey.java        |   2 +-
 .../gameserverpackets/ChangeAccessLevel.java  |   2 +-
 .../gameserverpackets/ChangePassword.java     |   2 +-
 .../gameserverpackets/GameServerAuth.java     |   2 +-
 .../gameserverpackets/PlayerAuthRequest.java  |   2 +-
 .../gameserverpackets/PlayerInGame.java       |   2 +-
 .../gameserverpackets/PlayerLogout.java       |   2 +-
 .../gameserverpackets/PlayerTracert.java      |   2 +-
 .../gameserverpackets/ReplyCharacters.java    |   2 +-
 .../gameserverpackets/RequestTempBan.java     |   2 +-
 .../gameserverpackets/ServerStatus.java       |   2 +-
 .../loginserverpackets/AuthResponse.java      |   2 +-
 .../ChangePasswordResponse.java               |   2 +-
 .../network/loginserverpackets/InitLS.java    |   2 +-
 .../loginserverpackets/KickPlayer.java        |   2 +-
 .../loginserverpackets/LoginServerFail.java   |   2 +-
 .../PlayerAuthResponse.java                   |   2 +-
 .../loginserverpackets/RequestCharacters.java |   2 +-
 .../commons}/network/BaseRecievePacket.java   |   2 +-
 .../commons}/network/BaseSendablePacket.java  |   2 +-
 .../gameserver/LoginServerThread.java         |   2 +-
 .../loginserverpackets/game/AuthRequest.java  |   2 +-
 .../loginserverpackets/game/BlowFishKey.java  |   2 +-
 .../game/ChangeAccessLevel.java               |   2 +-
 .../game/ChangePassword.java                  |   2 +-
 .../game/PlayerAuthRequest.java               |   2 +-
 .../loginserverpackets/game/PlayerInGame.java |   2 +-
 .../loginserverpackets/game/PlayerLogout.java |   2 +-
 .../game/PlayerTracert.java                   |   2 +-
 .../game/ReplyCharacters.java                 |   2 +-
 .../loginserverpackets/game/SendMail.java     |   2 +-
 .../loginserverpackets/game/ServerStatus.java |   2 +-
 .../loginserverpackets/game/TempBan.java      |   2 +-
 .../login/AuthResponse.java                   |   2 +-
 .../login/ChangePasswordResponse.java         |   2 +-
 .../loginserverpackets/login/InitLS.java      |   2 +-
 .../loginserverpackets/login/KickPlayer.java  |   2 +-
 .../login/LoginServerFail.java                |   2 +-
 .../login/PlayerAuthResponse.java             |   2 +-
 .../login/RequestCharacters.java              |   2 +-
 .../loginserver/GameServerThread.java         |   2 +-
 .../network/L2JGameServerPacketHandler.java   |   2 +-
 .../gameserverpackets/BlowFishKey.java        |   2 +-
 .../gameserverpackets/ChangeAccessLevel.java  |   2 +-
 .../gameserverpackets/ChangePassword.java     |   2 +-
 .../gameserverpackets/GameServerAuth.java     |   2 +-
 .../gameserverpackets/PlayerAuthRequest.java  |   2 +-
 .../gameserverpackets/PlayerInGame.java       |   2 +-
 .../gameserverpackets/PlayerLogout.java       |   2 +-
 .../gameserverpackets/PlayerTracert.java      |   2 +-
 .../gameserverpackets/ReplyCharacters.java    |   2 +-
 .../gameserverpackets/RequestTempBan.java     |   2 +-
 .../gameserverpackets/ServerStatus.java       |   2 +-
 .../loginserverpackets/AuthResponse.java      |   2 +-
 .../ChangePasswordResponse.java               |   2 +-
 .../network/loginserverpackets/InitLS.java    |   2 +-
 .../loginserverpackets/KickPlayer.java        |   2 +-
 .../loginserverpackets/LoginServerFail.java   |   2 +-
 .../PlayerAuthResponse.java                   |   2 +-
 .../loginserverpackets/RequestCharacters.java |   2 +-
 .../commons}/network/BaseRecievePacket.java   |   2 +-
 .../commons}/network/BaseSendablePacket.java  |   2 +-
 .../gameserver/LoginServerThread.java         |   2 +-
 .../loginserverpackets/game/AuthRequest.java  |   2 +-
 .../loginserverpackets/game/BlowFishKey.java  |   2 +-
 .../game/ChangeAccessLevel.java               |   2 +-
 .../game/ChangePassword.java                  |   2 +-
 .../game/PlayerAuthRequest.java               |   2 +-
 .../loginserverpackets/game/PlayerInGame.java |   2 +-
 .../loginserverpackets/game/PlayerLogout.java |   2 +-
 .../game/PlayerTracert.java                   |   2 +-
 .../game/ReplyCharacters.java                 |   2 +-
 .../loginserverpackets/game/SendMail.java     |   2 +-
 .../loginserverpackets/game/ServerStatus.java |   2 +-
 .../loginserverpackets/game/TempBan.java      |   2 +-
 .../login/AuthResponse.java                   |   2 +-
 .../login/ChangePasswordResponse.java         |   2 +-
 .../loginserverpackets/login/InitLS.java      |   2 +-
 .../loginserverpackets/login/KickPlayer.java  |   2 +-
 .../login/LoginServerFail.java                |   2 +-
 .../login/PlayerAuthResponse.java             |   2 +-
 .../login/RequestCharacters.java              |   2 +-
 .../loginserver/GameServerThread.java         |   2 +-
 .../network/L2JGameServerPacketHandler.java   |   2 +-
 .../gameserverpackets/BlowFishKey.java        |   2 +-
 .../gameserverpackets/ChangeAccessLevel.java  |   2 +-
 .../gameserverpackets/ChangePassword.java     |   2 +-
 .../gameserverpackets/GameServerAuth.java     |   2 +-
 .../gameserverpackets/PlayerAuthRequest.java  |   2 +-
 .../gameserverpackets/PlayerInGame.java       |   2 +-
 .../gameserverpackets/PlayerLogout.java       |   2 +-
 .../gameserverpackets/PlayerTracert.java      |   2 +-
 .../gameserverpackets/ReplyCharacters.java    |   2 +-
 .../gameserverpackets/RequestTempBan.java     |   2 +-
 .../gameserverpackets/ServerStatus.java       |   2 +-
 .../loginserverpackets/AuthResponse.java      |   2 +-
 .../ChangePasswordResponse.java               |   2 +-
 .../network/loginserverpackets/InitLS.java    |   2 +-
 .../loginserverpackets/KickPlayer.java        |   2 +-
 .../loginserverpackets/LoginServerFail.java   |   2 +-
 .../PlayerAuthResponse.java                   |   2 +-
 .../loginserverpackets/RequestCharacters.java |   2 +-
 .../{util => }/network/BaseRecievePacket.java |   2 +-
 .../commons}/network/BaseSendablePacket.java  |   2 +-
 .../gameserver/LoginServerThread.java         |   2 +-
 .../loginserverpackets/game/AuthRequest.java  |   2 +-
 .../loginserverpackets/game/BlowFishKey.java  |   2 +-
 .../game/ChangeAccessLevel.java               |   2 +-
 .../game/ChangePassword.java                  |   2 +-
 .../game/PlayerAuthRequest.java               |   2 +-
 .../loginserverpackets/game/PlayerInGame.java |   2 +-
 .../loginserverpackets/game/PlayerLogout.java |   2 +-
 .../game/PlayerTracert.java                   |   2 +-
 .../game/ReplyCharacters.java                 |   2 +-
 .../loginserverpackets/game/SendMail.java     |   2 +-
 .../loginserverpackets/game/ServerStatus.java |   2 +-
 .../loginserverpackets/game/TempBan.java      |   2 +-
 .../login/AuthResponse.java                   |   2 +-
 .../login/ChangePasswordResponse.java         |   2 +-
 .../loginserverpackets/login/InitLS.java      |   2 +-
 .../loginserverpackets/login/KickPlayer.java  |   2 +-
 .../login/LoginServerFail.java                |   2 +-
 .../login/PlayerAuthResponse.java             |   2 +-
 .../login/RequestCharacters.java              |   2 +-
 .../loginserver/GameServerThread.java         |   2 +-
 .../network/L2JGameServerPacketHandler.java   |   2 +-
 .../gameserverpackets/BlowFishKey.java        |   2 +-
 .../gameserverpackets/ChangeAccessLevel.java  |   2 +-
 .../gameserverpackets/ChangePassword.java     |   2 +-
 .../gameserverpackets/GameServerAuth.java     |   2 +-
 .../gameserverpackets/PlayerAuthRequest.java  |   2 +-
 .../gameserverpackets/PlayerInGame.java       |   2 +-
 .../gameserverpackets/PlayerLogout.java       |   2 +-
 .../gameserverpackets/PlayerTracert.java      |   2 +-
 .../gameserverpackets/ReplyCharacters.java    |   2 +-
 .../gameserverpackets/RequestTempBan.java     |   2 +-
 .../gameserverpackets/ServerStatus.java       |   2 +-
 .../loginserverpackets/AuthResponse.java      |   2 +-
 .../ChangePasswordResponse.java               |   2 +-
 .../network/loginserverpackets/InitLS.java    |   2 +-
 .../loginserverpackets/KickPlayer.java        |   2 +-
 .../loginserverpackets/LoginServerFail.java   |   2 +-
 .../PlayerAuthResponse.java                   |   2 +-
 .../loginserverpackets/RequestCharacters.java |   2 +-
 .../commons/network/BaseRecievePacket.java    | 107 ++++++++++++++
 .../commons/network/BaseSendablePacket.java   | 137 ++++++++++++++++++
 .../util/network/BaseRecievePacket.java       | 107 --------------
 .../util/network/BaseSendablePacket.java      | 137 ------------------
 .../gameserver/LoginServerThread.java         |   2 +-
 .../loginserverpackets/game/AuthRequest.java  |   2 +-
 .../loginserverpackets/game/BlowFishKey.java  |   2 +-
 .../game/ChangeAccessLevel.java               |   2 +-
 .../game/ChangePassword.java                  |   2 +-
 .../game/PlayerAuthRequest.java               |   2 +-
 .../loginserverpackets/game/PlayerInGame.java |   2 +-
 .../loginserverpackets/game/PlayerLogout.java |   2 +-
 .../game/PlayerTracert.java                   |   2 +-
 .../game/ReplyCharacters.java                 |   2 +-
 .../loginserverpackets/game/SendMail.java     |   2 +-
 .../loginserverpackets/game/ServerStatus.java |   2 +-
 .../loginserverpackets/game/TempBan.java      |   2 +-
 .../login/AuthResponse.java                   |   2 +-
 .../login/ChangePasswordResponse.java         |   2 +-
 .../loginserverpackets/login/InitLS.java      |   2 +-
 .../loginserverpackets/login/KickPlayer.java  |   2 +-
 .../login/LoginServerFail.java                |   2 +-
 .../login/PlayerAuthResponse.java             |   2 +-
 .../login/RequestCharacters.java              |   2 +-
 .../loginserver/GameServerThread.java         |   2 +-
 .../network/L2JGameServerPacketHandler.java   |   2 +-
 .../gameserverpackets/BlowFishKey.java        |   2 +-
 .../gameserverpackets/ChangeAccessLevel.java  |   2 +-
 .../gameserverpackets/ChangePassword.java     |   2 +-
 .../gameserverpackets/GameServerAuth.java     |   2 +-
 .../gameserverpackets/PlayerAuthRequest.java  |   2 +-
 .../gameserverpackets/PlayerInGame.java       |   2 +-
 .../gameserverpackets/PlayerLogout.java       |   2 +-
 .../gameserverpackets/PlayerTracert.java      |   2 +-
 .../gameserverpackets/ReplyCharacters.java    |   2 +-
 .../gameserverpackets/RequestTempBan.java     |   2 +-
 .../gameserverpackets/ServerStatus.java       |   2 +-
 .../loginserverpackets/AuthResponse.java      |   2 +-
 .../ChangePasswordResponse.java               |   2 +-
 .../network/loginserverpackets/InitLS.java    |   2 +-
 .../loginserverpackets/KickPlayer.java        |   2 +-
 .../loginserverpackets/LoginServerFail.java   |   2 +-
 .../PlayerAuthResponse.java                   |   2 +-
 .../loginserverpackets/RequestCharacters.java |   2 +-
 .../commons/network/BaseRecievePacket.java    | 107 ++++++++++++++
 .../commons/network/BaseSendablePacket.java   | 137 ++++++++++++++++++
 .../util/network/BaseRecievePacket.java       | 107 --------------
 .../util/network/BaseSendablePacket.java      | 137 ------------------
 .../gameserver/LoginServerThread.java         |   2 +-
 .../loginserverpackets/game/AuthRequest.java  |   2 +-
 .../loginserverpackets/game/BlowFishKey.java  |   2 +-
 .../game/ChangeAccessLevel.java               |   2 +-
 .../game/ChangePassword.java                  |   2 +-
 .../game/PlayerAuthRequest.java               |   2 +-
 .../loginserverpackets/game/PlayerInGame.java |   2 +-
 .../loginserverpackets/game/PlayerLogout.java |   2 +-
 .../game/PlayerTracert.java                   |   2 +-
 .../game/ReplyCharacters.java                 |   2 +-
 .../loginserverpackets/game/SendMail.java     |   2 +-
 .../loginserverpackets/game/ServerStatus.java |   2 +-
 .../loginserverpackets/game/TempBan.java      |   2 +-
 .../login/AuthResponse.java                   |   2 +-
 .../login/ChangePasswordResponse.java         |   2 +-
 .../loginserverpackets/login/InitLS.java      |   2 +-
 .../loginserverpackets/login/KickPlayer.java  |   2 +-
 .../login/LoginServerFail.java                |   2 +-
 .../login/PlayerAuthResponse.java             |   2 +-
 .../login/RequestCharacters.java              |   2 +-
 .../loginserver/GameServerThread.java         |   2 +-
 .../network/L2JGameServerPacketHandler.java   |   2 +-
 .../gameserverpackets/BlowFishKey.java        |   2 +-
 .../gameserverpackets/ChangeAccessLevel.java  |   2 +-
 .../gameserverpackets/ChangePassword.java     |   2 +-
 .../gameserverpackets/GameServerAuth.java     |   2 +-
 .../gameserverpackets/PlayerAuthRequest.java  |   2 +-
 .../gameserverpackets/PlayerInGame.java       |   2 +-
 .../gameserverpackets/PlayerLogout.java       |   2 +-
 .../gameserverpackets/PlayerTracert.java      |   2 +-
 .../gameserverpackets/ReplyCharacters.java    |   2 +-
 .../gameserverpackets/RequestTempBan.java     |   2 +-
 .../gameserverpackets/ServerStatus.java       |   2 +-
 .../loginserverpackets/AuthResponse.java      |   2 +-
 .../ChangePasswordResponse.java               |   2 +-
 .../network/loginserverpackets/InitLS.java    |   2 +-
 .../loginserverpackets/KickPlayer.java        |   2 +-
 .../loginserverpackets/LoginServerFail.java   |   2 +-
 .../PlayerAuthResponse.java                   |   2 +-
 .../loginserverpackets/RequestCharacters.java |   2 +-
 256 files changed, 736 insertions(+), 736 deletions(-)
 rename L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/{util => }/network/BaseRecievePacket.java (98%)
 rename {L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util => L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons}/network/BaseSendablePacket.java (98%)
 rename {L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util => L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons}/network/BaseRecievePacket.java (98%)
 rename {L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util => L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons}/network/BaseSendablePacket.java (98%)
 rename {L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util => L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons}/network/BaseRecievePacket.java (98%)
 rename {L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util => L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons}/network/BaseSendablePacket.java (98%)
 rename L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/{util => }/network/BaseRecievePacket.java (98%)
 rename {L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util => L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons}/network/BaseSendablePacket.java (98%)
 create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/BaseRecievePacket.java
 create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/BaseSendablePacket.java
 delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java
 delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java
 create mode 100644 L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/network/BaseRecievePacket.java
 create mode 100644 L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/network/BaseSendablePacket.java
 delete mode 100644 L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java
 delete mode 100644 L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/BaseRecievePacket.java
similarity index 98%
rename from L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java
rename to L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/BaseRecievePacket.java
index 9039a5677d..b8e2b08f14 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/BaseRecievePacket.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.commons.util.network;
+package com.l2jmobius.commons.network;
 
 import java.util.logging.Logger;
 
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/BaseSendablePacket.java
similarity index 98%
rename from L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java
rename to L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/BaseSendablePacket.java
index d3f09c47eb..894ea357b0 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/network/BaseSendablePacket.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.commons.util.network;
+package com.l2jmobius.commons.network;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/LoginServerThread.java
index 67a2386a5a..0eb637d9fd 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/LoginServerThread.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/LoginServerThread.java
@@ -43,9 +43,9 @@ import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.ConnectionState;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
index 6a3683658c..8681078d71 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 public class AuthRequest extends BaseSendablePacket
 {
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
index 17a4b21701..eb24a578fb 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
@@ -22,7 +22,7 @@ import java.util.logging.Logger;
 
 import javax.crypto.Cipher;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
index 76728c8c12..c7b1c61819 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
index 576d415725..aab5eda501 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
index aabb5c23fc..e728a28ea2 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.gameserver.LoginServerThread.SessionKey;
 
 /**
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
index 8de56e1a2c..5d9dadc279 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
index 9a7d0394da..4a6e7fe43a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
index c8af49a1b9..4fbf2b79c6 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
index 101dda1825..69264263b4 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO Thanks to mochitto
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
index 7d89a3c7f8..020bfbf98c 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
index 795a844106..947ac80751 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.ArrayList;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
index 286e727d10..c89239c35a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
index efc26b13af..113caaea70 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
index 1e98e329b2..6945db648c 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
index 2db98c635f..d937c4762e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class InitLS extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
index 3617c7a17a..fe2c0b2d88 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class KickPlayer extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
index 443bbd916e..f50e7a95e6 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class LoginServerFail extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
index 2d6e5fcaee..a87742fab7 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
index 0954e5bba2..d890f4b300 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author mrTJO Thanks to mochitto
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerThread.java
index 10188d5589..767e0b2326 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/GameServerThread.java
@@ -27,9 +27,9 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
 import com.l2jmobius.commons.util.crypt.ScrambledKeyPair;
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
index f32dee4790..83ad61827b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.network.gameserverpackets.BlowFishKey;
 import com.l2jmobius.loginserver.network.gameserverpackets.ChangeAccessLevel;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
index 9be997f496..6abfe18518 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
@@ -22,8 +22,8 @@ import java.util.logging.Logger;
 
 import javax.crypto.Cipher;
 
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState;
 
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
index ea221f4fce..03ff8df8d3 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
index f5ceee8f92..d4c10be532 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
@@ -25,7 +25,7 @@ import java.util.Collection;
 import java.util.logging.Logger;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
index 4d8945a63d..2154becbb5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
index 3ce8993621..f798b01ce8 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 import com.l2jmobius.loginserver.SessionKey;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
index 420e245412..8edc01dd59 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 
 /**
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
index 51f1c8a96e..194d82d565 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 
 /**
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
index 341c0a3a8c..69c263628b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.LoginController;
 
 /**
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
index 2ad47c7b19..f142853d21 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
index 13519ee8a1..1a76467686 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
@@ -23,7 +23,7 @@ import java.sql.SQLException;
 import java.util.logging.Logger;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.LoginController;
 
 /**
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
index f93bac51ac..6c7aed04d5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
index 0f7550db51..04211e4ec0 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 
 /**
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
index 2f9dbb7166..8a3a41f83b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author Nik
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
index 2f603f724a..f69027308b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.L2LoginServer;
 
 /**
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
index d7ab8c92bd..0162dc3fca 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
index 5f6ca8bedb..93ce70cdea 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
index 1c03bfb762..1c8aaaabae 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
index 82680dc00d..fe1afd4511 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/BaseRecievePacket.java
similarity index 98%
rename from L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java
rename to L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/BaseRecievePacket.java
index 9039a5677d..b8e2b08f14 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/BaseRecievePacket.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.commons.util.network;
+package com.l2jmobius.commons.network;
 
 import java.util.logging.Logger;
 
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/BaseSendablePacket.java
similarity index 98%
rename from L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java
rename to L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/BaseSendablePacket.java
index d3f09c47eb..894ea357b0 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/network/BaseSendablePacket.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.commons.util.network;
+package com.l2jmobius.commons.network;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/LoginServerThread.java
index 67a2386a5a..0eb637d9fd 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/LoginServerThread.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/LoginServerThread.java
@@ -43,9 +43,9 @@ import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.ConnectionState;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
index 6a3683658c..8681078d71 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 public class AuthRequest extends BaseSendablePacket
 {
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
index 17a4b21701..eb24a578fb 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
@@ -22,7 +22,7 @@ import java.util.logging.Logger;
 
 import javax.crypto.Cipher;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
index 76728c8c12..c7b1c61819 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
index 576d415725..aab5eda501 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
index aabb5c23fc..e728a28ea2 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.gameserver.LoginServerThread.SessionKey;
 
 /**
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
index 8de56e1a2c..5d9dadc279 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
index 9a7d0394da..4a6e7fe43a 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
index c8af49a1b9..4fbf2b79c6 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
index 101dda1825..69264263b4 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO Thanks to mochitto
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
index 7d89a3c7f8..020bfbf98c 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
index 795a844106..947ac80751 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.ArrayList;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
index 286e727d10..c89239c35a 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
index efc26b13af..113caaea70 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
index 1e98e329b2..6945db648c 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
index 2db98c635f..d937c4762e 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class InitLS extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
index 3617c7a17a..fe2c0b2d88 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class KickPlayer extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
index 443bbd916e..f50e7a95e6 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class LoginServerFail extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
index 2d6e5fcaee..a87742fab7 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
index 0954e5bba2..d890f4b300 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author mrTJO Thanks to mochitto
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerThread.java
index 10188d5589..767e0b2326 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/GameServerThread.java
@@ -27,9 +27,9 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
 import com.l2jmobius.commons.util.crypt.ScrambledKeyPair;
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
index f32dee4790..83ad61827b 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.network.gameserverpackets.BlowFishKey;
 import com.l2jmobius.loginserver.network.gameserverpackets.ChangeAccessLevel;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
index 9be997f496..6abfe18518 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
@@ -22,8 +22,8 @@ import java.util.logging.Logger;
 
 import javax.crypto.Cipher;
 
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState;
 
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
index ea221f4fce..03ff8df8d3 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
index f5ceee8f92..d4c10be532 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
@@ -25,7 +25,7 @@ import java.util.Collection;
 import java.util.logging.Logger;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
index 4d8945a63d..2154becbb5 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
index 3ce8993621..f798b01ce8 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 import com.l2jmobius.loginserver.SessionKey;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
index 420e245412..8edc01dd59 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 
 /**
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
index 51f1c8a96e..194d82d565 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 
 /**
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
index 341c0a3a8c..69c263628b 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.LoginController;
 
 /**
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
index 2ad47c7b19..f142853d21 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
index 13519ee8a1..1a76467686 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
@@ -23,7 +23,7 @@ import java.sql.SQLException;
 import java.util.logging.Logger;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.LoginController;
 
 /**
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
index f93bac51ac..6c7aed04d5 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
index 0f7550db51..04211e4ec0 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 
 /**
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
index 2f9dbb7166..8a3a41f83b 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author Nik
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
index 2f603f724a..f69027308b 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.L2LoginServer;
 
 /**
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
index d7ab8c92bd..0162dc3fca 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
index 5f6ca8bedb..93ce70cdea 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
index 1c03bfb762..1c8aaaabae 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
index 82680dc00d..fe1afd4511 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/BaseRecievePacket.java
similarity index 98%
rename from L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java
rename to L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/BaseRecievePacket.java
index 9039a5677d..b8e2b08f14 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/BaseRecievePacket.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.commons.util.network;
+package com.l2jmobius.commons.network;
 
 import java.util.logging.Logger;
 
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/BaseSendablePacket.java
similarity index 98%
rename from L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java
rename to L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/BaseSendablePacket.java
index d3f09c47eb..894ea357b0 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/network/BaseSendablePacket.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.commons.util.network;
+package com.l2jmobius.commons.network;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/LoginServerThread.java
index 694dc6dc8d..2e7fb8f49b 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/LoginServerThread.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/LoginServerThread.java
@@ -43,9 +43,9 @@ import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.ConnectionState;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
index 6a3683658c..8681078d71 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 public class AuthRequest extends BaseSendablePacket
 {
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
index 17a4b21701..eb24a578fb 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
@@ -22,7 +22,7 @@ import java.util.logging.Logger;
 
 import javax.crypto.Cipher;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
index 76728c8c12..c7b1c61819 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
index 576d415725..aab5eda501 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
index aabb5c23fc..e728a28ea2 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.gameserver.LoginServerThread.SessionKey;
 
 /**
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
index 8de56e1a2c..5d9dadc279 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
index 9a7d0394da..4a6e7fe43a 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
index c8af49a1b9..4fbf2b79c6 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
index 101dda1825..69264263b4 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO Thanks to mochitto
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
index 7d89a3c7f8..020bfbf98c 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
index 795a844106..947ac80751 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.ArrayList;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
index 286e727d10..c89239c35a 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
index efc26b13af..113caaea70 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
index 1e98e329b2..6945db648c 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
index 2db98c635f..d937c4762e 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class InitLS extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
index 3617c7a17a..fe2c0b2d88 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class KickPlayer extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
index 443bbd916e..f50e7a95e6 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class LoginServerFail extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
index 2d6e5fcaee..a87742fab7 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
index 0954e5bba2..d890f4b300 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author mrTJO Thanks to mochitto
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerThread.java
index 10188d5589..767e0b2326 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/GameServerThread.java
@@ -27,9 +27,9 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
 import com.l2jmobius.commons.util.crypt.ScrambledKeyPair;
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
index f32dee4790..83ad61827b 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.network.gameserverpackets.BlowFishKey;
 import com.l2jmobius.loginserver.network.gameserverpackets.ChangeAccessLevel;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
index 9be997f496..6abfe18518 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
@@ -22,8 +22,8 @@ import java.util.logging.Logger;
 
 import javax.crypto.Cipher;
 
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState;
 
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
index ea221f4fce..03ff8df8d3 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
index f5ceee8f92..d4c10be532 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
@@ -25,7 +25,7 @@ import java.util.Collection;
 import java.util.logging.Logger;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
index 4d8945a63d..2154becbb5 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
index 3ce8993621..f798b01ce8 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 import com.l2jmobius.loginserver.SessionKey;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
index 420e245412..8edc01dd59 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 
 /**
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
index 51f1c8a96e..194d82d565 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 
 /**
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
index 341c0a3a8c..69c263628b 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.LoginController;
 
 /**
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
index 2ad47c7b19..f142853d21 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
index 13519ee8a1..1a76467686 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
@@ -23,7 +23,7 @@ import java.sql.SQLException;
 import java.util.logging.Logger;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.LoginController;
 
 /**
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
index f93bac51ac..6c7aed04d5 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
index 0f7550db51..04211e4ec0 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 
 /**
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
index 2f9dbb7166..8a3a41f83b 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author Nik
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
index 2f603f724a..f69027308b 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.L2LoginServer;
 
 /**
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
index d7ab8c92bd..0162dc3fca 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
index 5f6ca8bedb..93ce70cdea 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
index 1c03bfb762..1c8aaaabae 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
index 82680dc00d..fe1afd4511 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/BaseRecievePacket.java
similarity index 98%
rename from L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java
rename to L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/BaseRecievePacket.java
index 9039a5677d..b8e2b08f14 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/BaseRecievePacket.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.commons.util.network;
+package com.l2jmobius.commons.network;
 
 import java.util.logging.Logger;
 
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/BaseSendablePacket.java
similarity index 98%
rename from L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java
rename to L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/BaseSendablePacket.java
index d3f09c47eb..894ea357b0 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/network/BaseSendablePacket.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.commons.util.network;
+package com.l2jmobius.commons.network;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/LoginServerThread.java
index 694dc6dc8d..2e7fb8f49b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/LoginServerThread.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/LoginServerThread.java
@@ -43,9 +43,9 @@ import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.ConnectionState;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
index 6a3683658c..8681078d71 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 public class AuthRequest extends BaseSendablePacket
 {
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
index 17a4b21701..eb24a578fb 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
@@ -22,7 +22,7 @@ import java.util.logging.Logger;
 
 import javax.crypto.Cipher;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
index 76728c8c12..c7b1c61819 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
index 576d415725..aab5eda501 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
index aabb5c23fc..e728a28ea2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.gameserver.LoginServerThread.SessionKey;
 
 /**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
index 8de56e1a2c..5d9dadc279 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
index 9a7d0394da..4a6e7fe43a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
index c8af49a1b9..4fbf2b79c6 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
index 101dda1825..69264263b4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO Thanks to mochitto
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
index 7d89a3c7f8..020bfbf98c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
index 795a844106..947ac80751 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.ArrayList;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
index 286e727d10..c89239c35a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
index efc26b13af..113caaea70 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
index 1e98e329b2..6945db648c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
index 2db98c635f..d937c4762e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class InitLS extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
index 3617c7a17a..fe2c0b2d88 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class KickPlayer extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
index 443bbd916e..f50e7a95e6 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class LoginServerFail extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
index 2d6e5fcaee..a87742fab7 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
index 0954e5bba2..d890f4b300 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author mrTJO Thanks to mochitto
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerThread.java
index 10188d5589..767e0b2326 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/GameServerThread.java
@@ -27,9 +27,9 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
 import com.l2jmobius.commons.util.crypt.ScrambledKeyPair;
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
index f32dee4790..83ad61827b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.network.gameserverpackets.BlowFishKey;
 import com.l2jmobius.loginserver.network.gameserverpackets.ChangeAccessLevel;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
index 9be997f496..6abfe18518 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
@@ -22,8 +22,8 @@ import java.util.logging.Logger;
 
 import javax.crypto.Cipher;
 
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState;
 
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
index ea221f4fce..03ff8df8d3 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
index f5ceee8f92..d4c10be532 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
@@ -25,7 +25,7 @@ import java.util.Collection;
 import java.util.logging.Logger;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
index 4d8945a63d..2154becbb5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
index 3ce8993621..f798b01ce8 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 import com.l2jmobius.loginserver.SessionKey;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
index 420e245412..8edc01dd59 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 
 /**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
index 51f1c8a96e..194d82d565 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 
 /**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
index 341c0a3a8c..69c263628b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.LoginController;
 
 /**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
index 2ad47c7b19..f142853d21 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
index 13519ee8a1..1a76467686 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
@@ -23,7 +23,7 @@ import java.sql.SQLException;
 import java.util.logging.Logger;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.LoginController;
 
 /**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
index f93bac51ac..6c7aed04d5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
index 0f7550db51..04211e4ec0 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 
 /**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
index 2f9dbb7166..8a3a41f83b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author Nik
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
index 2f603f724a..f69027308b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.L2LoginServer;
 
 /**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
index d7ab8c92bd..0162dc3fca 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
index 5f6ca8bedb..93ce70cdea 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
index 1c03bfb762..1c8aaaabae 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
index 82680dc00d..fe1afd4511 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/BaseRecievePacket.java
new file mode 100644
index 0000000000..b8e2b08f14
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/BaseRecievePacket.java
@@ -0,0 +1,107 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.commons.network;
+
+import java.util.logging.Logger;
+
+/**
+ * This class ...
+ * @version $Revision: 1.2.4.1 $ $Date: 2005/03/27 15:30:12 $
+ */
+public abstract class BaseRecievePacket
+{
+	private static final Logger _log = Logger.getLogger(BaseRecievePacket.class.getName());
+	
+	private final byte[] _decrypt;
+	private int _off;
+	
+	public BaseRecievePacket(byte[] decrypt)
+	{
+		_decrypt = decrypt;
+		_off = 1; // skip packet type id
+	}
+	
+	public int readD()
+	{
+		int result = _decrypt[_off++] & 0xff;
+		result |= (_decrypt[_off++] << 8) & 0xff00;
+		result |= (_decrypt[_off++] << 0x10) & 0xff0000;
+		result |= (_decrypt[_off++] << 0x18) & 0xff000000;
+		return result;
+	}
+	
+	public int readC()
+	{
+		return _decrypt[_off++] & 0xff;
+	}
+	
+	public int readH()
+	{
+		return (_decrypt[_off++] & 0xff) | ((_decrypt[_off++] << 8) & 0xff00);
+	}
+	
+	public double readF()
+	{
+		long result = _decrypt[_off++] & 0xff;
+		result |= (_decrypt[_off++] & 0xffL) << 8L;
+		result |= (_decrypt[_off++] & 0xffL) << 16L;
+		result |= (_decrypt[_off++] & 0xffL) << 24L;
+		result |= (_decrypt[_off++] & 0xffL) << 32L;
+		result |= (_decrypt[_off++] & 0xffL) << 40L;
+		result |= (_decrypt[_off++] & 0xffL) << 48L;
+		result |= (_decrypt[_off++] & 0xffL) << 56L;
+		return Double.longBitsToDouble(result);
+	}
+	
+	public String readS()
+	{
+		String result = null;
+		try
+		{
+			result = new String(_decrypt, _off, _decrypt.length - _off, "UTF-16LE");
+			result = result.substring(0, result.indexOf(0x00));
+			_off += (result.length() * 2) + 2;
+		}
+		catch (Exception e)
+		{
+			_log.warning(getClass().getSimpleName() + ": " + e.getMessage());
+		}
+		
+		return result;
+	}
+	
+	public final byte[] readB(int length)
+	{
+		final byte[] result = new byte[length];
+		System.arraycopy(_decrypt, _off, result, 0, length);
+		_off += length;
+		return result;
+	}
+	
+	public long readQ()
+	{
+		long result = _decrypt[_off++] & 0xff;
+		result |= (_decrypt[_off++] & 0xffL) << 8L;
+		result |= (_decrypt[_off++] & 0xffL) << 16L;
+		result |= (_decrypt[_off++] & 0xffL) << 24L;
+		result |= (_decrypt[_off++] & 0xffL) << 32L;
+		result |= (_decrypt[_off++] & 0xffL) << 40L;
+		result |= (_decrypt[_off++] & 0xffL) << 48L;
+		result |= (_decrypt[_off++] & 0xffL) << 56L;
+		return result;
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/BaseSendablePacket.java
new file mode 100644
index 0000000000..894ea357b0
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/network/BaseSendablePacket.java
@@ -0,0 +1,137 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.commons.network;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.logging.Logger;
+
+/**
+ * This class ...
+ * @version $Revision: 1.2.4.1 $ $Date: 2005/03/27 15:30:11 $
+ */
+public abstract class BaseSendablePacket
+{
+	private static final Logger _log = Logger.getLogger(BaseSendablePacket.class.getName());
+	
+	private final ByteArrayOutputStream _bao;
+	
+	protected BaseSendablePacket()
+	{
+		_bao = new ByteArrayOutputStream();
+	}
+	
+	protected void writeD(int value)
+	{
+		_bao.write(value & 0xff);
+		_bao.write((value >> 8) & 0xff);
+		_bao.write((value >> 16) & 0xff);
+		_bao.write((value >> 24) & 0xff);
+	}
+	
+	protected void writeH(int value)
+	{
+		_bao.write(value & 0xff);
+		_bao.write((value >> 8) & 0xff);
+	}
+	
+	protected void writeC(int value)
+	{
+		_bao.write(value & 0xff);
+	}
+	
+	protected void writeF(double org)
+	{
+		final long value = Double.doubleToRawLongBits(org);
+		_bao.write((int) (value & 0xff));
+		_bao.write((int) ((value >> 8) & 0xff));
+		_bao.write((int) ((value >> 16) & 0xff));
+		_bao.write((int) ((value >> 24) & 0xff));
+		_bao.write((int) ((value >> 32) & 0xff));
+		_bao.write((int) ((value >> 40) & 0xff));
+		_bao.write((int) ((value >> 48) & 0xff));
+		_bao.write((int) ((value >> 56) & 0xff));
+	}
+	
+	protected void writeS(String text)
+	{
+		try
+		{
+			if (text != null)
+			{
+				_bao.write(text.getBytes("UTF-16LE"));
+			}
+		}
+		catch (Exception e)
+		{
+			_log.warning(getClass().getSimpleName() + ": " + e.getMessage());
+		}
+		
+		_bao.write(0);
+		_bao.write(0);
+	}
+	
+	protected void writeB(byte[] array)
+	{
+		try
+		{
+			_bao.write(array);
+		}
+		catch (IOException e)
+		{
+			_log.warning(getClass().getSimpleName() + ": " + e.getMessage());
+		}
+	}
+	
+	protected void writeQ(long value)
+	{
+		_bao.write((int) (value & 0xff));
+		_bao.write((int) ((value >> 8) & 0xff));
+		_bao.write((int) ((value >> 16) & 0xff));
+		_bao.write((int) ((value >> 24) & 0xff));
+		_bao.write((int) ((value >> 32) & 0xff));
+		_bao.write((int) ((value >> 40) & 0xff));
+		_bao.write((int) ((value >> 48) & 0xff));
+		_bao.write((int) ((value >> 56) & 0xff));
+	}
+	
+	public int getLength()
+	{
+		return _bao.size() + 2;
+	}
+	
+	public byte[] getBytes()
+	{
+		// if (this instanceof Init)
+		// writeD(0x00); // reserve for XOR initial key
+		
+		writeD(0x00); // reserve for checksum
+		
+		final int padding = _bao.size() % 8;
+		if (padding != 0)
+		{
+			for (int i = padding; i < 8; i++)
+			{
+				writeC(0x00);
+			}
+		}
+		
+		return _bao.toByteArray();
+	}
+	
+	public abstract byte[] getContent() throws IOException;
+}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java
deleted file mode 100644
index 9039a5677d..0000000000
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.commons.util.network;
-
-import java.util.logging.Logger;
-
-/**
- * This class ...
- * @version $Revision: 1.2.4.1 $ $Date: 2005/03/27 15:30:12 $
- */
-public abstract class BaseRecievePacket
-{
-	private static final Logger _log = Logger.getLogger(BaseRecievePacket.class.getName());
-	
-	private final byte[] _decrypt;
-	private int _off;
-	
-	public BaseRecievePacket(byte[] decrypt)
-	{
-		_decrypt = decrypt;
-		_off = 1; // skip packet type id
-	}
-	
-	public int readD()
-	{
-		int result = _decrypt[_off++] & 0xff;
-		result |= (_decrypt[_off++] << 8) & 0xff00;
-		result |= (_decrypt[_off++] << 0x10) & 0xff0000;
-		result |= (_decrypt[_off++] << 0x18) & 0xff000000;
-		return result;
-	}
-	
-	public int readC()
-	{
-		return _decrypt[_off++] & 0xff;
-	}
-	
-	public int readH()
-	{
-		return (_decrypt[_off++] & 0xff) | ((_decrypt[_off++] << 8) & 0xff00);
-	}
-	
-	public double readF()
-	{
-		long result = _decrypt[_off++] & 0xff;
-		result |= (_decrypt[_off++] & 0xffL) << 8L;
-		result |= (_decrypt[_off++] & 0xffL) << 16L;
-		result |= (_decrypt[_off++] & 0xffL) << 24L;
-		result |= (_decrypt[_off++] & 0xffL) << 32L;
-		result |= (_decrypt[_off++] & 0xffL) << 40L;
-		result |= (_decrypt[_off++] & 0xffL) << 48L;
-		result |= (_decrypt[_off++] & 0xffL) << 56L;
-		return Double.longBitsToDouble(result);
-	}
-	
-	public String readS()
-	{
-		String result = null;
-		try
-		{
-			result = new String(_decrypt, _off, _decrypt.length - _off, "UTF-16LE");
-			result = result.substring(0, result.indexOf(0x00));
-			_off += (result.length() * 2) + 2;
-		}
-		catch (Exception e)
-		{
-			_log.warning(getClass().getSimpleName() + ": " + e.getMessage());
-		}
-		
-		return result;
-	}
-	
-	public final byte[] readB(int length)
-	{
-		final byte[] result = new byte[length];
-		System.arraycopy(_decrypt, _off, result, 0, length);
-		_off += length;
-		return result;
-	}
-	
-	public long readQ()
-	{
-		long result = _decrypt[_off++] & 0xff;
-		result |= (_decrypt[_off++] & 0xffL) << 8L;
-		result |= (_decrypt[_off++] & 0xffL) << 16L;
-		result |= (_decrypt[_off++] & 0xffL) << 24L;
-		result |= (_decrypt[_off++] & 0xffL) << 32L;
-		result |= (_decrypt[_off++] & 0xffL) << 40L;
-		result |= (_decrypt[_off++] & 0xffL) << 48L;
-		result |= (_decrypt[_off++] & 0xffL) << 56L;
-		return result;
-	}
-}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java
deleted file mode 100644
index d3f09c47eb..0000000000
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.commons.util.network;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.logging.Logger;
-
-/**
- * This class ...
- * @version $Revision: 1.2.4.1 $ $Date: 2005/03/27 15:30:11 $
- */
-public abstract class BaseSendablePacket
-{
-	private static final Logger _log = Logger.getLogger(BaseSendablePacket.class.getName());
-	
-	private final ByteArrayOutputStream _bao;
-	
-	protected BaseSendablePacket()
-	{
-		_bao = new ByteArrayOutputStream();
-	}
-	
-	protected void writeD(int value)
-	{
-		_bao.write(value & 0xff);
-		_bao.write((value >> 8) & 0xff);
-		_bao.write((value >> 16) & 0xff);
-		_bao.write((value >> 24) & 0xff);
-	}
-	
-	protected void writeH(int value)
-	{
-		_bao.write(value & 0xff);
-		_bao.write((value >> 8) & 0xff);
-	}
-	
-	protected void writeC(int value)
-	{
-		_bao.write(value & 0xff);
-	}
-	
-	protected void writeF(double org)
-	{
-		final long value = Double.doubleToRawLongBits(org);
-		_bao.write((int) (value & 0xff));
-		_bao.write((int) ((value >> 8) & 0xff));
-		_bao.write((int) ((value >> 16) & 0xff));
-		_bao.write((int) ((value >> 24) & 0xff));
-		_bao.write((int) ((value >> 32) & 0xff));
-		_bao.write((int) ((value >> 40) & 0xff));
-		_bao.write((int) ((value >> 48) & 0xff));
-		_bao.write((int) ((value >> 56) & 0xff));
-	}
-	
-	protected void writeS(String text)
-	{
-		try
-		{
-			if (text != null)
-			{
-				_bao.write(text.getBytes("UTF-16LE"));
-			}
-		}
-		catch (Exception e)
-		{
-			_log.warning(getClass().getSimpleName() + ": " + e.getMessage());
-		}
-		
-		_bao.write(0);
-		_bao.write(0);
-	}
-	
-	protected void writeB(byte[] array)
-	{
-		try
-		{
-			_bao.write(array);
-		}
-		catch (IOException e)
-		{
-			_log.warning(getClass().getSimpleName() + ": " + e.getMessage());
-		}
-	}
-	
-	protected void writeQ(long value)
-	{
-		_bao.write((int) (value & 0xff));
-		_bao.write((int) ((value >> 8) & 0xff));
-		_bao.write((int) ((value >> 16) & 0xff));
-		_bao.write((int) ((value >> 24) & 0xff));
-		_bao.write((int) ((value >> 32) & 0xff));
-		_bao.write((int) ((value >> 40) & 0xff));
-		_bao.write((int) ((value >> 48) & 0xff));
-		_bao.write((int) ((value >> 56) & 0xff));
-	}
-	
-	public int getLength()
-	{
-		return _bao.size() + 2;
-	}
-	
-	public byte[] getBytes()
-	{
-		// if (this instanceof Init)
-		// writeD(0x00); // reserve for XOR initial key
-		
-		writeD(0x00); // reserve for checksum
-		
-		final int padding = _bao.size() % 8;
-		if (padding != 0)
-		{
-			for (int i = padding; i < 8; i++)
-			{
-				writeC(0x00);
-			}
-		}
-		
-		return _bao.toByteArray();
-	}
-	
-	public abstract byte[] getContent() throws IOException;
-}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/LoginServerThread.java
index 694dc6dc8d..2e7fb8f49b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/LoginServerThread.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/LoginServerThread.java
@@ -43,9 +43,9 @@ import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.ConnectionState;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
index 6a3683658c..8681078d71 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 public class AuthRequest extends BaseSendablePacket
 {
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
index 17a4b21701..eb24a578fb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
@@ -22,7 +22,7 @@ import java.util.logging.Logger;
 
 import javax.crypto.Cipher;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
index 76728c8c12..c7b1c61819 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
index 576d415725..aab5eda501 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
index aabb5c23fc..e728a28ea2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.gameserver.LoginServerThread.SessionKey;
 
 /**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
index 8de56e1a2c..5d9dadc279 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
index 9a7d0394da..4a6e7fe43a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
index c8af49a1b9..4fbf2b79c6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
index 101dda1825..69264263b4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO Thanks to mochitto
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
index 7d89a3c7f8..020bfbf98c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
index 795a844106..947ac80751 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.ArrayList;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
index 286e727d10..c89239c35a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
index efc26b13af..113caaea70 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
index 1e98e329b2..6945db648c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
index 2db98c635f..d937c4762e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class InitLS extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
index 3617c7a17a..fe2c0b2d88 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class KickPlayer extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
index 443bbd916e..f50e7a95e6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class LoginServerFail extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
index 2d6e5fcaee..a87742fab7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
index 0954e5bba2..d890f4b300 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author mrTJO Thanks to mochitto
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerThread.java
index 10188d5589..767e0b2326 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/GameServerThread.java
@@ -27,9 +27,9 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
 import com.l2jmobius.commons.util.crypt.ScrambledKeyPair;
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
index f32dee4790..83ad61827b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.network.gameserverpackets.BlowFishKey;
 import com.l2jmobius.loginserver.network.gameserverpackets.ChangeAccessLevel;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
index 9be997f496..6abfe18518 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
@@ -22,8 +22,8 @@ import java.util.logging.Logger;
 
 import javax.crypto.Cipher;
 
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState;
 
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
index ea221f4fce..03ff8df8d3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
index f5ceee8f92..d4c10be532 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
@@ -25,7 +25,7 @@ import java.util.Collection;
 import java.util.logging.Logger;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
index 4d8945a63d..2154becbb5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
index 3ce8993621..f798b01ce8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 import com.l2jmobius.loginserver.SessionKey;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
index 420e245412..8edc01dd59 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 
 /**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
index 51f1c8a96e..194d82d565 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 
 /**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
index 341c0a3a8c..69c263628b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.LoginController;
 
 /**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
index 2ad47c7b19..f142853d21 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
index 13519ee8a1..1a76467686 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
@@ -23,7 +23,7 @@ import java.sql.SQLException;
 import java.util.logging.Logger;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.LoginController;
 
 /**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
index f93bac51ac..6c7aed04d5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
index 0f7550db51..04211e4ec0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 
 /**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
index 2f9dbb7166..8a3a41f83b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author Nik
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
index 2f603f724a..f69027308b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.L2LoginServer;
 
 /**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
index d7ab8c92bd..0162dc3fca 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
index 5f6ca8bedb..93ce70cdea 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
index 1c03bfb762..1c8aaaabae 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
index 82680dc00d..fe1afd4511 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/network/BaseRecievePacket.java
new file mode 100644
index 0000000000..b8e2b08f14
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/network/BaseRecievePacket.java
@@ -0,0 +1,107 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.commons.network;
+
+import java.util.logging.Logger;
+
+/**
+ * This class ...
+ * @version $Revision: 1.2.4.1 $ $Date: 2005/03/27 15:30:12 $
+ */
+public abstract class BaseRecievePacket
+{
+	private static final Logger _log = Logger.getLogger(BaseRecievePacket.class.getName());
+	
+	private final byte[] _decrypt;
+	private int _off;
+	
+	public BaseRecievePacket(byte[] decrypt)
+	{
+		_decrypt = decrypt;
+		_off = 1; // skip packet type id
+	}
+	
+	public int readD()
+	{
+		int result = _decrypt[_off++] & 0xff;
+		result |= (_decrypt[_off++] << 8) & 0xff00;
+		result |= (_decrypt[_off++] << 0x10) & 0xff0000;
+		result |= (_decrypt[_off++] << 0x18) & 0xff000000;
+		return result;
+	}
+	
+	public int readC()
+	{
+		return _decrypt[_off++] & 0xff;
+	}
+	
+	public int readH()
+	{
+		return (_decrypt[_off++] & 0xff) | ((_decrypt[_off++] << 8) & 0xff00);
+	}
+	
+	public double readF()
+	{
+		long result = _decrypt[_off++] & 0xff;
+		result |= (_decrypt[_off++] & 0xffL) << 8L;
+		result |= (_decrypt[_off++] & 0xffL) << 16L;
+		result |= (_decrypt[_off++] & 0xffL) << 24L;
+		result |= (_decrypt[_off++] & 0xffL) << 32L;
+		result |= (_decrypt[_off++] & 0xffL) << 40L;
+		result |= (_decrypt[_off++] & 0xffL) << 48L;
+		result |= (_decrypt[_off++] & 0xffL) << 56L;
+		return Double.longBitsToDouble(result);
+	}
+	
+	public String readS()
+	{
+		String result = null;
+		try
+		{
+			result = new String(_decrypt, _off, _decrypt.length - _off, "UTF-16LE");
+			result = result.substring(0, result.indexOf(0x00));
+			_off += (result.length() * 2) + 2;
+		}
+		catch (Exception e)
+		{
+			_log.warning(getClass().getSimpleName() + ": " + e.getMessage());
+		}
+		
+		return result;
+	}
+	
+	public final byte[] readB(int length)
+	{
+		final byte[] result = new byte[length];
+		System.arraycopy(_decrypt, _off, result, 0, length);
+		_off += length;
+		return result;
+	}
+	
+	public long readQ()
+	{
+		long result = _decrypt[_off++] & 0xff;
+		result |= (_decrypt[_off++] & 0xffL) << 8L;
+		result |= (_decrypt[_off++] & 0xffL) << 16L;
+		result |= (_decrypt[_off++] & 0xffL) << 24L;
+		result |= (_decrypt[_off++] & 0xffL) << 32L;
+		result |= (_decrypt[_off++] & 0xffL) << 40L;
+		result |= (_decrypt[_off++] & 0xffL) << 48L;
+		result |= (_decrypt[_off++] & 0xffL) << 56L;
+		return result;
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/network/BaseSendablePacket.java
new file mode 100644
index 0000000000..894ea357b0
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/network/BaseSendablePacket.java
@@ -0,0 +1,137 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.commons.network;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.logging.Logger;
+
+/**
+ * This class ...
+ * @version $Revision: 1.2.4.1 $ $Date: 2005/03/27 15:30:11 $
+ */
+public abstract class BaseSendablePacket
+{
+	private static final Logger _log = Logger.getLogger(BaseSendablePacket.class.getName());
+	
+	private final ByteArrayOutputStream _bao;
+	
+	protected BaseSendablePacket()
+	{
+		_bao = new ByteArrayOutputStream();
+	}
+	
+	protected void writeD(int value)
+	{
+		_bao.write(value & 0xff);
+		_bao.write((value >> 8) & 0xff);
+		_bao.write((value >> 16) & 0xff);
+		_bao.write((value >> 24) & 0xff);
+	}
+	
+	protected void writeH(int value)
+	{
+		_bao.write(value & 0xff);
+		_bao.write((value >> 8) & 0xff);
+	}
+	
+	protected void writeC(int value)
+	{
+		_bao.write(value & 0xff);
+	}
+	
+	protected void writeF(double org)
+	{
+		final long value = Double.doubleToRawLongBits(org);
+		_bao.write((int) (value & 0xff));
+		_bao.write((int) ((value >> 8) & 0xff));
+		_bao.write((int) ((value >> 16) & 0xff));
+		_bao.write((int) ((value >> 24) & 0xff));
+		_bao.write((int) ((value >> 32) & 0xff));
+		_bao.write((int) ((value >> 40) & 0xff));
+		_bao.write((int) ((value >> 48) & 0xff));
+		_bao.write((int) ((value >> 56) & 0xff));
+	}
+	
+	protected void writeS(String text)
+	{
+		try
+		{
+			if (text != null)
+			{
+				_bao.write(text.getBytes("UTF-16LE"));
+			}
+		}
+		catch (Exception e)
+		{
+			_log.warning(getClass().getSimpleName() + ": " + e.getMessage());
+		}
+		
+		_bao.write(0);
+		_bao.write(0);
+	}
+	
+	protected void writeB(byte[] array)
+	{
+		try
+		{
+			_bao.write(array);
+		}
+		catch (IOException e)
+		{
+			_log.warning(getClass().getSimpleName() + ": " + e.getMessage());
+		}
+	}
+	
+	protected void writeQ(long value)
+	{
+		_bao.write((int) (value & 0xff));
+		_bao.write((int) ((value >> 8) & 0xff));
+		_bao.write((int) ((value >> 16) & 0xff));
+		_bao.write((int) ((value >> 24) & 0xff));
+		_bao.write((int) ((value >> 32) & 0xff));
+		_bao.write((int) ((value >> 40) & 0xff));
+		_bao.write((int) ((value >> 48) & 0xff));
+		_bao.write((int) ((value >> 56) & 0xff));
+	}
+	
+	public int getLength()
+	{
+		return _bao.size() + 2;
+	}
+	
+	public byte[] getBytes()
+	{
+		// if (this instanceof Init)
+		// writeD(0x00); // reserve for XOR initial key
+		
+		writeD(0x00); // reserve for checksum
+		
+		final int padding = _bao.size() % 8;
+		if (padding != 0)
+		{
+			for (int i = padding; i < 8; i++)
+			{
+				writeC(0x00);
+			}
+		}
+		
+		return _bao.toByteArray();
+	}
+	
+	public abstract byte[] getContent() throws IOException;
+}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java
deleted file mode 100644
index 9039a5677d..0000000000
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/util/network/BaseRecievePacket.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.commons.util.network;
-
-import java.util.logging.Logger;
-
-/**
- * This class ...
- * @version $Revision: 1.2.4.1 $ $Date: 2005/03/27 15:30:12 $
- */
-public abstract class BaseRecievePacket
-{
-	private static final Logger _log = Logger.getLogger(BaseRecievePacket.class.getName());
-	
-	private final byte[] _decrypt;
-	private int _off;
-	
-	public BaseRecievePacket(byte[] decrypt)
-	{
-		_decrypt = decrypt;
-		_off = 1; // skip packet type id
-	}
-	
-	public int readD()
-	{
-		int result = _decrypt[_off++] & 0xff;
-		result |= (_decrypt[_off++] << 8) & 0xff00;
-		result |= (_decrypt[_off++] << 0x10) & 0xff0000;
-		result |= (_decrypt[_off++] << 0x18) & 0xff000000;
-		return result;
-	}
-	
-	public int readC()
-	{
-		return _decrypt[_off++] & 0xff;
-	}
-	
-	public int readH()
-	{
-		return (_decrypt[_off++] & 0xff) | ((_decrypt[_off++] << 8) & 0xff00);
-	}
-	
-	public double readF()
-	{
-		long result = _decrypt[_off++] & 0xff;
-		result |= (_decrypt[_off++] & 0xffL) << 8L;
-		result |= (_decrypt[_off++] & 0xffL) << 16L;
-		result |= (_decrypt[_off++] & 0xffL) << 24L;
-		result |= (_decrypt[_off++] & 0xffL) << 32L;
-		result |= (_decrypt[_off++] & 0xffL) << 40L;
-		result |= (_decrypt[_off++] & 0xffL) << 48L;
-		result |= (_decrypt[_off++] & 0xffL) << 56L;
-		return Double.longBitsToDouble(result);
-	}
-	
-	public String readS()
-	{
-		String result = null;
-		try
-		{
-			result = new String(_decrypt, _off, _decrypt.length - _off, "UTF-16LE");
-			result = result.substring(0, result.indexOf(0x00));
-			_off += (result.length() * 2) + 2;
-		}
-		catch (Exception e)
-		{
-			_log.warning(getClass().getSimpleName() + ": " + e.getMessage());
-		}
-		
-		return result;
-	}
-	
-	public final byte[] readB(int length)
-	{
-		final byte[] result = new byte[length];
-		System.arraycopy(_decrypt, _off, result, 0, length);
-		_off += length;
-		return result;
-	}
-	
-	public long readQ()
-	{
-		long result = _decrypt[_off++] & 0xff;
-		result |= (_decrypt[_off++] & 0xffL) << 8L;
-		result |= (_decrypt[_off++] & 0xffL) << 16L;
-		result |= (_decrypt[_off++] & 0xffL) << 24L;
-		result |= (_decrypt[_off++] & 0xffL) << 32L;
-		result |= (_decrypt[_off++] & 0xffL) << 40L;
-		result |= (_decrypt[_off++] & 0xffL) << 48L;
-		result |= (_decrypt[_off++] & 0xffL) << 56L;
-		return result;
-	}
-}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java
deleted file mode 100644
index d3f09c47eb..0000000000
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/util/network/BaseSendablePacket.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jmobius.commons.util.network;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.logging.Logger;
-
-/**
- * This class ...
- * @version $Revision: 1.2.4.1 $ $Date: 2005/03/27 15:30:11 $
- */
-public abstract class BaseSendablePacket
-{
-	private static final Logger _log = Logger.getLogger(BaseSendablePacket.class.getName());
-	
-	private final ByteArrayOutputStream _bao;
-	
-	protected BaseSendablePacket()
-	{
-		_bao = new ByteArrayOutputStream();
-	}
-	
-	protected void writeD(int value)
-	{
-		_bao.write(value & 0xff);
-		_bao.write((value >> 8) & 0xff);
-		_bao.write((value >> 16) & 0xff);
-		_bao.write((value >> 24) & 0xff);
-	}
-	
-	protected void writeH(int value)
-	{
-		_bao.write(value & 0xff);
-		_bao.write((value >> 8) & 0xff);
-	}
-	
-	protected void writeC(int value)
-	{
-		_bao.write(value & 0xff);
-	}
-	
-	protected void writeF(double org)
-	{
-		final long value = Double.doubleToRawLongBits(org);
-		_bao.write((int) (value & 0xff));
-		_bao.write((int) ((value >> 8) & 0xff));
-		_bao.write((int) ((value >> 16) & 0xff));
-		_bao.write((int) ((value >> 24) & 0xff));
-		_bao.write((int) ((value >> 32) & 0xff));
-		_bao.write((int) ((value >> 40) & 0xff));
-		_bao.write((int) ((value >> 48) & 0xff));
-		_bao.write((int) ((value >> 56) & 0xff));
-	}
-	
-	protected void writeS(String text)
-	{
-		try
-		{
-			if (text != null)
-			{
-				_bao.write(text.getBytes("UTF-16LE"));
-			}
-		}
-		catch (Exception e)
-		{
-			_log.warning(getClass().getSimpleName() + ": " + e.getMessage());
-		}
-		
-		_bao.write(0);
-		_bao.write(0);
-	}
-	
-	protected void writeB(byte[] array)
-	{
-		try
-		{
-			_bao.write(array);
-		}
-		catch (IOException e)
-		{
-			_log.warning(getClass().getSimpleName() + ": " + e.getMessage());
-		}
-	}
-	
-	protected void writeQ(long value)
-	{
-		_bao.write((int) (value & 0xff));
-		_bao.write((int) ((value >> 8) & 0xff));
-		_bao.write((int) ((value >> 16) & 0xff));
-		_bao.write((int) ((value >> 24) & 0xff));
-		_bao.write((int) ((value >> 32) & 0xff));
-		_bao.write((int) ((value >> 40) & 0xff));
-		_bao.write((int) ((value >> 48) & 0xff));
-		_bao.write((int) ((value >> 56) & 0xff));
-	}
-	
-	public int getLength()
-	{
-		return _bao.size() + 2;
-	}
-	
-	public byte[] getBytes()
-	{
-		// if (this instanceof Init)
-		// writeD(0x00); // reserve for XOR initial key
-		
-		writeD(0x00); // reserve for checksum
-		
-		final int padding = _bao.size() % 8;
-		if (padding != 0)
-		{
-			for (int i = padding; i < 8; i++)
-			{
-				writeC(0x00);
-			}
-		}
-		
-		return _bao.toByteArray();
-	}
-	
-	public abstract byte[] getContent() throws IOException;
-}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/LoginServerThread.java
index 694dc6dc8d..2e7fb8f49b 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/LoginServerThread.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/LoginServerThread.java
@@ -43,9 +43,9 @@ import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.ConnectionState;
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
index 6a3683658c..8681078d71 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/AuthRequest.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 public class AuthRequest extends BaseSendablePacket
 {
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
index 17a4b21701..eb24a578fb 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/BlowFishKey.java
@@ -22,7 +22,7 @@ import java.util.logging.Logger;
 
 import javax.crypto.Cipher;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
index 76728c8c12..c7b1c61819 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangeAccessLevel.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
index 576d415725..aab5eda501 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ChangePassword.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
index aabb5c23fc..e728a28ea2 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerAuthRequest.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.gameserver.LoginServerThread.SessionKey;
 
 /**
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
index 8de56e1a2c..5d9dadc279 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerInGame.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
index 9a7d0394da..4a6e7fe43a 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerLogout.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
index c8af49a1b9..4fbf2b79c6 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/PlayerTracert.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
index 101dda1825..69264263b4 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ReplyCharacters.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.List;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO Thanks to mochitto
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
index 7d89a3c7f8..020bfbf98c 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/SendMail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
index 795a844106..947ac80751 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
 import java.util.ArrayList;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
index 286e727d10..c89239c35a 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.game;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
index efc26b13af..113caaea70 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/AuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
index 1e98e329b2..6945db648c 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/ChangePasswordResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
index 2db98c635f..d937c4762e 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/InitLS.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class InitLS extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
index 3617c7a17a..fe2c0b2d88 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/KickPlayer.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class KickPlayer extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
index 443bbd916e..f50e7a95e6 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/LoginServerFail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 public class LoginServerFail extends BaseRecievePacket
 {
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
index 2d6e5fcaee..a87742fab7 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/PlayerAuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
index 0954e5bba2..d890f4b300 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/loginserverpackets/login/RequestCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.gameserver.network.loginserverpackets.login;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 
 /**
  * @author mrTJO Thanks to mochitto
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/GameServerThread.java
index 10188d5589..767e0b2326 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/GameServerThread.java
@@ -27,9 +27,9 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
 import com.l2jmobius.commons.util.crypt.ScrambledKeyPair;
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState;
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
index f32dee4790..83ad61827b 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/L2JGameServerPacketHandler.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.network.gameserverpackets.BlowFishKey;
 import com.l2jmobius.loginserver.network.gameserverpackets.ChangeAccessLevel;
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
index 9be997f496..6abfe18518 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/BlowFishKey.java
@@ -22,8 +22,8 @@ import java.util.logging.Logger;
 
 import javax.crypto.Cipher;
 
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.commons.util.crypt.NewCrypt;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.network.L2JGameServerPacketHandler.GameServerState;
 
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
index ea221f4fce..03ff8df8d3 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangeAccessLevel.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
index f5ceee8f92..d4c10be532 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ChangePassword.java
@@ -25,7 +25,7 @@ import java.util.Collection;
 import java.util.logging.Logger;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
index 4d8945a63d..2154becbb5 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/GameServerAuth.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
index 3ce8993621..f798b01ce8 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerAuthRequest.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 import com.l2jmobius.loginserver.SessionKey;
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
index 420e245412..8edc01dd59 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerInGame.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 
 /**
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
index 51f1c8a96e..194d82d565 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerLogout.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 
 /**
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
index 341c0a3a8c..69c263628b 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/PlayerTracert.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.LoginController;
 
 /**
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
index 2ad47c7b19..f142853d21 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ReplyCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.gameserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerThread;
 import com.l2jmobius.loginserver.LoginController;
 
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
index 13519ee8a1..1a76467686 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/RequestTempBan.java
@@ -23,7 +23,7 @@ import java.sql.SQLException;
 import java.util.logging.Logger;
 
 import com.l2jmobius.commons.database.DatabaseFactory;
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.LoginController;
 
 /**
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
index f93bac51ac..6c7aed04d5 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/gameserverpackets/ServerStatus.java
@@ -18,7 +18,7 @@ package com.l2jmobius.loginserver.network.gameserverpackets;
 
 import java.util.logging.Logger;
 
-import com.l2jmobius.commons.util.network.BaseRecievePacket;
+import com.l2jmobius.commons.network.BaseRecievePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 import com.l2jmobius.loginserver.GameServerTable.GameServerInfo;
 import com.l2jmobius.loginserver.GameServerThread;
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
index 0f7550db51..04211e4ec0 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/AuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.GameServerTable;
 
 /**
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
index 2f9dbb7166..8a3a41f83b 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/ChangePasswordResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author Nik
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
index 2f603f724a..f69027308b 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/InitLS.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 import com.l2jmobius.loginserver.L2LoginServer;
 
 /**
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
index d7ab8c92bd..0162dc3fca 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/KickPlayer.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
index 5f6ca8bedb..93ce70cdea 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/LoginServerFail.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
index 1c03bfb762..1c8aaaabae 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/PlayerAuthResponse.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
index 82680dc00d..fe1afd4511 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/loginserver/network/loginserverpackets/RequestCharacters.java
@@ -16,7 +16,7 @@
  */
 package com.l2jmobius.loginserver.network.loginserverpackets;
 
-import com.l2jmobius.commons.util.network.BaseSendablePacket;
+import com.l2jmobius.commons.network.BaseSendablePacket;
 
 /**
  * @author mrTJO