diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index e805548aaa8..8d81632f83e 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.20" />
+    <option name="version" value="1.9.22" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/CLI_Help.xml b/.idea/runConfigurations/CLI_Help.xml
new file mode 100644
index 00000000000..464c377ba88
--- /dev/null
+++ b/.idea/runConfigurations/CLI_Help.xml
@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="CLI Help" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="facades:PC:game" />
+          <option value="--args='--help'" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/game__gradle_.xml b/.idea/runConfigurations/Terasology.xml
similarity index 54%
rename from .idea/runConfigurations/game__gradle_.xml
rename to .idea/runConfigurations/Terasology.xml
index e97e09d6111..ba8cfc64c0c 100644
--- a/.idea/runConfigurations/game__gradle_.xml
+++ b/.idea/runConfigurations/Terasology.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="game (gradle)" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Terasology" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$/facades/PC" />
@@ -11,11 +11,15 @@
       <option name="taskNames">
         <list>
           <option value="game" />
+          <option value="--args='--homedir=. --no-crash-report'" />
         </list>
       </option>
-      <option name="vmOptions" value="" />
+      <option name="vmOptions" value="-Xms256m -Xmx1536m" />
     </ExternalSystemSettings>
-    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TerasologyPC.xml b/.idea/runConfigurations/TerasologyPC.xml
deleted file mode 100644
index 7b257a2799e..00000000000
--- a/.idea/runConfigurations/TerasologyPC.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TerasologyPC" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.terasology.engine.Terasology" />
-    <module name="Terasology.facades.PC.main" />
-    <option name="PROGRAM_PARAMETERS" value="--homedir=. --no-crash-report" />
-    <shortenClasspath name="MANIFEST" />
-    <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.terasology.engine.core.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="fetchModuleDependencies" externalProjectPath="$PROJECT_DIR$/modules" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
diff --git a/.idea/runConfigurations/TerasologyPC__2nd_client_.xml b/.idea/runConfigurations/TerasologyPC__2nd_client_.xml
deleted file mode 100644
index ede87b92473..00000000000
--- a/.idea/runConfigurations/TerasologyPC__2nd_client_.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TerasologyPC (2nd client)" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.terasology.engine.Terasology" />
-    <module name="Terasology.facades.PC.main" />
-    <option name="PROGRAM_PARAMETERS" value="--homedir=terasology-2ndclient --no-crash-report" />
-    <shortenClasspath name="MANIFEST" />
-    <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.terasology.engine.core.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="fetchModuleDependencies" externalProjectPath="$PROJECT_DIR$/modules" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TerasologyPC__2nd_client_for_mac.xml b/.idea/runConfigurations/TerasologyPC__2nd_client_for_mac.xml
deleted file mode 100644
index e00886a4768..00000000000
--- a/.idea/runConfigurations/TerasologyPC__2nd_client_for_mac.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TerasologyPC (2nd client) for Mac" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.terasology.engine.Terasology" />
-    <module name="Terasology.facades.PC.main" />
-    <option name="PROGRAM_PARAMETERS" value="--homedir=terasology-2ndclient --no-crash-report --no-splash" />
-    <shortenClasspath name="MANIFEST" />
-    <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m -XstartOnFirstThread -Djava.awt.headless=true" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.terasology.engine.core.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="fetchModuleDependencies" externalProjectPath="$PROJECT_DIR$/modules" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TerasologyPC__3rd_client_.xml b/.idea/runConfigurations/TerasologyPC__3rd_client_.xml
deleted file mode 100644
index 096f62ec2f3..00000000000
--- a/.idea/runConfigurations/TerasologyPC__3rd_client_.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TerasologyPC (3rd client)" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.terasology.engine.Terasology" />
-    <module name="Terasology.facades.PC.main" />
-    <option name="PROGRAM_PARAMETERS" value="--homedir=terasology-3rdclient --no-crash-report" />
-    <shortenClasspath name="MANIFEST" />
-    <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.terasology.engine.core.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="fetchModuleDependencies" externalProjectPath="$PROJECT_DIR$/modules" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TerasologyPC__CR_enabled_.xml b/.idea/runConfigurations/TerasologyPC__CR_enabled_.xml
deleted file mode 100644
index b6c752f9b55..00000000000
--- a/.idea/runConfigurations/TerasologyPC__CR_enabled_.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TerasologyPC (CR enabled)" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.terasology.engine.Terasology" />
-    <module name="Terasology.facades.PC.main" />
-    <option name="PROGRAM_PARAMETERS" value="--homedir=. --crash-report" />
-    <shortenClasspath name="MANIFEST" />
-    <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.terasology.engine.core.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="fetchModuleDependencies" externalProjectPath="$PROJECT_DIR$/modules" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TerasologyPC__EXTREME_8GB_.xml b/.idea/runConfigurations/TerasologyPC__EXTREME_8GB_.xml
deleted file mode 100644
index 40c5b9abe8d..00000000000
--- a/.idea/runConfigurations/TerasologyPC__EXTREME_8GB_.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TerasologyPC (EXTREME 8GB)" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.terasology.engine.Terasology" />
-    <module name="Terasology.facades.PC.main" />
-    <option name="PROGRAM_PARAMETERS" value="--homedir=. --no-crash-report" />
-    <shortenClasspath name="MANIFEST" />
-    <option name="VM_PARAMETERS" value="-Xms256m -Xmx8192m" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.terasology.engine.core.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="fetchModuleDependencies" externalProjectPath="$PROJECT_DIR$/modules" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TerasologyPC__Headless_.xml b/.idea/runConfigurations/TerasologyPC__Headless_.xml
deleted file mode 100644
index dd86327ebc6..00000000000
--- a/.idea/runConfigurations/TerasologyPC__Headless_.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TerasologyPC (Headless)" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.terasology.engine.Terasology" />
-    <module name="Terasology.facades.PC.main" />
-    <option name="PROGRAM_PARAMETERS" value="--headless --homedir=terasology-server --override-default-config=override.cfg" />
-    <shortenClasspath name="MANIFEST" />
-    <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.terasology.engine.core.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="fetchModuleDependencies" externalProjectPath="$PROJECT_DIR$/modules" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TerasologyPC__Java_FlightRecorder_.xml b/.idea/runConfigurations/TerasologyPC__Java_FlightRecorder_.xml
deleted file mode 100644
index 94040f7826f..00000000000
--- a/.idea/runConfigurations/TerasologyPC__Java_FlightRecorder_.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TerasologyPC (Java FlightRecorder)" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.terasology.engine.Terasology" />
-    <module name="Terasology.facades.PC.main" />
-    <option name="PROGRAM_PARAMETERS" value="--homedir=. --no-crash-report" />
-    <shortenClasspath name="MANIFEST" />
-    <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m -XX:+UnlockCommercialFeatures -XX:+FlightRecorder -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -XX:StartFlightRecording=filename=terasology.jfr,dumponexit=true" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.terasology.engine.core.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="fetchModuleDependencies" externalProjectPath="$PROJECT_DIR$/modules" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TerasologyPC__Splash_disabled_.xml b/.idea/runConfigurations/TerasologyPC__Splash_disabled_.xml
deleted file mode 100644
index 46582c03a0b..00000000000
--- a/.idea/runConfigurations/TerasologyPC__Splash_disabled_.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TerasologyPC (Splash disabled)" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.terasology.engine.Terasology" />
-    <module name="Terasology.facades.PC.main" />
-    <option name="PROGRAM_PARAMETERS" value="--homedir=. --no-crash-report --no-splash" />
-    <shortenClasspath name="MANIFEST" />
-    <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.terasology.engine.core.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="fetchModuleDependencies" externalProjectPath="$PROJECT_DIR$/modules" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TerasologyPC__load_latest_.xml b/.idea/runConfigurations/TerasologyPC__load_latest_.xml
deleted file mode 100644
index c6febd20a3b..00000000000
--- a/.idea/runConfigurations/TerasologyPC__load_latest_.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TerasologyPC (load latest)" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.terasology.engine.Terasology" />
-    <module name="Terasology.facades.PC.main" />
-    <option name="PROGRAM_PARAMETERS" value="--homedir=. --no-crash-report --load-last-game" />
-    <shortenClasspath name="MANIFEST" />
-    <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.terasology.engine.core.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="fetchModuleDependencies" externalProjectPath="$PROJECT_DIR$/modules" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TerasologyPC__no_audio_.xml b/.idea/runConfigurations/TerasologyPC__no_audio_.xml
deleted file mode 100644
index ebe8200612c..00000000000
--- a/.idea/runConfigurations/TerasologyPC__no_audio_.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TerasologyPC (no audio)" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.terasology.engine.Terasology" />
-    <module name="Terasology.facades.PC.main" />
-    <option name="PROGRAM_PARAMETERS" value="--homedir=. --no-crash-report --no-sound" />
-    <shortenClasspath name="MANIFEST" />
-    <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.terasology.engine.core.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="fetchModuleDependencies" externalProjectPath="$PROJECT_DIR$/modules" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TerasologyPC__no_saves_.xml b/.idea/runConfigurations/TerasologyPC__no_saves_.xml
deleted file mode 100644
index c0b10d8c3a7..00000000000
--- a/.idea/runConfigurations/TerasologyPC__no_saves_.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TerasologyPC (no saves)" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.terasology.engine.Terasology" />
-    <module name="Terasology.facades.PC.main" />
-    <option name="PROGRAM_PARAMETERS" value="--homedir=. --no-crash-report --no-save-games" />
-    <shortenClasspath name="MANIFEST" />
-    <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.terasology.engine.core.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="fetchModuleDependencies" externalProjectPath="$PROJECT_DIR$/modules" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TerasologyPC__permissive_security_.xml b/.idea/runConfigurations/TerasologyPC__permissive_security_.xml
deleted file mode 100644
index 72950e1268c..00000000000
--- a/.idea/runConfigurations/TerasologyPC__permissive_security_.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TerasologyPC (permissive security)" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.terasology.engine.Terasology" />
-    <module name="Terasology.facades.PC.main" />
-    <option name="PROGRAM_PARAMETERS" value="--homedir=. --no-crash-report --permissive-security" />
-    <shortenClasspath name="MANIFEST" />
-    <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m -Djava.library.path=$PROJECT_DIR$/natives/linux" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.terasology.engine.core.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="fetchModuleDependencies" externalProjectPath="$PROJECT_DIR$/modules" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TerasologyPC__recreate_latest_.xml b/.idea/runConfigurations/TerasologyPC__recreate_latest_.xml
deleted file mode 100644
index f24a1795f1f..00000000000
--- a/.idea/runConfigurations/TerasologyPC__recreate_latest_.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TerasologyPC (recreate latest)" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.terasology.engine.Terasology" />
-    <module name="Terasology.facades.PC.main" />
-    <option name="PROGRAM_PARAMETERS" value="--homedir=. --no-crash-report --create-last-game" />
-    <shortenClasspath name="MANIFEST" />
-    <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="fetchModuleDependencies" externalProjectPath="$PROJECT_DIR$/modules" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/TerasologyPC_for_mac.xml b/.idea/runConfigurations/TerasologyPC_for_mac.xml
deleted file mode 100644
index 960c75d1f4f..00000000000
--- a/.idea/runConfigurations/TerasologyPC_for_mac.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TerasologyPC for Mac" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="org.terasology.engine.Terasology" />
-    <module name="Terasology.facades.PC.main" />
-    <option name="PROGRAM_PARAMETERS" value="--homedir=. --no-crash-report --no-splash" />
-    <shortenClasspath name="MANIFEST" />
-    <option name="VM_PARAMETERS" value="-Xms256m -Xmx1536m -XstartOnFirstThread -Djava.awt.headless=true" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.terasology.engine.core.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="fetchModuleDependencies" externalProjectPath="$PROJECT_DIR$/modules" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Terasology__2nd_client_.xml b/.idea/runConfigurations/Terasology__2nd_client_.xml
new file mode 100644
index 00000000000..33c9e504e1c
--- /dev/null
+++ b/.idea/runConfigurations/Terasology__2nd_client_.xml
@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Terasology (2nd client)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Server/Client">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="game" />
+          <option value="--args='--homedir=terasology-2ndclient --no-crash-report'" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms256m -Xmx1536m" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Terasology__3rd_client_.xml b/.idea/runConfigurations/Terasology__3rd_client_.xml
new file mode 100644
index 00000000000..739f28ff1ae
--- /dev/null
+++ b/.idea/runConfigurations/Terasology__3rd_client_.xml
@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Terasology (3rd client)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Server/Client">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="game" />
+          <option value="--args='--homedir=terasology-3rdclient --no-crash-report'" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms256m -Xmx1536m" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Terasology__8GB_.xml b/.idea/runConfigurations/Terasology__8GB_.xml
new file mode 100644
index 00000000000..6d07fe07505
--- /dev/null
+++ b/.idea/runConfigurations/Terasology__8GB_.xml
@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Terasology (8GB)" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/facades/PC" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="game" />
+          <option value="--args='--homedir=. --no-crash-report'" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms256m -Xmx8192m" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Terasology__Headless_Server_.xml b/.idea/runConfigurations/Terasology__Headless_Server_.xml
new file mode 100644
index 00000000000..002ffc3c67f
--- /dev/null
+++ b/.idea/runConfigurations/Terasology__Headless_Server_.xml
@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Terasology (Headless Server)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Server/Client">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/facades/PC" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="game" />
+          <option value="--args='--headless --homedir=terasology-server --override-default-config=override.cfg'" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms256m -Xmx1536m" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Terasology__Java_FlightRecorder_.xml b/.idea/runConfigurations/Terasology__Java_FlightRecorder_.xml
new file mode 100644
index 00000000000..63fce9f77c4
--- /dev/null
+++ b/.idea/runConfigurations/Terasology__Java_FlightRecorder_.xml
@@ -0,0 +1,33 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Terasology (Java FlightRecorder)" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/facades/PC" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="game" />
+          <option value="--args='--homedir=. --no-crash-report'" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms256m -Xmx1536m -XX:+FlightRecorder -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -XX:StartFlightRecording=filename=terasology.jfr,dumponexit=true" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <EXTENSION ID="com.intellij.execution.ExternalSystemRunConfigurationJavaExtension">
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="org.terasology.engine.core.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+    </EXTENSION>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Terasology__MacOS__.xml b/.idea/runConfigurations/Terasology__MacOS__.xml
new file mode 100644
index 00000000000..32edc459efd
--- /dev/null
+++ b/.idea/runConfigurations/Terasology__MacOS__.xml
@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Terasology (MacOS)" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/facades/PC" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="game" />
+          <option value="--args='--homedir=. --no-crash-report --no-splash'" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms256m -Xmx1536m  -XstartOnFirstThread -Djava.awt.headless=true" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Terasology__with_Crash_Reporter_.xml b/.idea/runConfigurations/Terasology__with_Crash_Reporter_.xml
new file mode 100644
index 00000000000..0ce71a7f4de
--- /dev/null
+++ b/.idea/runConfigurations/Terasology__with_Crash_Reporter_.xml
@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Terasology (with Crash Reporter)" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/facades/PC" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="game" />
+          <option value="--args='--homedir=. --crash-report'" />
+        </list>
+      </option>
+      <option name="vmOptions" value="-Xms256m -Xmx1536m" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Tests___Integration.xml b/.idea/runConfigurations/Tests___Integration.xml
new file mode 100644
index 00000000000..3cc89f76bb2
--- /dev/null
+++ b/.idea/runConfigurations/Tests___Integration.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Tests - Integration" type="GradleRunConfiguration" factoryName="Gradle" folderName="Testing">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="integrationTest" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>true</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Tests___Integration__flaky_.xml b/.idea/runConfigurations/Tests___Integration__flaky_.xml
new file mode 100644
index 00000000000..0a66cca0f2b
--- /dev/null
+++ b/.idea/runConfigurations/Tests___Integration__flaky_.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Tests - Integration (flaky)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Testing">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="integrationTestFlaky" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>true</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Tests___Unit.xml b/.idea/runConfigurations/Tests___Unit.xml
new file mode 100644
index 00000000000..b65e4c04c2f
--- /dev/null
+++ b/.idea/runConfigurations/Tests___Unit.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Tests - Unit" type="GradleRunConfiguration" factoryName="Gradle" folderName="Testing">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="unitTest" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>true</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/engine_tests_with_JaCoCo.xml b/.idea/runConfigurations/engine_tests_with_JaCoCo.xml
deleted file mode 100644
index 11a0844b74c..00000000000
--- a/.idea/runConfigurations/engine_tests_with_JaCoCo.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="engine-tests with JaCoCo" type="JUnit" factoryName="JUnit">
-    <shortenClasspath name="MANIFEST" />
-    <useClassPathOnly />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.terasology.engine.core.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="wholeProject" />
-    </option>
-    <method v="2">
-      <option name="Make" enabled="true" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="fetchModuleDependencies" externalProjectPath="$PROJECT_DIR$/modules" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file