diff --git a/.changes/config.json b/.changes/config.json
index 84bd8e1c7..b041d2c99 100644
--- a/.changes/config.json
+++ b/.changes/config.json
@@ -209,7 +209,9 @@
     "tauri-bundler": {
       "path": "./tooling/bundler",
       "manager": "rust",
-      "dependencies": ["tauri-utils"]
+      "dependencies": [
+        "tauri-utils"
+      ]
     },
     "tauri-utils": {
       "path": "./core/tauri-utils",
@@ -218,29 +220,42 @@
     "tauri-runtime": {
       "path": "./core/tauri-runtime",
       "manager": "rust",
-      "dependencies": ["tauri-utils"],
+      "dependencies": [
+        "tauri-utils"
+      ],
       "postversion": "node ../../.scripts/covector/sync-prerelease.js ${ pkg.pkg } ${ release.type }"
     },
     "tauri-runtime-wry": {
       "path": "./core/tauri-runtime-wry",
       "manager": "rust",
-      "dependencies": ["tauri-utils", "tauri-runtime"],
+      "dependencies": [
+        "tauri-utils",
+        "tauri-runtime"
+      ],
       "postversion": "node ../../.scripts/covector/sync-prerelease.js ${ pkg.pkg } ${ release.type }"
     },
     "tauri-codegen": {
       "path": "./core/tauri-codegen",
       "manager": "rust",
-      "dependencies": ["tauri-utils"]
+      "dependencies": [
+        "tauri-utils"
+      ]
     },
     "tauri-macros": {
       "path": "./core/tauri-macros",
       "manager": "rust",
-      "dependencies": ["tauri-codegen", "tauri-utils"]
+      "dependencies": [
+        "tauri-codegen",
+        "tauri-utils"
+      ]
     },
     "tauri-build": {
       "path": "./core/tauri-build",
       "manager": "rust",
-      "dependencies": ["tauri-codegen", "tauri-utils"],
+      "dependencies": [
+        "tauri-codegen",
+        "tauri-utils"
+      ],
       "postversion": "node ../../.scripts/covector/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }"
     },
     "tauri": {
@@ -255,18 +270,23 @@
       "postversion": "node ../../.scripts/covector/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }"
     },
     "cli.js": {
-      "path": "./tooling/cli.rs/node",
+      "path": "./tooling/cli/node",
       "manager": "javascript",
-      "dependencies": ["cli.rs"],
+      "dependencies": [
+        "cli.rs"
+      ],
       "postversion": "node ../../.scripts/covector/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }",
       "prepublish": [],
       "publish": [],
       "postpublish": []
     },
     "cli.rs": {
-      "path": "./tooling/cli.rs",
+      "path": "./tooling/cli",
       "manager": "rust",
-      "dependencies": ["tauri-bundler", "tauri-utils"],
+      "dependencies": [
+        "tauri-bundler",
+        "tauri-utils"
+      ],
       "postversion": "cargo check"
     },
     "create-tauri-app": {
@@ -279,4 +299,4 @@
       "postversion": "node ../../.scripts/covector/sync-prerelease.js ${ pkg.pkg } ${ release.type }"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 66cbbae91..dfe16ecf0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -17,8 +17,8 @@
 
 /tooling/bundler/ @tauri-apps/bundler
 
-/tooling/cli.rs/ @tauri-apps/core
+/tooling/cli/ @tauri-apps/core
 
-/tooling/cli.rs/node/ @tauri-apps/js-cli
+/tooling/cli/node/ @tauri-apps/js-cli
 
 /core/** @tauri-apps/core
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 382d254e5..4f3fc1189 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -49,26 +49,26 @@ Hi! We, the maintainers, are really excited that you are interested in contribut
 
 First, [join our Discord server](https://discord.gg/SpmNs4S) and let us know that you want to contribute. This way we can point you in the right direction and help ensure your contribution will be as helpful as possible.
 
-To set up your machine for development, follow the [Tauri setup guide](https://tauri.studio/en/docs/get-started/intro#setting-up-your-environment) to get all the tools you need to develop Tauri apps. The only additional tool you may need is [Yarn](https://yarnpkg.com/), it is only required if you are developing the Node CLI or API packages (`tooling/cli.rs/node` and `tooling/api`). Next, fork and clone this repo. It is structured as a monorepo, which means that all the various Tauri packages are under the same repository. The development process varies depending on what part of Tauri you are contributing to, see the guides below for per-package instructions.
+To set up your machine for development, follow the [Tauri setup guide](https://tauri.studio/en/docs/get-started/intro#setting-up-your-environment) to get all the tools you need to develop Tauri apps. The only additional tool you may need is [Yarn](https://yarnpkg.com/), it is only required if you are developing the Node CLI or API packages (`tooling/cli/node` and `tooling/api`). Next, fork and clone this repo. It is structured as a monorepo, which means that all the various Tauri packages are under the same repository. The development process varies depending on what part of Tauri you are contributing to, see the guides below for per-package instructions.
 
 Some Tauri packages will be automatically built when running one of the examples. Others, however, will need to be built beforehand. To build these automatically, run the `.scripts/setup.sh` (Linux and macOS) or `.scripts/setup.ps1` (Windows) script. This will install the Rust and Node.js CLI and build the JS API. After that, you should be able to run all the examples. Note that the setup script should be executed from the root folder of the respository in order to run correctly.
 
 ### Packages Overview
 
 - The JS API (`/tooling/api`) contains JS bindings to the builtin Rust functions in the Rust API.
-- The Rust CLI (`/tooling/cli.rs`) is the primary CLI for creating and developing Tauri apps.
-- cli.js (`/tooling/cli.rs/node`) is a Node.js CLI wrapper for `cli.rs`.
+- cli.rs (`/tooling/cli`) is the primary CLI for creating and developing Tauri apps.
+- cli.js (`/tooling/cli/node`) is a Node.js CLI wrapper for `cli.rs`.
 - Tauri Bundler (`/tooling/bundler`) is used by the Rust CLI to package executables into installers.
 - Tauri Core (`/core/tauri`) is the heart of Tauri. It contains the code that starts the app, configures communication between Rust and the Webview, and ties all the other packages together.
 - The Macros (`/core/tauri-macros`) are used by Tauri Core for various functions.
 
 ### Developing The Node.js CLI (cli.js)
 
-`cli.js` is a wrapper to `cli.rs` so most changes should be written on the Rust CLI. The `[Tauri repo root]/tooling/cli.rs/node` folder contains only packaging scripts to properly publish the Rust CLI binaries to NPM.
+`cli.js` is a wrapper to `cli.rs` so most changes should be written on the Rust CLI. The `[Tauri repo root]/tooling/cli/node` folder contains only packaging scripts to properly publish the Rust CLI binaries to NPM.
 
 ### Developing Tauri Bundler and Rust CLI
 
-The code for the bundler is located in `[Tauri repo root]/tooling/bundler`, and the code for the Rust CLI is located in `[Tauri repo root]/tooling/cli.rs`. If you are using your local copy of cli.js (see above), any changes you make to the bundler and CLI will be automatically built and applied when running the build or dev command. Otherwise, running `cargo install --path .` in the Rust CLI directory will allow you to run `cargo tauri build` and `cargo tauri dev` anywhere, using the updated copy of the bundler and cli. You will have to run this command each time you make a change in either package.
+The code for the bundler is located in `[Tauri repo root]/tooling/bundler`, and the code for the Rust CLI is located in `[Tauri repo root]/tooling/cli`. If you are using your local copy of cli.js (see above), any changes you make to the bundler and CLI will be automatically built and applied when running the build or dev command. Otherwise, running `cargo install --path .` in the Rust CLI directory will allow you to run `cargo tauri build` and `cargo tauri dev` anywhere, using the updated copy of the bundler and cli. You will have to run this command each time you make a change in either package.
 
 ### Developing Tauri Core and Related Components (Rust API, Macros, Codegen, and Utils)
 
diff --git a/.github/workflows/artifacts-updater.yml b/.github/workflows/artifacts-updater.yml
index 8508333d4..2e9c94a5d 100644
--- a/.github/workflows/artifacts-updater.yml
+++ b/.github/workflows/artifacts-updater.yml
@@ -12,7 +12,7 @@ on:
     paths:
       - '.github/workflows/artifacts-updater.yml'
       - 'core/tauri/**'
-      - 'tooling/cli.rs/**'
+      - 'tooling/cli/**'
       - 'tooling/bundler/**'
       - 'examples/updater/**'
 
@@ -37,7 +37,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
-        
+
       - name: Get current date
         run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
         if: matrix.platform == 'macos-latest' || matrix.platform == 'ubuntu-latest'
@@ -78,27 +78,27 @@ jobs:
           restore-keys: |
             ${{ matrix.platform }}-stable-cargo-core-${{ hashFiles('core/**/Cargo.toml') }}
             ${{ matrix.platform }}-stable-cargo-core-
-        
+
       - name: Cache CLI cargo target
         uses: actions/cache@v2
         with:
-          path: tooling/cli.rs/target
+          path: tooling/cli/target
           # Add date to the cache to keep it up to date
-          key: ${{ matrix.platform }}-stable-cargo-cli-${{ hashFiles('tooling/cli.rs/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          key: ${{ matrix.platform }}-stable-cargo-cli-${{ hashFiles('tooling/cli/Cargo.lock') }}-${{ env.CURRENT_DATE }}
           # Restore from outdated cache for speed
           restore-keys: |
-            ${{ matrix.platform }}-stable-cargo-cli-${{ hashFiles('tooling/cli.rs/Cargo.lock') }}
+            ${{ matrix.platform }}-stable-cargo-cli-${{ hashFiles('tooling/cli/Cargo.lock') }}
             ${{ matrix.platform }}-stable-cargo-cli-
 
       - name: build and install cli.rs
-        run: cargo install --path tooling/cli.rs
+        run: cargo install --path tooling/cli
       - name: Check whether code signing should be enabled
         id: enablecodesigning
         env:
-            ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
+          ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
         run: |
-            echo "Enable code signing: ${{ env.ENABLE_CODE_SIGNING != '' }}"
-            echo "::set-output name=enabled::${{ env.ENABLE_CODE_SIGNING != '' }}"
+          echo "Enable code signing: ${{ env.ENABLE_CODE_SIGNING != '' }}"
+          echo "::set-output name=enabled::${{ env.ENABLE_CODE_SIGNING != '' }}"
       # run only on tauri-apps/tauri repo (require secrets)
       - name: build sample artifacts + code signing (updater)
         if: steps.enablecodesigning.outputs.enabled == 'true'
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index b2897c1bf..361ab4585 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -10,10 +10,10 @@ on:
     - cron: '0 0 * * *'
   push:
     paths:
-      - "**/Cargo.lock"
-      - "**/Cargo.toml"
-      - "**/package.json"
-      - "**/yarn.lock"
+      - '**/Cargo.lock'
+      - '**/Cargo.toml'
+      - '**/package.json'
+      - '**/yarn.lock'
 
 jobs:
   audit-rust:
@@ -30,5 +30,5 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: yarn audit
-        working-directory: tooling/cli.rs/node
+        working-directory: tooling/cli/node
         run: yarn audit
diff --git a/.github/workflows/build-smoke-tests.yml b/.github/workflows/build-smoke-tests.yml
index ea0d91692..070b7d9cb 100644
--- a/.github/workflows/build-smoke-tests.yml
+++ b/.github/workflows/build-smoke-tests.yml
@@ -72,7 +72,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
       - name: build and install cli.rs
-        run: cargo install --path tauri/tooling/cli.rs
+        run: cargo install --path tauri/tooling/cli
       - name: install and build assets
         working-directory: "example/${{ github.event.inputs.dir }}"
         run: ${{ github.event.inputs.buildAssets }}
diff --git a/.github/workflows/core-lint-fmt.yml b/.github/workflows/core-lint-fmt.yml
index d63663b9e..d15203d22 100644
--- a/.github/workflows/core-lint-fmt.yml
+++ b/.github/workflows/core-lint-fmt.yml
@@ -14,7 +14,7 @@ on:
       - '.github/workflows/core-lint-fmt.yml'
       - 'core/**'
       - 'examples/**'
-      - 'tooling/cli.rs/**'
+      - 'tooling/cli/**'
 
 jobs:
   workspace_clippy_fmt_check:
@@ -89,20 +89,20 @@ jobs:
 
       - uses: actions-rs/toolchain@v1
         with:
-            profile: minimal
-            toolchain: nightly
-            override: true
-            components: rustfmt, clippy
+          profile: minimal
+          toolchain: nightly
+          override: true
+          components: rustfmt, clippy
 
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --manifest-path ./tooling/cli.rs/Cargo.toml --all-targets --all-features -- -D warnings
+          args: --manifest-path ./tooling/cli/Cargo.toml --all-targets --all-features -- -D warnings
           name: cli
 
       - name: Get current date
         run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
-        
+
       - name: Cache cargo registry
         uses: actions/cache@v2.1.4
         with:
@@ -128,18 +128,18 @@ jobs:
       - name: Cache CLI cargo target
         uses: actions/cache@v2
         with:
-          path: tooling/cli.rs/target
+          path: tooling/cli/target
           # Add date to the cache to keep it up to date
-          key: ubuntu-latest-nightly-cargo-cli-${{ hashFiles('tooling/cli.rs/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          key: ubuntu-latest-nightly-cargo-cli-${{ hashFiles('tooling/cli/Cargo.lock') }}-${{ env.CURRENT_DATE }}
           # Restore from outdated cache for speed
           restore-keys: |
-            ubuntu-latest-nightly-cargo-cli-${{ hashFiles('tooling/cli.rs/Cargo.lock') }}
+            ubuntu-latest-nightly-cargo-cli-${{ hashFiles('tooling/cli/Cargo.lock') }}
             ubuntu-latest-nightly-cargo-cli-
 
       - uses: actions-rs/cargo@v1
         with:
           command: fmt
-          args: --manifest-path ./tooling/cli.rs/Cargo.toml --all -- --check
+          args: --manifest-path ./tooling/cli/Cargo.toml --all -- --check
 
   core_clippy_check:
     runs-on: ubuntu-latest
@@ -156,10 +156,10 @@ jobs:
 
       - uses: actions-rs/toolchain@v1
         with:
-            profile: minimal
-            toolchain: nightly
-            override: true
-            components: rustfmt, clippy
+          profile: minimal
+          toolchain: nightly
+          override: true
+          components: rustfmt, clippy
 
       - name: Get current date
         run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml
index a5fd020a1..187985413 100644
--- a/.github/workflows/covector-version-or-publish.yml
+++ b/.github/workflows/covector-version-or-publish.yml
@@ -32,19 +32,19 @@ jobs:
       - name: Cache CLI cargo target
         uses: actions/cache@v2
         with:
-          path: tooling/cli.rs/target
+          path: tooling/cli/target
           # Add date to the cache to keep it up to date
-          key: ubuntu-latest-stable-cargo-cli-${{ hashFiles('tooling/cli.rs/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          key: ubuntu-latest-stable-cargo-cli-${{ hashFiles('tooling/cli/Cargo.lock') }}-${{ env.CURRENT_DATE }}
           # Restore from outdated cache for speed
           restore-keys: |
-            ubuntu-latest-stable-cargo-cli-${{ hashFiles('tooling/cli.rs/Cargo.lock') }}
+            ubuntu-latest-stable-cargo-cli-${{ hashFiles('tooling/cli/Cargo.lock') }}
             ubuntu-latest-stable-cargo-cli-
 
       - name: build CLI
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --manifest-path ./tooling/cli.rs/Cargo.toml
+          args: --manifest-path ./tooling/cli/Cargo.toml
 
       - name: cargo login
         run: cargo login ${{ secrets.crate_token }}
diff --git a/.github/workflows/js-lint.yml b/.github/workflows/js-lint.yml
index da3fe8381..4da6b3a82 100644
--- a/.github/workflows/js-lint.yml
+++ b/.github/workflows/js-lint.yml
@@ -8,7 +8,7 @@ on:
   pull_request:
     paths:
       - '.github/workflows/js-lint.yml'
-      - 'tooling/cli.rs/node/**'
+      - 'tooling/cli/node/**'
       - 'tooling/api/**'
       - 'tooling/create-tauri-app/**'
 
@@ -23,14 +23,14 @@ jobs:
           cache: yarn
           cache-dependency-path: tooling/*/yarn.lock
       - name: install cli.js deps via yarn
-        working-directory: ./tooling/cli.rs/node/
+        working-directory: ./tooling/cli/node/
         run: yarn
       # nothing to lint
       #- name: run cli.js lint
-      #  working-directory: ./tooling/cli.rs/node/
+      #  working-directory: ./tooling/cli/node/
       #  run: yarn lint
       - name: run cli.js format
-        working-directory: ./tooling/cli.rs/node/
+        working-directory: ./tooling/cli/node/
         run: yarn format:check
 
       - name: install api deps via yarn
diff --git a/.github/workflows/publish-cli.yml b/.github/workflows/publish-cli.yml
index 6800f5252..3a8595cd7 100644
--- a/.github/workflows/publish-cli.yml
+++ b/.github/workflows/publish-cli.yml
@@ -10,7 +10,7 @@ on:
 
 defaults:
   run:
-    working-directory: tooling/cli.rs/node/
+    working-directory: tooling/cli/node/
 
 jobs:
   build:
@@ -35,14 +35,14 @@ jobs:
               docker pull $DOCKER_REGISTRY_URL/napi-rs/napi-rs/nodejs-rust:lts-debian
               docker tag $DOCKER_REGISTRY_URL/napi-rs/napi-rs/nodejs-rust:lts-debian builder
             build: |
-              docker run --rm -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry -v $(pwd)/../../../:/build -w /build builder sh -c "cd tooling/cli.rs/node && yarn build && strip *.node"
+              docker run --rm -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry -v $(pwd)/../../../:/build -w /build builder sh -c "cd tooling/cli/node && yarn build && strip *.node"
           - host: ubuntu-18.04
             target: x86_64-unknown-linux-musl
             architecture: x64
             docker: |
               docker pull $DOCKER_REGISTRY_URL/napi-rs/napi-rs/nodejs-rust:lts-alpine
               docker tag $DOCKER_REGISTRY_URL/napi-rs/napi-rs/nodejs-rust:lts-alpine builder
-            build: docker run --rm -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry -v $(pwd)/../../../:/build -w /build builder sh -c "cd tooling/cli.rs/node && yarn build && strip *.node"
+            build: docker run --rm -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry -v $(pwd)/../../../:/build -w /build builder sh -c "cd tooling/cli/node && yarn build && strip *.node"
           - host: macos-latest
             target: aarch64-apple-darwin
             build: |
@@ -74,7 +74,7 @@ jobs:
               docker pull ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
               docker tag ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine builder
             build: |
-              docker run --rm -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry -v $(pwd)/../../../:/build -w /build builder sh -c "cd tooling/cli.rs/node && yarn build --target=aarch64-unknown-linux-musl && /aarch64-linux-musl-cross/bin/aarch64-linux-musl-strip *.node"
+              docker run --rm -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry -v $(pwd)/../../../:/build -w /build builder sh -c "cd tooling/cli/node && yarn build --target=aarch64-unknown-linux-musl && /aarch64-linux-musl-cross/bin/aarch64-linux-musl-strip *.node"
           #- host: windows-latest
           #  architecture: x64
           #  target: aarch64-pc-windows-msvc
@@ -89,7 +89,7 @@ jobs:
           node-version: 16
           check-latest: true
           cache: yarn
-          cache-dependency-path: 'tooling/cli.rs/node/yarn.lock'
+          cache-dependency-path: 'tooling/cli/node/yarn.lock'
           architecture: ${{ matrix.settings.architecture }}
       - name: Install
         uses: actions-rs/toolchain@v1
@@ -106,7 +106,7 @@ jobs:
       - uses: Swatinem/rust-cache@v1
         with:
           key: ${{ matrix.settings.target }}
-          working-directory: 'tooling/cli.rs/'
+          working-directory: 'tooling/cli/'
       - name: Pull latest image
         run: ${{ matrix.settings.docker }}
         env:
@@ -125,7 +125,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: bindings-${{ matrix.settings.target }}
-          path: tooling/cli.rs/node/${{ env.APP_NAME }}.*.node
+          path: tooling/cli/node/${{ env.APP_NAME }}.*.node
           if-no-files-found: error
   #  build-freebsd:
   #    runs-on: macos-10.15
@@ -164,7 +164,7 @@ jobs:
   #            whoami
   #            env
   #            freebsd-version
-  #            cd ./tooling/cli.rs/node/
+  #            cd ./tooling/cli/node/
   #            yarn install --ignore-scripts --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
   #            yarn build
   #            strip -x *.node
@@ -174,7 +174,7 @@ jobs:
   #        uses: actions/upload-artifact@v2
   #        with:
   #          name: bindings-freebsd
-  #          path: tooling/cli.rs/node/${{ env.APP_NAME }}.*.node
+  #          path: tooling/cli/node/${{ env.APP_NAME }}.*.node
   #          if-no-files-found: error
   test-macOS-windows-binding:
     name: Test bindings on ${{ matrix.settings.target }} - node@${{ matrix.node }}
@@ -201,14 +201,14 @@ jobs:
           node-version: ${{ matrix.node }}
           check-latest: true
           cache: yarn
-          cache-dependency-path: 'tooling/cli.rs/node/yarn.lock'
+          cache-dependency-path: 'tooling/cli/node/yarn.lock'
       - name: Install dependencies
         run: yarn install --ignore-scripts --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
       - name: Download artifacts
         uses: actions/download-artifact@v2
         with:
           name: bindings-${{ matrix.settings.target }}
-          path: 'tooling/cli.rs/node/'
+          path: 'tooling/cli/node/'
       - name: List packages
         run: ls -R .
         shell: bash
@@ -234,14 +234,14 @@ jobs:
           node-version: ${{ matrix.node }}
           check-latest: true
           cache: yarn
-          cache-dependency-path: 'tooling/cli.rs/node/yarn.lock'
+          cache-dependency-path: 'tooling/cli/node/yarn.lock'
       - name: Install dependencies
         run: yarn install --ignore-scripts --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
       - name: Download artifacts
         uses: actions/download-artifact@v2
         with:
           name: bindings-x86_64-unknown-linux-gnu
-          path: 'tooling/cli.rs/node/'
+          path: 'tooling/cli/node/'
       - name: List packages
         run: ls -R .
         shell: bash
@@ -273,14 +273,14 @@ jobs:
           node-version: ${{ matrix.node }}
           check-latest: true
           cache: yarn
-          cache-dependency-path: 'tooling/cli.rs/node/yarn.lock'
+          cache-dependency-path: 'tooling/cli/node/yarn.lock'
       - name: Install dependencies
         run: yarn install --ignore-scripts --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
       - name: Download artifacts
         uses: actions/download-artifact@v2
         with:
           name: bindings-x86_64-unknown-linux-musl
-          path: 'tooling/cli.rs/node/'
+          path: 'tooling/cli/node/'
       - name: List packages
         run: ls -R .
         shell: bash
@@ -326,12 +326,12 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: bindings-aarch64-unknown-linux-gnu
-          path: 'tooling/cli.rs/node/'
+          path: 'tooling/cli/node/'
       - name: Download armv7-gnueabihf artifacts
         uses: actions/download-artifact@v2
         with:
           name: bindings-armv7-unknown-linux-gnueabihf
-          path: 'tooling/cli.rs/node/'
+          path: 'tooling/cli/node/'
       # TODO: actually run test, blocked by https://github.com/rust-lang/cargo/issues/8719
       - uses: addnab/docker-run-action@v3
         with:
@@ -349,7 +349,7 @@ jobs:
             eval "$(fnm env --use-on-cd)"
             fnm install ${{ matrix.node }}
             fnm use ${{ matrix.node }}
-            cd tooling/cli.rs/node
+            cd tooling/cli/node
             yarn tauri --help
             ls -la
   publish:
@@ -369,13 +369,13 @@ jobs:
           node-version: 16
           check-latest: true
           cache: yarn
-          cache-dependency-path: 'tooling/cli.rs/node/yarn.lock'
+          cache-dependency-path: 'tooling/cli/node/yarn.lock'
       - name: Install dependencies
         run: yarn install --ignore-scripts --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
       - name: Download all artifacts
         uses: actions/download-artifact@v2
         with:
-          path: tooling/cli.rs/node/artifacts
+          path: tooling/cli/node/artifacts
       - name: Move artifacts
         run: yarn artifacts
       - name: List packages
diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
index da5a5b90c..0da34e220 100644
--- a/.github/workflows/test-core.yml
+++ b/.github/workflows/test-core.yml
@@ -110,7 +110,7 @@ jobs:
       - name: Get current date
         if: matrix.platform == 'windows-latest'
         run: echo "CURRENT_DATE=$(Get-Date -Format "yyyy-MM-dd")" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        
+
       - name: Cache cargo registry
         uses: actions/cache@v2.1.4
         with:
@@ -136,19 +136,19 @@ jobs:
       - name: Cache CLI cargo target
         uses: actions/cache@v2
         with:
-          path: tooling/cli.rs/target
+          path: tooling/cli/target
           # Add date to the cache to keep it up to date
-          key: ${{ matrix.platform }}-stable-cargo-cli-${{ hashFiles('tooling/cli.rs/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          key: ${{ matrix.platform }}-stable-cargo-cli-${{ hashFiles('tooling/cli/Cargo.lock') }}-${{ env.CURRENT_DATE }}
           # Restore from outdated cache for speed
           restore-keys: |
-            ${{ matrix.platform }}-stable-cargo-cli-${{ hashFiles('tooling/cli.rs/Cargo.lock') }}
+            ${{ matrix.platform }}-stable-cargo-cli-${{ hashFiles('tooling/cli/Cargo.lock') }}
             ${{ matrix.platform }}-stable-cargo-cli-
 
       - name: build CLI
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --manifest-path ./tooling/cli.rs/Cargo.toml
+          args: --manifest-path ./tooling/cli/Cargo.toml
 
   test-tauri-js-cli:
     runs-on: ${{ matrix.platform }}
@@ -170,7 +170,7 @@ jobs:
         with:
           node-version: 14
           cache: yarn
-          cache-dependency-path: tooling/cli.rs/node/yarn.lock
+          cache-dependency-path: tooling/cli/node/yarn.lock
       - name: install webkit2gtk (ubuntu only)
         if: matrix.platform == 'ubuntu-latest'
         run: |
@@ -184,7 +184,7 @@ jobs:
       - name: Get current date
         if: matrix.platform == 'windows-latest'
         run: echo "CURRENT_DATE=$(Get-Date -Format "yyyy-MM-dd")" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        
+
       - name: Cache cargo registry
         uses: actions/cache@v2.1.4
         with:
@@ -210,29 +210,29 @@ jobs:
       - name: Cache CLI cargo target
         uses: actions/cache@v2
         with:
-          path: tooling/cli.rs/target
+          path: tooling/cli/target
           # Add date to the cache to keep it up to date
-          key: ${{ matrix.platform }}-stable-cargo-cli-${{ hashFiles('tooling/cli.rs/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          key: ${{ matrix.platform }}-stable-cargo-cli-${{ hashFiles('tooling/cli/Cargo.lock') }}-${{ env.CURRENT_DATE }}
           # Restore from outdated cache for speed
           restore-keys: |
-            ${{ matrix.platform }}-stable-cargo-cli-${{ hashFiles('tooling/cli.rs/Cargo.lock') }}
+            ${{ matrix.platform }}-stable-cargo-cli-${{ hashFiles('tooling/cli/Cargo.lock') }}
             ${{ matrix.platform }}-stable-cargo-cli-
 
       - name: Cache template cargo target
         uses: actions/cache@v2
         with:
-          path: tooling/cli.rs/node/test/jest/fixtures/empty/src-tauri/target
+          path: tooling/cli/node/test/jest/fixtures/empty/src-tauri/target
           # Add date to the cache to keep it up to date
-          key: ${{ matrix.platform }}-stable-template-${{ hashFiles('tooling/cli.rs/templates/app/**') }}-${{ env.CURRENT_DATE }}
+          key: ${{ matrix.platform }}-stable-template-${{ hashFiles('tooling/cli/templates/app/**') }}-${{ env.CURRENT_DATE }}
           # Restore from outdated cache for speed
           restore-keys: |
-            ${{ matrix.platform }}-stable-template-${{ hashFiles('tooling/cli.rs/templates/app/**') }}
+            ${{ matrix.platform }}-stable-template-${{ hashFiles('tooling/cli/templates/app/**') }}
             ${{ matrix.platform }}-stable-template-
 
       - name: test
         timeout-minutes: 30
         run: |
-          cd ./tooling/cli.rs/node
+          cd ./tooling/cli/node
           yarn
           yarn build
           yarn test
diff --git a/.github/workflows/test-cta.yml b/.github/workflows/test-cta.yml
index 41cc5e1c9..c8e45a74d 100644
--- a/.github/workflows/test-cta.yml
+++ b/.github/workflows/test-cta.yml
@@ -47,9 +47,9 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
       #- run: yarn
-      #  working-directory: tooling/cli.rs/node
+      #  working-directory: tooling/cli/node
       #- run: yarn build
-      #  working-directory: tooling/cli.rs/node
+      #  working-directory: tooling/cli/node
       - run: yarn
         working-directory: tooling/api
       - run: yarn build
diff --git a/.github/workflows/udeps.yml b/.github/workflows/udeps.yml
index 23f3014ab..9b2fa8c91 100644
--- a/.github/workflows/udeps.yml
+++ b/.github/workflows/udeps.yml
@@ -10,99 +10,99 @@ on:
       - '.github/workflows/udeps.yml'
       - 'core/**'
       - 'tooling/bundler/**'
-      - 'tooling/cli.rs/**'
+      - 'tooling/cli/**'
 
 jobs:
   udeps:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
 
-    - uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        toolchain: nightly
-        override: true
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          override: true
 
-    - name: Get current date
-      run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+      - name: Get current date
+        run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
 
-    - name: Cache cargo registry
-      uses: actions/cache@v2.1.4
-      with:
-        path: ~/.cargo/registry
-        # Add date to the cache to keep it up to date
-        key: ubuntu-latest-nightly-cargo-registry-${{ hashFiles('**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
-        # Restore from outdated cache for speed
-        restore-keys: |
-          ubuntu-latest-nightly-cargo-registry-${{ hashFiles('**/Cargo.toml') }}
-          ubuntu-latest-nightly-cargo-registry-
+      - name: Cache cargo registry
+        uses: actions/cache@v2.1.4
+        with:
+          path: ~/.cargo/registry
+          # Add date to the cache to keep it up to date
+          key: ubuntu-latest-nightly-cargo-registry-${{ hashFiles('**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ubuntu-latest-nightly-cargo-registry-${{ hashFiles('**/Cargo.toml') }}
+            ubuntu-latest-nightly-cargo-registry-
 
-    - name: Cache cargo index
-      uses: actions/cache@v2.1.4
-      with:
-        path: ~/.cargo/git
-        # Add date to the cache to keep it up to date
-        key: ubuntu-latest-nightly-cargo-index-${{ hashFiles('**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
-        # Restore from outdated cache for speed
-        restore-keys: |
-          ubuntu-latest-nightly-cargo-index-${{ hashFiles('**/Cargo.toml') }}
-          ubuntu-latest-nightly-cargo-index-
+      - name: Cache cargo index
+        uses: actions/cache@v2.1.4
+        with:
+          path: ~/.cargo/git
+          # Add date to the cache to keep it up to date
+          key: ubuntu-latest-nightly-cargo-index-${{ hashFiles('**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ubuntu-latest-nightly-cargo-index-${{ hashFiles('**/Cargo.toml') }}
+            ubuntu-latest-nightly-cargo-index-
 
-    - name: Cache core cargo target
-      uses: actions/cache@v2
-      with:
-        path: target
-        # Add date to the cache to keep it up to date
-        key: ubuntu-latest-nightly-cargo-core-${{ hashFiles('core/**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
-        # Restore from outdated cache for speed
-        restore-keys: |
-          ubuntu-latest-nightly-cargo-core-${{ hashFiles('core/**/Cargo.toml') }}
-          ubuntu-latest-nightly-cargo-core-
+      - name: Cache core cargo target
+        uses: actions/cache@v2
+        with:
+          path: target
+          # Add date to the cache to keep it up to date
+          key: ubuntu-latest-nightly-cargo-core-${{ hashFiles('core/**/Cargo.toml') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ubuntu-latest-nightly-cargo-core-${{ hashFiles('core/**/Cargo.toml') }}
+            ubuntu-latest-nightly-cargo-core-
 
-    - name: Cache bundler cargo target
-      uses: actions/cache@v2
-      with:
-        path: tooling/bundler/target
-        # Add date to the cache to keep it up to date
-        key: ubuntu-latest-nightly-cargo-bundler-${{ hashFiles('tooling/bundler/Cargo.lock') }}-${{ env.CURRENT_DATE }}
-        # Restore from outdated cache for speed
-        restore-keys: |
-          ubuntu-latest-nightly-cargo-bundler-${{ hashFiles('tooling/bundler/Cargo.lock') }}
-          ubuntu-latest-nightly-cargo-bundler-
+      - name: Cache bundler cargo target
+        uses: actions/cache@v2
+        with:
+          path: tooling/bundler/target
+          # Add date to the cache to keep it up to date
+          key: ubuntu-latest-nightly-cargo-bundler-${{ hashFiles('tooling/bundler/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ubuntu-latest-nightly-cargo-bundler-${{ hashFiles('tooling/bundler/Cargo.lock') }}
+            ubuntu-latest-nightly-cargo-bundler-
 
-    - name: Cache CLI cargo target
-      uses: actions/cache@v2
-      with:
-        path: tooling/cli.rs/target
-        # Add date to the cache to keep it up to date
-        key: ubuntu-latest-nightly-cargo-cli-${{ hashFiles('tooling/cli.rs/Cargo.lock') }}-${{ env.CURRENT_DATE }}
-        # Restore from outdated cache for speed
-        restore-keys: |
-          ubuntu-latest-nightly-cargo-cli-${{ hashFiles('tooling/cli.rs/Cargo.lock') }}
-          ubuntu-latest-nightly-cargo-cli-
+      - name: Cache CLI cargo target
+        uses: actions/cache@v2
+        with:
+          path: tooling/cli/target
+          # Add date to the cache to keep it up to date
+          key: ubuntu-latest-nightly-cargo-cli-${{ hashFiles('tooling/cli/Cargo.lock') }}-${{ env.CURRENT_DATE }}
+          # Restore from outdated cache for speed
+          restore-keys: |
+            ubuntu-latest-nightly-cargo-cli-${{ hashFiles('tooling/cli/Cargo.lock') }}
+            ubuntu-latest-nightly-cargo-cli-
 
-    - uses: actions-rs/cargo@v1
-      with:
-        command: install
-        args: cargo-udeps --locked
+      - uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: cargo-udeps --locked
 
-    - name: Install required packages
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
+      - name: Install required packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
 
-    - uses: actions-rs/cargo@v1
-      with:
-        command: udeps
-        args: --all-targets --all-features
+      - uses: actions-rs/cargo@v1
+        with:
+          command: udeps
+          args: --all-targets --all-features
 
-    - uses: actions-rs/cargo@v1
-      with:
-        command: udeps
-        args: --manifest-path ./tooling/bundler/Cargo.toml --all-targets --all-features
+      - uses: actions-rs/cargo@v1
+        with:
+          command: udeps
+          args: --manifest-path ./tooling/bundler/Cargo.toml --all-targets --all-features
 
-    - uses: actions-rs/cargo@v1
-      with:
-        command: udeps
-        args: --manifest-path ./tooling/cli.rs/Cargo.toml --all-targets --all-features
+      - uses: actions-rs/cargo@v1
+        with:
+          command: udeps
+          args: --manifest-path ./tooling/cli/Cargo.toml --all-targets --all-features
diff --git a/.husky/pre-commit b/.husky/pre-commit
index 64a08ff1d..1b7d9d961 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -15,10 +15,10 @@ else
   cd ../..
 fi
 
-if [ -z "$(git diff --name-only tooling/cli.rs/node)" ]; then
+if [ -z "$(git diff --name-only tooling/cli/node)" ]; then
   echo "skipping cli.js - no changes detected"
 else
-  cd tooling/cli.rs/node
+  cd tooling/cli/node
   yarn format
   cd ../../..
 fi
diff --git a/.scripts/covector/sync-cli-metadata.js b/.scripts/covector/sync-cli-metadata.js
index a7476bff5..cd1ceaa53 100644
--- a/.scripts/covector/sync-cli-metadata.js
+++ b/.scripts/covector/sync-cli-metadata.js
@@ -1,18 +1,21 @@
 #!/usr/bin/env node
-// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+ // Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
 /*
 This script is solely intended to be run as part of the `covector version` step to
-keep the `../tooling/cli.rs/metadata.json` up to date with other version bumps. Long term
+keep the `../tooling/cli/metadata.json` up to date with other version bumps. Long term
 we should look to find a more "rusty way" to import / "pin" a version value in our cli.rs
 rust binaries.
 */
 
-const { readFileSync, writeFileSync } = require('fs')
+const {
+  readFileSync,
+  writeFileSync
+} = require('fs')
 
-const filePath = `../../tooling/cli.rs/metadata.json`
+const filePath = `../../tooling/cli/metadata.json`
 const packageNickname = process.argv[2]
 const bump = process.argv[3]
 if (bump !== 'prerelease' && bump !== 'prepatch') {
diff --git a/.scripts/setup.ps1 b/.scripts/setup.ps1
index 445c64da0..4d435d465 100644
--- a/.scripts/setup.ps1
+++ b/.scripts/setup.ps1
@@ -9,7 +9,7 @@ yarn; yarn build
 cd ..\..
 
 echo "Installing the Tauri Rust CLI..."
-cd tooling\cli.rs
+cd tooling\cli
 cargo install --path .
 cd ..\..
 echo "Tauri Rust CLI installed. Run it with '$ cargo tauri [COMMAND]'."
@@ -21,7 +21,7 @@ $options = [System.Management.Automation.Host.ChoiceDescription[]]($yes, $no)
 $result = $host.ui.PromptForChoice("Node.js CLI", "Do you want to install the Node.js CLI?", $options, 1)
 switch ($result) {
   0{
-    cd tooling\cli.rs/node
+    cd tooling\cli\node
     yarn; yarn build; yarn link
     cd ..\..
     echo "Tauri Node.js CLI installed. use `yarn link @tauri-apps/cli` and run it with '$ yarn tauri [COMMAND]'."
diff --git a/.scripts/setup.sh b/.scripts/setup.sh
index fbabfde62..0f2410946 100755
--- a/.scripts/setup.sh
+++ b/.scripts/setup.sh
@@ -9,7 +9,7 @@ yarn && yarn build
 cd ../..
 
 echo "Building the Tauri Rust CLI..."
-cd tooling/cli.rs
+cd tooling/cli
 cargo install --path .
 cd ../..
 echo "Tauri Rust CLI installed. Run it with '$ cargo tauri [COMMAND]'."
@@ -18,7 +18,7 @@ echo "Do you want to install the Node.js CLI?"
 select yn in "Yes" "No"; do
     case $yn in
         Yes )
-            cd tooling/cli.rs/node
+            cd tooling/cli/node
             yarn && yarn build && yarn link
             cd ../../..
             echo "Tauri Node.js CLI installed. use `yarn link @tauri-apps/cli` and run it with '$ yarn tauri [COMMAND]'."
diff --git a/.scripts/update-lockfiles.sh b/.scripts/update-lockfiles.sh
index 6b82bb65f..1a9c84cde 100755
--- a/.scripts/update-lockfiles.sh
+++ b/.scripts/update-lockfiles.sh
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 
 declare -a examples=("api" "sidecar" "updater" "resources")
-declare -a tooling=("bench" "cli.rs" "webdriver")
+declare -a tooling=("bench" "cli" "webdriver")
 
 for example in "${examples[@]}"
 do
diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
index 4af347927..8bb874e2c 100644
--- a/ARCHITECTURE.md
+++ b/ARCHITECTURE.md
@@ -44,10 +44,10 @@ A typescript library that creates `cjs` and `esm` Javascript endpoints for you t
 #### [bundler](https://github.com/tauri-apps/tauri/tree/dev/tooling/bundler) [RUST / SHELL]
 The bundler is a library that builds a Tauri App for the platform triple it detects / is told. At the moment it currently supports macOS, Windows and Linux - but in the near future will support mobile platforms as well. May be used outside of Tauri projects.
 
-#### [cli.js](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli.rs/node) [JS]
-It is a wrapper around [cli.rs](https://github.com/tauri-apps/tauri/blob/dev/tooling/cli.rs) using [napi-rs](https://github.com/napi-rs/napi-rs) to produce NPM packages for each platform.
+#### [cli.js](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli/node) [JS]
+It is a wrapper around [cli.rs](https://github.com/tauri-apps/tauri/blob/dev/tooling/cli) using [napi-rs](https://github.com/napi-rs/napi-rs) to produce NPM packages for each platform.
 
-#### [cli.rs](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli.rs) [RUST]
+#### [cli.rs](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli) [RUST]
 This rust executable provides the full interface to all of the required activities for which the CLI is required. It will run on macOS, Windows, and Linux.
 
 #### [create-tauri-app](https://github.com/tauri-apps/tauri/tree/dev/tooling/create-tauri-app) [JS]
diff --git a/README.md b/README.md
index 5d3d748f3..e1f04fe17 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@
 
 | Component                                                                                     | Description                              | Version                                                                                                          | Lin | Win | Mac |
 | --------------------------------------------------------------------------------------------- | ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------- | --- | --- | --- |
-| [**cli.rs**](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli.rs)                     | create, develop and build apps           | [![](https://img.shields.io/crates/v/tauri-cli.svg)](https://crates.io/crates/tauri-cli)                         | ✅   | ✅   | ✅   |
-| [**cli.js**](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli.rs/node)                     | Node.js CLI wrapper for cli.rs           | [![](https://img.shields.io/npm/v/@tauri-apps/cli.svg)](https://www.npmjs.com/package/@tauri-apps/cli)           | ✅   | ✅   | ✅   |
+| [**cli.rs**](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli)                     | create, develop and build apps           | [![](https://img.shields.io/crates/v/tauri-cli.svg)](https://crates.io/crates/tauri-cli)                         | ✅   | ✅   | ✅   |
+| [**cli.js**](https://github.com/tauri-apps/tauri/tree/dev/tooling/cli/node)                     | Node.js CLI wrapper for cli.rs           | [![](https://img.shields.io/npm/v/@tauri-apps/cli.svg)](https://www.npmjs.com/package/@tauri-apps/cli)           | ✅   | ✅   | ✅   |
 | [**api.js**](https://github.com/tauri-apps/tauri/tree/dev/tooling/api)                        | JS API for interaction with Rust backend | [![](https://img.shields.io/npm/v/@tauri-apps/api.svg)](https://www.npmjs.com/package/@tauri-apps/api)           | ✅   | ✅   | ✅   |
 | [**create-tauri-app**](https://github.com/tauri-apps/tauri/tree/dev/tooling/create-tauri-app) | Get started with your first Tauri app    | [![](https://img.shields.io/npm/v/create-tauri-app.svg)](https://www.npmjs.com/package/create-tauri-app)         | ✅   | ✅   | ✅   |
 | [**vue-cli-plugin-tauri**](https://github.com/tauri-apps/vue-cli-plugin-tauri/)               | Vue CLI plugin for Tauri                 | [![](https://img.shields.io/npm/v/vue-cli-plugin-tauri.svg)](https://www.npmjs.com/package/vue-cli-plugin-tauri) | ✅   | ✅   | ✅   |
diff --git a/examples/api/package.json b/examples/api/package.json
index 51b706c4c..53f0c67dc 100644
--- a/examples/api/package.json
+++ b/examples/api/package.json
@@ -6,7 +6,7 @@
     "dev": "vite --clearScreen false --port 5000",
     "build": "vite build",
     "serve": "vite preview",
-    "tauri": "node ../../tooling/cli.rs/node/tauri.js"
+    "tauri": "node ../../tooling/cli/node/tauri.js"
   },
   "dependencies": {
     "@tauri-apps/api": "../../tooling/api/dist",
diff --git a/examples/commands/package.json b/examples/commands/package.json
index 6d5a249e0..b609dca33 100644
--- a/examples/commands/package.json
+++ b/examples/commands/package.json
@@ -2,6 +2,6 @@
   "name": "state",
   "version": "1.0.0",
   "scripts": {
-    "tauri": "node ../../tooling/cli.rs/node/tauri.js"
+    "tauri": "node ../../tooling/cli/node/tauri.js"
   }
 }
\ No newline at end of file
diff --git a/examples/helloworld/package.json b/examples/helloworld/package.json
index 21a0feccb..090a0da96 100644
--- a/examples/helloworld/package.json
+++ b/examples/helloworld/package.json
@@ -2,6 +2,6 @@
   "name": "hello-world",
   "version": "1.0.0",
   "scripts": {
-    "tauri": "node ../../tooling/cli.rs/node/tauri.js"
+    "tauri": "node ../../tooling/cli/node/tauri.js"
   }
 }
\ No newline at end of file
diff --git a/examples/isolation/package.json b/examples/isolation/package.json
index 4dfcd42a0..fdb28735c 100644
--- a/examples/isolation/package.json
+++ b/examples/isolation/package.json
@@ -2,7 +2,7 @@
   "name": "isolation",
   "license": "Apache-2.0 OR MIT",
   "scripts": {
-    "tauri": "node ../../tooling/cli.rs/node/tauri.js"
+    "tauri": "node ../../tooling/cli/node/tauri.js"
   },
   "dependencies": {
     "@tauri-apps/api": "../../tooling/api/dist"
diff --git a/examples/multiwindow/package.json b/examples/multiwindow/package.json
index d82cadfa5..0cda486d9 100644
--- a/examples/multiwindow/package.json
+++ b/examples/multiwindow/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "tauri": "node ../../tooling/cli.rs/node/tauri.js"
+    "tauri": "node ../../tooling/cli/node/tauri.js"
   },
   "private": true
 }
\ No newline at end of file
diff --git a/examples/navigation/package.json b/examples/navigation/package.json
index 359fc20c4..089cf71dc 100644
--- a/examples/navigation/package.json
+++ b/examples/navigation/package.json
@@ -2,6 +2,6 @@
   "name": "navigation",
   "version": "1.0.0",
   "scripts": {
-    "tauri": "node ../../tooling/cli.rs/node/tauri.js"
+    "tauri": "node ../../tooling/cli/node/tauri.js"
   }
 }
\ No newline at end of file
diff --git a/examples/resources/package.json b/examples/resources/package.json
index 90eb5c4c2..4d9bc4414 100644
--- a/examples/resources/package.json
+++ b/examples/resources/package.json
@@ -2,6 +2,6 @@
   "name": "resources",
   "version": "1.0.0",
   "scripts": {
-    "tauri": "node ../../tooling/cli.rs/node/tauri.js"
+    "tauri": "node ../../tooling/cli/node/tauri.js"
   }
 }
\ No newline at end of file
diff --git a/examples/sidecar/package.json b/examples/sidecar/package.json
index eee63d6a4..b40a20404 100644
--- a/examples/sidecar/package.json
+++ b/examples/sidecar/package.json
@@ -8,7 +8,7 @@
     ]
   },
   "scripts": {
-    "tauri": "node ../../tooling/cli.rs/node/tauri.js",
+    "tauri": "node ../../tooling/cli/node/tauri.js",
     "package": "pkg package.json --output src-tauri/binaries/app && node scripts/move-binary.js"
   },
   "devDependencies": {
diff --git a/examples/splashscreen/package.json b/examples/splashscreen/package.json
index 6c636d443..17e0df4ce 100644
--- a/examples/splashscreen/package.json
+++ b/examples/splashscreen/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "tauri": "node ../../tooling/cli.rs/node/tauri.js"
+    "tauri": "node ../../tooling/cli/node/tauri.js"
   },
   "private": true
 }
\ No newline at end of file
diff --git a/examples/streaming/package.json b/examples/streaming/package.json
index 687b246bc..1c04c4e49 100644
--- a/examples/streaming/package.json
+++ b/examples/streaming/package.json
@@ -2,6 +2,6 @@
   "name": "streaming",
   "version": "1.0.0",
   "scripts": {
-    "tauri": "node ../../tooling/cli.rs/node/tauri.js"
+    "tauri": "node ../../tooling/cli/node/tauri.js"
   }
 }
\ No newline at end of file
diff --git a/examples/updater/package.json b/examples/updater/package.json
index 14963d706..0e217e086 100644
--- a/examples/updater/package.json
+++ b/examples/updater/package.json
@@ -2,6 +2,6 @@
   "name": "updater",
   "version": "1.0.0",
   "scripts": {
-    "tauri": "node ../../tooling/cli.rs/node/tauri.js"
+    "tauri": "node ../../tooling/cli/node/tauri.js"
   }
 }
\ No newline at end of file
diff --git a/renovate.json b/renovate.json
index 525773969..ebd1563c7 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,20 +1,31 @@
 {
-  "extends": ["config:base"],
+  "extends": [
+    "config:base"
+  ],
   "schedule": "after 3am on Wednesday",
   "ignorePaths": [],
-  "labels": ["chore"],
-  "enabledManagers": ["cargo", "npm"],
+  "labels": [
+    "chore"
+  ],
+  "enabledManagers": [
+    "cargo",
+    "npm"
+  ],
   "cargo": {
     "enabled": true
   },
   "packageRules": [
     {
-      "packagePatterns": ["*"],
+      "packagePatterns": [
+        "*"
+      ],
       "enabled": false
     },
     {
       "enabled": true,
-      "paths": ["core/tauri/**"],
+      "paths": [
+        "core/tauri/**"
+      ],
       "groupName": "Tauri Core",
       "groupSlug": "allTauriCore",
       "commitMessagePrefix": "chore(deps)",
@@ -25,7 +36,9 @@
     },
     {
       "enabled": true,
-      "paths": ["core/tauri-build/**"],
+      "paths": [
+        "core/tauri-build/**"
+      ],
       "groupName": "Tauri Build",
       "groupSlug": "allTauriBuild",
       "commitMessagePrefix": "chore(deps)",
@@ -36,7 +49,9 @@
     },
     {
       "enabled": true,
-      "paths": ["core/tauri-codegen/**"],
+      "paths": [
+        "core/tauri-codegen/**"
+      ],
       "groupName": "Tauri Codegen",
       "groupSlug": "allTauriCodegen",
       "commitMessagePrefix": "chore(deps)",
@@ -47,7 +62,9 @@
     },
     {
       "enabled": true,
-      "paths": ["core/tauri-macros/**"],
+      "paths": [
+        "core/tauri-macros/**"
+      ],
       "groupName": "Tauri Macros",
       "groupSlug": "allTauriMacros",
       "commitMessagePrefix": "chore(deps)",
@@ -58,7 +75,9 @@
     },
     {
       "enabled": true,
-      "paths": ["core/tauri-utils/**"],
+      "paths": [
+        "core/tauri-utils/**"
+      ],
       "groupName": "Tauri Utils",
       "groupSlug": "allTauriUtils",
       "commitMessagePrefix": "chore(deps)",
@@ -69,7 +88,9 @@
     },
     {
       "enabled": true,
-      "paths": ["tooling/cli.rs/**"],
+      "paths": [
+        "tooling/cli/**"
+      ],
       "groupName": "Tauri CLI",
       "groupSlug": "allTauriCLI",
       "commitMessagePrefix": "chore(deps)",
@@ -80,7 +101,9 @@
     },
     {
       "enabled": true,
-      "paths": ["tooling/bundler/**"],
+      "paths": [
+        "tooling/bundler/**"
+      ],
       "groupName": "Tauri Bundler",
       "groupSlug": "allTauriBundler",
       "commitMessagePrefix": "chore(deps)",
@@ -91,7 +114,9 @@
     },
     {
       "enabled": true,
-      "paths": ["tooling/cli.rs/node"],
+      "paths": [
+        "tooling/cli/node"
+      ],
       "groupName": "Tauri JS CLI",
       "groupSlug": "allTauriJSCLI",
       "commitMessagePrefix": "chore(deps)",
@@ -102,7 +127,9 @@
     },
     {
       "enabled": true,
-      "paths": ["tooling/api/**"],
+      "paths": [
+        "tooling/api/**"
+      ],
       "groupName": "Tauri API Definitions",
       "groupSlug": "allTauriAPIDefinitions",
       "commitMessagePrefix": "chore(deps)",
@@ -113,7 +140,9 @@
     },
     {
       "enabled": true,
-      "paths": ["tooling/create-tauri-app/**"],
+      "paths": [
+        "tooling/create-tauri-app/**"
+      ],
       "groupName": "create-tauri-app",
       "groupSlug": "allCTA",
       "commitMessagePrefix": "chore(deps)",
@@ -123,4 +152,4 @@
       "rebaseConflictedPrs": false
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/tooling/bundler/README.md b/tooling/bundler/README.md
index 9975777d8..871920659 100644
--- a/tooling/bundler/README.md
+++ b/tooling/bundler/README.md
@@ -4,7 +4,7 @@ Wrap Rust executables in OS-specific app bundles.
 
 ## About
 
-This is a fork of the awesome [cargo-bundle](https://github.com/burtonageo/cargo-bundle), turned into a library used by the [Tauri CLI](../cli.rs).
+This is a fork of the awesome [cargo-bundle](https://github.com/burtonageo/cargo-bundle), turned into a library used by the [Tauri CLI](../cli).
 
 ## Configuration
 
diff --git a/tooling/cli.rs/.license_template b/tooling/cli/.license_template
similarity index 100%
rename from tooling/cli.rs/.license_template
rename to tooling/cli/.license_template
diff --git a/tooling/cli.rs/CHANGELOG.md b/tooling/cli/CHANGELOG.md
similarity index 100%
rename from tooling/cli.rs/CHANGELOG.md
rename to tooling/cli/CHANGELOG.md
diff --git a/tooling/cli.rs/Cargo.lock b/tooling/cli/Cargo.lock
similarity index 100%
rename from tooling/cli.rs/Cargo.lock
rename to tooling/cli/Cargo.lock
diff --git a/tooling/cli.rs/Cargo.toml b/tooling/cli/Cargo.toml
similarity index 100%
rename from tooling/cli.rs/Cargo.toml
rename to tooling/cli/Cargo.toml
diff --git a/tooling/cli.rs/MergeModules/Microsoft_VC142_CRT_x64.msm b/tooling/cli/MergeModules/Microsoft_VC142_CRT_x64.msm
similarity index 100%
rename from tooling/cli.rs/MergeModules/Microsoft_VC142_CRT_x64.msm
rename to tooling/cli/MergeModules/Microsoft_VC142_CRT_x64.msm
diff --git a/tooling/cli.rs/MergeModules/Microsoft_VC142_CRT_x86.msm b/tooling/cli/MergeModules/Microsoft_VC142_CRT_x86.msm
similarity index 100%
rename from tooling/cli.rs/MergeModules/Microsoft_VC142_CRT_x86.msm
rename to tooling/cli/MergeModules/Microsoft_VC142_CRT_x86.msm
diff --git a/tooling/cli.rs/README.md b/tooling/cli/README.md
similarity index 100%
rename from tooling/cli.rs/README.md
rename to tooling/cli/README.md
diff --git a/tooling/cli.rs/build.rs b/tooling/cli/build.rs
similarity index 100%
rename from tooling/cli.rs/build.rs
rename to tooling/cli/build.rs
diff --git a/tooling/cli.rs/metadata.json b/tooling/cli/metadata.json
similarity index 100%
rename from tooling/cli.rs/metadata.json
rename to tooling/cli/metadata.json
diff --git a/tooling/cli.rs/node/.cargo/config.toml b/tooling/cli/node/.cargo/config.toml
similarity index 100%
rename from tooling/cli.rs/node/.cargo/config.toml
rename to tooling/cli/node/.cargo/config.toml
diff --git a/tooling/cli.rs/node/.github-example/workflows/CI.yml b/tooling/cli/node/.github-example/workflows/CI.yml
similarity index 100%
rename from tooling/cli.rs/node/.github-example/workflows/CI.yml
rename to tooling/cli/node/.github-example/workflows/CI.yml
diff --git a/tooling/cli.rs/node/.gitignore b/tooling/cli/node/.gitignore
similarity index 100%
rename from tooling/cli.rs/node/.gitignore
rename to tooling/cli/node/.gitignore
diff --git a/tooling/cli.rs/node/.npmignore b/tooling/cli/node/.npmignore
similarity index 100%
rename from tooling/cli.rs/node/.npmignore
rename to tooling/cli/node/.npmignore
diff --git a/tooling/cli.rs/node/Cargo.toml b/tooling/cli/node/Cargo.toml
similarity index 100%
rename from tooling/cli.rs/node/Cargo.toml
rename to tooling/cli/node/Cargo.toml
diff --git a/tooling/cli.rs/node/README.md b/tooling/cli/node/README.md
similarity index 98%
rename from tooling/cli.rs/node/README.md
rename to tooling/cli/node/README.md
index efe0db0e0..929460b22 100644
--- a/tooling/cli.rs/node/README.md
+++ b/tooling/cli/node/README.md
@@ -21,7 +21,7 @@ Tauri is a polyglot and generic system that is very composable and allows engine
 
 Tauri apps can have custom menus and have tray-type interfaces. They can be updated, and are managed by the user's operating system as expected. They are very small, because they use the system's webview. They do not ship a runtime, since the final binary is compiled from rust. This makes the reversing of Tauri apps not a trivial task.
 ## This module
-Written in Typescript and packaged such that it can be used with `npm`, `pnpm`, and `yarn`, this library provides a node.js runner for common tasks when using Tauri, like `yarn tauri dev`. For the most part it is a wrapper around [cli.rs](https://github.com/tauri-apps/tauri/blob/dev/tooling/cli.rs).
+Written in Typescript and packaged such that it can be used with `npm`, `pnpm`, and `yarn`, this library provides a node.js runner for common tasks when using Tauri, like `yarn tauri dev`. For the most part it is a wrapper around [cli.rs](https://github.com/tauri-apps/tauri/blob/dev/tooling/cli).
 
 To learn more about the details of how all of these pieces fit together, please consult this [ARCHITECTURE.md](https://github.com/tauri-apps/tauri/blob/dev/ARCHITECTURE.md) document.
 
diff --git a/tooling/cli.rs/node/build.rs b/tooling/cli/node/build.rs
similarity index 100%
rename from tooling/cli.rs/node/build.rs
rename to tooling/cli/node/build.rs
diff --git a/tooling/cli.rs/node/index.d.ts b/tooling/cli/node/index.d.ts
similarity index 100%
rename from tooling/cli.rs/node/index.d.ts
rename to tooling/cli/node/index.d.ts
diff --git a/tooling/cli.rs/node/index.js b/tooling/cli/node/index.js
similarity index 100%
rename from tooling/cli.rs/node/index.js
rename to tooling/cli/node/index.js
diff --git a/tooling/cli.rs/node/jest.config.js b/tooling/cli/node/jest.config.js
similarity index 100%
rename from tooling/cli.rs/node/jest.config.js
rename to tooling/cli/node/jest.config.js
diff --git a/tooling/cli.rs/node/npm/darwin-arm64/README.md b/tooling/cli/node/npm/darwin-arm64/README.md
similarity index 100%
rename from tooling/cli.rs/node/npm/darwin-arm64/README.md
rename to tooling/cli/node/npm/darwin-arm64/README.md
diff --git a/tooling/cli.rs/node/npm/darwin-arm64/package.json b/tooling/cli/node/npm/darwin-arm64/package.json
similarity index 100%
rename from tooling/cli.rs/node/npm/darwin-arm64/package.json
rename to tooling/cli/node/npm/darwin-arm64/package.json
diff --git a/tooling/cli.rs/node/npm/darwin-x64/README.md b/tooling/cli/node/npm/darwin-x64/README.md
similarity index 100%
rename from tooling/cli.rs/node/npm/darwin-x64/README.md
rename to tooling/cli/node/npm/darwin-x64/README.md
diff --git a/tooling/cli.rs/node/npm/darwin-x64/package.json b/tooling/cli/node/npm/darwin-x64/package.json
similarity index 100%
rename from tooling/cli.rs/node/npm/darwin-x64/package.json
rename to tooling/cli/node/npm/darwin-x64/package.json
diff --git a/tooling/cli.rs/node/npm/linux-arm-gnueabihf/README.md b/tooling/cli/node/npm/linux-arm-gnueabihf/README.md
similarity index 100%
rename from tooling/cli.rs/node/npm/linux-arm-gnueabihf/README.md
rename to tooling/cli/node/npm/linux-arm-gnueabihf/README.md
diff --git a/tooling/cli.rs/node/npm/linux-arm-gnueabihf/package.json b/tooling/cli/node/npm/linux-arm-gnueabihf/package.json
similarity index 100%
rename from tooling/cli.rs/node/npm/linux-arm-gnueabihf/package.json
rename to tooling/cli/node/npm/linux-arm-gnueabihf/package.json
diff --git a/tooling/cli.rs/node/npm/linux-arm64-gnu/README.md b/tooling/cli/node/npm/linux-arm64-gnu/README.md
similarity index 100%
rename from tooling/cli.rs/node/npm/linux-arm64-gnu/README.md
rename to tooling/cli/node/npm/linux-arm64-gnu/README.md
diff --git a/tooling/cli.rs/node/npm/linux-arm64-gnu/package.json b/tooling/cli/node/npm/linux-arm64-gnu/package.json
similarity index 100%
rename from tooling/cli.rs/node/npm/linux-arm64-gnu/package.json
rename to tooling/cli/node/npm/linux-arm64-gnu/package.json
diff --git a/tooling/cli.rs/node/npm/linux-arm64-musl/README.md b/tooling/cli/node/npm/linux-arm64-musl/README.md
similarity index 100%
rename from tooling/cli.rs/node/npm/linux-arm64-musl/README.md
rename to tooling/cli/node/npm/linux-arm64-musl/README.md
diff --git a/tooling/cli.rs/node/npm/linux-arm64-musl/package.json b/tooling/cli/node/npm/linux-arm64-musl/package.json
similarity index 100%
rename from tooling/cli.rs/node/npm/linux-arm64-musl/package.json
rename to tooling/cli/node/npm/linux-arm64-musl/package.json
diff --git a/tooling/cli.rs/node/npm/linux-x64-gnu/README.md b/tooling/cli/node/npm/linux-x64-gnu/README.md
similarity index 100%
rename from tooling/cli.rs/node/npm/linux-x64-gnu/README.md
rename to tooling/cli/node/npm/linux-x64-gnu/README.md
diff --git a/tooling/cli.rs/node/npm/linux-x64-gnu/package.json b/tooling/cli/node/npm/linux-x64-gnu/package.json
similarity index 100%
rename from tooling/cli.rs/node/npm/linux-x64-gnu/package.json
rename to tooling/cli/node/npm/linux-x64-gnu/package.json
diff --git a/tooling/cli.rs/node/npm/linux-x64-musl/README.md b/tooling/cli/node/npm/linux-x64-musl/README.md
similarity index 100%
rename from tooling/cli.rs/node/npm/linux-x64-musl/README.md
rename to tooling/cli/node/npm/linux-x64-musl/README.md
diff --git a/tooling/cli.rs/node/npm/linux-x64-musl/package.json b/tooling/cli/node/npm/linux-x64-musl/package.json
similarity index 100%
rename from tooling/cli.rs/node/npm/linux-x64-musl/package.json
rename to tooling/cli/node/npm/linux-x64-musl/package.json
diff --git a/tooling/cli.rs/node/npm/win32-x64-msvc/README.md b/tooling/cli/node/npm/win32-x64-msvc/README.md
similarity index 100%
rename from tooling/cli.rs/node/npm/win32-x64-msvc/README.md
rename to tooling/cli/node/npm/win32-x64-msvc/README.md
diff --git a/tooling/cli.rs/node/npm/win32-x64-msvc/package.json b/tooling/cli/node/npm/win32-x64-msvc/package.json
similarity index 100%
rename from tooling/cli.rs/node/npm/win32-x64-msvc/package.json
rename to tooling/cli/node/npm/win32-x64-msvc/package.json
diff --git a/tooling/cli.rs/node/package.json b/tooling/cli/node/package.json
similarity index 100%
rename from tooling/cli.rs/node/package.json
rename to tooling/cli/node/package.json
diff --git a/tooling/cli.rs/node/src/lib.rs b/tooling/cli/node/src/lib.rs
similarity index 100%
rename from tooling/cli.rs/node/src/lib.rs
rename to tooling/cli/node/src/lib.rs
diff --git a/tooling/cli.rs/node/tauri.js b/tooling/cli/node/tauri.js
similarity index 100%
rename from tooling/cli.rs/node/tauri.js
rename to tooling/cli/node/tauri.js
diff --git a/tooling/cli.rs/node/test/jest/__tests__/template.spec.js b/tooling/cli/node/test/jest/__tests__/template.spec.js
similarity index 100%
rename from tooling/cli.rs/node/test/jest/__tests__/template.spec.js
rename to tooling/cli/node/test/jest/__tests__/template.spec.js
diff --git a/tooling/cli.rs/node/test/jest/fixtures/app-test-setup.js b/tooling/cli/node/test/jest/fixtures/app-test-setup.js
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/app-test-setup.js
rename to tooling/cli/node/test/jest/fixtures/app-test-setup.js
diff --git a/tooling/cli.rs/node/test/jest/fixtures/app/dist/index.html b/tooling/cli/node/test/jest/fixtures/app/dist/index.html
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/app/dist/index.html
rename to tooling/cli/node/test/jest/fixtures/app/dist/index.html
diff --git a/tooling/cli.rs/node/test/jest/fixtures/app/index.js b/tooling/cli/node/test/jest/fixtures/app/index.js
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/app/index.js
rename to tooling/cli/node/test/jest/fixtures/app/index.js
diff --git a/tooling/cli.rs/node/test/jest/fixtures/app/package.json b/tooling/cli/node/test/jest/fixtures/app/package.json
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/app/package.json
rename to tooling/cli/node/test/jest/fixtures/app/package.json
diff --git a/tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/.gitignore b/tooling/cli/node/test/jest/fixtures/app/src-tauri/.gitignore
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/.gitignore
rename to tooling/cli/node/test/jest/fixtures/app/src-tauri/.gitignore
diff --git a/tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/Cargo.toml b/tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/Cargo.toml
rename to tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml
diff --git a/tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/build.rs b/tooling/cli/node/test/jest/fixtures/app/src-tauri/build.rs
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/build.rs
rename to tooling/cli/node/test/jest/fixtures/app/src-tauri/build.rs
diff --git a/tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/icons/128x128.png b/tooling/cli/node/test/jest/fixtures/app/src-tauri/icons/128x128.png
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/icons/128x128.png
rename to tooling/cli/node/test/jest/fixtures/app/src-tauri/icons/128x128.png
diff --git a/tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/icons/128x128@2x.png b/tooling/cli/node/test/jest/fixtures/app/src-tauri/icons/128x128@2x.png
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/icons/128x128@2x.png
rename to tooling/cli/node/test/jest/fixtures/app/src-tauri/icons/128x128@2x.png
diff --git a/tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/icons/32x32.png b/tooling/cli/node/test/jest/fixtures/app/src-tauri/icons/32x32.png
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/icons/32x32.png
rename to tooling/cli/node/test/jest/fixtures/app/src-tauri/icons/32x32.png
diff --git a/tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/icons/icon.icns b/tooling/cli/node/test/jest/fixtures/app/src-tauri/icons/icon.icns
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/icons/icon.icns
rename to tooling/cli/node/test/jest/fixtures/app/src-tauri/icons/icon.icns
diff --git a/tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/icons/icon.ico b/tooling/cli/node/test/jest/fixtures/app/src-tauri/icons/icon.ico
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/icons/icon.ico
rename to tooling/cli/node/test/jest/fixtures/app/src-tauri/icons/icon.ico
diff --git a/tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/icons/icon.png b/tooling/cli/node/test/jest/fixtures/app/src-tauri/icons/icon.png
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/icons/icon.png
rename to tooling/cli/node/test/jest/fixtures/app/src-tauri/icons/icon.png
diff --git a/tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/rustfmt.toml b/tooling/cli/node/test/jest/fixtures/app/src-tauri/rustfmt.toml
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/rustfmt.toml
rename to tooling/cli/node/test/jest/fixtures/app/src-tauri/rustfmt.toml
diff --git a/tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/src/main.rs b/tooling/cli/node/test/jest/fixtures/app/src-tauri/src/main.rs
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/src/main.rs
rename to tooling/cli/node/test/jest/fixtures/app/src-tauri/src/main.rs
diff --git a/tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/tauri.conf.json b/tooling/cli/node/test/jest/fixtures/app/src-tauri/tauri.conf.json
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/app/src-tauri/tauri.conf.json
rename to tooling/cli/node/test/jest/fixtures/app/src-tauri/tauri.conf.json
diff --git a/tooling/cli.rs/node/test/jest/fixtures/empty/.gitignore b/tooling/cli/node/test/jest/fixtures/empty/.gitignore
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/empty/.gitignore
rename to tooling/cli/node/test/jest/fixtures/empty/.gitignore
diff --git a/tooling/cli.rs/node/test/jest/fixtures/empty/dist/index.html b/tooling/cli/node/test/jest/fixtures/empty/dist/index.html
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/empty/dist/index.html
rename to tooling/cli/node/test/jest/fixtures/empty/dist/index.html
diff --git a/tooling/cli.rs/node/test/jest/fixtures/empty/package.json b/tooling/cli/node/test/jest/fixtures/empty/package.json
similarity index 100%
rename from tooling/cli.rs/node/test/jest/fixtures/empty/package.json
rename to tooling/cli/node/test/jest/fixtures/empty/package.json
diff --git a/tooling/cli.rs/node/test/jest/helpers/logger.js b/tooling/cli/node/test/jest/helpers/logger.js
similarity index 100%
rename from tooling/cli.rs/node/test/jest/helpers/logger.js
rename to tooling/cli/node/test/jest/helpers/logger.js
diff --git a/tooling/cli.rs/node/test/jest/helpers/spawn.js b/tooling/cli/node/test/jest/helpers/spawn.js
similarity index 100%
rename from tooling/cli.rs/node/test/jest/helpers/spawn.js
rename to tooling/cli/node/test/jest/helpers/spawn.js
diff --git a/tooling/cli.rs/node/test/jest/jest.setup.js b/tooling/cli/node/test/jest/jest.setup.js
similarity index 100%
rename from tooling/cli.rs/node/test/jest/jest.setup.js
rename to tooling/cli/node/test/jest/jest.setup.js
diff --git a/tooling/cli.rs/node/yarn.lock b/tooling/cli/node/yarn.lock
similarity index 100%
rename from tooling/cli.rs/node/yarn.lock
rename to tooling/cli/node/yarn.lock
diff --git a/tooling/cli.rs/schema.json b/tooling/cli/schema.json
similarity index 100%
rename from tooling/cli.rs/schema.json
rename to tooling/cli/schema.json
diff --git a/tooling/cli.rs/src/build.rs b/tooling/cli/src/build.rs
similarity index 100%
rename from tooling/cli.rs/src/build.rs
rename to tooling/cli/src/build.rs
diff --git a/tooling/cli.rs/src/dev.rs b/tooling/cli/src/dev.rs
similarity index 100%
rename from tooling/cli.rs/src/dev.rs
rename to tooling/cli/src/dev.rs
diff --git a/tooling/cli.rs/src/helpers/app_paths.rs b/tooling/cli/src/helpers/app_paths.rs
similarity index 100%
rename from tooling/cli.rs/src/helpers/app_paths.rs
rename to tooling/cli/src/helpers/app_paths.rs
diff --git a/tooling/cli.rs/src/helpers/config.rs b/tooling/cli/src/helpers/config.rs
similarity index 100%
rename from tooling/cli.rs/src/helpers/config.rs
rename to tooling/cli/src/helpers/config.rs
diff --git a/tooling/cli.rs/src/helpers/framework.rs b/tooling/cli/src/helpers/framework.rs
similarity index 100%
rename from tooling/cli.rs/src/helpers/framework.rs
rename to tooling/cli/src/helpers/framework.rs
diff --git a/tooling/cli.rs/src/helpers/logger.rs b/tooling/cli/src/helpers/logger.rs
similarity index 100%
rename from tooling/cli.rs/src/helpers/logger.rs
rename to tooling/cli/src/helpers/logger.rs
diff --git a/tooling/cli.rs/src/helpers/manifest.rs b/tooling/cli/src/helpers/manifest.rs
similarity index 100%
rename from tooling/cli.rs/src/helpers/manifest.rs
rename to tooling/cli/src/helpers/manifest.rs
diff --git a/tooling/cli.rs/src/helpers/mod.rs b/tooling/cli/src/helpers/mod.rs
similarity index 100%
rename from tooling/cli.rs/src/helpers/mod.rs
rename to tooling/cli/src/helpers/mod.rs
diff --git a/tooling/cli.rs/src/helpers/template.rs b/tooling/cli/src/helpers/template.rs
similarity index 100%
rename from tooling/cli.rs/src/helpers/template.rs
rename to tooling/cli/src/helpers/template.rs
diff --git a/tooling/cli.rs/src/helpers/updater_signature.rs b/tooling/cli/src/helpers/updater_signature.rs
similarity index 100%
rename from tooling/cli.rs/src/helpers/updater_signature.rs
rename to tooling/cli/src/helpers/updater_signature.rs
diff --git a/tooling/cli.rs/src/info.rs b/tooling/cli/src/info.rs
similarity index 100%
rename from tooling/cli.rs/src/info.rs
rename to tooling/cli/src/info.rs
diff --git a/tooling/cli.rs/src/init.rs b/tooling/cli/src/init.rs
similarity index 100%
rename from tooling/cli.rs/src/init.rs
rename to tooling/cli/src/init.rs
diff --git a/tooling/cli.rs/src/interface/mod.rs b/tooling/cli/src/interface/mod.rs
similarity index 100%
rename from tooling/cli.rs/src/interface/mod.rs
rename to tooling/cli/src/interface/mod.rs
diff --git a/tooling/cli.rs/src/interface/rust.rs b/tooling/cli/src/interface/rust.rs
similarity index 100%
rename from tooling/cli.rs/src/interface/rust.rs
rename to tooling/cli/src/interface/rust.rs
diff --git a/tooling/cli.rs/src/lib.rs b/tooling/cli/src/lib.rs
similarity index 100%
rename from tooling/cli.rs/src/lib.rs
rename to tooling/cli/src/lib.rs
diff --git a/tooling/cli.rs/src/main.rs b/tooling/cli/src/main.rs
similarity index 100%
rename from tooling/cli.rs/src/main.rs
rename to tooling/cli/src/main.rs
diff --git a/tooling/cli.rs/src/plugin.rs b/tooling/cli/src/plugin.rs
similarity index 100%
rename from tooling/cli.rs/src/plugin.rs
rename to tooling/cli/src/plugin.rs
diff --git a/tooling/cli.rs/src/plugin/init.rs b/tooling/cli/src/plugin/init.rs
similarity index 100%
rename from tooling/cli.rs/src/plugin/init.rs
rename to tooling/cli/src/plugin/init.rs
diff --git a/tooling/cli.rs/src/signer.rs b/tooling/cli/src/signer.rs
similarity index 100%
rename from tooling/cli.rs/src/signer.rs
rename to tooling/cli/src/signer.rs
diff --git a/tooling/cli.rs/src/signer/generate.rs b/tooling/cli/src/signer/generate.rs
similarity index 100%
rename from tooling/cli.rs/src/signer/generate.rs
rename to tooling/cli/src/signer/generate.rs
diff --git a/tooling/cli.rs/src/signer/sign.rs b/tooling/cli/src/signer/sign.rs
similarity index 100%
rename from tooling/cli.rs/src/signer/sign.rs
rename to tooling/cli/src/signer/sign.rs
diff --git a/tooling/cli.rs/templates/app/src-tauri/.gitignore b/tooling/cli/templates/app/src-tauri/.gitignore
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/.gitignore
rename to tooling/cli/templates/app/src-tauri/.gitignore
diff --git a/tooling/cli.rs/templates/app/src-tauri/Cargo.crate-manifest b/tooling/cli/templates/app/src-tauri/Cargo.crate-manifest
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/Cargo.crate-manifest
rename to tooling/cli/templates/app/src-tauri/Cargo.crate-manifest
diff --git a/tooling/cli.rs/templates/app/src-tauri/build.rs b/tooling/cli/templates/app/src-tauri/build.rs
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/build.rs
rename to tooling/cli/templates/app/src-tauri/build.rs
diff --git a/tooling/cli.rs/templates/app/src-tauri/icons/128x128.png b/tooling/cli/templates/app/src-tauri/icons/128x128.png
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/icons/128x128.png
rename to tooling/cli/templates/app/src-tauri/icons/128x128.png
diff --git a/tooling/cli.rs/templates/app/src-tauri/icons/128x128@2x.png b/tooling/cli/templates/app/src-tauri/icons/128x128@2x.png
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/icons/128x128@2x.png
rename to tooling/cli/templates/app/src-tauri/icons/128x128@2x.png
diff --git a/tooling/cli.rs/templates/app/src-tauri/icons/32x32.png b/tooling/cli/templates/app/src-tauri/icons/32x32.png
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/icons/32x32.png
rename to tooling/cli/templates/app/src-tauri/icons/32x32.png
diff --git a/tooling/cli.rs/templates/app/src-tauri/icons/Square107x107Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square107x107Logo.png
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/icons/Square107x107Logo.png
rename to tooling/cli/templates/app/src-tauri/icons/Square107x107Logo.png
diff --git a/tooling/cli.rs/templates/app/src-tauri/icons/Square142x142Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square142x142Logo.png
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/icons/Square142x142Logo.png
rename to tooling/cli/templates/app/src-tauri/icons/Square142x142Logo.png
diff --git a/tooling/cli.rs/templates/app/src-tauri/icons/Square150x150Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square150x150Logo.png
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/icons/Square150x150Logo.png
rename to tooling/cli/templates/app/src-tauri/icons/Square150x150Logo.png
diff --git a/tooling/cli.rs/templates/app/src-tauri/icons/Square284x284Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square284x284Logo.png
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/icons/Square284x284Logo.png
rename to tooling/cli/templates/app/src-tauri/icons/Square284x284Logo.png
diff --git a/tooling/cli.rs/templates/app/src-tauri/icons/Square30x30Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square30x30Logo.png
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/icons/Square30x30Logo.png
rename to tooling/cli/templates/app/src-tauri/icons/Square30x30Logo.png
diff --git a/tooling/cli.rs/templates/app/src-tauri/icons/Square310x310Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square310x310Logo.png
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/icons/Square310x310Logo.png
rename to tooling/cli/templates/app/src-tauri/icons/Square310x310Logo.png
diff --git a/tooling/cli.rs/templates/app/src-tauri/icons/Square44x44Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square44x44Logo.png
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/icons/Square44x44Logo.png
rename to tooling/cli/templates/app/src-tauri/icons/Square44x44Logo.png
diff --git a/tooling/cli.rs/templates/app/src-tauri/icons/Square71x71Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square71x71Logo.png
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/icons/Square71x71Logo.png
rename to tooling/cli/templates/app/src-tauri/icons/Square71x71Logo.png
diff --git a/tooling/cli.rs/templates/app/src-tauri/icons/Square89x89Logo.png b/tooling/cli/templates/app/src-tauri/icons/Square89x89Logo.png
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/icons/Square89x89Logo.png
rename to tooling/cli/templates/app/src-tauri/icons/Square89x89Logo.png
diff --git a/tooling/cli.rs/templates/app/src-tauri/icons/StoreLogo.png b/tooling/cli/templates/app/src-tauri/icons/StoreLogo.png
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/icons/StoreLogo.png
rename to tooling/cli/templates/app/src-tauri/icons/StoreLogo.png
diff --git a/tooling/cli.rs/templates/app/src-tauri/icons/icon.icns b/tooling/cli/templates/app/src-tauri/icons/icon.icns
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/icons/icon.icns
rename to tooling/cli/templates/app/src-tauri/icons/icon.icns
diff --git a/tooling/cli.rs/templates/app/src-tauri/icons/icon.ico b/tooling/cli/templates/app/src-tauri/icons/icon.ico
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/icons/icon.ico
rename to tooling/cli/templates/app/src-tauri/icons/icon.ico
diff --git a/tooling/cli.rs/templates/app/src-tauri/icons/icon.png b/tooling/cli/templates/app/src-tauri/icons/icon.png
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/icons/icon.png
rename to tooling/cli/templates/app/src-tauri/icons/icon.png
diff --git a/tooling/cli.rs/templates/app/src-tauri/src/main.rs b/tooling/cli/templates/app/src-tauri/src/main.rs
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/src/main.rs
rename to tooling/cli/templates/app/src-tauri/src/main.rs
diff --git a/tooling/cli.rs/templates/app/src-tauri/tauri.conf.json b/tooling/cli/templates/app/src-tauri/tauri.conf.json
similarity index 100%
rename from tooling/cli.rs/templates/app/src-tauri/tauri.conf.json
rename to tooling/cli/templates/app/src-tauri/tauri.conf.json
diff --git a/tooling/cli.rs/templates/plugin/backend/.changes/config.json b/tooling/cli/templates/plugin/backend/.changes/config.json
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/.changes/config.json
rename to tooling/cli/templates/plugin/backend/.changes/config.json
diff --git a/tooling/cli.rs/templates/plugin/backend/.changes/initial-release.md b/tooling/cli/templates/plugin/backend/.changes/initial-release.md
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/.changes/initial-release.md
rename to tooling/cli/templates/plugin/backend/.changes/initial-release.md
diff --git a/tooling/cli.rs/templates/plugin/backend/.changes/readme.md b/tooling/cli/templates/plugin/backend/.changes/readme.md
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/.changes/readme.md
rename to tooling/cli/templates/plugin/backend/.changes/readme.md
diff --git a/tooling/cli.rs/templates/plugin/backend/.github/workflows/audit.yml b/tooling/cli/templates/plugin/backend/.github/workflows/audit.yml
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/.github/workflows/audit.yml
rename to tooling/cli/templates/plugin/backend/.github/workflows/audit.yml
diff --git a/tooling/cli.rs/templates/plugin/backend/.github/workflows/covector-status.yml b/tooling/cli/templates/plugin/backend/.github/workflows/covector-status.yml
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/.github/workflows/covector-status.yml
rename to tooling/cli/templates/plugin/backend/.github/workflows/covector-status.yml
diff --git a/tooling/cli.rs/templates/plugin/backend/.github/workflows/covector-version-or-publish.yml b/tooling/cli/templates/plugin/backend/.github/workflows/covector-version-or-publish.yml
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/.github/workflows/covector-version-or-publish.yml
rename to tooling/cli/templates/plugin/backend/.github/workflows/covector-version-or-publish.yml
diff --git a/tooling/cli.rs/templates/plugin/backend/.github/workflows/format.yml b/tooling/cli/templates/plugin/backend/.github/workflows/format.yml
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/.github/workflows/format.yml
rename to tooling/cli/templates/plugin/backend/.github/workflows/format.yml
diff --git a/tooling/cli.rs/templates/plugin/backend/.github/workflows/lint.yml b/tooling/cli/templates/plugin/backend/.github/workflows/lint.yml
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/.github/workflows/lint.yml
rename to tooling/cli/templates/plugin/backend/.github/workflows/lint.yml
diff --git a/tooling/cli.rs/templates/plugin/backend/.github/workflows/test.yml b/tooling/cli/templates/plugin/backend/.github/workflows/test.yml
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/.github/workflows/test.yml
rename to tooling/cli/templates/plugin/backend/.github/workflows/test.yml
diff --git a/tooling/cli.rs/templates/plugin/backend/.gitignore b/tooling/cli/templates/plugin/backend/.gitignore
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/.gitignore
rename to tooling/cli/templates/plugin/backend/.gitignore
diff --git a/tooling/cli.rs/templates/plugin/backend/.license_template b/tooling/cli/templates/plugin/backend/.license_template
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/.license_template
rename to tooling/cli/templates/plugin/backend/.license_template
diff --git a/tooling/cli.rs/templates/plugin/backend/Cargo.crate-manifest b/tooling/cli/templates/plugin/backend/Cargo.crate-manifest
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/Cargo.crate-manifest
rename to tooling/cli/templates/plugin/backend/Cargo.crate-manifest
diff --git a/tooling/cli.rs/templates/plugin/backend/README.md b/tooling/cli/templates/plugin/backend/README.md
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/README.md
rename to tooling/cli/templates/plugin/backend/README.md
diff --git a/tooling/cli.rs/templates/plugin/backend/examples/vanilla/.gitignore b/tooling/cli/templates/plugin/backend/examples/vanilla/.gitignore
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/examples/vanilla/.gitignore
rename to tooling/cli/templates/plugin/backend/examples/vanilla/.gitignore
diff --git a/tooling/cli.rs/templates/plugin/backend/examples/vanilla/package.json b/tooling/cli/templates/plugin/backend/examples/vanilla/package.json
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/examples/vanilla/package.json
rename to tooling/cli/templates/plugin/backend/examples/vanilla/package.json
diff --git a/tooling/cli.rs/templates/plugin/backend/examples/vanilla/public/index.html b/tooling/cli/templates/plugin/backend/examples/vanilla/public/index.html
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/examples/vanilla/public/index.html
rename to tooling/cli/templates/plugin/backend/examples/vanilla/public/index.html
diff --git a/tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/.gitignore b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/.gitignore
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/.gitignore
rename to tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/.gitignore
diff --git a/tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/Cargo.crate-manifest b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/Cargo.crate-manifest
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/Cargo.crate-manifest
rename to tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/Cargo.crate-manifest
diff --git a/tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/build.rs b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/build.rs
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/build.rs
rename to tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/build.rs
diff --git a/tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/icons/128x128.png b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/128x128.png
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/icons/128x128.png
rename to tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/128x128.png
diff --git a/tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/icons/128x128@2x.png b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/128x128@2x.png
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/icons/128x128@2x.png
rename to tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/128x128@2x.png
diff --git a/tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/icons/32x32.png b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/32x32.png
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/icons/32x32.png
rename to tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/32x32.png
diff --git a/tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.icns b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.icns
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.icns
rename to tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.icns
diff --git a/tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.ico b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.ico
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.ico
rename to tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.ico
diff --git a/tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.png b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.png
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.png
rename to tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/icons/icon.png
diff --git a/tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/rustfmt.toml b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/rustfmt.toml
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/rustfmt.toml
rename to tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/rustfmt.toml
diff --git a/tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/src/main.rs b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/src/main.rs
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/src/main.rs
rename to tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/src/main.rs
diff --git a/tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/tauri.conf.json b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/tauri.conf.json
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/examples/vanilla/src-tauri/tauri.conf.json
rename to tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/tauri.conf.json
diff --git a/tooling/cli.rs/templates/plugin/backend/src/lib.rs b/tooling/cli/templates/plugin/backend/src/lib.rs
similarity index 100%
rename from tooling/cli.rs/templates/plugin/backend/src/lib.rs
rename to tooling/cli/templates/plugin/backend/src/lib.rs
diff --git a/tooling/cli.rs/templates/plugin/with-api/.changes/config.json b/tooling/cli/templates/plugin/with-api/.changes/config.json
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/.changes/config.json
rename to tooling/cli/templates/plugin/with-api/.changes/config.json
diff --git a/tooling/cli.rs/templates/plugin/with-api/.changes/initial-release.md b/tooling/cli/templates/plugin/with-api/.changes/initial-release.md
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/.changes/initial-release.md
rename to tooling/cli/templates/plugin/with-api/.changes/initial-release.md
diff --git a/tooling/cli.rs/templates/plugin/with-api/.changes/readme.md b/tooling/cli/templates/plugin/with-api/.changes/readme.md
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/.changes/readme.md
rename to tooling/cli/templates/plugin/with-api/.changes/readme.md
diff --git a/tooling/cli.rs/templates/plugin/with-api/.github/workflows/audit.yml b/tooling/cli/templates/plugin/with-api/.github/workflows/audit.yml
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/.github/workflows/audit.yml
rename to tooling/cli/templates/plugin/with-api/.github/workflows/audit.yml
diff --git a/tooling/cli.rs/templates/plugin/with-api/.github/workflows/clippy.yml b/tooling/cli/templates/plugin/with-api/.github/workflows/clippy.yml
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/.github/workflows/clippy.yml
rename to tooling/cli/templates/plugin/with-api/.github/workflows/clippy.yml
diff --git a/tooling/cli.rs/templates/plugin/with-api/.github/workflows/covector-version-or-publish.yml b/tooling/cli/templates/plugin/with-api/.github/workflows/covector-version-or-publish.yml
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/.github/workflows/covector-version-or-publish.yml
rename to tooling/cli/templates/plugin/with-api/.github/workflows/covector-version-or-publish.yml
diff --git a/tooling/cli.rs/templates/plugin/with-api/.github/workflows/format.yml b/tooling/cli/templates/plugin/with-api/.github/workflows/format.yml
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/.github/workflows/format.yml
rename to tooling/cli/templates/plugin/with-api/.github/workflows/format.yml
diff --git a/tooling/cli.rs/templates/plugin/with-api/.github/workflows/test.yml b/tooling/cli/templates/plugin/with-api/.github/workflows/test.yml
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/.github/workflows/test.yml
rename to tooling/cli/templates/plugin/with-api/.github/workflows/test.yml
diff --git a/tooling/cli.rs/templates/plugin/with-api/.gitignore b/tooling/cli/templates/plugin/with-api/.gitignore
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/.gitignore
rename to tooling/cli/templates/plugin/with-api/.gitignore
diff --git a/tooling/cli.rs/templates/plugin/with-api/.license_template b/tooling/cli/templates/plugin/with-api/.license_template
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/.license_template
rename to tooling/cli/templates/plugin/with-api/.license_template
diff --git a/tooling/cli.rs/templates/plugin/with-api/Cargo.crate-manifest b/tooling/cli/templates/plugin/with-api/Cargo.crate-manifest
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/Cargo.crate-manifest
rename to tooling/cli/templates/plugin/with-api/Cargo.crate-manifest
diff --git a/tooling/cli.rs/templates/plugin/with-api/README.md b/tooling/cli/templates/plugin/with-api/README.md
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/README.md
rename to tooling/cli/templates/plugin/with-api/README.md
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/.gitignore b/tooling/cli/templates/plugin/with-api/examples/svelte-app/.gitignore
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/.gitignore
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/.gitignore
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/package.json b/tooling/cli/templates/plugin/with-api/examples/svelte-app/package.json
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/package.json
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/package.json
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/public/favicon.png b/tooling/cli/templates/plugin/with-api/examples/svelte-app/public/favicon.png
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/public/favicon.png
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/public/favicon.png
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/public/global.css b/tooling/cli/templates/plugin/with-api/examples/svelte-app/public/global.css
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/public/global.css
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/public/global.css
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/public/index.html b/tooling/cli/templates/plugin/with-api/examples/svelte-app/public/index.html
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/public/index.html
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/public/index.html
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/rollup.config.js b/tooling/cli/templates/plugin/with-api/examples/svelte-app/rollup.config.js
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/rollup.config.js
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/rollup.config.js
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/.gitignore b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/.gitignore
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/.gitignore
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/.gitignore
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/Cargo.crate-manifest b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/Cargo.crate-manifest
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/Cargo.crate-manifest
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/Cargo.crate-manifest
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/build.rs b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/build.rs
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/build.rs
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/build.rs
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/128x128.png b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/128x128.png
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/128x128.png
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/128x128.png
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/128x128@2x.png b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/128x128@2x.png
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/128x128@2x.png
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/128x128@2x.png
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/32x32.png b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/32x32.png
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/32x32.png
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/32x32.png
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.icns b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.icns
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.icns
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.icns
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.ico b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.ico
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.ico
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.ico
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.png b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.png
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.png
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/icons/icon.png
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/rustfmt.toml b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/rustfmt.toml
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/rustfmt.toml
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/rustfmt.toml
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/src/main.rs b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/src/main.rs
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/src/main.rs
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/src/main.rs
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/tauri.conf.json b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/tauri.conf.json
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src-tauri/tauri.conf.json
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/tauri.conf.json
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src/App.svelte b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src/App.svelte
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src/App.svelte
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/src/App.svelte
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src/main.ts b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src/main.ts
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/src/main.ts
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/src/main.ts
diff --git a/tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/tsconfig.json b/tooling/cli/templates/plugin/with-api/examples/svelte-app/tsconfig.json
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/examples/svelte-app/tsconfig.json
rename to tooling/cli/templates/plugin/with-api/examples/svelte-app/tsconfig.json
diff --git a/tooling/cli.rs/templates/plugin/with-api/package.json b/tooling/cli/templates/plugin/with-api/package.json
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/package.json
rename to tooling/cli/templates/plugin/with-api/package.json
diff --git a/tooling/cli.rs/templates/plugin/with-api/src/lib.rs b/tooling/cli/templates/plugin/with-api/src/lib.rs
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/src/lib.rs
rename to tooling/cli/templates/plugin/with-api/src/lib.rs
diff --git a/tooling/cli.rs/templates/plugin/with-api/webview-dist/index.d.ts b/tooling/cli/templates/plugin/with-api/webview-dist/index.d.ts
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/webview-dist/index.d.ts
rename to tooling/cli/templates/plugin/with-api/webview-dist/index.d.ts
diff --git a/tooling/cli.rs/templates/plugin/with-api/webview-dist/index.js b/tooling/cli/templates/plugin/with-api/webview-dist/index.js
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/webview-dist/index.js
rename to tooling/cli/templates/plugin/with-api/webview-dist/index.js
diff --git a/tooling/cli.rs/templates/plugin/with-api/webview-src/.gitignore b/tooling/cli/templates/plugin/with-api/webview-src/.gitignore
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/webview-src/.gitignore
rename to tooling/cli/templates/plugin/with-api/webview-src/.gitignore
diff --git a/tooling/cli.rs/templates/plugin/with-api/webview-src/index.ts b/tooling/cli/templates/plugin/with-api/webview-src/index.ts
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/webview-src/index.ts
rename to tooling/cli/templates/plugin/with-api/webview-src/index.ts
diff --git a/tooling/cli.rs/templates/plugin/with-api/webview-src/rollup.config.js b/tooling/cli/templates/plugin/with-api/webview-src/rollup.config.js
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/webview-src/rollup.config.js
rename to tooling/cli/templates/plugin/with-api/webview-src/rollup.config.js
diff --git a/tooling/cli.rs/templates/plugin/with-api/webview-src/tsconfig.json b/tooling/cli/templates/plugin/with-api/webview-src/tsconfig.json
similarity index 100%
rename from tooling/cli.rs/templates/plugin/with-api/webview-src/tsconfig.json
rename to tooling/cli/templates/plugin/with-api/webview-src/tsconfig.json
diff --git a/tooling/cli.rs/vswhere.exe b/tooling/cli/vswhere.exe
similarity index 100%
rename from tooling/cli.rs/vswhere.exe
rename to tooling/cli/vswhere.exe