diff --git a/trunk/.settings/org.eclipse.jdt.ui.prefs b/trunk/.settings/org.eclipse.jdt.ui.prefs
index 16652aa92c..099afc84c8 100644
--- a/trunk/.settings/org.eclipse.jdt.ui.prefs
+++ b/trunk/.settings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@ formatter_settings_version=12
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.importorder=java;javax;org;commons;com;
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.ondemandthreshold=99
diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java
index 37d82e759d..c1483bcd0a 100644
--- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java
+++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java
@@ -24,7 +24,8 @@ import java.util.Collection;
 import java.util.LinkedList;
 import java.util.StringTokenizer;
 
-import com.l2jserver.commons.mmocore.NioNetStringBuffer;
+import commons.mmocore.NioNetStringBuffer;
+
 import com.l2jserver.gameserver.GameServer;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.cache.HtmCache;
diff --git a/trunk/java/com/l2jserver/gameserver/GameServer.java b/trunk/java/com/l2jserver/gameserver/GameServer.java
index 4f74f1795c..9d37a8f513 100644
--- a/trunk/java/com/l2jserver/gameserver/GameServer.java
+++ b/trunk/java/com/l2jserver/gameserver/GameServer.java
@@ -30,11 +30,12 @@ import java.util.logging.Level;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
+import commons.mmocore.SelectorConfig;
+import commons.mmocore.SelectorThread;
+
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.Server;
-import com.l2jserver.commons.mmocore.SelectorConfig;
-import com.l2jserver.commons.mmocore.SelectorThread;
 import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.data.sql.impl.AnnouncementsTable;
 import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
diff --git a/trunk/java/com/l2jserver/gameserver/GeoData.java b/trunk/java/com/l2jserver/gameserver/GeoData.java
index b535970355..d5e19df75a 100644
--- a/trunk/java/com/l2jserver/gameserver/GeoData.java
+++ b/trunk/java/com/l2jserver/gameserver/GeoData.java
@@ -23,9 +23,10 @@ import java.nio.file.Path;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import commons.geodriver.Cell;
+import commons.geodriver.GeoDriver;
+
 import com.l2jserver.Config;
-import com.l2jserver.commons.geodriver.Cell;
-import com.l2jserver.commons.geodriver.GeoDriver;
 import com.l2jserver.gameserver.data.xml.impl.DoorData;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;
diff --git a/trunk/java/com/l2jserver/gameserver/network/L2GameClient.java b/trunk/java/com/l2jserver/gameserver/network/L2GameClient.java
index 568baa8b34..60ea16aa43 100644
--- a/trunk/java/com/l2jserver/gameserver/network/L2GameClient.java
+++ b/trunk/java/com/l2jserver/gameserver/network/L2GameClient.java
@@ -33,11 +33,12 @@ import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
+import commons.mmocore.MMOClient;
+import commons.mmocore.MMOConnection;
+import commons.mmocore.ReceivablePacket;
+
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
-import com.l2jserver.commons.mmocore.MMOClient;
-import com.l2jserver.commons.mmocore.MMOConnection;
-import com.l2jserver.commons.mmocore.ReceivablePacket;
 import com.l2jserver.gameserver.LoginServerThread;
 import com.l2jserver.gameserver.LoginServerThread.SessionKey;
 import com.l2jserver.gameserver.ThreadPoolManager;
diff --git a/trunk/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java b/trunk/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java
index 194cbbd2ec..0b177a3545 100644
--- a/trunk/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java
+++ b/trunk/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java
@@ -21,12 +21,13 @@ package com.l2jserver.gameserver.network;
 import java.nio.ByteBuffer;
 import java.util.logging.Logger;
 
+import commons.mmocore.IClientFactory;
+import commons.mmocore.IMMOExecutor;
+import commons.mmocore.IPacketHandler;
+import commons.mmocore.MMOConnection;
+import commons.mmocore.ReceivablePacket;
+
 import com.l2jserver.Config;
-import com.l2jserver.commons.mmocore.IClientFactory;
-import com.l2jserver.commons.mmocore.IMMOExecutor;
-import com.l2jserver.commons.mmocore.IPacketHandler;
-import com.l2jserver.commons.mmocore.MMOConnection;
-import com.l2jserver.commons.mmocore.ReceivablePacket;
 import com.l2jserver.gameserver.network.L2GameClient.GameClientState;
 import com.l2jserver.gameserver.network.clientpackets.*;
 import com.l2jserver.gameserver.network.clientpackets.adenadistribution.RequestDivideAdena;
diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/L2GameClientPacket.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/L2GameClientPacket.java
index 4ab08c89ce..713c795d95 100644
--- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/L2GameClientPacket.java
+++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/L2GameClientPacket.java
@@ -22,8 +22,9 @@ import java.nio.BufferUnderflowException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import commons.mmocore.ReceivablePacket;
+
 import com.l2jserver.Config;
-import com.l2jserver.commons.mmocore.ReceivablePacket;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.L2GameClient;
 import com.l2jserver.gameserver.network.SystemMessageId;
diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/L2GameServerPacket.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/L2GameServerPacket.java
index f17fd1e55a..025c28a92b 100644
--- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/L2GameServerPacket.java
+++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/L2GameServerPacket.java
@@ -21,7 +21,8 @@ package com.l2jserver.gameserver.network.serverpackets;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.l2jserver.commons.mmocore.SendablePacket;
+import commons.mmocore.SendablePacket;
+
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.interfaces.IPositionable;
 import com.l2jserver.gameserver.model.interfaces.IUpdateTypeComponent;
diff --git a/trunk/java/com/l2jserver/gameserver/pathfinding/cellnodes/NodeLoc.java b/trunk/java/com/l2jserver/gameserver/pathfinding/cellnodes/NodeLoc.java
index 2bdb36be8b..a5f6a4573e 100644
--- a/trunk/java/com/l2jserver/gameserver/pathfinding/cellnodes/NodeLoc.java
+++ b/trunk/java/com/l2jserver/gameserver/pathfinding/cellnodes/NodeLoc.java
@@ -18,7 +18,8 @@
  */
 package com.l2jserver.gameserver.pathfinding.cellnodes;
 
-import com.l2jserver.commons.geodriver.Cell;
+import commons.geodriver.Cell;
+
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc;
 
diff --git a/trunk/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java b/trunk/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java
index c0f2d808da..b04bb0886e 100644
--- a/trunk/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java
+++ b/trunk/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java
@@ -41,8 +41,9 @@ import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import javax.script.SimpleScriptContext;
 
+import commons.javaengine.JavaScriptEngineFactory;
+
 import com.l2jserver.Config;
-import com.l2jserver.commons.javaengine.JavaScriptEngineFactory;
 
 /**
  * Caches script engines and provides functionality for executing and managing scripts.
diff --git a/trunk/java/com/l2jserver/gameserver/util/GeoUtils.java b/trunk/java/com/l2jserver/gameserver/util/GeoUtils.java
index c91d5c8f8f..cb610ead38 100644
--- a/trunk/java/com/l2jserver/gameserver/util/GeoUtils.java
+++ b/trunk/java/com/l2jserver/gameserver/util/GeoUtils.java
@@ -20,7 +20,8 @@ package com.l2jserver.gameserver.util;
 
 import java.awt.Color;
 
-import com.l2jserver.commons.geodriver.Cell;
+import commons.geodriver.Cell;
+
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.ExServerPrimitive;
diff --git a/trunk/java/com/l2jserver/loginserver/L2LoginServer.java b/trunk/java/com/l2jserver/loginserver/L2LoginServer.java
index 0fe2984ec4..e115951b0f 100644
--- a/trunk/java/com/l2jserver/loginserver/L2LoginServer.java
+++ b/trunk/java/com/l2jserver/loginserver/L2LoginServer.java
@@ -32,11 +32,12 @@ import java.util.logging.Level;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
+import commons.mmocore.SelectorConfig;
+import commons.mmocore.SelectorThread;
+
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.Server;
-import com.l2jserver.commons.mmocore.SelectorConfig;
-import com.l2jserver.commons.mmocore.SelectorThread;
 import com.l2jserver.loginserver.network.L2LoginClient;
 import com.l2jserver.loginserver.network.L2LoginPacketHandler;
 import com.l2jserver.status.Status;
diff --git a/trunk/java/com/l2jserver/loginserver/SelectorHelper.java b/trunk/java/com/l2jserver/loginserver/SelectorHelper.java
index 6bca5b08f9..5fe73d8f5f 100644
--- a/trunk/java/com/l2jserver/loginserver/SelectorHelper.java
+++ b/trunk/java/com/l2jserver/loginserver/SelectorHelper.java
@@ -23,11 +23,12 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import com.l2jserver.commons.mmocore.IAcceptFilter;
-import com.l2jserver.commons.mmocore.IClientFactory;
-import com.l2jserver.commons.mmocore.IMMOExecutor;
-import com.l2jserver.commons.mmocore.MMOConnection;
-import com.l2jserver.commons.mmocore.ReceivablePacket;
+import commons.mmocore.IAcceptFilter;
+import commons.mmocore.IClientFactory;
+import commons.mmocore.IMMOExecutor;
+import commons.mmocore.MMOConnection;
+import commons.mmocore.ReceivablePacket;
+
 import com.l2jserver.loginserver.network.L2LoginClient;
 import com.l2jserver.loginserver.network.serverpackets.Init;
 import com.l2jserver.util.IPv4Filter;
diff --git a/trunk/java/com/l2jserver/loginserver/network/L2LoginClient.java b/trunk/java/com/l2jserver/loginserver/network/L2LoginClient.java
index ddd37142b6..85cd56ee0a 100644
--- a/trunk/java/com/l2jserver/loginserver/network/L2LoginClient.java
+++ b/trunk/java/com/l2jserver/loginserver/network/L2LoginClient.java
@@ -26,10 +26,11 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
 
+import commons.mmocore.MMOClient;
+import commons.mmocore.MMOConnection;
+import commons.mmocore.SendablePacket;
+
 import com.l2jserver.Config;
-import com.l2jserver.commons.mmocore.MMOClient;
-import com.l2jserver.commons.mmocore.MMOConnection;
-import com.l2jserver.commons.mmocore.SendablePacket;
 import com.l2jserver.loginserver.LoginController;
 import com.l2jserver.loginserver.SessionKey;
 import com.l2jserver.loginserver.network.serverpackets.L2LoginServerPacket;
diff --git a/trunk/java/com/l2jserver/loginserver/network/L2LoginPacketHandler.java b/trunk/java/com/l2jserver/loginserver/network/L2LoginPacketHandler.java
index 7e7aca5f44..fb7dc3f361 100644
--- a/trunk/java/com/l2jserver/loginserver/network/L2LoginPacketHandler.java
+++ b/trunk/java/com/l2jserver/loginserver/network/L2LoginPacketHandler.java
@@ -21,8 +21,9 @@ package com.l2jserver.loginserver.network;
 import java.nio.ByteBuffer;
 import java.util.logging.Logger;
 
-import com.l2jserver.commons.mmocore.IPacketHandler;
-import com.l2jserver.commons.mmocore.ReceivablePacket;
+import commons.mmocore.IPacketHandler;
+import commons.mmocore.ReceivablePacket;
+
 import com.l2jserver.loginserver.network.L2LoginClient.LoginClientState;
 import com.l2jserver.loginserver.network.clientpackets.AuthGameGuard;
 import com.l2jserver.loginserver.network.clientpackets.RequestAuthLogin;
diff --git a/trunk/java/com/l2jserver/loginserver/network/clientpackets/L2LoginClientPacket.java b/trunk/java/com/l2jserver/loginserver/network/clientpackets/L2LoginClientPacket.java
index ecd01624fd..c4d9ed61f0 100644
--- a/trunk/java/com/l2jserver/loginserver/network/clientpackets/L2LoginClientPacket.java
+++ b/trunk/java/com/l2jserver/loginserver/network/clientpackets/L2LoginClientPacket.java
@@ -21,7 +21,8 @@ package com.l2jserver.loginserver.network.clientpackets;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.l2jserver.commons.mmocore.ReceivablePacket;
+import commons.mmocore.ReceivablePacket;
+
 import com.l2jserver.loginserver.network.L2LoginClient;
 
 /**
diff --git a/trunk/java/com/l2jserver/loginserver/network/serverpackets/L2LoginServerPacket.java b/trunk/java/com/l2jserver/loginserver/network/serverpackets/L2LoginServerPacket.java
index 75ad9379a6..40abfbb6ce 100644
--- a/trunk/java/com/l2jserver/loginserver/network/serverpackets/L2LoginServerPacket.java
+++ b/trunk/java/com/l2jserver/loginserver/network/serverpackets/L2LoginServerPacket.java
@@ -18,7 +18,8 @@
  */
 package com.l2jserver.loginserver.network.serverpackets;
 
-import com.l2jserver.commons.mmocore.SendablePacket;
+import commons.mmocore.SendablePacket;
+
 import com.l2jserver.loginserver.network.L2LoginClient;
 
 /**
diff --git a/trunk/java/com/l2jserver/util/IPv4Filter.java b/trunk/java/com/l2jserver/util/IPv4Filter.java
index 1e5a856949..5443e65026 100644
--- a/trunk/java/com/l2jserver/util/IPv4Filter.java
+++ b/trunk/java/com/l2jserver/util/IPv4Filter.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map.Entry;
 
-import com.l2jserver.commons.mmocore.IAcceptFilter;
+import commons.mmocore.IAcceptFilter;
 
 /**
  * IPv4 filter.
diff --git a/trunk/java/com/l2jserver/commons/geodriver/Cell.java b/trunk/java/commons/geodriver/Cell.java
similarity index 94%
rename from trunk/java/com/l2jserver/commons/geodriver/Cell.java
rename to trunk/java/commons/geodriver/Cell.java
index 3a5f16d7c8..ef2e7a3874 100644
--- a/trunk/java/com/l2jserver/commons/geodriver/Cell.java
+++ b/trunk/java/commons/geodriver/Cell.java
@@ -16,7 +16,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.l2jserver.commons.geodriver;
+package commons.geodriver;
 
 /**
  * @author HorridoJoho
diff --git a/trunk/java/com/l2jserver/commons/geodriver/GeoDriver.java b/trunk/java/commons/geodriver/GeoDriver.java
similarity index 93%
rename from trunk/java/com/l2jserver/commons/geodriver/GeoDriver.java
rename to trunk/java/commons/geodriver/GeoDriver.java
index efde98a4a1..9718345651 100644
--- a/trunk/java/com/l2jserver/commons/geodriver/GeoDriver.java
+++ b/trunk/java/commons/geodriver/GeoDriver.java
@@ -16,7 +16,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.l2jserver.commons.geodriver;
+package commons.geodriver;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
@@ -25,8 +25,8 @@ import java.nio.channels.FileChannel.MapMode;
 import java.nio.file.Path;
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
-import com.l2jserver.commons.geodriver.regions.NullRegion;
-import com.l2jserver.commons.geodriver.regions.Region;
+import commons.geodriver.regions.NullRegion;
+import commons.geodriver.regions.Region;
 
 /**
  * @author HorridoJoho
diff --git a/trunk/java/com/l2jserver/commons/geodriver/IBlock.java b/trunk/java/commons/geodriver/IBlock.java
similarity index 94%
rename from trunk/java/com/l2jserver/commons/geodriver/IBlock.java
rename to trunk/java/commons/geodriver/IBlock.java
index 42ce540bdc..1f9de95ceb 100644
--- a/trunk/java/com/l2jserver/commons/geodriver/IBlock.java
+++ b/trunk/java/commons/geodriver/IBlock.java
@@ -16,7 +16,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.l2jserver.commons.geodriver;
+package commons.geodriver;
 
 /**
  * @author HorridoJoho
diff --git a/trunk/java/com/l2jserver/commons/geodriver/IRegion.java b/trunk/java/commons/geodriver/IRegion.java
similarity index 94%
rename from trunk/java/com/l2jserver/commons/geodriver/IRegion.java
rename to trunk/java/commons/geodriver/IRegion.java
index 90f552a664..4480e05153 100644
--- a/trunk/java/com/l2jserver/commons/geodriver/IRegion.java
+++ b/trunk/java/commons/geodriver/IRegion.java
@@ -16,7 +16,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.l2jserver.commons.geodriver;
+package commons.geodriver;
 
 /**
  * @author HorridoJoho
diff --git a/trunk/java/com/l2jserver/commons/geodriver/blocks/ComplexBlock.java b/trunk/java/commons/geodriver/blocks/ComplexBlock.java
similarity index 92%
rename from trunk/java/com/l2jserver/commons/geodriver/blocks/ComplexBlock.java
rename to trunk/java/commons/geodriver/blocks/ComplexBlock.java
index c7879bbbcc..d80f191406 100644
--- a/trunk/java/com/l2jserver/commons/geodriver/blocks/ComplexBlock.java
+++ b/trunk/java/commons/geodriver/blocks/ComplexBlock.java
@@ -16,11 +16,11 @@
  * 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.l2jserver.commons.geodriver.blocks;
+package commons.geodriver.blocks;
 
 import java.nio.ByteBuffer;
 
-import com.l2jserver.commons.geodriver.IBlock;
+import commons.geodriver.IBlock;
 
 /**
  * @author HorridoJoho
diff --git a/trunk/java/com/l2jserver/commons/geodriver/blocks/FlatBlock.java b/trunk/java/commons/geodriver/blocks/FlatBlock.java
similarity index 89%
rename from trunk/java/com/l2jserver/commons/geodriver/blocks/FlatBlock.java
rename to trunk/java/commons/geodriver/blocks/FlatBlock.java
index 7f829b61e9..9c5421f638 100644
--- a/trunk/java/com/l2jserver/commons/geodriver/blocks/FlatBlock.java
+++ b/trunk/java/commons/geodriver/blocks/FlatBlock.java
@@ -16,11 +16,11 @@
  * 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.l2jserver.commons.geodriver.blocks;
+package commons.geodriver.blocks;
 
 import java.nio.ByteBuffer;
 
-import com.l2jserver.commons.geodriver.IBlock;
+import commons.geodriver.IBlock;
 
 /**
  * @author HorridoJoho
diff --git a/trunk/java/com/l2jserver/commons/geodriver/blocks/MultilayerBlock.java b/trunk/java/commons/geodriver/blocks/MultilayerBlock.java
similarity index 94%
rename from trunk/java/com/l2jserver/commons/geodriver/blocks/MultilayerBlock.java
rename to trunk/java/commons/geodriver/blocks/MultilayerBlock.java
index d4b774d1b1..e45729db7a 100644
--- a/trunk/java/com/l2jserver/commons/geodriver/blocks/MultilayerBlock.java
+++ b/trunk/java/commons/geodriver/blocks/MultilayerBlock.java
@@ -16,11 +16,11 @@
  * 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.l2jserver.commons.geodriver.blocks;
+package commons.geodriver.blocks;
 
 import java.nio.ByteBuffer;
 
-import com.l2jserver.commons.geodriver.IBlock;
+import commons.geodriver.IBlock;
 
 /**
  * @author HorridoJoho
diff --git a/trunk/java/com/l2jserver/commons/geodriver/regions/NullRegion.java b/trunk/java/commons/geodriver/regions/NullRegion.java
similarity index 89%
rename from trunk/java/com/l2jserver/commons/geodriver/regions/NullRegion.java
rename to trunk/java/commons/geodriver/regions/NullRegion.java
index 536593dab4..685ef23fc4 100644
--- a/trunk/java/com/l2jserver/commons/geodriver/regions/NullRegion.java
+++ b/trunk/java/commons/geodriver/regions/NullRegion.java
@@ -16,9 +16,9 @@
  * 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.l2jserver.commons.geodriver.regions;
+package commons.geodriver.regions;
 
-import com.l2jserver.commons.geodriver.IRegion;
+import commons.geodriver.IRegion;
 
 /**
  * @author HorridoJoho
diff --git a/trunk/java/com/l2jserver/commons/geodriver/regions/Region.java b/trunk/java/commons/geodriver/regions/Region.java
similarity index 84%
rename from trunk/java/com/l2jserver/commons/geodriver/regions/Region.java
rename to trunk/java/commons/geodriver/regions/Region.java
index a7ca9f1390..1ab2d11471 100644
--- a/trunk/java/com/l2jserver/commons/geodriver/regions/Region.java
+++ b/trunk/java/commons/geodriver/regions/Region.java
@@ -16,15 +16,15 @@
  * 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.l2jserver.commons.geodriver.regions;
+package commons.geodriver.regions;
 
 import java.nio.ByteBuffer;
 
-import com.l2jserver.commons.geodriver.IBlock;
-import com.l2jserver.commons.geodriver.IRegion;
-import com.l2jserver.commons.geodriver.blocks.ComplexBlock;
-import com.l2jserver.commons.geodriver.blocks.FlatBlock;
-import com.l2jserver.commons.geodriver.blocks.MultilayerBlock;
+import commons.geodriver.IBlock;
+import commons.geodriver.IRegion;
+import commons.geodriver.blocks.ComplexBlock;
+import commons.geodriver.blocks.FlatBlock;
+import commons.geodriver.blocks.MultilayerBlock;
 
 /**
  * @author HorridoJoho
diff --git a/trunk/java/com/l2jserver/commons/javaengine/CompilationException.java b/trunk/java/commons/javaengine/CompilationException.java
similarity index 71%
rename from trunk/java/com/l2jserver/commons/javaengine/CompilationException.java
rename to trunk/java/commons/javaengine/CompilationException.java
index eb98d6bfed..7353b53e9d 100644
--- a/trunk/java/com/l2jserver/commons/javaengine/CompilationException.java
+++ b/trunk/java/commons/javaengine/CompilationException.java
@@ -1,4 +1,4 @@
-package com.l2jserver.commons.javaengine;
+package commons.javaengine;
 
 public class CompilationException extends Exception
 {
diff --git a/trunk/java/com/l2jserver/commons/javaengine/JavaCompiler.java b/trunk/java/commons/javaengine/JavaCompiler.java
similarity index 96%
rename from trunk/java/com/l2jserver/commons/javaengine/JavaCompiler.java
rename to trunk/java/commons/javaengine/JavaCompiler.java
index 49a15e3551..50001ebddb 100644
--- a/trunk/java/com/l2jserver/commons/javaengine/JavaCompiler.java
+++ b/trunk/java/commons/javaengine/JavaCompiler.java
@@ -21,7 +21,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.l2jserver.commons.javaengine;
+package commons.javaengine;
 
 import java.io.PrintWriter;
 import java.io.Writer;
diff --git a/trunk/java/com/l2jserver/commons/javaengine/JavaScriptEngine.java b/trunk/java/commons/javaengine/JavaScriptEngine.java
similarity index 95%
rename from trunk/java/com/l2jserver/commons/javaengine/JavaScriptEngine.java
rename to trunk/java/commons/javaengine/JavaScriptEngine.java
index 789a5dee36..5559a67cf8 100644
--- a/trunk/java/com/l2jserver/commons/javaengine/JavaScriptEngine.java
+++ b/trunk/java/commons/javaengine/JavaScriptEngine.java
@@ -21,7 +21,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.l2jserver.commons.javaengine;
+package commons.javaengine;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/trunk/java/com/l2jserver/commons/javaengine/JavaScriptEngineFactory.java b/trunk/java/commons/javaengine/JavaScriptEngineFactory.java
similarity index 95%
rename from trunk/java/com/l2jserver/commons/javaengine/JavaScriptEngineFactory.java
rename to trunk/java/commons/javaengine/JavaScriptEngineFactory.java
index 9a63462f8c..2819a075ec 100644
--- a/trunk/java/com/l2jserver/commons/javaengine/JavaScriptEngineFactory.java
+++ b/trunk/java/commons/javaengine/JavaScriptEngineFactory.java
@@ -21,7 +21,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.l2jserver.commons.javaengine;
+package commons.javaengine;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/trunk/java/com/l2jserver/commons/javaengine/MemoryClassLoader.java b/trunk/java/commons/javaengine/MemoryClassLoader.java
similarity index 95%
rename from trunk/java/com/l2jserver/commons/javaengine/MemoryClassLoader.java
rename to trunk/java/commons/javaengine/MemoryClassLoader.java
index ead675be30..65f04692f2 100644
--- a/trunk/java/com/l2jserver/commons/javaengine/MemoryClassLoader.java
+++ b/trunk/java/commons/javaengine/MemoryClassLoader.java
@@ -21,7 +21,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.l2jserver.commons.javaengine;
+package commons.javaengine;
 
 import java.io.File;
 import java.net.MalformedURLException;
diff --git a/trunk/java/com/l2jserver/commons/javaengine/MemoryJavaFileManager.java b/trunk/java/commons/javaengine/MemoryJavaFileManager.java
similarity index 95%
rename from trunk/java/com/l2jserver/commons/javaengine/MemoryJavaFileManager.java
rename to trunk/java/commons/javaengine/MemoryJavaFileManager.java
index 926d4a9fc8..4d31c1fe7d 100644
--- a/trunk/java/com/l2jserver/commons/javaengine/MemoryJavaFileManager.java
+++ b/trunk/java/commons/javaengine/MemoryJavaFileManager.java
@@ -21,7 +21,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.l2jserver.commons.javaengine;
+package commons.javaengine;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/trunk/java/com/l2jserver/commons/mmocore/AbstractPacket.java b/trunk/java/commons/mmocore/AbstractPacket.java
similarity index 92%
rename from trunk/java/com/l2jserver/commons/mmocore/AbstractPacket.java
rename to trunk/java/commons/mmocore/AbstractPacket.java
index 1950407028..dc3226be7d 100644
--- a/trunk/java/com/l2jserver/commons/mmocore/AbstractPacket.java
+++ b/trunk/java/commons/mmocore/AbstractPacket.java
@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package com.l2jserver.commons.mmocore;
+package commons.mmocore;
 
 import java.nio.ByteBuffer;
 
diff --git a/trunk/java/com/l2jserver/commons/mmocore/IAcceptFilter.java b/trunk/java/commons/mmocore/IAcceptFilter.java
similarity index 93%
rename from trunk/java/com/l2jserver/commons/mmocore/IAcceptFilter.java
rename to trunk/java/commons/mmocore/IAcceptFilter.java
index b9db8224c9..d687030300 100644
--- a/trunk/java/com/l2jserver/commons/mmocore/IAcceptFilter.java
+++ b/trunk/java/commons/mmocore/IAcceptFilter.java
@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package com.l2jserver.commons.mmocore;
+package commons.mmocore;
 
 import java.nio.channels.SocketChannel;
 
diff --git a/trunk/java/com/l2jserver/commons/mmocore/IClientFactory.java b/trunk/java/commons/mmocore/IClientFactory.java
similarity index 93%
rename from trunk/java/com/l2jserver/commons/mmocore/IClientFactory.java
rename to trunk/java/commons/mmocore/IClientFactory.java
index f7985580e7..197848e0d6 100644
--- a/trunk/java/com/l2jserver/commons/mmocore/IClientFactory.java
+++ b/trunk/java/commons/mmocore/IClientFactory.java
@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package com.l2jserver.commons.mmocore;
+package commons.mmocore;
 
 /**
  * @author KenM
diff --git a/trunk/java/com/l2jserver/commons/mmocore/IMMOExecutor.java b/trunk/java/commons/mmocore/IMMOExecutor.java
similarity index 93%
rename from trunk/java/com/l2jserver/commons/mmocore/IMMOExecutor.java
rename to trunk/java/commons/mmocore/IMMOExecutor.java
index 19407aadea..b16116b3d4 100644
--- a/trunk/java/com/l2jserver/commons/mmocore/IMMOExecutor.java
+++ b/trunk/java/commons/mmocore/IMMOExecutor.java
@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package com.l2jserver.commons.mmocore;
+package commons.mmocore;
 
 /**
  * @author KenM
diff --git a/trunk/java/com/l2jserver/commons/mmocore/IPacketHandler.java b/trunk/java/commons/mmocore/IPacketHandler.java
similarity index 93%
rename from trunk/java/com/l2jserver/commons/mmocore/IPacketHandler.java
rename to trunk/java/commons/mmocore/IPacketHandler.java
index fd50cf9ef3..fac5f9002f 100644
--- a/trunk/java/com/l2jserver/commons/mmocore/IPacketHandler.java
+++ b/trunk/java/commons/mmocore/IPacketHandler.java
@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package com.l2jserver.commons.mmocore;
+package commons.mmocore;
 
 import java.nio.ByteBuffer;
 
diff --git a/trunk/java/com/l2jserver/commons/mmocore/MMOClient.java b/trunk/java/commons/mmocore/MMOClient.java
similarity index 93%
rename from trunk/java/com/l2jserver/commons/mmocore/MMOClient.java
rename to trunk/java/commons/mmocore/MMOClient.java
index 9ddff48df1..08fe55b364 100644
--- a/trunk/java/com/l2jserver/commons/mmocore/MMOClient.java
+++ b/trunk/java/commons/mmocore/MMOClient.java
@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package com.l2jserver.commons.mmocore;
+package commons.mmocore;
 
 import java.nio.ByteBuffer;
 
diff --git a/trunk/java/com/l2jserver/commons/mmocore/MMOConnection.java b/trunk/java/commons/mmocore/MMOConnection.java
similarity index 94%
rename from trunk/java/com/l2jserver/commons/mmocore/MMOConnection.java
rename to trunk/java/commons/mmocore/MMOConnection.java
index e40692b61d..7657ec763e 100644
--- a/trunk/java/com/l2jserver/commons/mmocore/MMOConnection.java
+++ b/trunk/java/commons/mmocore/MMOConnection.java
@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package com.l2jserver.commons.mmocore;
+package commons.mmocore;
 
 import java.io.IOException;
 import java.net.InetAddress;
diff --git a/trunk/java/com/l2jserver/commons/mmocore/NioNetStackList.java b/trunk/java/commons/mmocore/NioNetStackList.java
similarity index 94%
rename from trunk/java/com/l2jserver/commons/mmocore/NioNetStackList.java
rename to trunk/java/commons/mmocore/NioNetStackList.java
index e521ae67e6..a0c6ed45bf 100644
--- a/trunk/java/com/l2jserver/commons/mmocore/NioNetStackList.java
+++ b/trunk/java/commons/mmocore/NioNetStackList.java
@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package com.l2jserver.commons.mmocore;
+package commons.mmocore;
 
 /**
  * @author Forsaiken
diff --git a/trunk/java/com/l2jserver/commons/mmocore/NioNetStringBuffer.java b/trunk/java/commons/mmocore/NioNetStringBuffer.java
similarity index 92%
rename from trunk/java/com/l2jserver/commons/mmocore/NioNetStringBuffer.java
rename to trunk/java/commons/mmocore/NioNetStringBuffer.java
index ce5cecbf3f..f66ba6436e 100644
--- a/trunk/java/com/l2jserver/commons/mmocore/NioNetStringBuffer.java
+++ b/trunk/java/commons/mmocore/NioNetStringBuffer.java
@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package com.l2jserver.commons.mmocore;
+package commons.mmocore;
 
 import java.nio.BufferOverflowException;
 
diff --git a/trunk/java/com/l2jserver/commons/mmocore/ReceivablePacket.java b/trunk/java/commons/mmocore/ReceivablePacket.java
similarity index 94%
rename from trunk/java/com/l2jserver/commons/mmocore/ReceivablePacket.java
rename to trunk/java/commons/mmocore/ReceivablePacket.java
index c9c843db37..db44dcbed5 100644
--- a/trunk/java/com/l2jserver/commons/mmocore/ReceivablePacket.java
+++ b/trunk/java/commons/mmocore/ReceivablePacket.java
@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package com.l2jserver.commons.mmocore;
+package commons.mmocore;
 
 import java.nio.ByteBuffer;
 
diff --git a/trunk/java/com/l2jserver/commons/mmocore/SelectorConfig.java b/trunk/java/commons/mmocore/SelectorConfig.java
similarity index 96%
rename from trunk/java/com/l2jserver/commons/mmocore/SelectorConfig.java
rename to trunk/java/commons/mmocore/SelectorConfig.java
index ce4acd5d25..3295b87611 100644
--- a/trunk/java/com/l2jserver/commons/mmocore/SelectorConfig.java
+++ b/trunk/java/commons/mmocore/SelectorConfig.java
@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package com.l2jserver.commons.mmocore;
+package commons.mmocore;
 
 /**
  * @author KenM
diff --git a/trunk/java/com/l2jserver/commons/mmocore/SelectorThread.java b/trunk/java/commons/mmocore/SelectorThread.java
similarity index 95%
rename from trunk/java/com/l2jserver/commons/mmocore/SelectorThread.java
rename to trunk/java/commons/mmocore/SelectorThread.java
index f915484cd8..7ae5fbeb69 100644
--- a/trunk/java/com/l2jserver/commons/mmocore/SelectorThread.java
+++ b/trunk/java/commons/mmocore/SelectorThread.java
@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package com.l2jserver.commons.mmocore;
+package commons.mmocore;
 
 import java.io.IOException;
 import java.net.InetAddress;
diff --git a/trunk/java/com/l2jserver/commons/mmocore/SendablePacket.java b/trunk/java/commons/mmocore/SendablePacket.java
similarity index 94%
rename from trunk/java/com/l2jserver/commons/mmocore/SendablePacket.java
rename to trunk/java/commons/mmocore/SendablePacket.java
index 5a875137f2..bb849f91a4 100644
--- a/trunk/java/com/l2jserver/commons/mmocore/SendablePacket.java
+++ b/trunk/java/commons/mmocore/SendablePacket.java
@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package com.l2jserver.commons.mmocore;
+package commons.mmocore;
 
 /**
  * @author KenM