diff --git a/.dockerignore b/.dockerignore
index 53a60c200..e125fd555 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,5 @@
 .github/
 .idea/
-.run/
 docs/
 scripts/
 # The source directory is required by Dockerfile.demo
diff --git a/.gitignore b/.gitignore
index d8e714db4..6d373cb93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,12 @@ docs/Gemfile.lock
 target/
 .classpath
 .project
-.idea/
 .vscode/
 
 # windows
 ~
 
+# 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 000000000..f76a7e895
--- /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/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 PostgreSQL.run.xml b/.idea/runConfigurations/Jetty with PostgreSQL.run.xml
similarity index 100%
rename from .run/Jetty with PostgreSQL.run.xml
rename to .idea/runConfigurations/Jetty with PostgreSQL.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 ed6d1f335..53b19875d 100644
--- a/DEVELOPING.md
+++ b/DEVELOPING.md
@@ -27,7 +27,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
+> in the [`.idea/runConfigurations`](.idea/runConfigurations) directory for convenience. IntelliJ will automatically pick those up when you open this
 > repository.
 
 ## Core Technologies
@@ -97,7 +97,7 @@ To build and run the API server in one go, invoke the Jetty Maven plugin as foll
 mvn jetty:run -P enhance -Dlogback.configurationFile=src/main/docker/logback.xml
 ```
 
-The above command is also suitable for debugging. For IntelliJ, simply *Debug* the [Jetty](./.run/Jetty.run.xml) run
+The above command is also suitable for debugging. For IntelliJ, simply *Debug* the [Jetty](.idea/runConfigurations/Jetty.run.xml) run
 configuration.
 
 ## Debugging with Frontend
diff --git a/scripts/data-nist-generate-dummy.sh b/dev/scripts/data-nist-generate-dummy.sh
similarity index 100%
rename from scripts/data-nist-generate-dummy.sh
rename to dev/scripts/data-nist-generate-dummy.sh
diff --git a/scripts/dbschema-generate.datanucleus.properties b/dev/scripts/dbschema-generate.datanucleus.properties
similarity index 100%
rename from scripts/dbschema-generate.datanucleus.properties
rename to dev/scripts/dbschema-generate.datanucleus.properties
diff --git a/scripts/dbschema-generate.log4j.properties b/dev/scripts/dbschema-generate.log4j.properties
similarity index 100%
rename from scripts/dbschema-generate.log4j.properties
rename to dev/scripts/dbschema-generate.log4j.properties
diff --git a/scripts/dbschema-generate.sh b/dev/scripts/dbschema-generate.sh
similarity index 86%
rename from scripts/dbschema-generate.sh
rename to dev/scripts/dbschema-generate.sh
index 198b7a9fd..ee0230c04 100755
--- a/scripts/dbschema-generate.sh
+++ b/dev/scripts/dbschema-generate.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 DEFAULT_OUTPUT="./schema.sql"
-DEFAULT_DNPROPS="./scripts/dbschema-generate.datanucleus.properties"
+DEFAULT_DNPROPS="./dev/scripts/dbschema-generate.datanucleus.properties"
 
 function printHelp() {
   echo "Generate the database schema for Dependency-Track."
@@ -40,4 +40,4 @@ mvn datanucleus:schema-create \
   -Dprops="${dnprops:-$DEFAULT_DNPROPS}" \
   -DcompleteDdl=true \
   -DddlFile="${output:-$DEFAULT_OUTPUT}" \
-  -Dlog4jConfiguration=./scripts/dbschema-generate.log4j.properties
\ No newline at end of file
+  -Dlog4jConfiguration=./dev/scripts/dbschema-generate.log4j.properties
\ No newline at end of file
diff --git a/scripts/logs-clear.sh b/dev/scripts/logs-clear.sh
similarity index 100%
rename from scripts/logs-clear.sh
rename to dev/scripts/logs-clear.sh