diff --git a/L2J_Mobius_C4/dist/login/servername.xml b/L2J_Mobius_C4/dist/login/data/servername.xml
similarity index 100%
rename from L2J_Mobius_C4/dist/login/servername.xml
rename to L2J_Mobius_C4/dist/login/data/servername.xml
diff --git a/L2J_Mobius_C4/dist/login/servername.xsd b/L2J_Mobius_C4/dist/login/data/servername.xsd
similarity index 100%
rename from L2J_Mobius_C4/dist/login/servername.xsd
rename to L2J_Mobius_C4/dist/login/data/servername.xsd
diff --git a/L2J_Mobius_C4/java/com/l2jmobius/gameserver/script/faenor/FaenorScriptEngine.java b/L2J_Mobius_C4/java/com/l2jmobius/gameserver/script/faenor/FaenorScriptEngine.java
index bdd60a4c87..780b874c83 100644
--- a/L2J_Mobius_C4/java/com/l2jmobius/gameserver/script/faenor/FaenorScriptEngine.java
+++ b/L2J_Mobius_C4/java/com/l2jmobius/gameserver/script/faenor/FaenorScriptEngine.java
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.script.Parser;
 import com.l2jmobius.gameserver.script.ParserNotCreatedException;
 import com.l2jmobius.gameserver.script.ScriptDocument;
 import com.l2jmobius.gameserver.script.ScriptEngine;
-import com.l2jmobius.gameserver.util.file.filter.XMLFilter;
+import com.l2jmobius.util.file.filter.XMLFilter;
 
 /**
  * @author Luis Arias
diff --git a/L2J_Mobius_C4/java/com/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_C4/java/com/l2jmobius/loginserver/GameServerTable.java
index ae42c14e8d..78e84596f7 100644
--- a/L2J_Mobius_C4/java/com/l2jmobius/loginserver/GameServerTable.java
+++ b/L2J_Mobius_C4/java/com/l2jmobius/loginserver/GameServerTable.java
@@ -137,7 +137,7 @@ public class GameServerTable
 	 */
 	private void loadServerNames()
 	{
-		try (InputStream in = new FileInputStream("servername.xml");
+		try (InputStream in = new FileInputStream("data/servername.xml");
 			UTF8StreamReader utf8 = new UTF8StreamReader())
 		{
 			final XMLStreamReaderImpl xpp = new XMLStreamReaderImpl();
@@ -397,14 +397,7 @@ public class GameServerTable
 		Collections.sort(_gameServerList, gsComparator);
 	}
 	
-	private final Comparator<GameServer> gsComparator = new Comparator<GameServer>()
-	{
-		@Override
-		public int compare(GameServer gs1, GameServer gs2)
-		{
-			return (gs1.server_id < gs2.server_id ? -1 : gs1.server_id == gs2.server_id ? 0 : 1);
-		}
-	};
+	private final Comparator<GameServer> gsComparator = (gs1, gs2) -> (gs1.server_id < gs2.server_id ? -1 : gs1.server_id == gs2.server_id ? 0 : 1);
 	
 	/**
 	 * @param thread
diff --git a/L2J_Mobius_C4/java/com/l2jmobius/gameserver/util/file/filter/XMLFilter.java b/L2J_Mobius_C4/java/com/l2jmobius/util/file/filter/XMLFilter.java
similarity index 92%
rename from L2J_Mobius_C4/java/com/l2jmobius/gameserver/util/file/filter/XMLFilter.java
rename to L2J_Mobius_C4/java/com/l2jmobius/util/file/filter/XMLFilter.java
index 230a3ccd37..42951888ae 100644
--- a/L2J_Mobius_C4/java/com/l2jmobius/gameserver/util/file/filter/XMLFilter.java
+++ b/L2J_Mobius_C4/java/com/l2jmobius/util/file/filter/XMLFilter.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.util.file.filter;
+package com.l2jmobius.util.file.filter;
 
 import java.io.File;
 import java.io.FileFilter;