diff --git a/.gitignore b/.gitignore
index f8eb38a..823cae9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ node_modules/
 dist/
 investigation/
 vaults/
-plugin/main.js
+packages/*/dist/
+packages/bridge-plugin/main.js
 server/plugins/*/plugin/main.js
 demo-vaults/
diff --git a/build.js b/build.js
index c0112e1..de86ef8 100644
--- a/build.js
+++ b/build.js
@@ -8,17 +8,8 @@ Promise.all([
   // Build ignis-ui.js (delegated to packages/ui)
   require("./packages/ui/build.js"),
 
-  // Build ignis-bridge plugin
-  esbuild.build({
-    entryPoints: [path.join(__dirname, "plugin", "src", "main.js")],
-    bundle: true,
-    outfile: path.join(__dirname, "plugin", "main.js"),
-    format: "cjs",
-    platform: "browser",
-    target: ["chrome90"],
-    external: ["obsidian", "fs"],
-    logLevel: "info",
-  }),
+  // Build ignis-bridge plugin (delegated to packages/bridge-plugin)
+  require("./packages/bridge-plugin/build.js"),
 
   // Build headless-sync bundled plugin
   esbuild.build({
diff --git a/packages/bridge-plugin/build.js b/packages/bridge-plugin/build.js
new file mode 100644
index 0000000..37f6a9d
--- /dev/null
+++ b/packages/bridge-plugin/build.js
@@ -0,0 +1,13 @@
+const esbuild = require("esbuild");
+const path = require("path");
+
+module.exports = esbuild.build({
+  entryPoints: [path.join(__dirname, "src", "main.js")],
+  bundle: true,
+  outfile: path.join(__dirname, "main.js"),
+  format: "cjs",
+  platform: "browser",
+  target: ["chrome90"],
+  external: ["obsidian", "fs"],
+  logLevel: "info",
+});
diff --git a/plugin/manifest.json b/packages/bridge-plugin/manifest.json
similarity index 100%
rename from plugin/manifest.json
rename to packages/bridge-plugin/manifest.json
diff --git a/packages/bridge-plugin/package.json b/packages/bridge-plugin/package.json
index 8ecbea9..2ff2478 100644
--- a/packages/bridge-plugin/package.json
+++ b/packages/bridge-plugin/package.json
@@ -1,5 +1,11 @@
 {
   "name": "@ignis/bridge-plugin",
   "version": "0.0.0-internal",
-  "private": true
+  "private": true,
+  "scripts": {
+    "build": "node build.js"
+  },
+  "devDependencies": {
+    "esbuild": "^0.20.0"
+  }
 }
diff --git a/plugin/src/demo-guards.js b/packages/bridge-plugin/src/demo-guards.js
similarity index 100%
rename from plugin/src/demo-guards.js
rename to packages/bridge-plugin/src/demo-guards.js
diff --git a/plugin/src/file-actions.js b/packages/bridge-plugin/src/file-actions.js
similarity index 100%
rename from plugin/src/file-actions.js
rename to packages/bridge-plugin/src/file-actions.js
diff --git a/plugin/src/main.js b/packages/bridge-plugin/src/main.js
similarity index 100%
rename from plugin/src/main.js
rename to packages/bridge-plugin/src/main.js
diff --git a/plugin/src/plugin-registry.js b/packages/bridge-plugin/src/plugin-registry.js
similarity index 100%
rename from plugin/src/plugin-registry.js
rename to packages/bridge-plugin/src/plugin-registry.js
diff --git a/plugin/src/settings/general-tab.js b/packages/bridge-plugin/src/settings/general-tab.js
similarity index 100%
rename from plugin/src/settings/general-tab.js
rename to packages/bridge-plugin/src/settings/general-tab.js
diff --git a/plugin/src/settings/inject.js b/packages/bridge-plugin/src/settings/inject.js
similarity index 100%
rename from plugin/src/settings/inject.js
rename to packages/bridge-plugin/src/settings/inject.js
diff --git a/plugin/src/settings/plugin-tabs.js b/packages/bridge-plugin/src/settings/plugin-tabs.js
similarity index 100%
rename from plugin/src/settings/plugin-tabs.js
rename to packages/bridge-plugin/src/settings/plugin-tabs.js
diff --git a/plugin/src/settings/server-plugins-tab.js b/packages/bridge-plugin/src/settings/server-plugins-tab.js
similarity index 100%
rename from plugin/src/settings/server-plugins-tab.js
rename to packages/bridge-plugin/src/settings/server-plugins-tab.js
diff --git a/plugin/src/settings/settings-ui.js b/packages/bridge-plugin/src/settings/settings-ui.js
similarity index 100%
rename from plugin/src/settings/settings-ui.js
rename to packages/bridge-plugin/src/settings/settings-ui.js
diff --git a/plugin/src/status-bar.js b/packages/bridge-plugin/src/status-bar.js
similarity index 100%
rename from plugin/src/status-bar.js
rename to packages/bridge-plugin/src/status-bar.js
diff --git a/plugin/src/workspace-picker.js b/packages/bridge-plugin/src/workspace-picker.js
similarity index 100%
rename from plugin/src/workspace-picker.js
rename to packages/bridge-plugin/src/workspace-picker.js
diff --git a/plugin/styles.css b/packages/bridge-plugin/styles.css
similarity index 100%
rename from plugin/styles.css
rename to packages/bridge-plugin/styles.css
diff --git a/server/bridge-plugin.js b/server/bridge-plugin.js
index 9543508..1202717 100644
--- a/server/bridge-plugin.js
+++ b/server/bridge-plugin.js
@@ -6,7 +6,7 @@ const {
 } = require("./plugin-system/obsidian-plugin");
 
 const BRIDGE_PLUGIN_ID = "ignis-bridge";
-const BRIDGE_PLUGIN_DIR = path.join(__dirname, "..", "plugin");
+const BRIDGE_PLUGIN_DIR = path.join(__dirname, "..", "packages", "bridge-plugin");
 
 // .ignis metadata helpers