diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 16c76dcd9..28387b850 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,17 +2,75 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="0dbfe935-8085-4dde-9815-06f8b3761458" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/Client/src/org/runite/Client.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/org/crandor/game/world/GameSettings.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/org/crandor/game/world/GameSettings.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/runManagement.sh" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/runManagement.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/runServer.sh" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/runServer.sh" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/Management-Server/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main$2.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main$3.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main$4.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main$5.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main$6.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main$7.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main$8.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/ServerConstants.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/classloader/ClassLoadServer.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/classloader/WorkerThread.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/Constants.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/Initializer$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/Initializer.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/SplashFrame$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/SplashFrame.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/screen/InteractiveOverlay.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/screen/SplashScreen$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/screen/SplashScreen.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/screen/impl/LoadingBar.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/EventProducer.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/IoEventHandler.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/IoReadEvent.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/IoSession.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/IoWriteEvent.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/NioReactor.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/event/HSReadEvent.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/event/HSWriteEvent.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/event/PacketReadEvent.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/event/PacketWriteEvent$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/event/PacketWriteEvent.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/event/RegistryReadEvent.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/event/RegistryWriteEvent.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/packet/IoBuffer.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/packet/PacketHeader.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/packet/WorldPacketRepository.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/producer/HSEventProducer.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/producer/PacketEventProducer.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/producer/RegistryEventProducer.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/OperatingSystem.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/PunishmentStorage.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/ShutdownSequence.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/communication/ClanRank.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/communication/ClanRepository.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/communication/CommunicationInfo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/mysql/SQLColumn.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/mysql/SQLEntryHandler.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/mysql/SQLManager.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/mysql/SQLTable.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/mysql/WorldListSQLHandler.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/util/ByteBufferUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/util/Command.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/util/EncryptionManager$BCrypt.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/util/EncryptionManager.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/util/PlayerDatabaseGen.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/util/StringUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/util/TaskExecutor.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/world/GameServer.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/world/PlayerSession.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/world/WorldDatabase.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/world/info/CountryFlag.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/world/info/Response.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/world/info/UIDInfo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/world/info/WorldInfo.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/Management-Server/runManagement.sh" beforeDir="false" afterPath="$PROJECT_DIR$/Management-Server/runManagement.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Server/runServer.sh" beforeDir="false" afterPath="$PROJECT_DIR$/Server/runServer.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Server/src/org/crandor/game/world/GameSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/org/crandor/game/world/GameSettings.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Server/src/org/crandor/Server.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/org/crandor/Server.java" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -54,7 +112,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.Server">
+  <component name="RunManager" selected="Application.Management">
     <configuration name="Client" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.runite.Client" />
       <module name="09Scape" />
diff --git a/Management-Server/.gitignore b/Management-Server/.gitignore
index 17a06722d..85b4f9e6f 100644
--- a/Management-Server/.gitignore
+++ b/Management-Server/.gitignore
@@ -16,3 +16,4 @@ data/cache/
 *.userlibraries
 *.class
 data/players/**
+org/
diff --git a/Management-Server/org/keldagrim/Main$1.class b/Management-Server/org/keldagrim/Main$1.class
deleted file mode 100644
index 90e954c78..000000000
Binary files a/Management-Server/org/keldagrim/Main$1.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/Main$2.class b/Management-Server/org/keldagrim/Main$2.class
deleted file mode 100644
index be1f778cc..000000000
Binary files a/Management-Server/org/keldagrim/Main$2.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/Main$3.class b/Management-Server/org/keldagrim/Main$3.class
deleted file mode 100644
index 5afc4ca41..000000000
Binary files a/Management-Server/org/keldagrim/Main$3.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/Main$4.class b/Management-Server/org/keldagrim/Main$4.class
deleted file mode 100644
index 14d1f933e..000000000
Binary files a/Management-Server/org/keldagrim/Main$4.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/Main$5.class b/Management-Server/org/keldagrim/Main$5.class
deleted file mode 100644
index 330158734..000000000
Binary files a/Management-Server/org/keldagrim/Main$5.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/Main$6.class b/Management-Server/org/keldagrim/Main$6.class
deleted file mode 100644
index 7b266d90d..000000000
Binary files a/Management-Server/org/keldagrim/Main$6.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/Main$7.class b/Management-Server/org/keldagrim/Main$7.class
deleted file mode 100644
index 55491494b..000000000
Binary files a/Management-Server/org/keldagrim/Main$7.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/Main$8.class b/Management-Server/org/keldagrim/Main$8.class
deleted file mode 100644
index 777d9df9c..000000000
Binary files a/Management-Server/org/keldagrim/Main$8.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/Main.class b/Management-Server/org/keldagrim/Main.class
deleted file mode 100644
index 721f841cd..000000000
Binary files a/Management-Server/org/keldagrim/Main.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/ServerConstants.class b/Management-Server/org/keldagrim/ServerConstants.class
deleted file mode 100644
index 484c78a1a..000000000
Binary files a/Management-Server/org/keldagrim/ServerConstants.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/classloader/ClassLoadServer.class b/Management-Server/org/keldagrim/classloader/ClassLoadServer.class
deleted file mode 100644
index b069c1f62..000000000
Binary files a/Management-Server/org/keldagrim/classloader/ClassLoadServer.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/classloader/WorkerThread.class b/Management-Server/org/keldagrim/classloader/WorkerThread.class
deleted file mode 100644
index 8e59e4677..000000000
Binary files a/Management-Server/org/keldagrim/classloader/WorkerThread.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/launcher/Constants.class b/Management-Server/org/keldagrim/launcher/Constants.class
deleted file mode 100644
index 2dad57481..000000000
Binary files a/Management-Server/org/keldagrim/launcher/Constants.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/launcher/Initializer$1.class b/Management-Server/org/keldagrim/launcher/Initializer$1.class
deleted file mode 100644
index 656975cd5..000000000
Binary files a/Management-Server/org/keldagrim/launcher/Initializer$1.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/launcher/Initializer.class b/Management-Server/org/keldagrim/launcher/Initializer.class
deleted file mode 100644
index 1f259c385..000000000
Binary files a/Management-Server/org/keldagrim/launcher/Initializer.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/launcher/SplashFrame$1.class b/Management-Server/org/keldagrim/launcher/SplashFrame$1.class
deleted file mode 100644
index 03bee3b3e..000000000
Binary files a/Management-Server/org/keldagrim/launcher/SplashFrame$1.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/launcher/SplashFrame.class b/Management-Server/org/keldagrim/launcher/SplashFrame.class
deleted file mode 100644
index 013986f17..000000000
Binary files a/Management-Server/org/keldagrim/launcher/SplashFrame.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/launcher/screen/InteractiveOverlay.class b/Management-Server/org/keldagrim/launcher/screen/InteractiveOverlay.class
deleted file mode 100644
index 77993d9b9..000000000
Binary files a/Management-Server/org/keldagrim/launcher/screen/InteractiveOverlay.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/launcher/screen/SplashScreen$1.class b/Management-Server/org/keldagrim/launcher/screen/SplashScreen$1.class
deleted file mode 100644
index 839cdff9f..000000000
Binary files a/Management-Server/org/keldagrim/launcher/screen/SplashScreen$1.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/launcher/screen/SplashScreen.class b/Management-Server/org/keldagrim/launcher/screen/SplashScreen.class
deleted file mode 100644
index 38ef147c4..000000000
Binary files a/Management-Server/org/keldagrim/launcher/screen/SplashScreen.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/launcher/screen/impl/LoadingBar.class b/Management-Server/org/keldagrim/launcher/screen/impl/LoadingBar.class
deleted file mode 100644
index 2578703d4..000000000
Binary files a/Management-Server/org/keldagrim/launcher/screen/impl/LoadingBar.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/EventProducer.class b/Management-Server/org/keldagrim/net/EventProducer.class
deleted file mode 100644
index bb95de04d..000000000
Binary files a/Management-Server/org/keldagrim/net/EventProducer.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/IoEventHandler.class b/Management-Server/org/keldagrim/net/IoEventHandler.class
deleted file mode 100644
index 7cfde10be..000000000
Binary files a/Management-Server/org/keldagrim/net/IoEventHandler.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/IoReadEvent.class b/Management-Server/org/keldagrim/net/IoReadEvent.class
deleted file mode 100644
index be64a4e6f..000000000
Binary files a/Management-Server/org/keldagrim/net/IoReadEvent.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/IoSession.class b/Management-Server/org/keldagrim/net/IoSession.class
deleted file mode 100644
index 27c62a995..000000000
Binary files a/Management-Server/org/keldagrim/net/IoSession.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/IoWriteEvent.class b/Management-Server/org/keldagrim/net/IoWriteEvent.class
deleted file mode 100644
index 391a382fb..000000000
Binary files a/Management-Server/org/keldagrim/net/IoWriteEvent.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/NioReactor.class b/Management-Server/org/keldagrim/net/NioReactor.class
deleted file mode 100644
index 83bbbee7c..000000000
Binary files a/Management-Server/org/keldagrim/net/NioReactor.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/event/HSReadEvent.class b/Management-Server/org/keldagrim/net/event/HSReadEvent.class
deleted file mode 100644
index 6d582a7b5..000000000
Binary files a/Management-Server/org/keldagrim/net/event/HSReadEvent.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/event/HSWriteEvent.class b/Management-Server/org/keldagrim/net/event/HSWriteEvent.class
deleted file mode 100644
index 23bc74645..000000000
Binary files a/Management-Server/org/keldagrim/net/event/HSWriteEvent.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/event/PacketReadEvent.class b/Management-Server/org/keldagrim/net/event/PacketReadEvent.class
deleted file mode 100644
index 63f98c037..000000000
Binary files a/Management-Server/org/keldagrim/net/event/PacketReadEvent.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/event/PacketWriteEvent$1.class b/Management-Server/org/keldagrim/net/event/PacketWriteEvent$1.class
deleted file mode 100644
index f9ed6332e..000000000
Binary files a/Management-Server/org/keldagrim/net/event/PacketWriteEvent$1.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/event/PacketWriteEvent.class b/Management-Server/org/keldagrim/net/event/PacketWriteEvent.class
deleted file mode 100644
index 8d459c152..000000000
Binary files a/Management-Server/org/keldagrim/net/event/PacketWriteEvent.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/event/RegistryReadEvent.class b/Management-Server/org/keldagrim/net/event/RegistryReadEvent.class
deleted file mode 100644
index c25c658ba..000000000
Binary files a/Management-Server/org/keldagrim/net/event/RegistryReadEvent.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/event/RegistryWriteEvent.class b/Management-Server/org/keldagrim/net/event/RegistryWriteEvent.class
deleted file mode 100644
index c7fdb11f9..000000000
Binary files a/Management-Server/org/keldagrim/net/event/RegistryWriteEvent.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/packet/IoBuffer.class b/Management-Server/org/keldagrim/net/packet/IoBuffer.class
deleted file mode 100644
index 840d0c898..000000000
Binary files a/Management-Server/org/keldagrim/net/packet/IoBuffer.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/packet/PacketHeader.class b/Management-Server/org/keldagrim/net/packet/PacketHeader.class
deleted file mode 100644
index fb5190423..000000000
Binary files a/Management-Server/org/keldagrim/net/packet/PacketHeader.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/packet/WorldPacketRepository.class b/Management-Server/org/keldagrim/net/packet/WorldPacketRepository.class
deleted file mode 100644
index fb1c65174..000000000
Binary files a/Management-Server/org/keldagrim/net/packet/WorldPacketRepository.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/producer/HSEventProducer.class b/Management-Server/org/keldagrim/net/producer/HSEventProducer.class
deleted file mode 100644
index af4264ed1..000000000
Binary files a/Management-Server/org/keldagrim/net/producer/HSEventProducer.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/producer/PacketEventProducer.class b/Management-Server/org/keldagrim/net/producer/PacketEventProducer.class
deleted file mode 100644
index d56483c13..000000000
Binary files a/Management-Server/org/keldagrim/net/producer/PacketEventProducer.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/net/producer/RegistryEventProducer.class b/Management-Server/org/keldagrim/net/producer/RegistryEventProducer.class
deleted file mode 100644
index cbb586a61..000000000
Binary files a/Management-Server/org/keldagrim/net/producer/RegistryEventProducer.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/OperatingSystem.class b/Management-Server/org/keldagrim/system/OperatingSystem.class
deleted file mode 100644
index 82216f211..000000000
Binary files a/Management-Server/org/keldagrim/system/OperatingSystem.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/PunishmentStorage.class b/Management-Server/org/keldagrim/system/PunishmentStorage.class
deleted file mode 100644
index 2a9a240c6..000000000
Binary files a/Management-Server/org/keldagrim/system/PunishmentStorage.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/ShutdownSequence.class b/Management-Server/org/keldagrim/system/ShutdownSequence.class
deleted file mode 100644
index 7af9d4151..000000000
Binary files a/Management-Server/org/keldagrim/system/ShutdownSequence.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/communication/ClanRank.class b/Management-Server/org/keldagrim/system/communication/ClanRank.class
deleted file mode 100644
index 78ff35ddf..000000000
Binary files a/Management-Server/org/keldagrim/system/communication/ClanRank.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/communication/ClanRepository.class b/Management-Server/org/keldagrim/system/communication/ClanRepository.class
deleted file mode 100644
index 388704728..000000000
Binary files a/Management-Server/org/keldagrim/system/communication/ClanRepository.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/communication/CommunicationInfo.class b/Management-Server/org/keldagrim/system/communication/CommunicationInfo.class
deleted file mode 100644
index b17ae2ea8..000000000
Binary files a/Management-Server/org/keldagrim/system/communication/CommunicationInfo.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/mysql/SQLColumn.class b/Management-Server/org/keldagrim/system/mysql/SQLColumn.class
deleted file mode 100644
index 0f3d4c121..000000000
Binary files a/Management-Server/org/keldagrim/system/mysql/SQLColumn.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/mysql/SQLEntryHandler.class b/Management-Server/org/keldagrim/system/mysql/SQLEntryHandler.class
deleted file mode 100644
index 47414c9ae..000000000
Binary files a/Management-Server/org/keldagrim/system/mysql/SQLEntryHandler.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/mysql/SQLManager.class b/Management-Server/org/keldagrim/system/mysql/SQLManager.class
deleted file mode 100644
index f2049339a..000000000
Binary files a/Management-Server/org/keldagrim/system/mysql/SQLManager.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/mysql/SQLTable.class b/Management-Server/org/keldagrim/system/mysql/SQLTable.class
deleted file mode 100644
index ddbe8246b..000000000
Binary files a/Management-Server/org/keldagrim/system/mysql/SQLTable.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/mysql/WorldListSQLHandler.class b/Management-Server/org/keldagrim/system/mysql/WorldListSQLHandler.class
deleted file mode 100644
index 5c18b89fa..000000000
Binary files a/Management-Server/org/keldagrim/system/mysql/WorldListSQLHandler.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/util/ByteBufferUtils.class b/Management-Server/org/keldagrim/system/util/ByteBufferUtils.class
deleted file mode 100644
index 04fca8a1d..000000000
Binary files a/Management-Server/org/keldagrim/system/util/ByteBufferUtils.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/util/Command.class b/Management-Server/org/keldagrim/system/util/Command.class
deleted file mode 100644
index a8baaea72..000000000
Binary files a/Management-Server/org/keldagrim/system/util/Command.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/util/EncryptionManager$BCrypt.class b/Management-Server/org/keldagrim/system/util/EncryptionManager$BCrypt.class
deleted file mode 100644
index d3587a6ab..000000000
Binary files a/Management-Server/org/keldagrim/system/util/EncryptionManager$BCrypt.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/util/EncryptionManager.class b/Management-Server/org/keldagrim/system/util/EncryptionManager.class
deleted file mode 100644
index ae65df44d..000000000
Binary files a/Management-Server/org/keldagrim/system/util/EncryptionManager.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/util/PlayerDatabaseGen.class b/Management-Server/org/keldagrim/system/util/PlayerDatabaseGen.class
deleted file mode 100644
index 64d4a329b..000000000
Binary files a/Management-Server/org/keldagrim/system/util/PlayerDatabaseGen.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/util/StringUtils.class b/Management-Server/org/keldagrim/system/util/StringUtils.class
deleted file mode 100644
index 3dfea1a9d..000000000
Binary files a/Management-Server/org/keldagrim/system/util/StringUtils.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/system/util/TaskExecutor.class b/Management-Server/org/keldagrim/system/util/TaskExecutor.class
deleted file mode 100644
index 10d86a8fa..000000000
Binary files a/Management-Server/org/keldagrim/system/util/TaskExecutor.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/world/GameServer.class b/Management-Server/org/keldagrim/world/GameServer.class
deleted file mode 100644
index ab92781fd..000000000
Binary files a/Management-Server/org/keldagrim/world/GameServer.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/world/PlayerSession.class b/Management-Server/org/keldagrim/world/PlayerSession.class
deleted file mode 100644
index 18ca9aa28..000000000
Binary files a/Management-Server/org/keldagrim/world/PlayerSession.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/world/WorldDatabase.class b/Management-Server/org/keldagrim/world/WorldDatabase.class
deleted file mode 100644
index 567d312ba..000000000
Binary files a/Management-Server/org/keldagrim/world/WorldDatabase.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/world/info/CountryFlag.class b/Management-Server/org/keldagrim/world/info/CountryFlag.class
deleted file mode 100644
index 45a66251c..000000000
Binary files a/Management-Server/org/keldagrim/world/info/CountryFlag.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/world/info/Response.class b/Management-Server/org/keldagrim/world/info/Response.class
deleted file mode 100644
index 2119e4440..000000000
Binary files a/Management-Server/org/keldagrim/world/info/Response.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/world/info/UIDInfo.class b/Management-Server/org/keldagrim/world/info/UIDInfo.class
deleted file mode 100644
index 70015a7e8..000000000
Binary files a/Management-Server/org/keldagrim/world/info/UIDInfo.class and /dev/null differ
diff --git a/Management-Server/org/keldagrim/world/info/WorldInfo.class b/Management-Server/org/keldagrim/world/info/WorldInfo.class
deleted file mode 100644
index 08bc2238d..000000000
Binary files a/Management-Server/org/keldagrim/world/info/WorldInfo.class and /dev/null differ
diff --git a/Management-Server/runManagement.sh b/Management-Server/runManagement.sh
index 29115cc01..71fc39c9c 100755
--- a/Management-Server/runManagement.sh
+++ b/Management-Server/runManagement.sh
@@ -1,3 +1,3 @@
 rm -rf org
 cp -r ../CompiledServer/production/09Scape/org .
-java -server -cp ".:./bin;.:./lib/*" org.crandor.Management false true false true true
+java -server -cp ".:./bin;.:./lib/*" org.keldagrim.Management false true false true true
diff --git a/Server/src/org/crandor/Server.java b/Server/src/org/crandor/Server.java
index ebde3ff86..dc89fd597 100644
--- a/Server/src/org/crandor/Server.java
+++ b/Server/src/org/crandor/Server.java
@@ -11,6 +11,7 @@ import org.crandor.net.amsc.WorldCommunicator;
 import org.crandor.tools.TimeStamp;
 import org.crandor.tools.backup.AutoBackup;
 
+import java.awt.*;
 import java.net.BindException;
 
 /**
@@ -44,7 +45,11 @@ public final class Server {
 			GameWorld.setSettings(GameSettings.parse(args));
 		}
 		if (GameWorld.getSettings().isGui()) {
-			ConsoleFrame.getInstance().init();
+			try {
+				ConsoleFrame.getInstance().init();
+			} catch (HeadlessException e) {
+				System.out.println("X11 server missing - launching server with no GUI!");
+			}
 		}
 		startTime = System.currentTimeMillis();
 		final TimeStamp t = new TimeStamp();