diff --git a/L2J_Mobius_1.0_Ertheia/build.xml b/L2J_Mobius_1.0_Ertheia/build.xml
index 94fbc94f3c..245dcde99c 100644
--- a/L2J_Mobius_1.0_Ertheia/build.xml
+++ b/L2J_Mobius_1.0_Ertheia/build.xml
@@ -21,8 +21,7 @@
 	<property name="build" location="../build" />
 	<property name="build.bin" location="${build}/bin" />
 	<property name="build.dist" location="${build}/dist" />
-	<property name="build.dist.game" location="${build.dist}/game" />
-	<property name="build.dist.login" location="${build.dist}/login" />
+	<property name="build.dist.libs" location="${build.dist}/libs" />
 	<property name="build.dist.dbinstaller" location="${build.dist}/db_installer" />
 	<property name="datapack" location="dist" />
 	<property name="libs" location="${datapack}/libs" />
@@ -70,7 +69,7 @@
 			<format property="time.stamp" pattern="yyyy-MM-dd HH:mm:ss" />
 		</tstamp>
 
-		<jar destfile="${build.dist.login}/LoginServer.jar" level="9">
+		<jar destfile="${build.dist.libs}/LoginServer.jar" level="9">
 			<fileset dir="${build.bin}">
 				<exclude name="**/dbinstaller/**" />
 				<exclude name="**/gameserver/**" />
@@ -86,7 +85,7 @@
 				<attribute name="Main-Class" value="com.l2jmobius.loginserver.LoginServer" />
 			</manifest>
 		</jar>
-		<jar destfile="${build.dist.game}/GameServer.jar" level="9">
+		<jar destfile="${build.dist.libs}/GameServer.jar" level="9">
 			<fileset dir="${build.bin}">
 				<exclude name="**/dbinstaller/**" />
 				<exclude name="**/loginserver/**" />
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/GameServer_loop.sh b/L2J_Mobius_1.0_Ertheia/dist/game/GameServer_loop.sh
index 65ff2c74f2..752e9ec48a 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/GameServer_loop.sh
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/GameServer_loop.sh
@@ -7,7 +7,7 @@
 while :; do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar GameServer.jar > log/stdout.log 2>&1
+	java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar ../libs/GameServer.jar > log/stdout.log 2>&1
 	[ $? -ne 2 ] && break
 #	/etc/init.d/mysql restart
 	sleep 10
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/GeoDataConverter.bat b/L2J_Mobius_1.0_Ertheia/dist/game/GeoDataConverter.bat
index 1f199613e9..3b4270d5dd 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/GeoDataConverter.bat
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/GeoDataConverter.bat
@@ -1,6 +1,6 @@
 @echo off
 title L2D geodata converter
 
-java -Xmx512m -cp ./../libs/*;GameServer.jar com.l2jmobius.tools.geodataconverter.GeoDataConverter
+java -Xmx512m -cp ./../libs/* com.l2jmobius.tools.geodataconverter.GeoDataConverter
 
 pause
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/GeoDataConverter.sh b/L2J_Mobius_1.0_Ertheia/dist/game/GeoDataConverter.sh
index ac182b008f..934cc42075 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/GeoDataConverter.sh
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/GeoDataConverter.sh
@@ -1,4 +1,4 @@
 #! /bin/sh
 
-java -Xmx512m -cp ../libs/*:GameServer.jar com.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+java -Xmx512m -cp ../libs/*: com.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
 
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/startGameServer.bat b/L2J_Mobius_1.0_Ertheia/dist/game/startGameServer.bat
index 5aabe300d0..08c0cd84cc 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/startGameServer.bat
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/startGameServer.bat
@@ -5,15 +5,7 @@ title L2J Mobius - Game Server Console
 echo Starting Game Server.
 echo.
 
-REM java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Dpython.cachedir=../cachedir -Xms1024m -Xmx1536m -jar GameServer.jar
-java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar GameServer.jar
-
-REM NOTE: If you have a powerful machine, you could modify/add some extra parameters for performance, like:
-REM -Xms1536m
-REM -Xmx3072m
-REM -XX:+AggressiveOpts
-REM Use this parameters carefully, some of them could cause abnormal behavior, deadlocks, etc.
-REM More info here: http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html
+java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar ../libs/GameServer.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
diff --git a/L2J_Mobius_1.0_Ertheia/dist/login/LoginServer_loop.sh b/L2J_Mobius_1.0_Ertheia/dist/login/LoginServer_loop.sh
index 794e01ab41..600080c2b7 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/login/LoginServer_loop.sh
+++ b/L2J_Mobius_1.0_Ertheia/dist/login/LoginServer_loop.sh
@@ -5,7 +5,7 @@ until [ $err == 0 ];
 do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Xms128m -Xmx256m -jar LoginServer.jar > log/stdout.log 2>&1
+	java -Xms128m -Xmx256m -jar ../libs/LoginServer.jar > log/stdout.log 2>&1
 	err=$?
 	sleep 10;
 done
diff --git a/L2J_Mobius_1.0_Ertheia/dist/login/RegisterGameServer.bat b/L2J_Mobius_1.0_Ertheia/dist/login/RegisterGameServer.bat
index 0601033c52..6280e04eba 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/login/RegisterGameServer.bat
+++ b/L2J_Mobius_1.0_Ertheia/dist/login/RegisterGameServer.bat
@@ -1,5 +1,5 @@
 @echo off
 title Register Game Server
 color 17
-java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c
+java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/* com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c
 pause
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/login/RegisterGameServer.sh b/L2J_Mobius_1.0_Ertheia/dist/login/RegisterGameServer.sh
index 03abd37b47..a88fb79fb8 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/login/RegisterGameServer.sh
+++ b/L2J_Mobius_1.0_Ertheia/dist/login/RegisterGameServer.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.gsregistering.GameServerRegister -c
\ No newline at end of file
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*: com.l2jmobius.tools.gsregistering.GameServerRegister -c
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/login/startLoginServer.bat b/L2J_Mobius_1.0_Ertheia/dist/login/startLoginServer.bat
index d3957e8795..8d8941223f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/login/startLoginServer.bat
+++ b/L2J_Mobius_1.0_Ertheia/dist/login/startLoginServer.bat
@@ -5,8 +5,7 @@ title L2J Mobius - Login Server Console
 echo Starting Login Server.
 echo.
 
-REM java -Xms128m -Xmx256m -jar LoginServer.jar
-java -version:1.8 -server -Xms128m -Xmx256m -jar LoginServer.jar
+java -version:1.8 -server -Xms128m -Xmx256m -jar ../libs/LoginServer.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
diff --git a/L2J_Mobius_1.0_Ertheia/dist/login/startSQLAccountManager.bat b/L2J_Mobius_1.0_Ertheia/dist/login/startSQLAccountManager.bat
index 6f6d9fb509..dcf00b6c59 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/login/startSQLAccountManager.bat
+++ b/L2J_Mobius_1.0_Ertheia/dist/login/startSQLAccountManager.bat
@@ -1,7 +1,7 @@
 @echo off
 title SQL Account Manager
 color 17
-java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager
+java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/* com.l2jmobius.tools.accountmanager.SQLAccountManager
 if %errorlevel% == 0 (
 echo.
 echo Execution successful
diff --git a/L2J_Mobius_1.0_Ertheia/dist/login/startSQLAccountManager.sh b/L2J_Mobius_1.0_Ertheia/dist/login/startSQLAccountManager.sh
index d090d4ff98..972b0e107a 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/login/startSQLAccountManager.sh
+++ b/L2J_Mobius_1.0_Ertheia/dist/login/startSQLAccountManager.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*: com.l2jmobius.tools.accountmanager.SQLAccountManager
diff --git a/L2J_Mobius_2.5_Underground/build.xml b/L2J_Mobius_2.5_Underground/build.xml
index 145a1a1570..061d49f631 100644
--- a/L2J_Mobius_2.5_Underground/build.xml
+++ b/L2J_Mobius_2.5_Underground/build.xml
@@ -21,8 +21,7 @@
 	<property name="build" location="../build" />
 	<property name="build.bin" location="${build}/bin" />
 	<property name="build.dist" location="${build}/dist" />
-	<property name="build.dist.game" location="${build.dist}/game" />
-	<property name="build.dist.login" location="${build.dist}/login" />
+	<property name="build.dist.libs" location="${build.dist}/libs" />
 	<property name="build.dist.dbinstaller" location="${build.dist}/db_installer" />
 	<property name="datapack" location="dist" />
 	<property name="libs" location="${datapack}/libs" />
@@ -70,7 +69,7 @@
 			<format property="time.stamp" pattern="yyyy-MM-dd HH:mm:ss" />
 		</tstamp>
 
-		<jar destfile="${build.dist.login}/LoginServer.jar" level="9">
+		<jar destfile="${build.dist.libs}/LoginServer.jar" level="9">
 			<fileset dir="${build.bin}">
 				<exclude name="**/dbinstaller/**" />
 				<exclude name="**/gameserver/**" />
@@ -86,7 +85,7 @@
 				<attribute name="Main-Class" value="com.l2jmobius.loginserver.LoginServer" />
 			</manifest>
 		</jar>
-		<jar destfile="${build.dist.game}/GameServer.jar" level="9">
+		<jar destfile="${build.dist.libs}/GameServer.jar" level="9">
 			<fileset dir="${build.bin}">
 				<exclude name="**/dbinstaller/**" />
 				<exclude name="**/loginserver/**" />
diff --git a/L2J_Mobius_2.5_Underground/dist/game/GameServer_loop.sh b/L2J_Mobius_2.5_Underground/dist/game/GameServer_loop.sh
index 65ff2c74f2..752e9ec48a 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/GameServer_loop.sh
+++ b/L2J_Mobius_2.5_Underground/dist/game/GameServer_loop.sh
@@ -7,7 +7,7 @@
 while :; do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar GameServer.jar > log/stdout.log 2>&1
+	java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar ../libs/GameServer.jar > log/stdout.log 2>&1
 	[ $? -ne 2 ] && break
 #	/etc/init.d/mysql restart
 	sleep 10
diff --git a/L2J_Mobius_2.5_Underground/dist/game/GeoDataConverter.bat b/L2J_Mobius_2.5_Underground/dist/game/GeoDataConverter.bat
index 1f199613e9..3b4270d5dd 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/GeoDataConverter.bat
+++ b/L2J_Mobius_2.5_Underground/dist/game/GeoDataConverter.bat
@@ -1,6 +1,6 @@
 @echo off
 title L2D geodata converter
 
-java -Xmx512m -cp ./../libs/*;GameServer.jar com.l2jmobius.tools.geodataconverter.GeoDataConverter
+java -Xmx512m -cp ./../libs/* com.l2jmobius.tools.geodataconverter.GeoDataConverter
 
 pause
diff --git a/L2J_Mobius_2.5_Underground/dist/game/GeoDataConverter.sh b/L2J_Mobius_2.5_Underground/dist/game/GeoDataConverter.sh
index ac182b008f..934cc42075 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/GeoDataConverter.sh
+++ b/L2J_Mobius_2.5_Underground/dist/game/GeoDataConverter.sh
@@ -1,4 +1,4 @@
 #! /bin/sh
 
-java -Xmx512m -cp ../libs/*:GameServer.jar com.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+java -Xmx512m -cp ../libs/*: com.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
 
diff --git a/L2J_Mobius_2.5_Underground/dist/game/startGameServer.bat b/L2J_Mobius_2.5_Underground/dist/game/startGameServer.bat
index 5aabe300d0..08c0cd84cc 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/startGameServer.bat
+++ b/L2J_Mobius_2.5_Underground/dist/game/startGameServer.bat
@@ -5,15 +5,7 @@ title L2J Mobius - Game Server Console
 echo Starting Game Server.
 echo.
 
-REM java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Dpython.cachedir=../cachedir -Xms1024m -Xmx1536m -jar GameServer.jar
-java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar GameServer.jar
-
-REM NOTE: If you have a powerful machine, you could modify/add some extra parameters for performance, like:
-REM -Xms1536m
-REM -Xmx3072m
-REM -XX:+AggressiveOpts
-REM Use this parameters carefully, some of them could cause abnormal behavior, deadlocks, etc.
-REM More info here: http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html
+java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar ../libs/GameServer.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
diff --git a/L2J_Mobius_2.5_Underground/dist/login/LoginServer_loop.sh b/L2J_Mobius_2.5_Underground/dist/login/LoginServer_loop.sh
index 794e01ab41..600080c2b7 100644
--- a/L2J_Mobius_2.5_Underground/dist/login/LoginServer_loop.sh
+++ b/L2J_Mobius_2.5_Underground/dist/login/LoginServer_loop.sh
@@ -5,7 +5,7 @@ until [ $err == 0 ];
 do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Xms128m -Xmx256m -jar LoginServer.jar > log/stdout.log 2>&1
+	java -Xms128m -Xmx256m -jar ../libs/LoginServer.jar > log/stdout.log 2>&1
 	err=$?
 	sleep 10;
 done
diff --git a/L2J_Mobius_2.5_Underground/dist/login/RegisterGameServer.bat b/L2J_Mobius_2.5_Underground/dist/login/RegisterGameServer.bat
index 0601033c52..6280e04eba 100644
--- a/L2J_Mobius_2.5_Underground/dist/login/RegisterGameServer.bat
+++ b/L2J_Mobius_2.5_Underground/dist/login/RegisterGameServer.bat
@@ -1,5 +1,5 @@
 @echo off
 title Register Game Server
 color 17
-java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c
+java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/* com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c
 pause
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/login/RegisterGameServer.sh b/L2J_Mobius_2.5_Underground/dist/login/RegisterGameServer.sh
index 03abd37b47..a88fb79fb8 100644
--- a/L2J_Mobius_2.5_Underground/dist/login/RegisterGameServer.sh
+++ b/L2J_Mobius_2.5_Underground/dist/login/RegisterGameServer.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.gsregistering.GameServerRegister -c
\ No newline at end of file
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*: com.l2jmobius.tools.gsregistering.GameServerRegister -c
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/login/startLoginServer.bat b/L2J_Mobius_2.5_Underground/dist/login/startLoginServer.bat
index d3957e8795..8d8941223f 100644
--- a/L2J_Mobius_2.5_Underground/dist/login/startLoginServer.bat
+++ b/L2J_Mobius_2.5_Underground/dist/login/startLoginServer.bat
@@ -5,8 +5,7 @@ title L2J Mobius - Login Server Console
 echo Starting Login Server.
 echo.
 
-REM java -Xms128m -Xmx256m -jar LoginServer.jar
-java -version:1.8 -server -Xms128m -Xmx256m -jar LoginServer.jar
+java -version:1.8 -server -Xms128m -Xmx256m -jar ../libs/LoginServer.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
diff --git a/L2J_Mobius_2.5_Underground/dist/login/startSQLAccountManager.bat b/L2J_Mobius_2.5_Underground/dist/login/startSQLAccountManager.bat
index 6f6d9fb509..dcf00b6c59 100644
--- a/L2J_Mobius_2.5_Underground/dist/login/startSQLAccountManager.bat
+++ b/L2J_Mobius_2.5_Underground/dist/login/startSQLAccountManager.bat
@@ -1,7 +1,7 @@
 @echo off
 title SQL Account Manager
 color 17
-java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager
+java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/* com.l2jmobius.tools.accountmanager.SQLAccountManager
 if %errorlevel% == 0 (
 echo.
 echo Execution successful
diff --git a/L2J_Mobius_2.5_Underground/dist/login/startSQLAccountManager.sh b/L2J_Mobius_2.5_Underground/dist/login/startSQLAccountManager.sh
index d090d4ff98..972b0e107a 100644
--- a/L2J_Mobius_2.5_Underground/dist/login/startSQLAccountManager.sh
+++ b/L2J_Mobius_2.5_Underground/dist/login/startSQLAccountManager.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*: com.l2jmobius.tools.accountmanager.SQLAccountManager
diff --git a/L2J_Mobius_3.0_Helios/build.xml b/L2J_Mobius_3.0_Helios/build.xml
index 246a8b7d53..fa64c28576 100644
--- a/L2J_Mobius_3.0_Helios/build.xml
+++ b/L2J_Mobius_3.0_Helios/build.xml
@@ -21,8 +21,7 @@
 	<property name="build" location="../build" />
 	<property name="build.bin" location="${build}/bin" />
 	<property name="build.dist" location="${build}/dist" />
-	<property name="build.dist.game" location="${build.dist}/game" />
-	<property name="build.dist.login" location="${build.dist}/login" />
+	<property name="build.dist.libs" location="${build.dist}/libs" />
 	<property name="build.dist.dbinstaller" location="${build.dist}/db_installer" />
 	<property name="datapack" location="dist" />
 	<property name="libs" location="${datapack}/libs" />
@@ -70,7 +69,7 @@
 			<format property="time.stamp" pattern="yyyy-MM-dd HH:mm:ss" />
 		</tstamp>
 
-		<jar destfile="${build.dist.login}/LoginServer.jar" level="9">
+		<jar destfile="${build.dist.libs}/LoginServer.jar" level="9">
 			<fileset dir="${build.bin}">
 				<exclude name="**/dbinstaller/**" />
 				<exclude name="**/gameserver/**" />
@@ -86,7 +85,7 @@
 				<attribute name="Main-Class" value="com.l2jmobius.loginserver.LoginServer" />
 			</manifest>
 		</jar>
-		<jar destfile="${build.dist.game}/GameServer.jar" level="9">
+		<jar destfile="${build.dist.libs}/GameServer.jar" level="9">
 			<fileset dir="${build.bin}">
 				<exclude name="**/dbinstaller/**" />
 				<exclude name="**/loginserver/**" />
diff --git a/L2J_Mobius_3.0_Helios/dist/game/GameServer_loop.sh b/L2J_Mobius_3.0_Helios/dist/game/GameServer_loop.sh
index 65ff2c74f2..752e9ec48a 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/GameServer_loop.sh
+++ b/L2J_Mobius_3.0_Helios/dist/game/GameServer_loop.sh
@@ -7,7 +7,7 @@
 while :; do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar GameServer.jar > log/stdout.log 2>&1
+	java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar ../libs/GameServer.jar > log/stdout.log 2>&1
 	[ $? -ne 2 ] && break
 #	/etc/init.d/mysql restart
 	sleep 10
diff --git a/L2J_Mobius_3.0_Helios/dist/game/GeoDataConverter.bat b/L2J_Mobius_3.0_Helios/dist/game/GeoDataConverter.bat
index 1f199613e9..3b4270d5dd 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/GeoDataConverter.bat
+++ b/L2J_Mobius_3.0_Helios/dist/game/GeoDataConverter.bat
@@ -1,6 +1,6 @@
 @echo off
 title L2D geodata converter
 
-java -Xmx512m -cp ./../libs/*;GameServer.jar com.l2jmobius.tools.geodataconverter.GeoDataConverter
+java -Xmx512m -cp ./../libs/* com.l2jmobius.tools.geodataconverter.GeoDataConverter
 
 pause
diff --git a/L2J_Mobius_3.0_Helios/dist/game/GeoDataConverter.sh b/L2J_Mobius_3.0_Helios/dist/game/GeoDataConverter.sh
index ac182b008f..934cc42075 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/GeoDataConverter.sh
+++ b/L2J_Mobius_3.0_Helios/dist/game/GeoDataConverter.sh
@@ -1,4 +1,4 @@
 #! /bin/sh
 
-java -Xmx512m -cp ../libs/*:GameServer.jar com.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+java -Xmx512m -cp ../libs/*: com.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
 
diff --git a/L2J_Mobius_3.0_Helios/dist/game/startGameServer.bat b/L2J_Mobius_3.0_Helios/dist/game/startGameServer.bat
index 5aabe300d0..08c0cd84cc 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/startGameServer.bat
+++ b/L2J_Mobius_3.0_Helios/dist/game/startGameServer.bat
@@ -5,15 +5,7 @@ title L2J Mobius - Game Server Console
 echo Starting Game Server.
 echo.
 
-REM java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Dpython.cachedir=../cachedir -Xms1024m -Xmx1536m -jar GameServer.jar
-java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar GameServer.jar
-
-REM NOTE: If you have a powerful machine, you could modify/add some extra parameters for performance, like:
-REM -Xms1536m
-REM -Xmx3072m
-REM -XX:+AggressiveOpts
-REM Use this parameters carefully, some of them could cause abnormal behavior, deadlocks, etc.
-REM More info here: http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html
+java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar ../libs/GameServer.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
diff --git a/L2J_Mobius_3.0_Helios/dist/login/LoginServer_loop.sh b/L2J_Mobius_3.0_Helios/dist/login/LoginServer_loop.sh
index 794e01ab41..600080c2b7 100644
--- a/L2J_Mobius_3.0_Helios/dist/login/LoginServer_loop.sh
+++ b/L2J_Mobius_3.0_Helios/dist/login/LoginServer_loop.sh
@@ -5,7 +5,7 @@ until [ $err == 0 ];
 do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Xms128m -Xmx256m -jar LoginServer.jar > log/stdout.log 2>&1
+	java -Xms128m -Xmx256m -jar ../libs/LoginServer.jar > log/stdout.log 2>&1
 	err=$?
 	sleep 10;
 done
diff --git a/L2J_Mobius_3.0_Helios/dist/login/RegisterGameServer.bat b/L2J_Mobius_3.0_Helios/dist/login/RegisterGameServer.bat
index 0601033c52..6280e04eba 100644
--- a/L2J_Mobius_3.0_Helios/dist/login/RegisterGameServer.bat
+++ b/L2J_Mobius_3.0_Helios/dist/login/RegisterGameServer.bat
@@ -1,5 +1,5 @@
 @echo off
 title Register Game Server
 color 17
-java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c
+java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/* com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c
 pause
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/login/RegisterGameServer.sh b/L2J_Mobius_3.0_Helios/dist/login/RegisterGameServer.sh
index 03abd37b47..a88fb79fb8 100644
--- a/L2J_Mobius_3.0_Helios/dist/login/RegisterGameServer.sh
+++ b/L2J_Mobius_3.0_Helios/dist/login/RegisterGameServer.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.gsregistering.GameServerRegister -c
\ No newline at end of file
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*: com.l2jmobius.tools.gsregistering.GameServerRegister -c
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/login/startLoginServer.bat b/L2J_Mobius_3.0_Helios/dist/login/startLoginServer.bat
index d3957e8795..8d8941223f 100644
--- a/L2J_Mobius_3.0_Helios/dist/login/startLoginServer.bat
+++ b/L2J_Mobius_3.0_Helios/dist/login/startLoginServer.bat
@@ -5,8 +5,7 @@ title L2J Mobius - Login Server Console
 echo Starting Login Server.
 echo.
 
-REM java -Xms128m -Xmx256m -jar LoginServer.jar
-java -version:1.8 -server -Xms128m -Xmx256m -jar LoginServer.jar
+java -version:1.8 -server -Xms128m -Xmx256m -jar ../libs/LoginServer.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
diff --git a/L2J_Mobius_3.0_Helios/dist/login/startSQLAccountManager.bat b/L2J_Mobius_3.0_Helios/dist/login/startSQLAccountManager.bat
index 6f6d9fb509..dcf00b6c59 100644
--- a/L2J_Mobius_3.0_Helios/dist/login/startSQLAccountManager.bat
+++ b/L2J_Mobius_3.0_Helios/dist/login/startSQLAccountManager.bat
@@ -1,7 +1,7 @@
 @echo off
 title SQL Account Manager
 color 17
-java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager
+java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/* com.l2jmobius.tools.accountmanager.SQLAccountManager
 if %errorlevel% == 0 (
 echo.
 echo Execution successful
diff --git a/L2J_Mobius_3.0_Helios/dist/login/startSQLAccountManager.sh b/L2J_Mobius_3.0_Helios/dist/login/startSQLAccountManager.sh
index d090d4ff98..972b0e107a 100644
--- a/L2J_Mobius_3.0_Helios/dist/login/startSQLAccountManager.sh
+++ b/L2J_Mobius_3.0_Helios/dist/login/startSQLAccountManager.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*: com.l2jmobius.tools.accountmanager.SQLAccountManager
diff --git a/L2J_Mobius_4.0_GrandCrusade/build.xml b/L2J_Mobius_4.0_GrandCrusade/build.xml
index f2d694d59a..5207ce69f8 100644
--- a/L2J_Mobius_4.0_GrandCrusade/build.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/build.xml
@@ -21,8 +21,7 @@
 	<property name="build" location="../build" />
 	<property name="build.bin" location="${build}/bin" />
 	<property name="build.dist" location="${build}/dist" />
-	<property name="build.dist.game" location="${build.dist}/game" />
-	<property name="build.dist.login" location="${build.dist}/login" />
+	<property name="build.dist.libs" location="${build.dist}/libs" />
 	<property name="build.dist.dbinstaller" location="${build.dist}/db_installer" />
 	<property name="datapack" location="dist" />
 	<property name="libs" location="${datapack}/libs" />
@@ -70,7 +69,7 @@
 			<format property="time.stamp" pattern="yyyy-MM-dd HH:mm:ss" />
 		</tstamp>
 
-		<jar destfile="${build.dist.login}/LoginServer.jar" level="9">
+		<jar destfile="${build.dist.libs}/LoginServer.jar" level="9">
 			<fileset dir="${build.bin}">
 				<exclude name="**/dbinstaller/**" />
 				<exclude name="**/gameserver/**" />
@@ -86,7 +85,7 @@
 				<attribute name="Main-Class" value="com.l2jmobius.loginserver.LoginServer" />
 			</manifest>
 		</jar>
-		<jar destfile="${build.dist.game}/GameServer.jar" level="9">
+		<jar destfile="${build.dist.libs}/GameServer.jar" level="9">
 			<fileset dir="${build.bin}">
 				<exclude name="**/dbinstaller/**" />
 				<exclude name="**/loginserver/**" />
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/GameServer_loop.sh b/L2J_Mobius_4.0_GrandCrusade/dist/game/GameServer_loop.sh
index 65ff2c74f2..752e9ec48a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/GameServer_loop.sh
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/GameServer_loop.sh
@@ -7,7 +7,7 @@
 while :; do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar GameServer.jar > log/stdout.log 2>&1
+	java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar ../libs/GameServer.jar > log/stdout.log 2>&1
 	[ $? -ne 2 ] && break
 #	/etc/init.d/mysql restart
 	sleep 10
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/GeoDataConverter.bat b/L2J_Mobius_4.0_GrandCrusade/dist/game/GeoDataConverter.bat
index 1f199613e9..3b4270d5dd 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/GeoDataConverter.bat
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/GeoDataConverter.bat
@@ -1,6 +1,6 @@
 @echo off
 title L2D geodata converter
 
-java -Xmx512m -cp ./../libs/*;GameServer.jar com.l2jmobius.tools.geodataconverter.GeoDataConverter
+java -Xmx512m -cp ./../libs/* com.l2jmobius.tools.geodataconverter.GeoDataConverter
 
 pause
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/GeoDataConverter.sh b/L2J_Mobius_4.0_GrandCrusade/dist/game/GeoDataConverter.sh
index ac182b008f..934cc42075 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/GeoDataConverter.sh
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/GeoDataConverter.sh
@@ -1,4 +1,4 @@
 #! /bin/sh
 
-java -Xmx512m -cp ../libs/*:GameServer.jar com.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+java -Xmx512m -cp ../libs/*: com.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
 
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/startGameServer.bat b/L2J_Mobius_4.0_GrandCrusade/dist/game/startGameServer.bat
index 5aabe300d0..08c0cd84cc 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/startGameServer.bat
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/startGameServer.bat
@@ -5,15 +5,7 @@ title L2J Mobius - Game Server Console
 echo Starting Game Server.
 echo.
 
-REM java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Dpython.cachedir=../cachedir -Xms1024m -Xmx1536m -jar GameServer.jar
-java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar GameServer.jar
-
-REM NOTE: If you have a powerful machine, you could modify/add some extra parameters for performance, like:
-REM -Xms1536m
-REM -Xmx3072m
-REM -XX:+AggressiveOpts
-REM Use this parameters carefully, some of them could cause abnormal behavior, deadlocks, etc.
-REM More info here: http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html
+java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar ../libs/GameServer.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/login/LoginServer_loop.sh b/L2J_Mobius_4.0_GrandCrusade/dist/login/LoginServer_loop.sh
index 794e01ab41..600080c2b7 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/login/LoginServer_loop.sh
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/login/LoginServer_loop.sh
@@ -5,7 +5,7 @@ until [ $err == 0 ];
 do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Xms128m -Xmx256m -jar LoginServer.jar > log/stdout.log 2>&1
+	java -Xms128m -Xmx256m -jar ../libs/LoginServer.jar > log/stdout.log 2>&1
 	err=$?
 	sleep 10;
 done
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/login/RegisterGameServer.bat b/L2J_Mobius_4.0_GrandCrusade/dist/login/RegisterGameServer.bat
index 0601033c52..6280e04eba 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/login/RegisterGameServer.bat
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/login/RegisterGameServer.bat
@@ -1,5 +1,5 @@
 @echo off
 title Register Game Server
 color 17
-java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c
+java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/* com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c
 pause
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/login/RegisterGameServer.sh b/L2J_Mobius_4.0_GrandCrusade/dist/login/RegisterGameServer.sh
index 03abd37b47..a88fb79fb8 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/login/RegisterGameServer.sh
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/login/RegisterGameServer.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.gsregistering.GameServerRegister -c
\ No newline at end of file
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*: com.l2jmobius.tools.gsregistering.GameServerRegister -c
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/login/startLoginServer.bat b/L2J_Mobius_4.0_GrandCrusade/dist/login/startLoginServer.bat
index d3957e8795..8d8941223f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/login/startLoginServer.bat
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/login/startLoginServer.bat
@@ -5,8 +5,7 @@ title L2J Mobius - Login Server Console
 echo Starting Login Server.
 echo.
 
-REM java -Xms128m -Xmx256m -jar LoginServer.jar
-java -version:1.8 -server -Xms128m -Xmx256m -jar LoginServer.jar
+java -version:1.8 -server -Xms128m -Xmx256m -jar ../libs/LoginServer.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/login/startSQLAccountManager.bat b/L2J_Mobius_4.0_GrandCrusade/dist/login/startSQLAccountManager.bat
index 6f6d9fb509..dcf00b6c59 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/login/startSQLAccountManager.bat
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/login/startSQLAccountManager.bat
@@ -1,7 +1,7 @@
 @echo off
 title SQL Account Manager
 color 17
-java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager
+java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/* com.l2jmobius.tools.accountmanager.SQLAccountManager
 if %errorlevel% == 0 (
 echo.
 echo Execution successful
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/login/startSQLAccountManager.sh b/L2J_Mobius_4.0_GrandCrusade/dist/login/startSQLAccountManager.sh
index d090d4ff98..972b0e107a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/login/startSQLAccountManager.sh
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/login/startSQLAccountManager.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*: com.l2jmobius.tools.accountmanager.SQLAccountManager
diff --git a/L2J_Mobius_C6_Interlude/build.xml b/L2J_Mobius_C6_Interlude/build.xml
index 383617c363..17f4446493 100644
--- a/L2J_Mobius_C6_Interlude/build.xml
+++ b/L2J_Mobius_C6_Interlude/build.xml
@@ -21,8 +21,7 @@
 	<property name="build" location="../build" />
 	<property name="build.bin" location="${build}/bin" />
 	<property name="build.dist" location="${build}/dist" />
-	<property name="build.dist.game" location="${build.dist}/game" />
-	<property name="build.dist.login" location="${build.dist}/login" />
+	<property name="build.dist.libs" location="${build.dist}/libs" />
 	<property name="build.dist.dbinstaller" location="${build.dist}/db_installer" />
 	<property name="datapack" location="dist" />
 	<property name="libs" location="${datapack}/libs" />
@@ -70,10 +69,10 @@
 			<format property="time.stamp" pattern="yyyy-MM-dd HH:mm:ss" />
 		</tstamp>
 
-		<jar destfile="${build.dist.login}/LoginServer.jar" level="9">
+		<jar destfile="${build.dist.libs}/LoginServer.jar" level="9">
 			<fileset dir="${build.bin}">
-				<exclude name="**/gameserver/**" />
 				<exclude name="**/dbinstaller/**" />
+				<exclude name="**/gameserver/**" />
 			</fileset>
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
@@ -83,7 +82,7 @@
 				<attribute name="Main-Class" value="com.l2jmobius.loginserver.LoginServer" />
 			</manifest>
 		</jar>
-		<jar destfile="${build.dist.game}/GameServer.jar" level="9">
+		<jar destfile="${build.dist.libs}/GameServer.jar" level="9">
 			<fileset dir="${build.bin}">
 				<exclude name="**/dbinstaller/**" />
 				<exclude name="**/loginserver/**" />
diff --git a/L2J_Mobius_C6_Interlude/dist/game/GameServer_loop.sh b/L2J_Mobius_C6_Interlude/dist/game/GameServer_loop.sh
index 65ff2c74f2..752e9ec48a 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/GameServer_loop.sh
+++ b/L2J_Mobius_C6_Interlude/dist/game/GameServer_loop.sh
@@ -7,7 +7,7 @@
 while :; do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar GameServer.jar > log/stdout.log 2>&1
+	java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar ../libs/GameServer.jar > log/stdout.log 2>&1
 	[ $? -ne 2 ] && break
 #	/etc/init.d/mysql restart
 	sleep 10
diff --git a/L2J_Mobius_C6_Interlude/dist/game/startGameServer.bat b/L2J_Mobius_C6_Interlude/dist/game/startGameServer.bat
index 5aabe300d0..08c0cd84cc 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/startGameServer.bat
+++ b/L2J_Mobius_C6_Interlude/dist/game/startGameServer.bat
@@ -5,15 +5,7 @@ title L2J Mobius - Game Server Console
 echo Starting Game Server.
 echo.
 
-REM java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Dpython.cachedir=../cachedir -Xms1024m -Xmx1536m -jar GameServer.jar
-java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar GameServer.jar
-
-REM NOTE: If you have a powerful machine, you could modify/add some extra parameters for performance, like:
-REM -Xms1536m
-REM -Xmx3072m
-REM -XX:+AggressiveOpts
-REM Use this parameters carefully, some of them could cause abnormal behavior, deadlocks, etc.
-REM More info here: http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html
+java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar ../libs/GameServer.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
diff --git a/L2J_Mobius_C6_Interlude/dist/login/LoginServer_loop.sh b/L2J_Mobius_C6_Interlude/dist/login/LoginServer_loop.sh
index 794e01ab41..600080c2b7 100644
--- a/L2J_Mobius_C6_Interlude/dist/login/LoginServer_loop.sh
+++ b/L2J_Mobius_C6_Interlude/dist/login/LoginServer_loop.sh
@@ -5,7 +5,7 @@ until [ $err == 0 ];
 do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Xms128m -Xmx256m -jar LoginServer.jar > log/stdout.log 2>&1
+	java -Xms128m -Xmx256m -jar ../libs/LoginServer.jar > log/stdout.log 2>&1
 	err=$?
 	sleep 10;
 done
diff --git a/L2J_Mobius_C6_Interlude/dist/login/RegisterGameServer.bat b/L2J_Mobius_C6_Interlude/dist/login/RegisterGameServer.bat
index 0601033c52..6280e04eba 100644
--- a/L2J_Mobius_C6_Interlude/dist/login/RegisterGameServer.bat
+++ b/L2J_Mobius_C6_Interlude/dist/login/RegisterGameServer.bat
@@ -1,5 +1,5 @@
 @echo off
 title Register Game Server
 color 17
-java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c
+java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/* com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c
 pause
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/login/RegisterGameServer.sh b/L2J_Mobius_C6_Interlude/dist/login/RegisterGameServer.sh
index 03abd37b47..a88fb79fb8 100644
--- a/L2J_Mobius_C6_Interlude/dist/login/RegisterGameServer.sh
+++ b/L2J_Mobius_C6_Interlude/dist/login/RegisterGameServer.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.gsregistering.GameServerRegister -c
\ No newline at end of file
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*: com.l2jmobius.tools.gsregistering.GameServerRegister -c
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/login/startLoginServer.bat b/L2J_Mobius_C6_Interlude/dist/login/startLoginServer.bat
index 1ed6b50463..81553a4281 100644
--- a/L2J_Mobius_C6_Interlude/dist/login/startLoginServer.bat
+++ b/L2J_Mobius_C6_Interlude/dist/login/startLoginServer.bat
@@ -5,8 +5,7 @@ title L2J Mobius - Login Server Console
 echo Starting Login Server.
 echo.
 
-REM java -Xms128m -Xmx256m -jar LoginServer.jar
-java -version:1.8 -server -Xms128m -Xmx256m -jar LoginServer.jar
+java -version:1.8 -server -Xms128m -Xmx256m -jar ../libs/LoginServer.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
diff --git a/L2J_Mobius_C6_Interlude/dist/login/startSQLAccountManager.bat b/L2J_Mobius_C6_Interlude/dist/login/startSQLAccountManager.bat
index 6f6d9fb509..dcf00b6c59 100644
--- a/L2J_Mobius_C6_Interlude/dist/login/startSQLAccountManager.bat
+++ b/L2J_Mobius_C6_Interlude/dist/login/startSQLAccountManager.bat
@@ -1,7 +1,7 @@
 @echo off
 title SQL Account Manager
 color 17
-java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager
+java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/* com.l2jmobius.tools.accountmanager.SQLAccountManager
 if %errorlevel% == 0 (
 echo.
 echo Execution successful
diff --git a/L2J_Mobius_C6_Interlude/dist/login/startSQLAccountManager.sh b/L2J_Mobius_C6_Interlude/dist/login/startSQLAccountManager.sh
index d090d4ff98..972b0e107a 100644
--- a/L2J_Mobius_C6_Interlude/dist/login/startSQLAccountManager.sh
+++ b/L2J_Mobius_C6_Interlude/dist/login/startSQLAccountManager.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*: com.l2jmobius.tools.accountmanager.SQLAccountManager
diff --git a/L2J_Mobius_CT_2.6_HighFive/build.xml b/L2J_Mobius_CT_2.6_HighFive/build.xml
index cd7969124a..baec993f0d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/build.xml
+++ b/L2J_Mobius_CT_2.6_HighFive/build.xml
@@ -21,8 +21,7 @@
 	<property name="build" location="../build" />
 	<property name="build.bin" location="${build}/bin" />
 	<property name="build.dist" location="${build}/dist" />
-	<property name="build.dist.game" location="${build.dist}/game" />
-	<property name="build.dist.login" location="${build.dist}/login" />
+	<property name="build.dist.libs" location="${build.dist}/libs" />
 	<property name="build.dist.dbinstaller" location="${build.dist}/db_installer" />
 	<property name="datapack" location="dist" />
 	<property name="libs" location="${datapack}/libs" />
@@ -70,7 +69,7 @@
 			<format property="time.stamp" pattern="yyyy-MM-dd HH:mm:ss" />
 		</tstamp>
 
-		<jar destfile="${build.dist.login}/LoginServer.jar" level="9">
+		<jar destfile="${build.dist.libs}/LoginServer.jar" level="9">
 			<fileset dir="${build.bin}">
 				<exclude name="**/dbinstaller/**" />
 				<exclude name="**/gameserver/**" />
@@ -86,7 +85,7 @@
 				<attribute name="Main-Class" value="com.l2jmobius.loginserver.LoginServer" />
 			</manifest>
 		</jar>
-		<jar destfile="${build.dist.game}/GameServer.jar" level="9">
+		<jar destfile="${build.dist.libs}/GameServer.jar" level="9">
 			<fileset dir="${build.bin}">
 				<exclude name="**/dbinstaller/**" />
 				<exclude name="**/loginserver/**" />
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/GameServer_loop.sh b/L2J_Mobius_CT_2.6_HighFive/dist/game/GameServer_loop.sh
index 65ff2c74f2..752e9ec48a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/GameServer_loop.sh
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/GameServer_loop.sh
@@ -7,7 +7,7 @@
 while :; do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar GameServer.jar > log/stdout.log 2>&1
+	java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar ../libs/GameServer.jar > log/stdout.log 2>&1
 	[ $? -ne 2 ] && break
 #	/etc/init.d/mysql restart
 	sleep 10
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/GeoDataConverter.bat b/L2J_Mobius_CT_2.6_HighFive/dist/game/GeoDataConverter.bat
index 1f199613e9..3b4270d5dd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/GeoDataConverter.bat
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/GeoDataConverter.bat
@@ -1,6 +1,6 @@
 @echo off
 title L2D geodata converter
 
-java -Xmx512m -cp ./../libs/*;GameServer.jar com.l2jmobius.tools.geodataconverter.GeoDataConverter
+java -Xmx512m -cp ./../libs/* com.l2jmobius.tools.geodataconverter.GeoDataConverter
 
 pause
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/GeoDataConverter.sh b/L2J_Mobius_CT_2.6_HighFive/dist/game/GeoDataConverter.sh
index ac182b008f..934cc42075 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/GeoDataConverter.sh
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/GeoDataConverter.sh
@@ -1,4 +1,4 @@
 #! /bin/sh
 
-java -Xmx512m -cp ../libs/*:GameServer.jar com.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+java -Xmx512m -cp ../libs/*: com.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
 
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/startGameServer.bat b/L2J_Mobius_CT_2.6_HighFive/dist/game/startGameServer.bat
index 5aabe300d0..08c0cd84cc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/startGameServer.bat
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/startGameServer.bat
@@ -5,15 +5,7 @@ title L2J Mobius - Game Server Console
 echo Starting Game Server.
 echo.
 
-REM java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Dpython.cachedir=../cachedir -Xms1024m -Xmx1536m -jar GameServer.jar
-java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar GameServer.jar
-
-REM NOTE: If you have a powerful machine, you could modify/add some extra parameters for performance, like:
-REM -Xms1536m
-REM -Xmx3072m
-REM -XX:+AggressiveOpts
-REM Use this parameters carefully, some of them could cause abnormal behavior, deadlocks, etc.
-REM More info here: http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html
+java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar ../libs/GameServer.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/login/LoginServer_loop.sh b/L2J_Mobius_CT_2.6_HighFive/dist/login/LoginServer_loop.sh
index 794e01ab41..600080c2b7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/login/LoginServer_loop.sh
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/login/LoginServer_loop.sh
@@ -5,7 +5,7 @@ until [ $err == 0 ];
 do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Xms128m -Xmx256m -jar LoginServer.jar > log/stdout.log 2>&1
+	java -Xms128m -Xmx256m -jar ../libs/LoginServer.jar > log/stdout.log 2>&1
 	err=$?
 	sleep 10;
 done
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/login/RegisterGameServer.bat b/L2J_Mobius_CT_2.6_HighFive/dist/login/RegisterGameServer.bat
index 0601033c52..6280e04eba 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/login/RegisterGameServer.bat
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/login/RegisterGameServer.bat
@@ -1,5 +1,5 @@
 @echo off
 title Register Game Server
 color 17
-java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c
+java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/* com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c
 pause
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/login/RegisterGameServer.sh b/L2J_Mobius_CT_2.6_HighFive/dist/login/RegisterGameServer.sh
index 03abd37b47..a88fb79fb8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/login/RegisterGameServer.sh
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/login/RegisterGameServer.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.gsregistering.GameServerRegister -c
\ No newline at end of file
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*: com.l2jmobius.tools.gsregistering.GameServerRegister -c
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/login/startLoginServer.bat b/L2J_Mobius_CT_2.6_HighFive/dist/login/startLoginServer.bat
index d3957e8795..8d8941223f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/login/startLoginServer.bat
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/login/startLoginServer.bat
@@ -5,8 +5,7 @@ title L2J Mobius - Login Server Console
 echo Starting Login Server.
 echo.
 
-REM java -Xms128m -Xmx256m -jar LoginServer.jar
-java -version:1.8 -server -Xms128m -Xmx256m -jar LoginServer.jar
+java -version:1.8 -server -Xms128m -Xmx256m -jar ../libs/LoginServer.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/login/startSQLAccountManager.bat b/L2J_Mobius_CT_2.6_HighFive/dist/login/startSQLAccountManager.bat
index 6f6d9fb509..dcf00b6c59 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/login/startSQLAccountManager.bat
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/login/startSQLAccountManager.bat
@@ -1,7 +1,7 @@
 @echo off
 title SQL Account Manager
 color 17
-java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager
+java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/* com.l2jmobius.tools.accountmanager.SQLAccountManager
 if %errorlevel% == 0 (
 echo.
 echo Execution successful
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/login/startSQLAccountManager.sh b/L2J_Mobius_CT_2.6_HighFive/dist/login/startSQLAccountManager.sh
index d090d4ff98..972b0e107a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/login/startSQLAccountManager.sh
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/login/startSQLAccountManager.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*: com.l2jmobius.tools.accountmanager.SQLAccountManager
diff --git a/L2J_Mobius_Classic_2.0_Saviors/build.xml b/L2J_Mobius_Classic_2.0_Saviors/build.xml
index 6d086bca3c..2beb01c9c4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/build.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/build.xml
@@ -21,8 +21,7 @@
 	<property name="build" location="../build" />
 	<property name="build.bin" location="${build}/bin" />
 	<property name="build.dist" location="${build}/dist" />
-	<property name="build.dist.game" location="${build.dist}/game" />
-	<property name="build.dist.login" location="${build.dist}/login" />
+	<property name="build.dist.libs" location="${build.dist}/libs" />
 	<property name="build.dist.dbinstaller" location="${build.dist}/db_installer" />
 	<property name="datapack" location="dist" />
 	<property name="libs" location="${datapack}/libs" />
@@ -70,7 +69,7 @@
 			<format property="time.stamp" pattern="yyyy-MM-dd HH:mm:ss" />
 		</tstamp>
 
-		<jar destfile="${build.dist.login}/LoginServer.jar" level="9">
+		<jar destfile="${build.dist.libs}/LoginServer.jar" level="9">
 			<fileset dir="${build.bin}">
 				<exclude name="**/dbinstaller/**" />
 				<exclude name="**/gameserver/**" />
@@ -86,7 +85,7 @@
 				<attribute name="Main-Class" value="com.l2jmobius.loginserver.LoginServer" />
 			</manifest>
 		</jar>
-		<jar destfile="${build.dist.game}/GameServer.jar" level="9">
+		<jar destfile="${build.dist.libs}/GameServer.jar" level="9">
 			<fileset dir="${build.bin}">
 				<exclude name="**/dbinstaller/**" />
 				<exclude name="**/loginserver/**" />
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/GameServer_loop.sh b/L2J_Mobius_Classic_2.0_Saviors/dist/game/GameServer_loop.sh
index 65ff2c74f2..752e9ec48a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/GameServer_loop.sh
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/GameServer_loop.sh
@@ -7,7 +7,7 @@
 while :; do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar GameServer.jar > log/stdout.log 2>&1
+	java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar ../libs/GameServer.jar > log/stdout.log 2>&1
 	[ $? -ne 2 ] && break
 #	/etc/init.d/mysql restart
 	sleep 10
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/GeoDataConverter.bat b/L2J_Mobius_Classic_2.0_Saviors/dist/game/GeoDataConverter.bat
index 1f199613e9..3b4270d5dd 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/GeoDataConverter.bat
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/GeoDataConverter.bat
@@ -1,6 +1,6 @@
 @echo off
 title L2D geodata converter
 
-java -Xmx512m -cp ./../libs/*;GameServer.jar com.l2jmobius.tools.geodataconverter.GeoDataConverter
+java -Xmx512m -cp ./../libs/* com.l2jmobius.tools.geodataconverter.GeoDataConverter
 
 pause
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/GeoDataConverter.sh b/L2J_Mobius_Classic_2.0_Saviors/dist/game/GeoDataConverter.sh
index ac182b008f..934cc42075 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/GeoDataConverter.sh
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/GeoDataConverter.sh
@@ -1,4 +1,4 @@
 #! /bin/sh
 
-java -Xmx512m -cp ../libs/*:GameServer.jar com.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+java -Xmx512m -cp ../libs/*: com.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
 
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/startGameServer.bat b/L2J_Mobius_Classic_2.0_Saviors/dist/game/startGameServer.bat
index 5aabe300d0..08c0cd84cc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/startGameServer.bat
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/startGameServer.bat
@@ -5,15 +5,7 @@ title L2J Mobius - Game Server Console
 echo Starting Game Server.
 echo.
 
-REM java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Dpython.cachedir=../cachedir -Xms1024m -Xmx1536m -jar GameServer.jar
-java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar GameServer.jar
-
-REM NOTE: If you have a powerful machine, you could modify/add some extra parameters for performance, like:
-REM -Xms1536m
-REM -Xmx3072m
-REM -XX:+AggressiveOpts
-REM Use this parameters carefully, some of them could cause abnormal behavior, deadlocks, etc.
-REM More info here: http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html
+java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar ../libs/GameServer.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/login/LoginServer_loop.sh b/L2J_Mobius_Classic_2.0_Saviors/dist/login/LoginServer_loop.sh
index 794e01ab41..600080c2b7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/login/LoginServer_loop.sh
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/login/LoginServer_loop.sh
@@ -5,7 +5,7 @@ until [ $err == 0 ];
 do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Xms128m -Xmx256m -jar LoginServer.jar > log/stdout.log 2>&1
+	java -Xms128m -Xmx256m -jar ../libs/LoginServer.jar > log/stdout.log 2>&1
 	err=$?
 	sleep 10;
 done
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/login/RegisterGameServer.bat b/L2J_Mobius_Classic_2.0_Saviors/dist/login/RegisterGameServer.bat
index 0601033c52..6280e04eba 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/login/RegisterGameServer.bat
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/login/RegisterGameServer.bat
@@ -1,5 +1,5 @@
 @echo off
 title Register Game Server
 color 17
-java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c
+java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/* com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c
 pause
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/login/RegisterGameServer.sh b/L2J_Mobius_Classic_2.0_Saviors/dist/login/RegisterGameServer.sh
index 03abd37b47..a88fb79fb8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/login/RegisterGameServer.sh
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/login/RegisterGameServer.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.gsregistering.GameServerRegister -c
\ No newline at end of file
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*: com.l2jmobius.tools.gsregistering.GameServerRegister -c
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/login/startLoginServer.bat b/L2J_Mobius_Classic_2.0_Saviors/dist/login/startLoginServer.bat
index d3957e8795..8d8941223f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/login/startLoginServer.bat
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/login/startLoginServer.bat
@@ -5,8 +5,7 @@ title L2J Mobius - Login Server Console
 echo Starting Login Server.
 echo.
 
-REM java -Xms128m -Xmx256m -jar LoginServer.jar
-java -version:1.8 -server -Xms128m -Xmx256m -jar LoginServer.jar
+java -version:1.8 -server -Xms128m -Xmx256m -jar ../libs/LoginServer.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/login/startSQLAccountManager.bat b/L2J_Mobius_Classic_2.0_Saviors/dist/login/startSQLAccountManager.bat
index 6f6d9fb509..dcf00b6c59 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/login/startSQLAccountManager.bat
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/login/startSQLAccountManager.bat
@@ -1,7 +1,7 @@
 @echo off
 title SQL Account Manager
 color 17
-java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager
+java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/* com.l2jmobius.tools.accountmanager.SQLAccountManager
 if %errorlevel% == 0 (
 echo.
 echo Execution successful
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/login/startSQLAccountManager.sh b/L2J_Mobius_Classic_2.0_Saviors/dist/login/startSQLAccountManager.sh
index d090d4ff98..972b0e107a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/login/startSQLAccountManager.sh
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/login/startSQLAccountManager.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*: com.l2jmobius.tools.accountmanager.SQLAccountManager
diff --git a/L2J_Mobius_Classic_2.0_Zaken/build.xml b/L2J_Mobius_Classic_2.0_Zaken/build.xml
index e0d8b99a1b..d2f12ef70b 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/build.xml
+++ b/L2J_Mobius_Classic_2.0_Zaken/build.xml
@@ -21,8 +21,7 @@
 	<property name="build" location="../build" />
 	<property name="build.bin" location="${build}/bin" />
 	<property name="build.dist" location="${build}/dist" />
-	<property name="build.dist.game" location="${build.dist}/game" />
-	<property name="build.dist.login" location="${build.dist}/login" />
+	<property name="build.dist.libs" location="${build.dist}/libs" />
 	<property name="build.dist.dbinstaller" location="${build.dist}/db_installer" />
 	<property name="datapack" location="dist" />
 	<property name="libs" location="${datapack}/libs" />
@@ -70,7 +69,7 @@
 			<format property="time.stamp" pattern="yyyy-MM-dd HH:mm:ss" />
 		</tstamp>
 
-		<jar destfile="${build.dist.login}/LoginServer.jar" level="9">
+		<jar destfile="${build.dist.libs}/LoginServer.jar" level="9">
 			<fileset dir="${build.bin}">
 				<exclude name="**/dbinstaller/**" />
 				<exclude name="**/gameserver/**" />
@@ -86,7 +85,7 @@
 				<attribute name="Main-Class" value="com.l2jmobius.loginserver.LoginServer" />
 			</manifest>
 		</jar>
-		<jar destfile="${build.dist.game}/GameServer.jar" level="9">
+		<jar destfile="${build.dist.libs}/GameServer.jar" level="9">
 			<fileset dir="${build.bin}">
 				<exclude name="**/dbinstaller/**" />
 				<exclude name="**/loginserver/**" />
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/GameServer_loop.sh b/L2J_Mobius_Classic_2.0_Zaken/dist/game/GameServer_loop.sh
index 65ff2c74f2..752e9ec48a 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/GameServer_loop.sh
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/GameServer_loop.sh
@@ -7,7 +7,7 @@
 while :; do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar GameServer.jar > log/stdout.log 2>&1
+	java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Xms2048m -Xmx4096m -jar ../libs/GameServer.jar > log/stdout.log 2>&1
 	[ $? -ne 2 ] && break
 #	/etc/init.d/mysql restart
 	sleep 10
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/GeoDataConverter.bat b/L2J_Mobius_Classic_2.0_Zaken/dist/game/GeoDataConverter.bat
index 1f199613e9..3b4270d5dd 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/GeoDataConverter.bat
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/GeoDataConverter.bat
@@ -1,6 +1,6 @@
 @echo off
 title L2D geodata converter
 
-java -Xmx512m -cp ./../libs/*;GameServer.jar com.l2jmobius.tools.geodataconverter.GeoDataConverter
+java -Xmx512m -cp ./../libs/* com.l2jmobius.tools.geodataconverter.GeoDataConverter
 
 pause
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/GeoDataConverter.sh b/L2J_Mobius_Classic_2.0_Zaken/dist/game/GeoDataConverter.sh
index ac182b008f..934cc42075 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/GeoDataConverter.sh
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/GeoDataConverter.sh
@@ -1,4 +1,4 @@
 #! /bin/sh
 
-java -Xmx512m -cp ../libs/*:GameServer.jar com.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
+java -Xmx512m -cp ../libs/*: com.l2jmobius.tools.geodataconverter.GeoDataConverter > log/stdout.log 2>&1
 
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/startGameServer.bat b/L2J_Mobius_Classic_2.0_Zaken/dist/game/startGameServer.bat
index 5aabe300d0..08c0cd84cc 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/startGameServer.bat
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/startGameServer.bat
@@ -5,15 +5,7 @@ title L2J Mobius - Game Server Console
 echo Starting Game Server.
 echo.
 
-REM java -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Dpython.cachedir=../cachedir -Xms1024m -Xmx1536m -jar GameServer.jar
-java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar GameServer.jar
-
-REM NOTE: If you have a powerful machine, you could modify/add some extra parameters for performance, like:
-REM -Xms1536m
-REM -Xmx3072m
-REM -XX:+AggressiveOpts
-REM Use this parameters carefully, some of them could cause abnormal behavior, deadlocks, etc.
-REM More info here: http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html
+java -version:1.8 -server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g -jar ../libs/GameServer.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/login/LoginServer_loop.sh b/L2J_Mobius_Classic_2.0_Zaken/dist/login/LoginServer_loop.sh
index 794e01ab41..600080c2b7 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/login/LoginServer_loop.sh
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/login/LoginServer_loop.sh
@@ -5,7 +5,7 @@ until [ $err == 0 ];
 do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Xms128m -Xmx256m -jar LoginServer.jar > log/stdout.log 2>&1
+	java -Xms128m -Xmx256m -jar ../libs/LoginServer.jar > log/stdout.log 2>&1
 	err=$?
 	sleep 10;
 done
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/login/RegisterGameServer.bat b/L2J_Mobius_Classic_2.0_Zaken/dist/login/RegisterGameServer.bat
index 0601033c52..6280e04eba 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/login/RegisterGameServer.bat
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/login/RegisterGameServer.bat
@@ -1,5 +1,5 @@
 @echo off
 title Register Game Server
 color 17
-java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c
+java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/* com.l2jmobius.tools.gsregistering.BaseGameServerRegister -c
 pause
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/login/RegisterGameServer.sh b/L2J_Mobius_Classic_2.0_Zaken/dist/login/RegisterGameServer.sh
index 03abd37b47..a88fb79fb8 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/login/RegisterGameServer.sh
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/login/RegisterGameServer.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.gsregistering.GameServerRegister -c
\ No newline at end of file
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*: com.l2jmobius.tools.gsregistering.GameServerRegister -c
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/login/startLoginServer.bat b/L2J_Mobius_Classic_2.0_Zaken/dist/login/startLoginServer.bat
index d3957e8795..8d8941223f 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/login/startLoginServer.bat
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/login/startLoginServer.bat
@@ -5,8 +5,7 @@ title L2J Mobius - Login Server Console
 echo Starting Login Server.
 echo.
 
-REM java -Xms128m -Xmx256m -jar LoginServer.jar
-java -version:1.8 -server -Xms128m -Xmx256m -jar LoginServer.jar
+java -version:1.8 -server -Xms128m -Xmx256m -jar ../libs/LoginServer.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/login/startSQLAccountManager.bat b/L2J_Mobius_Classic_2.0_Zaken/dist/login/startSQLAccountManager.bat
index 6f6d9fb509..dcf00b6c59 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/login/startSQLAccountManager.bat
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/login/startSQLAccountManager.bat
@@ -1,7 +1,7 @@
 @echo off
 title SQL Account Manager
 color 17
-java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/*;LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager
+java -version:1.8 -Djava.util.logging.config.file=console.cfg -cp ./../libs/* com.l2jmobius.tools.accountmanager.SQLAccountManager
 if %errorlevel% == 0 (
 echo.
 echo Execution successful
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/login/startSQLAccountManager.sh b/L2J_Mobius_Classic_2.0_Zaken/dist/login/startSQLAccountManager.sh
index d090d4ff98..972b0e107a 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/login/startSQLAccountManager.sh
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/login/startSQLAccountManager.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*:LoginServer.jar com.l2jmobius.tools.accountmanager.SQLAccountManager
+java -Djava.util.logging.config.file=console.cfg -cp ./../libs/*: com.l2jmobius.tools.accountmanager.SQLAccountManager