diff --git a/.changes/config.json b/.changes/config.json
index 9a9f48262..c6e2c8e19 100644
--- a/.changes/config.json
+++ b/.changes/config.json
@@ -170,25 +170,33 @@
       ]
     },
     "tauri-utils": {
-      "path": "./tauri-utils",
+      "path": "./core/tauri-utils",
       "manager": "rust"
     },
     "tauri-api": {
-      "path": "./tauri-api",
+      "path": "./core/tauri-api",
       "manager": "rust",
       "dependencies": ["tauri-utils"]
     },
     "tauri-macros": {
-      "path": "./tauri-macros",
+      "path": "./core/tauri-macros",
       "manager": "rust",
       "dependencies": ["tauri-utils"]
     },
     "tauri-updater": {
-      "path": "./tauri-updater",
+      "path": "./core/tauri-updater",
+      "manager": "rust"
+    },
+    "tauri-build": {
+      "path": "./core/tauri-build",
+      "manager": "rust"
+    },
+    "tauri-codegen": {
+      "path": "./core/tauri-codegen",
       "manager": "rust"
     },
     "tauri": {
-      "path": "./tauri",
+      "path": "./core/tauri",
       "manager": "rust",
       "dependencies": ["api", "tauri-api", "tauri-macros", "tauri-updater"]
     }
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 90c6735d6..6d8ac0a74 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -53,12 +53,12 @@ Some Tauri packages will be automatically built when running one of the examples
 ### Packages Overview
 
 - The JS API (`/api`) contains JS bindings to the builtin Rust functions in the Rust API.
-- The Rust API (`/tauri-api`) contains the Rust functions used by the JS API.
+- The Rust API (`/core/tauri-api`) contains the Rust functions used by the JS API.
 - Tauri.js (`/cli/tauri.js`) is the primary CLI for creating and developing Tauri apps.
 - The Rust CLI (`/cli/core`) is a new version of the CLI that will replace Tauri.js, but now it only supports build and dev commands. Tauri.js will automatically use the Rust CLI for these commands.
 - Tauri Bundler (`/cli/tauri-bundler`) is used by the Rust CLI to package executables into installers.
-- Tauri 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 (`/tauri-macros`) are used by Tauri Core for various functions.
+- 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 (Tauri.js)
 
@@ -79,7 +79,7 @@ The code for the bundler is located in `[Tauri repo root]/cli/tauri-bundler`, an
 
 ### Developing Tauri Core and Related Components (Rust API, Macros, and Utils)
 
-The code for Tauri Core is located in `[Tauri repo root]/tauri`, and the Rust API, Macros, and Utils are in `[Tauri repo root]/tauri-(api/macros/utils)`. The easiest way to test your changes is to use the `[Tauri repo root]/examples/helloworld` app. It automatically rebuilds and uses your local copy of the Tauri core packages. Just run `yarn tauri build` or `yarn tauri dev` in the helloworld app directory after making changes to test them out. To use your local changes in another project, edit its `src-tauri/Cargo.toml` file so that the `tauri` key looks like `tauri = { path = "PATH", features = [ "api-all", "cli" ] }`, where `PATH` is the relative path to `[Tauri repo root]/tauri`. Then, your local copy of the Tauri core packages will be rebuilt and used whenever you build that project.
+The code for Tauri Core is located in `[Tauri repo root]/core/tauri`, and the Rust API, Macros, and Utils are in `[Tauri repo root]/core/tauri-(api/macros/utils)`. The easiest way to test your changes is to use the `[Tauri repo root]/examples/helloworld` app. It automatically rebuilds and uses your local copy of the Tauri core packages. Just run `yarn tauri build` or `yarn tauri dev` in the helloworld app directory after making changes to test them out. To use your local changes in another project, edit its `src-tauri/Cargo.toml` file so that the `tauri` key looks like `tauri = { path = "PATH", features = [ "api-all", "cli" ] }`, where `PATH` is the relative path to `[Tauri repo root]/core/tauri`. Then, your local copy of the Tauri core packages will be rebuilt and used whenever you build that project.
 
 ### Developing the JS API
 
diff --git a/.github/workflows/artifacts-updater.yml b/.github/workflows/artifacts-updater.yml
index 1ca19d88a..90612c57c 100644
--- a/.github/workflows/artifacts-updater.yml
+++ b/.github/workflows/artifacts-updater.yml
@@ -3,8 +3,8 @@ on:
   pull_request:
     paths:
       - '.github/workflows/artifacts-updater.yml'
-      - 'tauri/**'
-      - 'tauri-updater/**'
+      - 'core/tauri/**'
+      - 'core/tauri-updater/**'
       - 'cli/core/**'
       - 'cli/tauri-bundler/**'
       - 'examples/updater/**'
diff --git a/.github/workflows/core-lint-fmt.yml b/.github/workflows/core-lint-fmt.yml
index 72bc8663a..25670a6ed 100644
--- a/.github/workflows/core-lint-fmt.yml
+++ b/.github/workflows/core-lint-fmt.yml
@@ -6,11 +6,6 @@ on:
       - '.github/workflows/core-lint-fmt.yml'
       - 'core/**'
       - 'examples/**'
-      - 'tauri/**'
-      - 'tauri-utils/**'
-      - 'tauri-api/**'
-      - 'tauri-macros/**'
-      - 'tauri-updater/**'
       - 'cli/core/**'
 
 jobs:
@@ -78,5 +73,5 @@ jobs:
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --manifest-path ./tauri/Cargo.toml --all-targets --features ${{ matrix.feature }} -- -D warnings
+          args: --manifest-path ./core/tauri/Cargo.toml --all-targets --features ${{ matrix.feature }} -- -D warnings
           name: core
diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml
index 09a02fee7..6b755bb8d 100644
--- a/.github/workflows/covector-version-or-publish.yml
+++ b/.github/workflows/covector-version-or-publish.yml
@@ -68,7 +68,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y webkit2gtk-4.0
       - name: generate rust docs
-        working-directory: tauri
+        working-directory: core/tauri
         run: cargo doc --no-deps
       - name: run rustdocusaurus
         uses: tauri-apps/rustdocusaurus/github-action@v1
diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
index 69b06a7fc..4caa65a14 100644
--- a/.github/workflows/test-core.yml
+++ b/.github/workflows/test-core.yml
@@ -6,11 +6,6 @@ on:
       - '.github/workflows/test-core.yml'
       - 'core/**'
       - 'examples/**'
-      - 'tauri/**'
-      - 'tauri-utils/**'
-      - 'tauri-api/**'
-      - 'tauri-macros/**'
-      - 'tauri-updater/**'
       - 'cli/**'
 
 env:
@@ -36,10 +31,6 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y webkit2gtk-4.0
-      - name: build
-        run: |
-          cd ./tauri
-          cargo build
       - name: test
         run: |
           cargo test
@@ -93,4 +84,3 @@ jobs:
         timeout-minutes: 15
         working-directory: cli/tauri.js
         run: yarn build-release
-        
diff --git a/.github/workflows/udeps.yml b/.github/workflows/udeps.yml
index 763b313ce..b4e732c90 100644
--- a/.github/workflows/udeps.yml
+++ b/.github/workflows/udeps.yml
@@ -5,11 +5,6 @@ on:
     paths:
       - '.github/workflows/udeps.yml'
       - 'core/**'
-      - 'tauri/**'
-      - 'tauri-utils/**'
-      - 'tauri-api/**'
-      - 'tauri-macros/**'
-      - 'tauri-updater/**'
       - 'cli/tauri-bundler/**'
       - 'cli/core/**'
 
diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml
index 4d858926f..bd1c21ad8 100644
--- a/.github/workflows/update-docs.yml
+++ b/.github/workflows/update-docs.yml
@@ -30,7 +30,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y webkit2gtk-4.0
       - name: generate rust docs
-        working-directory: tauri
+        working-directory: core/tauri
         run: cargo doc --no-deps
       - name: run rustdocusaurus
         uses: tauri-apps/rustdocusaurus/github-action@v1
diff --git a/Cargo.toml b/Cargo.toml
index d95bd64b0..68bf4f2e1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,11 +1,10 @@
 [workspace]
 members = [
-  "tauri",
-  "tauri-api",
-  "tauri-macros",
-  "tauri-utils",
-
   # core
+  "core/tauri",
+  "core/tauri-api",
+  "core/tauri-macros",
+  "core/tauri-utils",
   "core/tauri-build",
   "core/tauri-codegen",
 
diff --git a/cli/core/src/init.rs b/cli/core/src/init.rs
index f20267cae..d3b1fd9cc 100644
--- a/cli/core/src/init.rs
+++ b/cli/core/src/init.rs
@@ -99,7 +99,7 @@ impl Init {
         (
           format!(
             "{{  path = {:?} }}",
-            resolve_tauri_path(&tauri_path, "tauri")
+            resolve_tauri_path(&tauri_path, "core/tauri")
           ),
           format!(
             "{{  path = {:?} }}",
@@ -108,7 +108,7 @@ impl Init {
         )
       } else {
         let tauri_manifest: Manifest =
-          toml::from_str(include_str!("../../../tauri/Cargo.toml")).unwrap();
+          toml::from_str(include_str!("../../../core/tauri/Cargo.toml")).unwrap();
         let tauri_build_manifest: Manifest =
           toml::from_str(include_str!("../../../core/tauri-build/Cargo.toml")).unwrap();
         (
diff --git a/cli/tauri.js/test/jest/fixtures/app/src-tauri/Cargo.toml b/cli/tauri.js/test/jest/fixtures/app/src-tauri/Cargo.toml
index 38480fc6c..e2d8bfdbc 100644
--- a/cli/tauri.js/test/jest/fixtures/app/src-tauri/Cargo.toml
+++ b/cli/tauri.js/test/jest/fixtures/app/src-tauri/Cargo.toml
@@ -24,7 +24,7 @@ icon = [
 serde_json = "1.0.64"
 serde = "1.0"
 serde_derive = "1.0"
-tauri = { path = "../../../../../../../tauri", features =["api-all"]}
+tauri = { path = "../../../../../../../core/tauri", features =["api-all"]}
 
 [features]
 custom-protocol = [ "tauri/custom-protocol" ]
diff --git a/clippy.toml b/clippy.toml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tauri-api/.scripts/loop_qc.sh b/core/tauri-api/.scripts/loop_qc.sh
similarity index 100%
rename from tauri-api/.scripts/loop_qc.sh
rename to core/tauri-api/.scripts/loop_qc.sh
diff --git a/tauri-api/CHANGELOG.md b/core/tauri-api/CHANGELOG.md
similarity index 100%
rename from tauri-api/CHANGELOG.md
rename to core/tauri-api/CHANGELOG.md
diff --git a/tauri-api/Cargo.toml b/core/tauri-api/Cargo.toml
similarity index 100%
rename from tauri-api/Cargo.toml
rename to core/tauri-api/Cargo.toml
diff --git a/tauri-api/src/app.rs b/core/tauri-api/src/app.rs
similarity index 100%
rename from tauri-api/src/app.rs
rename to core/tauri-api/src/app.rs
diff --git a/tauri-api/src/cli.rs b/core/tauri-api/src/cli.rs
similarity index 100%
rename from tauri-api/src/cli.rs
rename to core/tauri-api/src/cli.rs
diff --git a/tauri-api/src/cli/macros.rs b/core/tauri-api/src/cli/macros.rs
similarity index 100%
rename from tauri-api/src/cli/macros.rs
rename to core/tauri-api/src/cli/macros.rs
diff --git a/tauri-api/src/command.rs b/core/tauri-api/src/command.rs
similarity index 100%
rename from tauri-api/src/command.rs
rename to core/tauri-api/src/command.rs
diff --git a/tauri-api/src/dialog.rs b/core/tauri-api/src/dialog.rs
similarity index 100%
rename from tauri-api/src/dialog.rs
rename to core/tauri-api/src/dialog.rs
diff --git a/tauri-api/src/dir.rs b/core/tauri-api/src/dir.rs
similarity index 100%
rename from tauri-api/src/dir.rs
rename to core/tauri-api/src/dir.rs
diff --git a/tauri-api/src/error.rs b/core/tauri-api/src/error.rs
similarity index 100%
rename from tauri-api/src/error.rs
rename to core/tauri-api/src/error.rs
diff --git a/tauri-api/src/file.rs b/core/tauri-api/src/file.rs
similarity index 100%
rename from tauri-api/src/file.rs
rename to core/tauri-api/src/file.rs
diff --git a/tauri-api/src/file/extract.rs b/core/tauri-api/src/file/extract.rs
similarity index 100%
rename from tauri-api/src/file/extract.rs
rename to core/tauri-api/src/file/extract.rs
diff --git a/tauri-api/src/file/file_move.rs b/core/tauri-api/src/file/file_move.rs
similarity index 100%
rename from tauri-api/src/file/file_move.rs
rename to core/tauri-api/src/file/file_move.rs
diff --git a/tauri-api/src/http.rs b/core/tauri-api/src/http.rs
similarity index 100%
rename from tauri-api/src/http.rs
rename to core/tauri-api/src/http.rs
diff --git a/tauri-api/src/lib.rs b/core/tauri-api/src/lib.rs
similarity index 100%
rename from tauri-api/src/lib.rs
rename to core/tauri-api/src/lib.rs
diff --git a/tauri-api/src/notification.rs b/core/tauri-api/src/notification.rs
similarity index 100%
rename from tauri-api/src/notification.rs
rename to core/tauri-api/src/notification.rs
diff --git a/tauri-api/src/path.rs b/core/tauri-api/src/path.rs
similarity index 100%
rename from tauri-api/src/path.rs
rename to core/tauri-api/src/path.rs
diff --git a/tauri-api/src/rpc.rs b/core/tauri-api/src/rpc.rs
similarity index 100%
rename from tauri-api/src/rpc.rs
rename to core/tauri-api/src/rpc.rs
diff --git a/tauri-api/src/shell.rs b/core/tauri-api/src/shell.rs
similarity index 100%
rename from tauri-api/src/shell.rs
rename to core/tauri-api/src/shell.rs
diff --git a/tauri-api/src/shortcuts.rs b/core/tauri-api/src/shortcuts.rs
similarity index 100%
rename from tauri-api/src/shortcuts.rs
rename to core/tauri-api/src/shortcuts.rs
diff --git a/tauri-api/src/tcp.rs b/core/tauri-api/src/tcp.rs
similarity index 100%
rename from tauri-api/src/tcp.rs
rename to core/tauri-api/src/tcp.rs
diff --git a/tauri-api/src/version.rs b/core/tauri-api/src/version.rs
similarity index 100%
rename from tauri-api/src/version.rs
rename to core/tauri-api/src/version.rs
diff --git a/tauri-api/test/test.txt b/core/tauri-api/test/test.txt
similarity index 100%
rename from tauri-api/test/test.txt
rename to core/tauri-api/test/test.txt
diff --git a/tauri-api/test/test_binary b/core/tauri-api/test/test_binary
similarity index 100%
rename from tauri-api/test/test_binary
rename to core/tauri-api/test/test_binary
diff --git a/core/tauri-codegen/Cargo.toml b/core/tauri-codegen/Cargo.toml
index 4c288e940..6dedad9d8 100644
--- a/core/tauri-codegen/Cargo.toml
+++ b/core/tauri-codegen/Cargo.toml
@@ -15,7 +15,7 @@ proc-macro2 = "1"
 quote = "1"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-tauri-api = { path = "../../tauri-api", features = ["build"] }
+tauri-api = { path = "../tauri-api", features = ["build"] }
 thiserror = "1"
 walkdir = "2"
 zstd = "0.7"
diff --git a/tauri-macros/Cargo.toml b/core/tauri-macros/Cargo.toml
similarity index 89%
rename from tauri-macros/Cargo.toml
rename to core/tauri-macros/Cargo.toml
index 07fee1fbf..e4de8f0b1 100644
--- a/tauri-macros/Cargo.toml
+++ b/core/tauri-macros/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 proc-macro2 = "1"
 quote = "1"
 syn = { version = "1", features = [ "full" ] }
-tauri-codegen = { path = "../core/tauri-codegen" }
+tauri-codegen = { path = "../tauri-codegen" }
 
 [features]
 custom-protocol = []
diff --git a/tauri-macros/src/command.rs b/core/tauri-macros/src/command.rs
similarity index 100%
rename from tauri-macros/src/command.rs
rename to core/tauri-macros/src/command.rs
diff --git a/tauri-macros/src/context/mod.rs b/core/tauri-macros/src/context/mod.rs
similarity index 100%
rename from tauri-macros/src/context/mod.rs
rename to core/tauri-macros/src/context/mod.rs
diff --git a/tauri-macros/src/lib.rs b/core/tauri-macros/src/lib.rs
similarity index 100%
rename from tauri-macros/src/lib.rs
rename to core/tauri-macros/src/lib.rs
diff --git a/tauri-updater/Cargo.toml b/core/tauri-updater/Cargo.toml
similarity index 100%
rename from tauri-updater/Cargo.toml
rename to core/tauri-updater/Cargo.toml
diff --git a/tauri-updater/README.md b/core/tauri-updater/README.md
similarity index 100%
rename from tauri-updater/README.md
rename to core/tauri-updater/README.md
diff --git a/tauri-updater/src/error.rs b/core/tauri-updater/src/error.rs
similarity index 100%
rename from tauri-updater/src/error.rs
rename to core/tauri-updater/src/error.rs
diff --git a/tauri-updater/src/lib.rs b/core/tauri-updater/src/lib.rs
similarity index 100%
rename from tauri-updater/src/lib.rs
rename to core/tauri-updater/src/lib.rs
diff --git a/tauri-updater/test/fixture/archives/archive.tar.gz b/core/tauri-updater/test/fixture/archives/archive.tar.gz
similarity index 100%
rename from tauri-updater/test/fixture/archives/archive.tar.gz
rename to core/tauri-updater/test/fixture/archives/archive.tar.gz
diff --git a/tauri-updater/test/fixture/archives/archive.tar.gz.badsig b/core/tauri-updater/test/fixture/archives/archive.tar.gz.badsig
similarity index 100%
rename from tauri-updater/test/fixture/archives/archive.tar.gz.badsig
rename to core/tauri-updater/test/fixture/archives/archive.tar.gz.badsig
diff --git a/tauri-updater/test/fixture/archives/archive.tar.gz.sig b/core/tauri-updater/test/fixture/archives/archive.tar.gz.sig
similarity index 100%
rename from tauri-updater/test/fixture/archives/archive.tar.gz.sig
rename to core/tauri-updater/test/fixture/archives/archive.tar.gz.sig
diff --git a/tauri-updater/test/fixture/archives/archive.zip b/core/tauri-updater/test/fixture/archives/archive.zip
similarity index 100%
rename from tauri-updater/test/fixture/archives/archive.zip
rename to core/tauri-updater/test/fixture/archives/archive.zip
diff --git a/tauri-updater/test/fixture/archives/archive.zip.sig b/core/tauri-updater/test/fixture/archives/archive.zip.sig
similarity index 100%
rename from tauri-updater/test/fixture/archives/archive.zip.sig
rename to core/tauri-updater/test/fixture/archives/archive.zip.sig
diff --git a/tauri-updater/test/fixture/bad_signature/update.key b/core/tauri-updater/test/fixture/bad_signature/update.key
similarity index 100%
rename from tauri-updater/test/fixture/bad_signature/update.key
rename to core/tauri-updater/test/fixture/bad_signature/update.key
diff --git a/tauri-updater/test/fixture/bad_signature/update.key.pub b/core/tauri-updater/test/fixture/bad_signature/update.key.pub
similarity index 100%
rename from tauri-updater/test/fixture/bad_signature/update.key.pub
rename to core/tauri-updater/test/fixture/bad_signature/update.key.pub
diff --git a/tauri-updater/test/fixture/good_signature/update.key b/core/tauri-updater/test/fixture/good_signature/update.key
similarity index 100%
rename from tauri-updater/test/fixture/good_signature/update.key
rename to core/tauri-updater/test/fixture/good_signature/update.key
diff --git a/tauri-updater/test/fixture/good_signature/update.key.pub b/core/tauri-updater/test/fixture/good_signature/update.key.pub
similarity index 100%
rename from tauri-updater/test/fixture/good_signature/update.key.pub
rename to core/tauri-updater/test/fixture/good_signature/update.key.pub
diff --git a/tauri-utils/Cargo.toml b/core/tauri-utils/Cargo.toml
similarity index 100%
rename from tauri-utils/Cargo.toml
rename to core/tauri-utils/Cargo.toml
diff --git a/tauri-utils/src/assets.rs b/core/tauri-utils/src/assets.rs
similarity index 100%
rename from tauri-utils/src/assets.rs
rename to core/tauri-utils/src/assets.rs
diff --git a/tauri-utils/src/config.rs b/core/tauri-utils/src/config.rs
similarity index 100%
rename from tauri-utils/src/config.rs
rename to core/tauri-utils/src/config.rs
diff --git a/tauri-utils/src/lib.rs b/core/tauri-utils/src/lib.rs
similarity index 100%
rename from tauri-utils/src/lib.rs
rename to core/tauri-utils/src/lib.rs
diff --git a/tauri-utils/src/platform.rs b/core/tauri-utils/src/platform.rs
similarity index 100%
rename from tauri-utils/src/platform.rs
rename to core/tauri-utils/src/platform.rs
diff --git a/tauri-utils/src/process.rs b/core/tauri-utils/src/process.rs
similarity index 100%
rename from tauri-utils/src/process.rs
rename to core/tauri-utils/src/process.rs
diff --git a/tauri/CHANGELOG.md b/core/tauri/CHANGELOG.md
similarity index 100%
rename from tauri/CHANGELOG.md
rename to core/tauri/CHANGELOG.md
diff --git a/tauri/Cargo.toml b/core/tauri/Cargo.toml
similarity index 100%
rename from tauri/Cargo.toml
rename to core/tauri/Cargo.toml
diff --git a/tauri/build.rs b/core/tauri/build.rs
similarity index 100%
rename from tauri/build.rs
rename to core/tauri/build.rs
diff --git a/tauri/scripts/bundle.js b/core/tauri/scripts/bundle.js
similarity index 100%
rename from tauri/scripts/bundle.js
rename to core/tauri/scripts/bundle.js
diff --git a/tauri/scripts/core.js b/core/tauri/scripts/core.js
similarity index 100%
rename from tauri/scripts/core.js
rename to core/tauri/scripts/core.js
diff --git a/tauri/src/endpoints.rs b/core/tauri/src/endpoints.rs
similarity index 100%
rename from tauri/src/endpoints.rs
rename to core/tauri/src/endpoints.rs
diff --git a/tauri/src/endpoints/app.rs b/core/tauri/src/endpoints/app.rs
similarity index 100%
rename from tauri/src/endpoints/app.rs
rename to core/tauri/src/endpoints/app.rs
diff --git a/tauri/src/endpoints/cli.rs b/core/tauri/src/endpoints/cli.rs
similarity index 100%
rename from tauri/src/endpoints/cli.rs
rename to core/tauri/src/endpoints/cli.rs
diff --git a/tauri/src/endpoints/dialog.rs b/core/tauri/src/endpoints/dialog.rs
similarity index 100%
rename from tauri/src/endpoints/dialog.rs
rename to core/tauri/src/endpoints/dialog.rs
diff --git a/tauri/src/endpoints/event.rs b/core/tauri/src/endpoints/event.rs
similarity index 100%
rename from tauri/src/endpoints/event.rs
rename to core/tauri/src/endpoints/event.rs
diff --git a/tauri/src/endpoints/file_system.rs b/core/tauri/src/endpoints/file_system.rs
similarity index 100%
rename from tauri/src/endpoints/file_system.rs
rename to core/tauri/src/endpoints/file_system.rs
diff --git a/tauri/src/endpoints/global_shortcut.rs b/core/tauri/src/endpoints/global_shortcut.rs
similarity index 100%
rename from tauri/src/endpoints/global_shortcut.rs
rename to core/tauri/src/endpoints/global_shortcut.rs
diff --git a/tauri/src/endpoints/http.rs b/core/tauri/src/endpoints/http.rs
similarity index 100%
rename from tauri/src/endpoints/http.rs
rename to core/tauri/src/endpoints/http.rs
diff --git a/tauri/src/endpoints/internal.rs b/core/tauri/src/endpoints/internal.rs
similarity index 100%
rename from tauri/src/endpoints/internal.rs
rename to core/tauri/src/endpoints/internal.rs
diff --git a/tauri/src/endpoints/notification.rs b/core/tauri/src/endpoints/notification.rs
similarity index 100%
rename from tauri/src/endpoints/notification.rs
rename to core/tauri/src/endpoints/notification.rs
diff --git a/tauri/src/endpoints/shell.rs b/core/tauri/src/endpoints/shell.rs
similarity index 100%
rename from tauri/src/endpoints/shell.rs
rename to core/tauri/src/endpoints/shell.rs
diff --git a/tauri/src/endpoints/window.rs b/core/tauri/src/endpoints/window.rs
similarity index 100%
rename from tauri/src/endpoints/window.rs
rename to core/tauri/src/endpoints/window.rs
diff --git a/tauri/src/error.rs b/core/tauri/src/error.rs
similarity index 100%
rename from tauri/src/error.rs
rename to core/tauri/src/error.rs
diff --git a/tauri/src/event.rs b/core/tauri/src/event.rs
similarity index 100%
rename from tauri/src/event.rs
rename to core/tauri/src/event.rs
diff --git a/tauri/src/hooks.rs b/core/tauri/src/hooks.rs
similarity index 100%
rename from tauri/src/hooks.rs
rename to core/tauri/src/hooks.rs
diff --git a/tauri/src/lib.rs b/core/tauri/src/lib.rs
similarity index 100%
rename from tauri/src/lib.rs
rename to core/tauri/src/lib.rs
diff --git a/tauri/src/plugin.rs b/core/tauri/src/plugin.rs
similarity index 100%
rename from tauri/src/plugin.rs
rename to core/tauri/src/plugin.rs
diff --git a/tauri/src/runtime/app.rs b/core/tauri/src/runtime/app.rs
similarity index 100%
rename from tauri/src/runtime/app.rs
rename to core/tauri/src/runtime/app.rs
diff --git a/tauri/src/runtime/flavor/mod.rs b/core/tauri/src/runtime/flavor/mod.rs
similarity index 100%
rename from tauri/src/runtime/flavor/mod.rs
rename to core/tauri/src/runtime/flavor/mod.rs
diff --git a/tauri/src/runtime/flavor/wry.rs b/core/tauri/src/runtime/flavor/wry.rs
similarity index 100%
rename from tauri/src/runtime/flavor/wry.rs
rename to core/tauri/src/runtime/flavor/wry.rs
diff --git a/tauri/src/runtime/manager.rs b/core/tauri/src/runtime/manager.rs
similarity index 100%
rename from tauri/src/runtime/manager.rs
rename to core/tauri/src/runtime/manager.rs
diff --git a/tauri/src/runtime/mod.rs b/core/tauri/src/runtime/mod.rs
similarity index 100%
rename from tauri/src/runtime/mod.rs
rename to core/tauri/src/runtime/mod.rs
diff --git a/tauri/src/runtime/tag.rs b/core/tauri/src/runtime/tag.rs
similarity index 100%
rename from tauri/src/runtime/tag.rs
rename to core/tauri/src/runtime/tag.rs
diff --git a/tauri/src/runtime/updater.rs b/core/tauri/src/runtime/updater.rs
similarity index 100%
rename from tauri/src/runtime/updater.rs
rename to core/tauri/src/runtime/updater.rs
diff --git a/tauri/src/runtime/webview.rs b/core/tauri/src/runtime/webview.rs
similarity index 100%
rename from tauri/src/runtime/webview.rs
rename to core/tauri/src/runtime/webview.rs
diff --git a/tauri/src/runtime/window.rs b/core/tauri/src/runtime/window.rs
similarity index 100%
rename from tauri/src/runtime/window.rs
rename to core/tauri/src/runtime/window.rs
diff --git a/tauri/src/settings.rs b/core/tauri/src/settings.rs
similarity index 100%
rename from tauri/src/settings.rs
rename to core/tauri/src/settings.rs
diff --git a/tauri/test/fixture/config.json b/core/tauri/test/fixture/config.json
similarity index 100%
rename from tauri/test/fixture/config.json
rename to core/tauri/test/fixture/config.json
diff --git a/tauri/test/fixture/dist/index.html b/core/tauri/test/fixture/dist/index.html
similarity index 100%
rename from tauri/test/fixture/dist/index.html
rename to core/tauri/test/fixture/dist/index.html
diff --git a/tauri/test/fixture/src-tauri/icons/icon.ico b/core/tauri/test/fixture/src-tauri/icons/icon.ico
similarity index 100%
rename from tauri/test/fixture/src-tauri/icons/icon.ico
rename to core/tauri/test/fixture/src-tauri/icons/icon.ico
diff --git a/tauri/test/fixture/src-tauri/tauri.conf.json b/core/tauri/test/fixture/src-tauri/tauri.conf.json
similarity index 100%
rename from tauri/test/fixture/src-tauri/tauri.conf.json
rename to core/tauri/test/fixture/src-tauri/tauri.conf.json
diff --git a/tauri/test/fixture/test.txt b/core/tauri/test/fixture/test.txt
similarity index 100%
rename from tauri/test/fixture/test.txt
rename to core/tauri/test/fixture/test.txt
diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml
index cdaffeea5..19e38a0f4 100644
--- a/examples/api/src-tauri/Cargo.toml
+++ b/examples/api/src-tauri/Cargo.toml
@@ -10,7 +10,7 @@ tauri-build = { path = "../../../core/tauri-build" }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = [ "derive" ] }
-tauri = { path = "../../../tauri", features =["api-all", "cli"]}
+tauri = { path = "../../../core/tauri", features =["api-all", "cli"]}
 
 [features]
 default = [ "custom-protocol" ]
diff --git a/examples/helloworld/src-tauri/Cargo.toml b/examples/helloworld/src-tauri/Cargo.toml
index 3f5a84390..a0288cb0c 100644
--- a/examples/helloworld/src-tauri/Cargo.toml
+++ b/examples/helloworld/src-tauri/Cargo.toml
@@ -10,7 +10,7 @@ tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ]}
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = [ "derive" ] }
-tauri = { path = "../../../tauri", features =["api-all"]}
+tauri = { path = "../../../core/tauri", features =["api-all"]}
 
 [features]
 default = [ "custom-protocol" ]
diff --git a/examples/multiwindow/src-tauri/Cargo.toml b/examples/multiwindow/src-tauri/Cargo.toml
index b5a3c83d9..1e42a40bd 100644
--- a/examples/multiwindow/src-tauri/Cargo.toml
+++ b/examples/multiwindow/src-tauri/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 tauri-build = { path = "../../../core/tauri-build" }
 
 [dependencies]
-tauri = { path = "../../../tauri", features =["api-all"]}
+tauri = { path = "../../../core/tauri", features =["api-all"]}
 
 [features]
 default = [ "custom-protocol" ]
diff --git a/examples/updater/src-tauri/Cargo.toml b/examples/updater/src-tauri/Cargo.toml
index d687e5561..30cb9ff76 100644
--- a/examples/updater/src-tauri/Cargo.toml
+++ b/examples/updater/src-tauri/Cargo.toml
@@ -10,7 +10,7 @@ tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ]}
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = [ "derive" ] }
-tauri = { path = "../../../tauri", features =["api-all"]}
+tauri = { path = "../../../core/tauri", features =["api-all"]}
 
 [features]
 default = [ "custom-protocol" ]
diff --git a/renovate.json b/renovate.json
index 9c11e3b87..dd07c7d26 100644
--- a/renovate.json
+++ b/renovate.json
@@ -14,7 +14,7 @@
     },
     {
       "enabled": true,
-      "paths": ["tauri/**"],
+      "paths": ["core/tauri/**"],
       "groupName": "Tauri Core",
       "groupSlug": "allTauriCore",
       "commitMessagePrefix": "chore(deps)",
@@ -25,7 +25,7 @@
     },
     {
       "enabled": true,
-      "paths": ["tauri-api/**"],
+      "paths": ["core/tauri-api/**"],
       "groupName": "Tauri API",
       "groupSlug": "allTauriAPI",
       "commitMessagePrefix": "chore(deps)",
@@ -34,6 +34,61 @@
       },
       "rebaseConflictedPrs": false
     },
+    {
+      "enabled": true,
+      "paths": ["core/tauri-build/**"],
+      "groupName": "Tauri Build",
+      "groupSlug": "allTauriBuild",
+      "commitMessagePrefix": "chore(deps)",
+      "lockFileMaintenance": {
+        "enabled": true
+      },
+      "rebaseConflictedPrs": false
+    },
+    {
+      "enabled": true,
+      "paths": ["core/tauri-codegen/**"],
+      "groupName": "Tauri Codegen",
+      "groupSlug": "allTauriCodegen",
+      "commitMessagePrefix": "chore(deps)",
+      "lockFileMaintenance": {
+        "enabled": true
+      },
+      "rebaseConflictedPrs": false
+    },
+    {
+      "enabled": true,
+      "paths": ["core/tauri-macros/**"],
+      "groupName": "Tauri Macros",
+      "groupSlug": "allTauriMacros",
+      "commitMessagePrefix": "chore(deps)",
+      "lockFileMaintenance": {
+        "enabled": true
+      },
+      "rebaseConflictedPrs": false
+    },
+    {
+      "enabled": true,
+      "paths": ["core/tauri-updater/**"],
+      "groupName": "Tauri Updater",
+      "groupSlug": "allTauriUpdater",
+      "commitMessagePrefix": "chore(deps)",
+      "lockFileMaintenance": {
+        "enabled": true
+      },
+      "rebaseConflictedPrs": false
+    },
+    {
+      "enabled": true,
+      "paths": ["core/tauri-utils/**"],
+      "groupName": "Tauri Utils",
+      "groupSlug": "allTauriUtils",
+      "commitMessagePrefix": "chore(deps)",
+      "lockFileMaintenance": {
+        "enabled": true
+      },
+      "rebaseConflictedPrs": false
+    },
     {
       "enabled": true,
       "paths": ["cli/core/**"],