diff --git a/scripts/forge/cli/setup.ts b/tools/forgeCLI/cli/setup.ts
similarity index 100%
rename from scripts/forge/cli/setup.ts
rename to tools/forgeCLI/cli/setup.ts
diff --git a/scripts/forge/commands/dev-commands.ts b/tools/forgeCLI/commands/dev-commands.ts
similarity index 99%
rename from scripts/forge/commands/dev-commands.ts
rename to tools/forgeCLI/commands/dev-commands.ts
index 683683987..7398daa49 100644
--- a/scripts/forge/commands/dev-commands.ts
+++ b/tools/forgeCLI/commands/dev-commands.ts
@@ -116,7 +116,7 @@ function startAllServices(): void {
 
     concurrently(services as ConcurrentServiceConfig[], {
       killOthers: ['failure', 'success'],
-      restartTries: 3,
+      restartTries: 0,
       prefix: 'name',
       prefixColors: ['cyan', 'green', 'magenta']
     })
diff --git a/scripts/forge/commands/module-commands/commands/add-module.ts b/tools/forgeCLI/commands/module-commands/commands/add-module.ts
similarity index 100%
rename from scripts/forge/commands/module-commands/commands/add-module.ts
rename to tools/forgeCLI/commands/module-commands/commands/add-module.ts
diff --git a/scripts/forge/commands/module-commands/commands/list-modules.ts b/tools/forgeCLI/commands/module-commands/commands/list-modules.ts
similarity index 100%
rename from scripts/forge/commands/module-commands/commands/list-modules.ts
rename to tools/forgeCLI/commands/module-commands/commands/list-modules.ts
diff --git a/scripts/forge/commands/module-commands/commands/remove-module.ts b/tools/forgeCLI/commands/module-commands/commands/remove-module.ts
similarity index 100%
rename from scripts/forge/commands/module-commands/commands/remove-module.ts
rename to tools/forgeCLI/commands/module-commands/commands/remove-module.ts
diff --git a/scripts/forge/commands/module-commands/index.ts b/tools/forgeCLI/commands/module-commands/index.ts
similarity index 100%
rename from scripts/forge/commands/module-commands/index.ts
rename to tools/forgeCLI/commands/module-commands/index.ts
diff --git a/scripts/forge/commands/module-commands/utils/ast-utils.ts b/tools/forgeCLI/commands/module-commands/utils/ast-utils.ts
similarity index 100%
rename from scripts/forge/commands/module-commands/utils/ast-utils.ts
rename to tools/forgeCLI/commands/module-commands/utils/ast-utils.ts
diff --git a/scripts/forge/commands/module-commands/utils/constants.ts b/tools/forgeCLI/commands/module-commands/utils/constants.ts
similarity index 100%
rename from scripts/forge/commands/module-commands/utils/constants.ts
rename to tools/forgeCLI/commands/module-commands/utils/constants.ts
diff --git a/scripts/forge/commands/module-commands/utils/file-system.ts b/tools/forgeCLI/commands/module-commands/utils/file-system.ts
similarity index 100%
rename from scripts/forge/commands/module-commands/utils/file-system.ts
rename to tools/forgeCLI/commands/module-commands/utils/file-system.ts
diff --git a/scripts/forge/commands/module-commands/utils/route-injection.ts b/tools/forgeCLI/commands/module-commands/utils/route-injection.ts
similarity index 100%
rename from scripts/forge/commands/module-commands/utils/route-injection.ts
rename to tools/forgeCLI/commands/module-commands/utils/route-injection.ts
diff --git a/scripts/forge/commands/module-commands/utils/schema-injection.ts b/tools/forgeCLI/commands/module-commands/utils/schema-injection.ts
similarity index 100%
rename from scripts/forge/commands/module-commands/utils/schema-injection.ts
rename to tools/forgeCLI/commands/module-commands/utils/schema-injection.ts
diff --git a/scripts/forge/commands/module-commands/utils/server-injection.ts b/tools/forgeCLI/commands/module-commands/utils/server-injection.ts
similarity index 100%
rename from scripts/forge/commands/module-commands/utils/server-injection.ts
rename to tools/forgeCLI/commands/module-commands/utils/server-injection.ts
diff --git a/scripts/forge/commands/module-commands/utils/utils.ts b/tools/forgeCLI/commands/module-commands/utils/utils.ts
similarity index 100%
rename from scripts/forge/commands/module-commands/utils/utils.ts
rename to tools/forgeCLI/commands/module-commands/utils/utils.ts
diff --git a/scripts/forge/commands/module-commands/utils/validation.ts b/tools/forgeCLI/commands/module-commands/utils/validation.ts
similarity index 100%
rename from scripts/forge/commands/module-commands/utils/validation.ts
rename to tools/forgeCLI/commands/module-commands/utils/validation.ts
diff --git a/scripts/forge/commands/project-commands.ts b/tools/forgeCLI/commands/project-commands.ts
similarity index 100%
rename from scripts/forge/commands/project-commands.ts
rename to tools/forgeCLI/commands/project-commands.ts
diff --git a/scripts/forge/constants/constants.ts b/tools/forgeCLI/constants/constants.ts
similarity index 100%
rename from scripts/forge/constants/constants.ts
rename to tools/forgeCLI/constants/constants.ts
diff --git a/scripts/forge/index.ts b/tools/forgeCLI/index.ts
similarity index 100%
rename from scripts/forge/index.ts
rename to tools/forgeCLI/index.ts
diff --git a/scripts/forge/types/index.ts b/tools/forgeCLI/types/index.ts
similarity index 100%
rename from scripts/forge/types/index.ts
rename to tools/forgeCLI/types/index.ts
diff --git a/scripts/forge/utils/helpers.ts b/tools/forgeCLI/utils/helpers.ts
similarity index 100%
rename from scripts/forge/utils/helpers.ts
rename to tools/forgeCLI/utils/helpers.ts
diff --git a/scripts/forge/utils/logging.ts b/tools/forgeCLI/utils/logging.ts
similarity index 100%
rename from scripts/forge/utils/logging.ts
rename to tools/forgeCLI/utils/logging.ts