diff --git a/.dockerignore b/.dockerignore
index dac4bc9d91..73cd897d7e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,5 @@
 .github/
 .idea/
-.run/
 docs/
 scripts/
 src/
diff --git a/.gitignore b/.gitignore
index d73962f835..6d373cb939 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,12 @@ docs/Gemfile.lock
 target/
 .classpath
 .project
-.idea/
 .vscode/
 
 # windows
-~
\ No newline at end of file
+~
+
+# IntelliJ
+.idea/*
+!.idea/icon.svg
+!.idea/runConfigurations/
\ No newline at end of file
diff --git a/.idea/icon.svg b/.idea/icon.svg
new file mode 100644
index 0000000000..f76a7e8959
--- /dev/null
+++ b/.idea/icon.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 300 474" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="Symbol">
+        <g transform="matrix(7.55778,0,0,7.55778,138.927,48.5738)">
+            <path d="M0,7.701C0,10.047 -1.909,11.955 -4.254,11.955L-11.955,11.955C-14.3,11.955 -16.209,10.047 -16.209,7.701L-16.209,0.001C-16.209,-2.345 -14.3,-4.253 -11.955,-4.253L-4.254,-4.253C-1.909,-4.253 0,-2.345 0,0.001L0,7.701ZM-3.895,-6.427L-12.314,-6.427C-15.665,-6.427 -18.382,-3.71 -18.382,-0.359L-18.382,8.061C-18.382,11.412 -15.665,14.128 -12.314,14.128L-3.895,14.128C-0.543,14.128 2.173,11.412 2.173,8.061L2.173,-0.359C2.173,-3.71 -0.543,-6.427 -3.895,-6.427" style="fill:rgb(255,0,207);fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(7.55778,0,0,7.55778,283.577,211.824)">
+            <path d="M0,7.701C0,10.047 -1.909,11.955 -4.254,11.955L-11.955,11.955C-14.3,11.955 -16.209,10.047 -16.209,7.701L-16.209,0.001C-16.209,-2.345 -14.3,-4.253 -11.955,-4.253L-4.254,-4.253C-1.909,-4.253 0,-2.345 0,0.001L0,7.701ZM-3.895,-6.427L-12.314,-6.427C-15.665,-6.427 -18.382,-3.71 -18.382,-0.359L-18.382,8.061C-18.382,11.412 -15.665,14.128 -12.314,14.128L-3.895,14.128C-0.543,14.128 2.173,11.412 2.173,8.061L2.173,-0.359C2.173,-3.71 -0.543,-6.427 -3.895,-6.427" style="fill:rgb(255,0,207);fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(7.55778,0,0,7.55778,138.927,366.902)">
+            <path d="M0,7.701C0,10.047 -1.909,11.955 -4.254,11.955L-11.955,11.955C-14.3,11.955 -16.209,10.047 -16.209,7.701L-16.209,0.001C-16.209,-2.345 -14.3,-4.253 -11.955,-4.253L-4.254,-4.253C-1.909,-4.253 0,-2.345 0,0.001L0,7.701ZM-3.895,-6.427L-12.314,-6.427C-15.665,-6.427 -18.382,-3.71 -18.382,-0.359L-18.382,8.061C-18.382,11.412 -15.665,14.128 -12.314,14.128L-3.895,14.128C-0.543,14.128 2.173,11.412 2.173,8.061L2.173,-0.359C2.173,-3.71 -0.543,-6.427 -3.895,-6.427" style="fill:rgb(255,0,207);fill-rule:nonzero;"/>
+        </g>
+    </g>
+</svg>
diff --git a/.run/Build API Server Image.run.xml b/.idea/runConfigurations/Build API Server Image.run.xml
similarity index 100%
rename from .run/Build API Server Image.run.xml
rename to .idea/runConfigurations/Build API Server Image.run.xml
diff --git a/.run/Build API Server.run.xml b/.idea/runConfigurations/Build API Server.run.xml
similarity index 100%
rename from .run/Build API Server.run.xml
rename to .idea/runConfigurations/Build API Server.run.xml
diff --git a/.run/Build Bundled Image.run.xml b/.idea/runConfigurations/Build Bundled Image.run.xml
similarity index 100%
rename from .run/Build Bundled Image.run.xml
rename to .idea/runConfigurations/Build Bundled Image.run.xml
diff --git a/.run/Build Bundled.run.xml b/.idea/runConfigurations/Build Bundled.run.xml
similarity index 100%
rename from .run/Build Bundled.run.xml
rename to .idea/runConfigurations/Build Bundled.run.xml
diff --git a/.run/Compose (w_ MSSQL).run.xml b/.idea/runConfigurations/Compose (w_ MSSQL).run.xml
similarity index 100%
rename from .run/Compose (w_ MSSQL).run.xml
rename to .idea/runConfigurations/Compose (w_ MSSQL).run.xml
diff --git a/.run/Compose (w_ Postgres).run.xml b/.idea/runConfigurations/Compose (w_ Postgres).run.xml
similarity index 100%
rename from .run/Compose (w_ Postgres).run.xml
rename to .idea/runConfigurations/Compose (w_ Postgres).run.xml
diff --git a/.run/DataNucleus Enhance.run.xml b/.idea/runConfigurations/DataNucleus Enhance.run.xml
similarity index 100%
rename from .run/DataNucleus Enhance.run.xml
rename to .idea/runConfigurations/DataNucleus Enhance.run.xml
diff --git a/.run/Jetty with H2 Console.run.xml b/.idea/runConfigurations/Jetty with H2 Console.run.xml
similarity index 100%
rename from .run/Jetty with H2 Console.run.xml
rename to .idea/runConfigurations/Jetty with H2 Console.run.xml
diff --git a/.run/Jetty.run.xml b/.idea/runConfigurations/Jetty.run.xml
similarity index 100%
rename from .run/Jetty.run.xml
rename to .idea/runConfigurations/Jetty.run.xml
diff --git a/.run/Test.run.xml b/.idea/runConfigurations/Test.run.xml
similarity index 100%
rename from .run/Test.run.xml
rename to .idea/runConfigurations/Test.run.xml
diff --git a/DEVELOPING.md b/DEVELOPING.md
index 2f26c975ea..c69bc57be7 100644
--- a/DEVELOPING.md
+++ b/DEVELOPING.md
@@ -24,7 +24,7 @@ There are a few things you'll need on your journey:
 * Docker (optional)
 
 > We provide common [run configurations](https://www.jetbrains.com/help/idea/run-debug-configuration.html) for IntelliJ 
-> in the [`.run`](./.run) directory for convenience. IntelliJ will automatically pick those up when you open this repository.
+> in the [`.idea/runConfigurations`](./.idea/runConfigurations) directory for convenience. IntelliJ will automatically pick those up when you open this repository.
 
 ## Core Technologies
 
@@ -84,7 +84,7 @@ mvn jetty:run -P enhance -Dlogback.configurationFile=src/main/docker/logback.xml
 > Note that the `bundle-ui` profile has no effect using this method. 
 > It works only for the API server, not the bundled distribution.
 
-The above command is also suitable for debugging. For IntelliJ, simply *Debug* the [Jetty](./.run/Jetty.run.xml) run configuration.
+The above command is also suitable for debugging. For IntelliJ, simply *Debug* the [Jetty](./.idea/runConfigurations/Jetty.run.xml) run configuration.
 
 ### Inspecting the database