diff --git a/.gitignore b/.gitignore
index 087f67231..17ce819ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,7 @@
 **/.idea/tasks.xml
 Server/**/*.class
 CompiledServer/**/*.jar
+.idea/
+.idea/workspace.xml
+**/.idea/workspace.xml
+**/.idea/*
diff --git a/.idea/artifacts/09Scape_jar.xml b/.idea/artifacts/09Scape_jar.xml
deleted file mode 100644
index 4d810ac4d..000000000
--- a/.idea/artifacts/09Scape_jar.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="09Scape:jar">
-    <output-path>$PROJECT_DIR$/CompiledServer/artifacts/09Scape_jar</output-path>
-    <root id="archive" name="2009-Scape.jar">
-      <element id="directory" name="META-INF">
-        <element id="file-copy" path="$PROJECT_DIR$/Client/src/org/runite/METAs/META-INF/MANIFEST.MF" />
-      </element>
-      <element id="extracted-dir" path="$PROJECT_DIR$/Client/lib/clientlibs.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Client/lib/guava-18.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Client/lib/trident-7.2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Client/lib/commons-io-2.4.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Client/lib/joda-time-2.9.9.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Client/lib/json-simple-1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Client/lib/substance-7.2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Client/lib/laf-plugin-7.2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Client/lib/laf-widget-7.2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Client/lib/json-simple-1.1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Client/lib/reflections-0.9.10.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Client/lib/javassist-3.20.0-GA.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Client/lib/twitter4j-core-4.0.3-SNAPSHOT.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Client/lib/mysql-connector-java-5.1.30-bin.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Client/clientlibs.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Management-Server/lib/clientlibs.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Management-Server/lib/guava-18.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Management-Server/lib/trident-7.2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Management-Server/lib/commons-io-2.4.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Management-Server/lib/joda-time-2.9.9.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Management-Server/lib/json-simple-1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Management-Server/lib/substance-7.2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Management-Server/lib/laf-plugin-7.2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Management-Server/lib/laf-widget-7.2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Management-Server/lib/json-simple-1.1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Management-Server/lib/reflections-0.9.10.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Management-Server/lib/javassist-3.20.0-GA.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Management-Server/lib/twitter4j-core-4.0.3-SNAPSHOT.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Management-Server/lib/mysql-connector-java-5.1.30-bin.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Server/data/libs/clientlibs.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Server/data/libs/guava-18.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Server/data/libs/trident-7.2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Server/data/libs/commons-io-2.4.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Server/data/libs/joda-time-2.9.9.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Server/data/libs/json-simple-1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Server/data/libs/substance-7.2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Server/data/libs/laf-plugin-7.2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Server/data/libs/laf-widget-7.2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Server/data/libs/json-simple-1.1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Server/data/libs/reflections-0.9.10.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Server/data/libs/javassist-3.20.0-GA.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Server/data/libs/twitter4j-core-4.0.3-SNAPSHOT.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Server/data/libs/mysql-connector-java-5.1.30-bin.jar" path-in-jar="/" />
-      <element id="dir-copy" path="$PROJECT_DIR$/CompiledServer/production/Client" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index d1443faa6..05b3f6560 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/09Scape.iml" filepath="$PROJECT_DIR$/.idea/09Scape.iml" />
+      <module fileurl="file://$PROJECT_DIR$/RS-2009.iml" filepath="$PROJECT_DIR$/RS-2009.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 436e69f7f..1933ec504 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="30ea45b9-ec6c-429a-b4dc-a876070cf30e" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/RS-2009.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/artifacts/09Scape_jar.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -13,6 +16,37 @@
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Management-Server/src/org/keldagrim/Management.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="300">
+              <caret line="33" column="16" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="16" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/Server.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="150">
+              <caret line="22" column="19" selection-start-line="22" selection-start-column="19" selection-end-line="22" selection-end-column="19" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/Client/src/org/runite/Client.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="165">
+              <caret line="17" column="52" selection-start-line="17" selection-start-column="52" selection-end-line="17" selection-end-column="52" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -38,6 +72,82 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="ProjectId" id="1SoCmFrlg0BRp0t2EAHW2CVwxLb" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
+              <item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
+              <item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="Client" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
+              <item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="Client" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
+              <item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="Client" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="runite" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
+              <item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="Management-Server" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
+              <item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="Management-Server" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
+              <item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="Server" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
+              <item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="Server" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
+              <item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="Server" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="org" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="RS-2009" type="b2602c69:ProjectViewProjectNode" />
+              <item name="RS-2009" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="Server" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="org" type="462c0819:PsiDirectoryNode" />
+              <item name="crandor" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
+  </component>
   <component name="PropertiesComponent">
     <property name="Downloaded.Files.Path.Enabled" value="false" />
     <property name="Repository.Attach.Annotations" value="false" />
@@ -46,8 +156,9 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/CompiledServer/production/Client" />
-    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1578360598759" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/Client/lib" />
+    <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="restartRequiresConfirmation" value="false" />
@@ -65,10 +176,10 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.Management">
+  <component name="RunManager" selected="Application.GameLaunch">
     <configuration name="GameLaunch" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.runite.GameLaunch" />
-      <module name="09Scape" />
+      <module name="RS-2009" />
       <extension name="coverage">
         <pattern>
           <option name="PATTERN" value="org.runite.*" />
@@ -81,7 +192,7 @@
     </configuration>
     <configuration name="Management" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.keldagrim.Management" />
-      <module name="09Scape" />
+      <module name="RS-2009" />
       <extension name="coverage">
         <pattern>
           <option name="PATTERN" value="org.keldagrim.*" />
@@ -95,7 +206,7 @@
     <configuration name="Server" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
       <option name="MAIN_CLASS_NAME" value="org.crandor.Server" />
-      <module name="09Scape" />
+      <module name="RS-2009" />
       <option name="VM_PARAMETERS" value="-Xmx1024m" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Server" />
       <extension name="coverage">
@@ -115,9 +226,9 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.Management" />
         <item itemvalue="Application.GameLaunch" />
         <item itemvalue="Application.Server" />
+        <item itemvalue="Application.Management" />
       </list>
     </recent_temporary>
   </component>
@@ -135,6 +246,39 @@
     </task>
     <servers />
   </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="0" width="1920" height="1036" extended-state="6" />
+    <layout>
+      <window_info id="Image Layers" />
+      <window_info id="Designer" />
+      <window_info id="UI Designer" />
+      <window_info id="Capture Tool" />
+      <window_info id="Favorites" side_tool="true" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24973376" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Version Control" />
+      <window_info anchor="bottom" id="Terminal" />
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="bottom" id="Build" weight="0.32969433" />
+      <window_info anchor="bottom" id="Messages" weight="0.32969433" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.32969433" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="Palette" />
+      <window_info anchor="right" id="Gradle" />
+      <window_info anchor="right" id="Theme Preview" />
+      <window_info anchor="right" id="Maven" />
+      <window_info anchor="right" id="Capture Analysis" />
+      <window_info anchor="right" id="Palette&#9;" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+    </layout>
+  </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
@@ -144,6 +288,12 @@
         <entry key="MAIN">
           <value>
             <State>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
+              </option>
               <option name="COLUMN_ORDER" />
             </State>
           </value>
@@ -165,4 +315,101 @@
       </map>
     </option>
   </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/Management-Server/src/org/keldagrim/Management.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="33" column="16" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/Server.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="22" column="19" selection-start-line="22" selection-start-column="19" selection-end-line="22" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/org/runite/Client.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="17" column="52" selection-start-line="17" selection-start-column="52" selection-end-line="17" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ArtifactsStructureConfigurable.UI">
+        <settings>
+          <artifact-editor />
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="FacetStructureConfigurable.UI">
+        <settings>
+          <last-edited>No facets are configured</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="GlobalLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="JdkListConfigurable.UI">
+        <settings>
+          <last-edited>1.7</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ModuleStructureConfigurable.UI">
+        <settings>
+          <last-edited>RS-2009</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
 </project>
\ No newline at end of file
diff --git a/Client/src/org/runite/METAs/META-INF/MANIFEST.MF b/Management-Server/src/META-INF/MANIFEST.MF
similarity index 100%
rename from Client/src/org/runite/METAs/META-INF/MANIFEST.MF
rename to Management-Server/src/META-INF/MANIFEST.MF
diff --git a/RS-2009.iml b/RS-2009.iml
new file mode 100644
index 000000000..790473144
--- /dev/null
+++ b/RS-2009.iml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="ExternalSystem" externalSystem="GRADLE" externalSystemModuleGroup="" externalSystemModuleVersion="unspecified" linkedProjectId="RS-2009" linkedProjectPath="$MODULE_DIR$" rootProjectPath="$MODULE_DIR$" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/Client/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/Client/lib" recursive="false" />
+      </library>
+    </orderEntry>
+  </component>
+</module>
\ No newline at end of file
diff --git a/Server/src/META-INF/MANIFEST.MF b/Server/src/META-INF/MANIFEST.MF
deleted file mode 100644
index d7812e5ab..000000000
--- a/Server/src/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: org.runite.Client
-
diff --git a/Server/src/METAs/META-INF/MANIFEST.MF b/Server/src/METAs/META-INF/MANIFEST.MF
deleted file mode 100644
index 683bd2ea1..000000000
--- a/Server/src/METAs/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: org.runite.GameLaunch
-