diff --git a/package-lock.json b/package-lock.json
index 9794000..e368036 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1788,8 +1788,8 @@
         "redux": "^4.0.4"
       }
     },
-    "@rondo.dev/scripts": {
-      "version": "file:packages/scripts",
+    "@rondo.dev/rondo-cli": {
+      "version": "file:packages/rondo-cli",
       "requires": {
         "@rondo.dev/argparse": "file:packages/argparse",
         "browser-unpack": "^1.4.2",
diff --git a/package.json b/package.json
index 5621a16..19572a0 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "scripts": {
     "clean": "lerna exec rimraf --stream -- lib/ esm/ *.tsbuildinfo",
     "lint": "eslint --ext .ts,.tsx,.ts .",
-    "bootstrap": "ttsc --build packages/scripts",
+    "bootstrap": "ttsc --build packages/rondo-cli",
     "compile": "npm run compile:lib && npm run compile:esm",
     "compile:lib": "lerna exec rondo --stream -- build",
     "compile:esm": "lerna exec rondo --stream -- build --esm",
@@ -27,7 +27,7 @@
     "@rondo.dev/react-captcha": "file:packages/react-captcha",
     "@rondo.dev/react-test": "file:packages/react-test",
     "@rondo.dev/redux": "file:packages/redux",
-    "@rondo.dev/scripts": "file:packages/scripts",
+    "@rondo.dev/rondo-cli": "file:packages/rondo-cli",
     "@rondo.dev/server": "file:packages/server",
     "@rondo.dev/tasq": "file:packages/tasq",
     "@rondo.dev/test-utils": "file:packages/test-utils",
diff --git a/packages/scripts/@types/browser-unpack.d.ts b/packages/rondo-cli/@types/browser-unpack.d.ts
similarity index 100%
rename from packages/scripts/@types/browser-unpack.d.ts
rename to packages/rondo-cli/@types/browser-unpack.d.ts
diff --git a/packages/scripts/jest.config.js b/packages/rondo-cli/jest.config.js
similarity index 100%
rename from packages/scripts/jest.config.js
rename to packages/rondo-cli/jest.config.js
diff --git a/packages/scripts/jest.setup.js b/packages/rondo-cli/jest.setup.js
similarity index 100%
rename from packages/scripts/jest.setup.js
rename to packages/rondo-cli/jest.setup.js
diff --git a/packages/scripts/package.json b/packages/rondo-cli/package.json
similarity index 93%
rename from packages/scripts/package.json
rename to packages/rondo-cli/package.json
index 8267a85..8703f0e 100644
--- a/packages/scripts/package.json
+++ b/packages/rondo-cli/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@rondo.dev/scripts",
+  "name": "@rondo.dev/rondo-cli",
   "version": "0.0.1",
   "private": true,
   "scripts": {
@@ -22,4 +22,4 @@
   "devDependencies": {},
   "module": "esm/index.js",
   "main": "lib/index.js"
-}
\ No newline at end of file
+}
diff --git a/packages/scripts/preinstall.js b/packages/rondo-cli/preinstall.js
similarity index 100%
rename from packages/scripts/preinstall.js
rename to packages/rondo-cli/preinstall.js
diff --git a/packages/scripts/src/Command.ts b/packages/rondo-cli/src/Command.ts
similarity index 100%
rename from packages/scripts/src/Command.ts
rename to packages/rondo-cli/src/Command.ts
diff --git a/packages/scripts/src/Subprocess.test.ts b/packages/rondo-cli/src/Subprocess.test.ts
similarity index 100%
rename from packages/scripts/src/Subprocess.test.ts
rename to packages/rondo-cli/src/Subprocess.test.ts
diff --git a/packages/scripts/src/Subprocess.ts b/packages/rondo-cli/src/Subprocess.ts
similarity index 100%
rename from packages/scripts/src/Subprocess.ts
rename to packages/rondo-cli/src/Subprocess.ts
diff --git a/packages/scripts/src/getFolders.ts b/packages/rondo-cli/src/getFolders.ts
similarity index 100%
rename from packages/scripts/src/getFolders.ts
rename to packages/rondo-cli/src/getFolders.ts
diff --git a/packages/scripts/src/index.ts b/packages/rondo-cli/src/index.ts
similarity index 100%
rename from packages/scripts/src/index.ts
rename to packages/rondo-cli/src/index.ts
diff --git a/packages/scripts/src/log.ts b/packages/rondo-cli/src/log.ts
similarity index 100%
rename from packages/scripts/src/log.ts
rename to packages/rondo-cli/src/log.ts
diff --git a/packages/scripts/src/modules.test.ts b/packages/rondo-cli/src/modules.test.ts
similarity index 100%
rename from packages/scripts/src/modules.test.ts
rename to packages/rondo-cli/src/modules.test.ts
diff --git a/packages/scripts/src/modules.ts b/packages/rondo-cli/src/modules.ts
similarity index 100%
rename from packages/scripts/src/modules.ts
rename to packages/rondo-cli/src/modules.ts
diff --git a/packages/scripts/src/resolve.ts b/packages/rondo-cli/src/resolve.ts
similarity index 100%
rename from packages/scripts/src/resolve.ts
rename to packages/rondo-cli/src/resolve.ts
diff --git a/packages/scripts/src/run.ts b/packages/rondo-cli/src/run.ts
similarity index 100%
rename from packages/scripts/src/run.ts
rename to packages/rondo-cli/src/run.ts
diff --git a/packages/scripts/src/scripts/add.ts b/packages/rondo-cli/src/scripts/add.ts
similarity index 100%
rename from packages/scripts/src/scripts/add.ts
rename to packages/rondo-cli/src/scripts/add.ts
diff --git a/packages/scripts/src/scripts/build.ts b/packages/rondo-cli/src/scripts/build.ts
similarity index 100%
rename from packages/scripts/src/scripts/build.ts
rename to packages/rondo-cli/src/scripts/build.ts
diff --git a/packages/scripts/src/scripts/clean.ts b/packages/rondo-cli/src/scripts/clean.ts
similarity index 100%
rename from packages/scripts/src/scripts/clean.ts
rename to packages/rondo-cli/src/scripts/clean.ts
diff --git a/packages/scripts/src/scripts/exportDir.ts b/packages/rondo-cli/src/scripts/exportDir.ts
similarity index 100%
rename from packages/scripts/src/scripts/exportDir.ts
rename to packages/rondo-cli/src/scripts/exportDir.ts
diff --git a/packages/scripts/src/scripts/imports.ts b/packages/rondo-cli/src/scripts/imports.ts
similarity index 100%
rename from packages/scripts/src/scripts/imports.ts
rename to packages/rondo-cli/src/scripts/imports.ts
diff --git a/packages/scripts/src/scripts/index.ts b/packages/rondo-cli/src/scripts/index.ts
similarity index 100%
rename from packages/scripts/src/scripts/index.ts
rename to packages/rondo-cli/src/scripts/index.ts
diff --git a/packages/scripts/src/scripts/intergen.sample.ts b/packages/rondo-cli/src/scripts/intergen.sample.ts
similarity index 100%
rename from packages/scripts/src/scripts/intergen.sample.ts
rename to packages/rondo-cli/src/scripts/intergen.sample.ts
diff --git a/packages/scripts/src/scripts/intergen.test.ts b/packages/rondo-cli/src/scripts/intergen.test.ts
similarity index 100%
rename from packages/scripts/src/scripts/intergen.test.ts
rename to packages/rondo-cli/src/scripts/intergen.test.ts
diff --git a/packages/scripts/src/scripts/intergen.ts b/packages/rondo-cli/src/scripts/intergen.ts
similarity index 100%
rename from packages/scripts/src/scripts/intergen.ts
rename to packages/rondo-cli/src/scripts/intergen.ts
diff --git a/packages/scripts/src/scripts/syncEsmConfig.ts b/packages/rondo-cli/src/scripts/syncEsmConfig.ts
similarity index 100%
rename from packages/scripts/src/scripts/syncEsmConfig.ts
rename to packages/rondo-cli/src/scripts/syncEsmConfig.ts
diff --git a/packages/scripts/src/scripts/unpack.ts b/packages/rondo-cli/src/scripts/unpack.ts
similarity index 100%
rename from packages/scripts/src/scripts/unpack.ts
rename to packages/rondo-cli/src/scripts/unpack.ts
diff --git a/packages/scripts/src/scripts/update.test.ts b/packages/rondo-cli/src/scripts/update.test.ts
similarity index 100%
rename from packages/scripts/src/scripts/update.test.ts
rename to packages/rondo-cli/src/scripts/update.test.ts
diff --git a/packages/scripts/src/scripts/update.ts b/packages/rondo-cli/src/scripts/update.ts
similarity index 100%
rename from packages/scripts/src/scripts/update.ts
rename to packages/rondo-cli/src/scripts/update.ts
diff --git a/packages/scripts/src/util/getHelp.ts b/packages/rondo-cli/src/util/getHelp.ts
similarity index 100%
rename from packages/scripts/src/util/getHelp.ts
rename to packages/rondo-cli/src/util/getHelp.ts
diff --git a/packages/scripts/src/util/index.ts b/packages/rondo-cli/src/util/index.ts
similarity index 100%
rename from packages/scripts/src/util/index.ts
rename to packages/rondo-cli/src/util/index.ts
diff --git a/packages/scripts/src/util/pad.ts b/packages/rondo-cli/src/util/pad.ts
similarity index 100%
rename from packages/scripts/src/util/pad.ts
rename to packages/rondo-cli/src/util/pad.ts
diff --git a/packages/scripts/template/jest.config.js b/packages/rondo-cli/template/jest.config.js
similarity index 100%
rename from packages/scripts/template/jest.config.js
rename to packages/rondo-cli/template/jest.config.js
diff --git a/packages/scripts/template/jest.setup.js b/packages/rondo-cli/template/jest.setup.js
similarity index 100%
rename from packages/scripts/template/jest.setup.js
rename to packages/rondo-cli/template/jest.setup.js
diff --git a/packages/scripts/template/package.json b/packages/rondo-cli/template/package.json
similarity index 100%
rename from packages/scripts/template/package.json
rename to packages/rondo-cli/template/package.json
diff --git a/packages/scripts/template/src/index.ts b/packages/rondo-cli/template/src/index.ts
similarity index 100%
rename from packages/scripts/template/src/index.ts
rename to packages/rondo-cli/template/src/index.ts
diff --git a/packages/scripts/template/src/jest.env.ts b/packages/rondo-cli/template/src/jest.env.ts
similarity index 100%
rename from packages/scripts/template/src/jest.env.ts
rename to packages/rondo-cli/template/src/jest.env.ts
diff --git a/packages/scripts/template/tsconfig.esm.json b/packages/rondo-cli/template/tsconfig.esm.json
similarity index 100%
rename from packages/scripts/template/tsconfig.esm.json
rename to packages/rondo-cli/template/tsconfig.esm.json
diff --git a/packages/scripts/template/tsconfig.json b/packages/rondo-cli/template/tsconfig.json
similarity index 100%
rename from packages/scripts/template/tsconfig.json
rename to packages/rondo-cli/template/tsconfig.json
diff --git a/packages/scripts/tsconfig.esm.json b/packages/rondo-cli/tsconfig.esm.json
similarity index 100%
rename from packages/scripts/tsconfig.esm.json
rename to packages/rondo-cli/tsconfig.esm.json
diff --git a/packages/scripts/tsconfig.json b/packages/rondo-cli/tsconfig.json
similarity index 100%
rename from packages/scripts/tsconfig.json
rename to packages/rondo-cli/tsconfig.json