diff --git a/.gitignore b/.gitignore
index 49cb49b507a..a183c17fcdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,14 +28,10 @@ build/
/gradle.properties
/override.cfg
-# Ignore IntelliJ - could use "/**/*.iml" to catch all .iml files, but that requires a somewhat recent Git version
+# Ignore IntelliJ
+!/.idea
+!/.run
/out/
-modules/BuilderSampleGameplay/BuilderSampleGameplay.iml
-facades/PC/PC.iml
-facades/TeraEd/TeraEd.iml
-engine/engine.iml
-engine-tests/engine-tests.iml
-/*.iml
/*.ipr
/*.iws
/projectFilesBackup*
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000000..9f7eed846f4
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+/shelf
+workspace.xml
+
+# managed by gradle sync
+/gradle.xml
+
+# too much churn with modules
+/vcs.xml
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
new file mode 100644
index 00000000000..9d52d6a75e7
--- /dev/null
+++ b/.idea/checkstyle-idea.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 00000000000..f127e819472
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 00000000000..79ee123c2b2
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 00000000000..3058433f8e4
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/copyright/Moving_Blocks_Apache_License.xml b/.idea/copyright/Moving_Blocks_Apache_License.xml
new file mode 100644
index 00000000000..5f2a84b2b72
--- /dev/null
+++ b/.idea/copyright/Moving_Blocks_Apache_License.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 00000000000..c0be6f157b0
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/.idea/dictionaries/kevint.xml b/.idea/dictionaries/kevint.xml
new file mode 100644
index 00000000000..1177fe52705
--- /dev/null
+++ b/.idea/dictionaries/kevint.xml
@@ -0,0 +1,7 @@
+
+
+
+ terasology
+
+
+
\ No newline at end of file
diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml
new file mode 100644
index 00000000000..abf7b55b3d7
--- /dev/null
+++ b/.idea/externalDependencies.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 00000000000..24388987c15
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000000..ddfb614f23d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.run/game (gradle).run.xml b/.run/game (gradle).run.xml
new file mode 100644
index 00000000000..72b386463a0
--- /dev/null
+++ b/.run/game (gradle).run.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
diff --git a/.run/run PC (permissive).run.xml b/.run/run PC (permissive).run.xml
new file mode 100644
index 00000000000..6d9ff9ddfad
--- /dev/null
+++ b/.run/run PC (permissive).run.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.run/run PC.run.xml b/.run/run PC.run.xml
new file mode 100644
index 00000000000..3d5731f65d6
--- /dev/null
+++ b/.run/run PC.run.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+