From 684daa5c1edc4fa937ac130341b714ca63abec4f Mon Sep 17 00:00:00 2001
From: Rishabh Patel <ptlrshb@gmail.com>
Date: Mon, 27 Jul 2026 15:03:07 -0700
Subject: [PATCH] HDDS-16002. Rearrange IntelliJ run configurations into groups
 for better organization.

---
 .run/Datanode1-ha.run.xml                | 2 +-
 .run/Datanode1.run.xml                   | 2 +-
 .run/Datanode2-ha.run.xml                | 2 +-
 .run/Datanode2.run.xml                   | 2 +-
 .run/Datanode3-ha.run.xml                | 2 +-
 .run/Datanode3.run.xml                   | 2 +-
 .run/FreonStandalone.run.xml             | 2 +-
 .run/OzoneFsShell-ha.run.xml             | 2 +-
 .run/OzoneFsShell.run.xml                | 2 +-
 .run/OzoneManager-ha.run.xml             | 2 +-
 .run/OzoneManager.run.xml                | 2 +-
 .run/OzoneManagerInit-ha.run.xml         | 2 +-
 .run/OzoneManagerInit.run.xml            | 2 +-
 .run/OzoneShell-ha.run.xml               | 2 +-
 .run/OzoneShell.run.xml                  | 2 +-
 .run/PrimordialSCM-ha.run.xml            | 2 +-
 .run/PrimordialSCMInit-ha.run.xml        | 4 ++--
 .run/Recon-ha.run.xml                    | 2 +-
 .run/Recon.run.xml                       | 2 +-
 .run/S3Gateway.run.xml                   | 2 +-
 .run/Scm2-ha.run.xml                     | 2 +-
 .run/Scm2Bootstrap-ha.run.xml            | 4 ++--
 .run/Scm3-ha.run.xml                     | 2 +-
 .run/Scm3Bootstrap-ha.run.xml            | 2 +-
 .run/ScmRoles.run.xml                    | 4 ++--
 .run/StorageContainerManager.run.xml     | 2 +-
 .run/StorageContainerManagerInit.run.xml | 2 +-
 27 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.run/Datanode1-ha.run.xml b/.run/Datanode1-ha.run.xml
index ad1e735d6b4c..ccdb59cf5b11 100644
--- a/.run/Datanode1-ha.run.xml
+++ b/.run/Datanode1-ha.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Datanode1-ha" type="Application" factoryName="Application">
+  <configuration default="false" name="Datanode1-ha" type="Application" factoryName="Application" folderName="ozone-ha">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.HddsDatanodeService" />
     <module name="ozone-datanode" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set ozone.metadata.dirs=/tmp/datanode1 --set hdds.datanode.dir=/tmp/datanode1/storage" />
diff --git a/.run/Datanode1.run.xml b/.run/Datanode1.run.xml
index 16580fa82013..380e28a8abcb 100644
--- a/.run/Datanode1.run.xml
+++ b/.run/Datanode1.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Datanode1" type="Application" factoryName="Application">
+  <configuration default="false" name="Datanode1" type="Application" factoryName="Application" folderName="ozone">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.HddsDatanodeService" />
     <module name="ozone-datanode" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml --set ozone.metadata.dirs=/tmp/datanode1 --set hdds.datanode.dir=/tmp/datanode1/storage" />
diff --git a/.run/Datanode2-ha.run.xml b/.run/Datanode2-ha.run.xml
index df9c4c0ab3e6..e07b681681fe 100644
--- a/.run/Datanode2-ha.run.xml
+++ b/.run/Datanode2-ha.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Datanode2-ha" type="Application" factoryName="Application">
+  <configuration default="false" name="Datanode2-ha" type="Application" factoryName="Application" folderName="ozone-ha">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.HddsDatanodeService" />
     <module name="ozone-datanode" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set ozone.metadata.dirs=/tmp/datanode2 --set hdds.datanode.dir=/tmp/datanode2/storage --set hdds.datanode.http-address=127.0.0.1:10021 --set hdds.container.ratis.ipc.port=10022 --set hdds.container.ipc.port=10023 --set hdds.container.ratis.server.port=10024 --set hdds.container.ratis.admin.port=10025 --set hdds.datanode.replication.port=10026 --set hdds.container.ratis.datastream.port=10027 --set hdds.datanode.client.port=10028" />
diff --git a/.run/Datanode2.run.xml b/.run/Datanode2.run.xml
index f1f2f2f4f0cc..efcbd2d15a65 100644
--- a/.run/Datanode2.run.xml
+++ b/.run/Datanode2.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Datanode2" type="Application" factoryName="Application">
+  <configuration default="false" name="Datanode2" type="Application" factoryName="Application" folderName="ozone">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.HddsDatanodeService" />
     <module name="ozone-datanode" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml --set ozone.metadata.dirs=/tmp/datanode2 --set hdds.datanode.dir=/tmp/datanode2/storage --set hdds.datanode.http-address=127.0.0.1:10021 --set hdds.container.ratis.ipc.port=10022 --set hdds.container.ipc.port=10023 --set hdds.container.ratis.server.port=10024 --set hdds.container.ratis.admin.port=10025 --set hdds.datanode.replication.port=10026 --set hdds.container.ratis.datastream.port=10027 --set hdds.datanode.client.port=10028" />
diff --git a/.run/Datanode3-ha.run.xml b/.run/Datanode3-ha.run.xml
index 5e4c7ffb946a..cae3710298b5 100644
--- a/.run/Datanode3-ha.run.xml
+++ b/.run/Datanode3-ha.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Datanode3-ha" type="Application" factoryName="Application">
+  <configuration default="false" name="Datanode3-ha" type="Application" factoryName="Application" folderName="ozone-ha">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.HddsDatanodeService" />
     <module name="ozone-datanode" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set ozone.metadata.dirs=/tmp/datanode3 --set hdds.datanode.dir=/tmp/datanode3/storage --set hdds.datanode.http-address=127.0.0.1:10031 --set hdds.container.ratis.ipc.port=10032 --set hdds.container.ipc.port=10033 --set hdds.container.ratis.server.port=10034 --set hdds.container.ratis.admin.port=10035 --set hdds.datanode.replication.port=10036 --set hdds.container.ratis.datastream.port=10037 --set hdds.datanode.client.port=10038" />
diff --git a/.run/Datanode3.run.xml b/.run/Datanode3.run.xml
index 1c9d946b81c4..69966ea678c0 100644
--- a/.run/Datanode3.run.xml
+++ b/.run/Datanode3.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Datanode3" type="Application" factoryName="Application">
+  <configuration default="false" name="Datanode3" type="Application" factoryName="Application" folderName="ozone">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.HddsDatanodeService" />
     <module name="ozone-datanode" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml --set ozone.metadata.dirs=/tmp/datanode3 --set hdds.datanode.dir=/tmp/datanode3/storage --set hdds.datanode.http-address=127.0.0.1:10031 --set hdds.container.ratis.ipc.port=10032 --set hdds.container.ipc.port=10033 --set hdds.container.ratis.server.port=10034 --set hdds.container.ratis.admin.port=10035 --set hdds.datanode.replication.port=10036 --set hdds.container.ratis.datastream.port=10037 --set hdds.datanode.client.port=10038" />
diff --git a/.run/FreonStandalone.run.xml b/.run/FreonStandalone.run.xml
index cc17c5f48d5f..5455f70ef2fa 100644
--- a/.run/FreonStandalone.run.xml
+++ b/.run/FreonStandalone.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="FreonStandalone" type="Application" factoryName="Application">
+  <configuration default="false" name="FreonStandalone" type="Application" factoryName="Application" folderName="ozone">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.freon.Freon" />
     <module name="ozone-tools" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml rk" />
diff --git a/.run/OzoneFsShell-ha.run.xml b/.run/OzoneFsShell-ha.run.xml
index 6f8d82de471c..9abd1a4914f0 100644
--- a/.run/OzoneFsShell-ha.run.xml
+++ b/.run/OzoneFsShell-ha.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="OzoneFsShell-ha" type="Application" factoryName="Application">
+  <configuration default="false" name="OzoneFsShell-ha" type="Application" factoryName="Application" folderName="ozone-ha">
     <envs>
       <env name="OZONE_CONF_DIR" value="$PROJECT_DIR$/hadoop-ozone/dev-support/intellij" />
     </envs>
diff --git a/.run/OzoneFsShell.run.xml b/.run/OzoneFsShell.run.xml
index ad2dc6db2a9c..2269be4ec824 100644
--- a/.run/OzoneFsShell.run.xml
+++ b/.run/OzoneFsShell.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="OzoneFsShell" type="Application" factoryName="Application">
+  <configuration default="false" name="OzoneFsShell" type="Application" factoryName="Application" folderName="ozone">
     <envs>
       <env name="OZONE_CONF_DIR" value="$PROJECT_DIR$/hadoop-ozone/dev-support/intellij" />
     </envs>
diff --git a/.run/OzoneManager-ha.run.xml b/.run/OzoneManager-ha.run.xml
index 26d32c2488e5..131a04d638a0 100644
--- a/.run/OzoneManager-ha.run.xml
+++ b/.run/OzoneManager-ha.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="OzoneManager-ha" type="Application" factoryName="Application">
+  <configuration default="false" name="OzoneManager-ha" type="Application" factoryName="Application" folderName="ozone-ha">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.om.OzoneManagerStarter" />
     <module name="ozone-manager" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml" />
diff --git a/.run/OzoneManager.run.xml b/.run/OzoneManager.run.xml
index 41b80a9cfc22..d8cefd7277bf 100644
--- a/.run/OzoneManager.run.xml
+++ b/.run/OzoneManager.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="OzoneManager" type="Application" factoryName="Application">
+  <configuration default="false" name="OzoneManager" type="Application" factoryName="Application" folderName="ozone">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.om.OzoneManagerStarter" />
     <module name="ozone-manager" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
diff --git a/.run/OzoneManagerInit-ha.run.xml b/.run/OzoneManagerInit-ha.run.xml
index c1f6f0e1ada2..216c5b184c02 100644
--- a/.run/OzoneManagerInit-ha.run.xml
+++ b/.run/OzoneManagerInit-ha.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="OzoneManagerInit-ha" type="Application" factoryName="Application">
+  <configuration default="false" name="OzoneManagerInit-ha" type="Application" factoryName="Application" folderName="ozone-ha">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.om.OzoneManagerStarter" />
     <module name="ozone-manager" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --init" />
diff --git a/.run/OzoneManagerInit.run.xml b/.run/OzoneManagerInit.run.xml
index 1cff9a22cd41..a898ffd0e903 100644
--- a/.run/OzoneManagerInit.run.xml
+++ b/.run/OzoneManagerInit.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="OzoneManagerInit" type="Application" factoryName="Application">
+  <configuration default="false" name="OzoneManagerInit" type="Application" factoryName="Application" folderName="ozone">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.om.OzoneManagerStarter" />
     <module name="ozone-manager" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml --init" />
diff --git a/.run/OzoneShell-ha.run.xml b/.run/OzoneShell-ha.run.xml
index bb10aa85d463..55ae7cc39b7b 100644
--- a/.run/OzoneShell-ha.run.xml
+++ b/.run/OzoneShell-ha.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="OzoneShell-ha" type="Application" factoryName="Application">
+  <configuration default="false" name="OzoneShell-ha" type="Application" factoryName="Application" folderName="ozone-ha">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.shell.OzoneShell" />
     <module name="ozone-cli-shell" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml volume create /vol1" />
diff --git a/.run/OzoneShell.run.xml b/.run/OzoneShell.run.xml
index 019ad21370e7..f2d9802bf46c 100644
--- a/.run/OzoneShell.run.xml
+++ b/.run/OzoneShell.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="OzoneShell" type="Application" factoryName="Application">
+  <configuration default="false" name="OzoneShell" type="Application" factoryName="Application" folderName="ozone">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.shell.OzoneShell" />
     <module name="ozone-cli-shell" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml volume create /vol1" />
diff --git a/.run/PrimordialSCM-ha.run.xml b/.run/PrimordialSCM-ha.run.xml
index 9ff99d1b2c6e..c398cbcd56dd 100644
--- a/.run/PrimordialSCM-ha.run.xml
+++ b/.run/PrimordialSCM-ha.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PrimordialSCM-ha" type="Application" factoryName="Application">
+  <configuration default="false" name="PrimordialSCM-ha" type="Application" factoryName="Application" folderName="ozone-ha">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
     <module name="hdds-server-scm" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set ozone.scm.node.id=scm1 --set ozone.metadata.dirs=/tmp/scm1 --set ozone.scm.http-address=127.0.0.1:19876" />
diff --git a/.run/PrimordialSCMInit-ha.run.xml b/.run/PrimordialSCMInit-ha.run.xml
index 011499c8165e..3f061be90720 100644
--- a/.run/PrimordialSCMInit-ha.run.xml
+++ b/.run/PrimordialSCMInit-ha.run.xml
@@ -15,10 +15,10 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PrimordialSCMInit-ha" type="Application" factoryName="Application" nameIsGenerated="false">
+  <configuration default="false" name="PrimordialSCMInit-ha" type="Application" factoryName="Application" folderName="ozone-ha">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
     <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set ozone.metadata.dirs=/tmp/scm1 --set ozone.scm.node.id=scm1 --set ozone.scm.http-address=127.0.0.1:19876 --init" />"
+    <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set ozone.metadata.dirs=/tmp/scm1 --set ozone.scm.node.id=scm1 --set ozone.scm.http-address=127.0.0.1:19876 --init" />
     <option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties" />
     <extension name="coverage">
       <pattern>
diff --git a/.run/Recon-ha.run.xml b/.run/Recon-ha.run.xml
index fb4135c9a669..e0ddd436266e 100644
--- a/.run/Recon-ha.run.xml
+++ b/.run/Recon-ha.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Recon-ha" type="Application" factoryName="Application">
+  <configuration default="false" name="Recon-ha" type="Application" factoryName="Application" folderName="ozone-ha">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.recon.ReconServer" />
     <module name="ozone-recon" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml" />
diff --git a/.run/Recon.run.xml b/.run/Recon.run.xml
index af193029dc4f..cb688880b72e 100644
--- a/.run/Recon.run.xml
+++ b/.run/Recon.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Recon" type="Application" factoryName="Application">
+  <configuration default="false" name="Recon" type="Application" factoryName="Application" folderName="ozone">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.recon.ReconServer" />
     <module name="ozone-recon" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
diff --git a/.run/S3Gateway.run.xml b/.run/S3Gateway.run.xml
index f2f274d30151..d8fcf34aa2dd 100644
--- a/.run/S3Gateway.run.xml
+++ b/.run/S3Gateway.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="S3Gateway" type="Application" factoryName="Application">
+  <configuration default="false" name="S3Gateway" type="Application" factoryName="Application" folderName="ozone">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.s3.Gateway" />
     <module name="ozone-s3gateway" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
diff --git a/.run/Scm2-ha.run.xml b/.run/Scm2-ha.run.xml
index 7d48186208f3..d060c27727f1 100644
--- a/.run/Scm2-ha.run.xml
+++ b/.run/Scm2-ha.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Scm2-ha" type="Application" factoryName="Application" nameIsGenerated="false">
+  <configuration default="false" name="Scm2-ha" type="Application" factoryName="Application" folderName="ozone-ha">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
     <module name="hdds-server-scm" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set ozone.metadata.dirs=/tmp/scm2 --set ozone.scm.node.id=scm2 --set ozone.scm.http-address=127.0.0.1:29876" />
diff --git a/.run/Scm2Bootstrap-ha.run.xml b/.run/Scm2Bootstrap-ha.run.xml
index 267f27b02932..48344c940e27 100644
--- a/.run/Scm2Bootstrap-ha.run.xml
+++ b/.run/Scm2Bootstrap-ha.run.xml
@@ -15,10 +15,10 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Scm2Bootstrap-ha" type="Application" factoryName="Application" nameIsGenerated="false">
+  <configuration default="false" name="Scm2Bootstrap-ha" type="Application" factoryName="Application" folderName="ozone-ha">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
     <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set ozone.metadata.dirs=/tmp/scm2 --set ozone.scm.node.id=scm2 --set ozone.scm.http-address=127.0.0.1:29876 --bootstrap" />"
+    <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set ozone.metadata.dirs=/tmp/scm2 --set ozone.scm.node.id=scm2 --set ozone.scm.http-address=127.0.0.1:29876 --bootstrap" />
     <option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties" />
     <extension name="coverage">
       <pattern>
diff --git a/.run/Scm3-ha.run.xml b/.run/Scm3-ha.run.xml
index 9c0623803bd6..3781b377ab2b 100644
--- a/.run/Scm3-ha.run.xml
+++ b/.run/Scm3-ha.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Scm3-ha" type="Application" factoryName="Application" nameIsGenerated="false">
+  <configuration default="false" name="Scm3-ha" type="Application" factoryName="Application" folderName="ozone-ha">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
     <module name="hdds-server-scm" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set ozone.metadata.dirs=/tmp/scm3 --set ozone.scm.node.id=scm3 --set ozone.scm.http-address=127.0.0.1:39876" />
diff --git a/.run/Scm3Bootstrap-ha.run.xml b/.run/Scm3Bootstrap-ha.run.xml
index 96bbb24e6007..9136a7c12451 100644
--- a/.run/Scm3Bootstrap-ha.run.xml
+++ b/.run/Scm3Bootstrap-ha.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Scm3Bootstrap-ha" type="Application" factoryName="Application" nameIsGenerated="false">
+  <configuration default="false" name="Scm3Bootstrap-ha" type="Application" factoryName="Application" folderName="ozone-ha">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
     <module name="hdds-server-scm" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set ozone.metadata.dirs=/tmp/scm3 --set ozone.scm.node.id=scm3 --set ozone.scm.http-address=127.0.0.1:39876 --bootstrap" />
diff --git a/.run/ScmRoles.run.xml b/.run/ScmRoles.run.xml
index f6d6278ac671..fb684f4e34be 100644
--- a/.run/ScmRoles.run.xml
+++ b/.run/ScmRoles.run.xml
@@ -15,9 +15,9 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ScmRoles" type="Application" factoryName="Application">
+  <configuration default="false" name="ScmRoles" type="Application" factoryName="Application" folderName="ozone-ha">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.admin.OzoneAdmin" />
-    <module name="ozone-tools" />
+    <module name="ozone-cli-admin" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml scm roles -id=scm-group" />
     <option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties" />
     <extension name="coverage">
diff --git a/.run/StorageContainerManager.run.xml b/.run/StorageContainerManager.run.xml
index 0d26691fc9ea..e058f09b4630 100644
--- a/.run/StorageContainerManager.run.xml
+++ b/.run/StorageContainerManager.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" type="Application" factoryName="Application" nameIsGenerated="false">
+  <configuration default="false" name="StorageContainerManager" type="Application" factoryName="Application" folderName="ozone">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
     <module name="hdds-server-scm" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
diff --git a/.run/StorageContainerManagerInit.run.xml b/.run/StorageContainerManagerInit.run.xml
index 789fda56378c..4fbea0e8596f 100644
--- a/.run/StorageContainerManagerInit.run.xml
+++ b/.run/StorageContainerManagerInit.run.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManagerInit" type="Application" factoryName="Application" nameIsGenerated="false">
+  <configuration default="false" name="StorageContainerManagerInit" type="Application" factoryName="Application" folderName="ozone">
     <option name="MAIN_CLASS_NAME" value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
     <module name="hdds-server-scm" />
     <option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml --init" />