diff --git a/bin/plug-compile.ts b/bin/plug-compile.ts
index bbbda613..15d44c6b 100755
--- a/bin/plug-compile.ts
+++ b/bin/plug-compile.ts
@@ -3,7 +3,7 @@ import { Command } from "@cliffy/command";
 
 import { version } from "../version.ts";
 
-import { plugCompileCommand } from "../lib/plugos/plug_compile.ts";
+import { plugCompileCommand } from "../client/plugos/plug_compile.ts";
 
 await new Command()
   .name("plug-compile")
diff --git a/build_client.ts b/build_client.ts
index 5ee1d033..e73d1377 100644
--- a/build_client.ts
+++ b/build_client.ts
@@ -3,7 +3,7 @@ import { fileURLToPath } from "node:url";
 
 import sass from "denosass";
 
-import { patchDenoLibJS } from "./lib/plugos/plug_compile.ts";
+import { patchDenoLibJS } from "./client/plugos/plug_compile.ts";
 import { denoPlugins } from "@luca/esbuild-deno-loader";
 import * as esbuild from "esbuild";
 
diff --git a/build_plugs_libraries.ts b/build_plugs_libraries.ts
index 4607d7cb..481108f3 100644
--- a/build_plugs_libraries.ts
+++ b/build_plugs_libraries.ts
@@ -1,6 +1,6 @@
 import * as path from "@std/path";
 import * as esbuild from "esbuild";
-import { compileManifests } from "./lib/plugos/plug_compile.ts";
+import { compileManifests } from "./client/plugos/plug_compile.ts";
 import { builtinPlugNames } from "./plugs/builtin_plugs.ts";
 import { parseArgs } from "@std/cli/parse-args";
 import { fileURLToPath } from "node:url";
diff --git a/lib/asset_bundle/builder.ts b/client/asset_bundle/builder.ts
similarity index 100%
rename from lib/asset_bundle/builder.ts
rename to client/asset_bundle/builder.ts
diff --git a/lib/asset_bundle/bundle.test.ts b/client/asset_bundle/bundle.test.ts
similarity index 100%
rename from lib/asset_bundle/bundle.test.ts
rename to client/asset_bundle/bundle.test.ts
diff --git a/lib/asset_bundle/bundle.ts b/client/asset_bundle/bundle.ts
similarity index 95%
rename from lib/asset_bundle/bundle.ts
rename to client/asset_bundle/bundle.ts
index a9705afc..35d4fa5b 100644
--- a/lib/asset_bundle/bundle.ts
+++ b/client/asset_bundle/bundle.ts
@@ -1,4 +1,7 @@
-import { base64Decode, base64EncodedDataUrl } from "../crypto.ts";
+import {
+  base64Decode,
+  base64EncodedDataUrl,
+} from "../../plug-api/lib/crypto.ts";
 
 type DataUrl = string;
 
diff --git a/client/boot.ts b/client/boot.ts
index b29b56c9..91f3b653 100644
--- a/client/boot.ts
+++ b/client/boot.ts
@@ -1,6 +1,9 @@
-import { safeRun } from "../lib/async.ts";
-import { notAuthenticatedError, offlineError } from "../lib/constants.ts";
-import { initLogger } from "../lib/logger.ts";
+import { safeRun } from "@silverbulletmd/silverbullet/lib/async";
+import {
+  notAuthenticatedError,
+  offlineError,
+} from "@silverbulletmd/silverbullet/constants";
+import { initLogger } from "./logger.ts";
 import { extractSpaceLuaFromPageText, loadConfig } from "./boot_config.ts";
 import { Client } from "./client.ts";
 import type { Config } from "./config.ts";
@@ -9,7 +12,7 @@ import {
 } from "./service_worker/util.ts";
 import "./polyfills.ts";
 import type { BootConfig } from "./ui_types.ts";
-import { BoxProxy } from "../lib/box_proxy.ts";
+import { BoxProxy } from "./box_proxy.ts";
 
 const logger = initLogger("[Client]");
 
diff --git a/client/boot_config.ts b/client/boot_config.ts
index 2bca3d64..95dcda5b 100644
--- a/client/boot_config.ts
+++ b/client/boot_config.ts
@@ -3,19 +3,19 @@ import {
   traverseTree,
 } from "@silverbulletmd/silverbullet/lib/tree";
 import { parseMarkdown } from "./markdown_parser/parser.ts";
-import { System } from "../lib/plugos/system.ts";
-import { configSyscalls } from "./syscalls/config.ts";
+import { System } from "./plugos/system.ts";
+import { configSyscalls } from "./plugos/syscalls/config.ts";
 import { Config } from "./config.ts";
-import { luaBuildStandardEnv } from "../lib/space_lua/stdlib.ts";
+import { luaBuildStandardEnv } from "./space_lua/stdlib.ts";
 import { exposeSyscalls } from "./space_lua_api.ts";
-import { parse } from "../lib/space_lua/parse.ts";
-import { LuaEnv, LuaStackFrame } from "../lib/space_lua/runtime.ts";
-import { evalStatement } from "../lib/space_lua/eval.ts";
-import { editorSyscalls } from "./syscalls/editor.ts";
-import { markdownSyscalls } from "./syscalls/markdown.ts";
-import { yamlSyscalls } from "./syscalls/yaml.ts";
-import { languageSyscalls } from "./syscalls/language.ts";
-import { jsonschemaSyscalls } from "./syscalls/jsonschema.ts";
+import { parse } from "./space_lua/parse.ts";
+import { LuaEnv, LuaStackFrame } from "./space_lua/runtime.ts";
+import { evalStatement } from "./space_lua/eval.ts";
+import { editorSyscalls } from "./plugos/syscalls/editor.ts";
+import { markdownSyscalls } from "./plugos/syscalls/markdown.ts";
+import { yamlSyscalls } from "./plugos/syscalls/yaml.ts";
+import { languageSyscalls } from "./plugos/syscalls/language.ts";
+import { jsonschemaSyscalls } from "./plugos/syscalls/jsonschema.ts";
 
 /**
  * Parses a page (CONFIG in practice) and extracts all space-lua code
diff --git a/lib/box_proxy.test.ts b/client/box_proxy.test.ts
similarity index 100%
rename from lib/box_proxy.test.ts
rename to client/box_proxy.test.ts
diff --git a/lib/box_proxy.ts b/client/box_proxy.ts
similarity index 100%
rename from lib/box_proxy.ts
rename to client/box_proxy.ts
diff --git a/client/client.ts b/client/client.ts
index 8efe4a4c..be4770d7 100644
--- a/client/client.ts
+++ b/client/client.ts
@@ -16,7 +16,7 @@ import type {
   FilterOption,
   SlashCompletions,
 } from "@silverbulletmd/silverbullet/type/client";
-import { EventHook } from "./hooks/event.ts";
+import { EventHook } from "./plugos/hooks/event.ts";
 import type { Command } from "./types/command.ts";
 import {
   type LocationState,
@@ -36,11 +36,11 @@ import type {
   PageCreatingEvent,
 } from "@silverbulletmd/silverbullet/type/event";
 import type { StyleObject } from "../plugs/index/style.ts";
-import { jitter, throttle } from "../lib/async.ts";
-import { PlugSpacePrimitives } from "../lib/spaces/plug_space_primitives.ts";
-import { EventedSpacePrimitives } from "../lib/spaces/evented_space_primitives.ts";
-import { simpleHash } from "../lib/crypto.ts";
-import { HttpSpacePrimitives } from "../lib/spaces/http_space_primitives.ts";
+import { jitter, throttle } from "@silverbulletmd/silverbullet/lib/async";
+import { PlugSpacePrimitives } from "./spaces/plug_space_primitives.ts";
+import { EventedSpacePrimitives } from "./spaces/evented_space_primitives.ts";
+import { simpleHash } from "@silverbulletmd/silverbullet/lib/crypto";
+import { HttpSpacePrimitives } from "./spaces/http_space_primitives.ts";
 import {
   encodePageURI,
   encodeRef,
@@ -55,17 +55,17 @@ import {
 import { ClientSystem } from "./client_system.ts";
 import { createEditorState, isValidEditor } from "./editor_state.ts";
 import { MainUI } from "./editor_ui.tsx";
-import type { SpacePrimitives } from "../lib/spaces/space_primitives.ts";
-import { DataStore } from "../lib/data/datastore.ts";
-import { IndexedDBKvPrimitives } from "../lib/data/indexeddb_kv_primitives.ts";
-import { DataStoreMQ } from "../lib/data/mq.datastore.ts";
+import type { SpacePrimitives } from "./spaces/space_primitives.ts";
+import { DataStore } from "./data/datastore.ts";
+import { IndexedDBKvPrimitives } from "./data/indexeddb_kv_primitives.ts";
+import { DataStoreMQ } from "./data/mq.datastore.ts";
 
-import { ReadOnlySpacePrimitives } from "../lib/spaces/ro_space_primitives.ts";
-import { LimitedMap } from "../lib/limited_map.ts";
-import { fsEndpoint, plugPrefix } from "../lib/spaces/constants.ts";
+import { ReadOnlySpacePrimitives } from "./spaces/ro_space_primitives.ts";
+import { LimitedMap } from "@silverbulletmd/silverbullet/lib/limited_map";
+import { fsEndpoint, plugPrefix } from "./spaces/constants.ts";
 import { diffAndPrepareChanges } from "./cm_util.ts";
 import { DocumentEditor } from "./document_editor.ts";
-import { parseExpressionString } from "../lib/space_lua/parse.ts";
+import { parseExpressionString } from "./space_lua/parse.ts";
 import type { Config } from "./config.ts";
 import type {
   DocumentMeta,
@@ -73,8 +73,11 @@ import type {
   PageMeta,
 } from "@silverbulletmd/silverbullet/type/index";
 import { parseMarkdown } from "./markdown_parser/parser.ts";
-import { CheckPathSpacePrimitives } from "../lib/spaces/checked_space_primitives.ts";
-import { notFoundError, offlineError } from "../lib/constants.ts";
+import { CheckPathSpacePrimitives } from "./spaces/checked_space_primitives.ts";
+import {
+  notFoundError,
+  offlineError,
+} from "@silverbulletmd/silverbullet/constants";
 
 const frontMatterRegex = /^---\n(([^\n]|\n)*?)---\n/;
 
diff --git a/client/client_system.ts b/client/client_system.ts
index ae20ac18..40706569 100644
--- a/client/client_system.ts
+++ b/client/client_system.ts
@@ -1,47 +1,49 @@
-import { PlugNamespaceHook } from "./hooks/plug_namespace.ts";
-import type { SilverBulletHooks } from "../lib/manifest.ts";
-import type { EventHook } from "./hooks/event.ts";
-import { createWorkerSandboxFromLocalPath } from "../lib/plugos/sandboxes/web_worker_sandbox.ts";
+import { PlugNamespaceHook } from "./plugos/hooks/plug_namespace.ts";
+import type { SilverBulletHooks } from "@silverbulletmd/silverbullet/type/manifest";
+import type { EventHook } from "./plugos/hooks/event.ts";
+import { createWorkerSandboxFromLocalPath } from "./plugos/sandboxes/web_worker_sandbox.ts";
 
-import assetSyscalls from "../lib/plugos/syscalls/asset.ts";
-import { eventSyscalls } from "../lib/plugos/syscalls/event.ts";
-import { System } from "../lib/plugos/system.ts";
+import assetSyscalls from "./plugos/syscalls/asset.ts";
+import { System } from "./plugos/system.ts";
 import type { Client } from "./client.ts";
-import { CodeWidgetHook } from "./hooks/code_widget.ts";
-import { CommandHook } from "./hooks/command.ts";
-import { SlashCommandHook } from "./hooks/slash_command.ts";
-import { SyscallHook } from "./hooks/syscall.ts";
-import { clientStoreSyscalls } from "./syscalls/clientStore.ts";
-import { editorSyscalls } from "./syscalls/editor.ts";
-import { sandboxFetchSyscalls } from "./syscalls/fetch.ts";
-import { markdownSyscalls } from "./syscalls/markdown.ts";
-import { shellSyscalls } from "./syscalls/shell.ts";
-import { spaceReadSyscalls, spaceWriteSyscalls } from "./syscalls/space.ts";
-import { syncSyscalls } from "./syscalls/sync.ts";
-import { systemSyscalls } from "./syscalls/system.ts";
-import { yamlSyscalls } from "./syscalls/yaml.ts";
+import { CodeWidgetHook } from "./plugos/hooks/code_widget.ts";
+import { CommandHook } from "./plugos/hooks/command.ts";
+import { SlashCommandHook } from "./plugos/hooks/slash_command.ts";
+import { SyscallHook } from "./plugos/hooks/syscall.ts";
+import { clientStoreSyscalls } from "./plugos/syscalls/clientStore.ts";
+import { editorSyscalls } from "./plugos/syscalls/editor.ts";
+import { sandboxFetchSyscalls } from "./plugos/syscalls/fetch.ts";
+import { markdownSyscalls } from "./plugos/syscalls/markdown.ts";
+import { shellSyscalls } from "./plugos/syscalls/shell.ts";
+import {
+  spaceReadSyscalls,
+  spaceWriteSyscalls,
+} from "./plugos/syscalls/space.ts";
+import { syncSyscalls } from "./plugos/syscalls/sync.ts";
+import { systemSyscalls } from "./plugos/syscalls/system.ts";
+import { yamlSyscalls } from "./plugos/syscalls/yaml.ts";
 import type { Space } from "./space.ts";
-import { MQHook } from "../lib/plugos/hooks/mq.ts";
-import { mqSyscalls } from "../lib/plugos/syscalls/mq.ts";
+import { MQHook } from "./plugos/hooks/mq.ts";
+import { mqSyscalls } from "./plugos/syscalls/mq.ts";
 import {
   dataStoreReadSyscalls,
   dataStoreWriteSyscalls,
-} from "./syscalls/datastore.ts";
-import type { DataStore } from "../lib/data/datastore.ts";
-import { languageSyscalls } from "./syscalls/language.ts";
-import { codeWidgetSyscalls } from "./syscalls/code_widget.ts";
-import { clientCodeWidgetSyscalls } from "./syscalls/client_code_widget.ts";
-import { KVPrimitivesManifestCache } from "../lib/plugos/manifest_cache.ts";
+} from "./plugos/syscalls/datastore.ts";
+import type { DataStore } from "./data/datastore.ts";
+import { languageSyscalls } from "./plugos/syscalls/language.ts";
+import { codeWidgetSyscalls } from "./plugos/syscalls/code_widget.ts";
+import { clientCodeWidgetSyscalls } from "./plugos/syscalls/client_code_widget.ts";
+import { KVPrimitivesManifestCache } from "./plugos/manifest_cache.ts";
 import { createKeyBindings } from "./editor_state.ts";
-import type { DataStoreMQ } from "../lib/data/mq.datastore.ts";
-import { plugPrefix } from "../lib/spaces/constants.ts";
-import { jsonschemaSyscalls } from "./syscalls/jsonschema.ts";
-import { luaSyscalls } from "./syscalls/lua.ts";
-import { indexSyscalls } from "./syscalls/index.ts";
-import { configSyscalls } from "./syscalls/config.ts";
-import { eventListenerSyscalls } from "./syscalls/event.ts";
-import { DocumentEditorHook } from "./hooks/document_editor.ts";
-import type { LuaCollectionQuery } from "../lib/space_lua/query_collection.ts";
+import type { DataStoreMQ } from "./data/mq.datastore.ts";
+import { plugPrefix } from "./spaces/constants.ts";
+import { jsonschemaSyscalls } from "./plugos/syscalls/jsonschema.ts";
+import { luaSyscalls } from "./plugos/syscalls/lua.ts";
+import { indexSyscalls } from "./plugos/syscalls/index.ts";
+import { configSyscalls } from "./plugos/syscalls/config.ts";
+import { eventSyscalls } from "./plugos/syscalls/event.ts";
+import { DocumentEditorHook } from "./plugos/hooks/document_editor.ts";
+import type { LuaCollectionQuery } from "./space_lua/query_collection.ts";
 import type { Command } from "./types/command.ts";
 import { SpaceLuaEnvironment } from "./space_lua.ts";
 import {
@@ -51,7 +53,7 @@ import {
   LuaStackFrame,
   type LuaValue,
   luaValueToJS,
-} from "../lib/space_lua/runtime.ts";
+} from "./space_lua/runtime.ts";
 import { buildThreadLocalEnv, handleLuaError } from "./space_lua_api.ts";
 import { builtinPlugPaths } from "../plugs/builtin_plugs.ts";
 
@@ -180,8 +182,7 @@ export class ClientSystem {
     // Syscalls available to all plugs
     this.system.registerSyscalls(
       [],
-      eventSyscalls(this.eventHook),
-      eventListenerSyscalls(this.client),
+      eventSyscalls(this.eventHook, this.client),
       editorSyscalls(this.client),
       spaceReadSyscalls(this.client),
       systemSyscalls(client, false),
diff --git a/client/cm_plugins/editor_paste.ts b/client/cm_plugins/editor_paste.ts
index f2d4aaba..a71fe55e 100644
--- a/client/cm_plugins/editor_paste.ts
+++ b/client/cm_plugins/editor_paste.ts
@@ -13,10 +13,10 @@ import {
   findParentMatching,
   nodeAtPos,
 } from "@silverbulletmd/silverbullet/lib/tree";
-import { maximumDocumentSize } from "../../lib/constants.ts";
-import { safeRun } from "../../lib/async.ts";
+import { maximumDocumentSize } from "@silverbulletmd/silverbullet/constants";
+import { safeRun } from "@silverbulletmd/silverbullet/lib/async";
 import { resolveMarkdownLink } from "@silverbulletmd/silverbullet/lib/resolve";
-import { localDateString } from "../../lib/dates.ts";
+import { localDateString } from "@silverbulletmd/silverbullet/lib/dates";
 import type { UploadFile } from "@silverbulletmd/silverbullet/type/client";
 import { isValidName, isValidPath } from "@silverbulletmd/silverbullet/lib/ref";
 
diff --git a/client/cm_plugins/lua_directive.ts b/client/cm_plugins/lua_directive.ts
index f3ff24f7..a5a736a7 100644
--- a/client/cm_plugins/lua_directive.ts
+++ b/client/cm_plugins/lua_directive.ts
@@ -7,19 +7,16 @@ import {
   isCursorInRange,
 } from "./util.ts";
 import type { Client } from "../client.ts";
-import { parse as parseLua } from "../../lib/space_lua/parse.ts";
-import type {
-  LuaBlock,
-  LuaFunctionCallStatement,
-} from "../../lib/space_lua/ast.ts";
-import { evalExpression } from "../../lib/space_lua/eval.ts";
+import { parse as parseLua } from "../space_lua/parse.ts";
+import type { LuaBlock, LuaFunctionCallStatement } from "../space_lua/ast.ts";
+import { evalExpression } from "../space_lua/eval.ts";
 import {
   LuaEnv,
   LuaRuntimeError,
   LuaStackFrame,
   luaValueToJS,
   singleResult,
-} from "../../lib/space_lua/runtime.ts";
+} from "../space_lua/runtime.ts";
 import {
   encodeRef,
   getNameFromPath,
@@ -27,7 +24,7 @@ import {
 import { resolveASTReference } from "../space_lua.ts";
 import { LuaWidget } from "./lua_widget.ts";
 import YAML from "js-yaml";
-import type { PageMeta } from "../../plug-api/types/index.ts";
+import type { PageMeta } from "@silverbulletmd/silverbullet/type/index";
 
 export function luaDirectivePlugin(client: Client) {
   return decoratorStateField((state: EditorState) => {
diff --git a/client/cm_plugins/lua_widget.ts b/client/cm_plugins/lua_widget.ts
index 5deebb83..436d93c5 100644
--- a/client/cm_plugins/lua_widget.ts
+++ b/client/cm_plugins/lua_widget.ts
@@ -13,7 +13,7 @@ import {
   moveCursorIntoText,
 } from "./widget_util.ts";
 import { expandMarkdown } from "../markdown/inline.ts";
-import { LuaStackFrame, LuaTable } from "../../lib/space_lua/runtime.ts";
+import { LuaStackFrame, LuaTable } from "../space_lua/runtime.ts";
 import { isBlockMarkdown, jsonToMDTable } from "../markdown/result_render.ts";
 import { activeWidgets } from "./code_widget.ts";
 
diff --git a/client/cm_plugins/table.ts b/client/cm_plugins/table.ts
index 954c5cb2..b2aeda5d 100644
--- a/client/cm_plugins/table.ts
+++ b/client/cm_plugins/table.ts
@@ -8,7 +8,10 @@ import {
 } from "./util.ts";
 
 import { renderMarkdownToHtml } from "../markdown/markdown_render.ts";
-import { type ParseTree, renderToText } from "../../plug-api/lib/tree.ts";
+import {
+  type ParseTree,
+  renderToText,
+} from "@silverbulletmd/silverbullet/lib/tree";
 import { lezerToParseTree } from "../markdown_parser/parse_tree.ts";
 import type { Client } from "../client.ts";
 import {
@@ -16,7 +19,7 @@ import {
   resolveMarkdownLink,
 } from "@silverbulletmd/silverbullet/lib/resolve";
 import { expandMarkdown } from "../markdown/inline.ts";
-import { LuaStackFrame } from "../../lib/space_lua/runtime.ts";
+import { LuaStackFrame } from "../space_lua/runtime.ts";
 import { attachWidgetEventHandlers } from "./widget_util.ts";
 
 class TableViewWidget extends WidgetType {
diff --git a/lib/data/datastore.test.ts b/client/data/datastore.test.ts
similarity index 100%
rename from lib/data/datastore.test.ts
rename to client/data/datastore.test.ts
diff --git a/lib/data/datastore.ts b/client/data/datastore.ts
similarity index 100%
rename from lib/data/datastore.ts
rename to client/data/datastore.ts
diff --git a/lib/data/indexeddb_kv_primitives.test.ts b/client/data/indexeddb_kv_primitives.test.ts
similarity index 100%
rename from lib/data/indexeddb_kv_primitives.test.ts
rename to client/data/indexeddb_kv_primitives.test.ts
diff --git a/lib/data/indexeddb_kv_primitives.ts b/client/data/indexeddb_kv_primitives.ts
similarity index 100%
rename from lib/data/indexeddb_kv_primitives.ts
rename to client/data/indexeddb_kv_primitives.ts
diff --git a/lib/data/kv_primitives.test.ts b/client/data/kv_primitives.test.ts
similarity index 100%
rename from lib/data/kv_primitives.test.ts
rename to client/data/kv_primitives.test.ts
diff --git a/lib/data/kv_primitives.ts b/client/data/kv_primitives.ts
similarity index 100%
rename from lib/data/kv_primitives.ts
rename to client/data/kv_primitives.ts
diff --git a/lib/data/memory_kv_primitives.test.ts b/client/data/memory_kv_primitives.test.ts
similarity index 100%
rename from lib/data/memory_kv_primitives.test.ts
rename to client/data/memory_kv_primitives.test.ts
diff --git a/lib/data/memory_kv_primitives.ts b/client/data/memory_kv_primitives.ts
similarity index 96%
rename from lib/data/memory_kv_primitives.ts
rename to client/data/memory_kv_primitives.ts
index 75f55ed6..5f00f79e 100644
--- a/lib/data/memory_kv_primitives.ts
+++ b/client/data/memory_kv_primitives.ts
@@ -1,7 +1,7 @@
 import type { KvPrimitives, KvQueryOptions } from "./kv_primitives.ts";
-import { throttle } from "../async.ts";
+import { throttle } from "@silverbulletmd/silverbullet/lib/async";
 
-import type { KV, KvKey } from "../../plug-api/types/datastore.ts";
+import type { KV, KvKey } from "@silverbulletmd/silverbullet/type/datastore";
 
 const memoryKeySeparator = "\0";
 
diff --git a/lib/data/mq.datastore.test.ts b/client/data/mq.datastore.test.ts
similarity index 100%
rename from lib/data/mq.datastore.test.ts
rename to client/data/mq.datastore.test.ts
diff --git a/lib/data/mq.datastore.ts b/client/data/mq.datastore.ts
similarity index 99%
rename from lib/data/mq.datastore.ts
rename to client/data/mq.datastore.ts
index 8e425da4..84cb8455 100644
--- a/lib/data/mq.datastore.ts
+++ b/client/data/mq.datastore.ts
@@ -8,7 +8,7 @@ import type {
   MQStats,
   MQSubscribeOptions,
 } from "../../plug-api/types/datastore.ts";
-import { race, sleep } from "../async.ts";
+import { race, sleep } from "@silverbulletmd/silverbullet/lib/async";
 
 export type ProcessingMessage = MQMessage & {
   ts: number;
diff --git a/lib/data/prefixed_kv_primitives.ts b/client/data/prefixed_kv_primitives.ts
similarity index 100%
rename from lib/data/prefixed_kv_primitives.ts
rename to client/data/prefixed_kv_primitives.ts
diff --git a/client/document_editor.ts b/client/document_editor.ts
index 0d558b01..69278acc 100644
--- a/client/document_editor.ts
+++ b/client/document_editor.ts
@@ -1,6 +1,6 @@
 import type { Client } from "./client.ts";
-import { timeout } from "../lib/async.ts";
-import type { DocumentMeta } from "../plug-api/types/index.ts";
+import { timeout } from "@silverbulletmd/silverbullet/lib/async";
+import type { DocumentMeta } from "@silverbulletmd/silverbullet/type/index";
 import type { Ref } from "@silverbulletmd/silverbullet/lib/ref";
 
 type DocumentEditorIframeWindow = Window & {
diff --git a/client/editor_state.ts b/client/editor_state.ts
index 4439e071..2c2622de 100644
--- a/client/editor_state.ts
+++ b/client/editor_state.ts
@@ -48,7 +48,7 @@ import { postScriptPrefacePlugin } from "./cm_plugins/top_bottom_panels.ts";
 import { languageFor } from "./languages.ts";
 import { plugLinter } from "./cm_plugins/lint.ts";
 import { extendedMarkdownLanguage } from "./markdown_parser/parser.ts";
-import { safeRun } from "../lib/async.ts";
+import { safeRun } from "@silverbulletmd/silverbullet/lib/async";
 import { codeCopyPlugin } from "./cm_plugins/code_copy.ts";
 import { disableSpellcheck } from "./cm_plugins/spell_checking.ts";
 import type { ClickEvent } from "@silverbulletmd/silverbullet/type/client";
diff --git a/client/editor_ui.tsx b/client/editor_ui.tsx
index faa8d294..5012eb84 100644
--- a/client/editor_ui.tsx
+++ b/client/editor_ui.tsx
@@ -17,7 +17,7 @@ import { closeSearchPanel } from "@codemirror/search";
 import { runScopeHandlers } from "@codemirror/view";
 import type { Client } from "./client.ts";
 import { Panel } from "./components/panel.tsx";
-import { safeRun } from "../lib/async.ts";
+import { safeRun } from "@silverbulletmd/silverbullet/lib/async";
 import type { FilterOption } from "@silverbulletmd/silverbullet/type/client";
 import {
   getNameFromPath,
diff --git a/client/languages.ts b/client/languages.ts
index 25dba4e6..ffdbe47f 100644
--- a/client/languages.ts
+++ b/client/languages.ts
@@ -50,7 +50,7 @@ import {
 } from "@codemirror/lang-javascript";
 import { cssLanguage } from "@codemirror/lang-css";
 import { nixLanguage } from "@replit/codemirror-lang-nix";
-import { luaLanguage } from "../lib/space_lua/parse.ts";
+import { luaLanguage } from "./space_lua/parse.ts";
 
 const yamlStreamLanguage = StreamLanguage.define(yamlLanguage);
 
diff --git a/lib/logger.test.ts b/client/logger.test.ts
similarity index 100%
rename from lib/logger.test.ts
rename to client/logger.test.ts
diff --git a/lib/logger.ts b/client/logger.ts
similarity index 100%
rename from lib/logger.ts
rename to client/logger.ts
diff --git a/client/markdown/inline.ts b/client/markdown/inline.ts
index a5207465..f608cdbc 100644
--- a/client/markdown/inline.ts
+++ b/client/markdown/inline.ts
@@ -18,15 +18,15 @@ import {
 } from "@silverbulletmd/silverbullet/lib/resolve";
 import { mime } from "mimetypes";
 import type { Client } from "../client.ts";
-import type { LuaEnv, LuaStackFrame } from "../../lib/space_lua/runtime.ts";
+import type { LuaEnv, LuaStackFrame } from "../space_lua/runtime.ts";
 import { parseMarkdown } from "../markdown_parser/parser.ts";
 import { renderExpressionResult } from "./result_render.ts";
-import { parseExpressionString } from "../../lib/space_lua/parse.ts";
-import { evalExpression } from "../../lib/space_lua/eval.ts";
-import type { LuaExpression } from "../../lib/space_lua/ast.ts";
+import { parseExpressionString } from "../space_lua/parse.ts";
+import { evalExpression } from "../space_lua/eval.ts";
+import type { LuaExpression } from "../space_lua/ast.ts";
 import { mdLinkRegex, wikiLinkRegex } from "../markdown_parser/constants.ts";
 
-import { fsEndpoint } from "../../lib/spaces/constants.ts";
+import { fsEndpoint } from "../spaces/constants.ts";
 
 /**
  * Describes the dimensions of a transclusion, if provided through the alias.
diff --git a/client/markdown/result_render.ts b/client/markdown/result_render.ts
index eeb6a1de..7171ea5a 100644
--- a/client/markdown/result_render.ts
+++ b/client/markdown/result_render.ts
@@ -1,4 +1,4 @@
-import { LuaTable, luaToString } from "../../lib/space_lua/runtime.ts";
+import { LuaTable, luaToString } from "../space_lua/runtime.ts";
 
 export function defaultTransformer(v: any): Promise<string> {
   if (v === undefined) {
diff --git a/client/markdown_parser/parser.ts b/client/markdown_parser/parser.ts
index bcf62503..41f40d88 100644
--- a/client/markdown_parser/parser.ts
+++ b/client/markdown_parser/parser.ts
@@ -16,7 +16,7 @@ import { Table } from "./table_parser.ts";
 import { nakedUrlRegex, pWikiLinkRegex, tagRegex } from "./constants.ts";
 import { parse } from "./parse_tree.ts";
 import type { ParseTree } from "@silverbulletmd/silverbullet/lib/tree";
-import { luaLanguage } from "../../lib/space_lua/parse.ts";
+import { luaLanguage } from "../space_lua/parse.ts";
 
 const WikiLink: MarkdownConfig = {
   defineNodes: [
diff --git a/lib/plugos/event.test.ts b/client/plugos/event.test.ts
similarity index 100%
rename from lib/plugos/event.test.ts
rename to client/plugos/event.test.ts
diff --git a/lib/plugos/event.ts b/client/plugos/event.ts
similarity index 100%
rename from lib/plugos/event.ts
rename to client/plugos/event.ts
diff --git a/lib/plugos/eventhook.ts b/client/plugos/eventhook.ts
similarity index 72%
rename from lib/plugos/eventhook.ts
rename to client/plugos/eventhook.ts
index be6dac2e..20f790ec 100644
--- a/lib/plugos/eventhook.ts
+++ b/client/plugos/eventhook.ts
@@ -1,4 +1,4 @@
-import type { EventHookT } from "../manifest.ts";
+import type { EventHookT } from "@silverbulletmd/silverbullet/type/manifest";
 import type { Hook } from "./types.ts";
 
 export interface EventHookI extends Hook<EventHookT> {
diff --git a/client/hooks/code_widget.ts b/client/plugos/hooks/code_widget.ts
similarity index 89%
rename from client/hooks/code_widget.ts
rename to client/plugos/hooks/code_widget.ts
index 635d7645..c921cabb 100644
--- a/client/hooks/code_widget.ts
+++ b/client/plugos/hooks/code_widget.ts
@@ -1,6 +1,6 @@
-import type { Hook, Manifest } from "../../lib/plugos/types.ts";
-import type { System } from "../../lib/plugos/system.ts";
-import type { CodeWidgetT } from "../../lib/manifest.ts";
+import type { Hook, Manifest } from "../types.ts";
+import type { System } from "../system.ts";
+import type { CodeWidgetT } from "@silverbulletmd/silverbullet/type/manifest";
 import type { CodeWidgetCallback } from "@silverbulletmd/silverbullet/type/client";
 
 export class CodeWidgetHook implements Hook<CodeWidgetT> {
diff --git a/client/hooks/command.ts b/client/plugos/hooks/command.ts
similarity index 87%
rename from client/hooks/command.ts
rename to client/plugos/hooks/command.ts
index d7a27292..569f3882 100644
--- a/client/hooks/command.ts
+++ b/client/plugos/hooks/command.ts
@@ -1,9 +1,9 @@
-import type { Hook, Manifest } from "../../lib/plugos/types.ts";
-import type { System } from "../../lib/plugos/system.ts";
-import { EventEmitter } from "../../lib/plugos/event.ts";
-import { throttle } from "../../lib/async.ts";
-import type { Command, CommandHookEvents } from "../types/command.ts";
-import type { CommandHookT } from "../../lib/manifest.ts";
+import type { Hook, Manifest } from "../types.ts";
+import type { System } from "../system.ts";
+import { EventEmitter } from "../event.ts";
+import { throttle } from "@silverbulletmd/silverbullet/lib/async";
+import type { Command, CommandHookEvents } from "../../types/command.ts";
+import type { CommandHookT } from "@silverbulletmd/silverbullet/type/manifest";
 
 export class CommandHook extends EventEmitter<CommandHookEvents>
   implements Hook<CommandHookT> {
diff --git a/client/hooks/document_editor.ts b/client/plugos/hooks/document_editor.ts
similarity index 91%
rename from client/hooks/document_editor.ts
rename to client/plugos/hooks/document_editor.ts
index 7055795d..ac78aa19 100644
--- a/client/hooks/document_editor.ts
+++ b/client/plugos/hooks/document_editor.ts
@@ -1,6 +1,6 @@
-import type { Hook, Manifest } from "../../lib/plugos/types.ts";
-import type { DocumentEditorT } from "../../lib/manifest.ts";
-import type { System } from "../../lib/plugos/system.ts";
+import type { Hook, Manifest } from "../types.ts";
+import type { DocumentEditorT } from "@silverbulletmd/silverbullet/type/manifest";
+import type { System } from "../system.ts";
 import type { DocumentEditorCallback } from "@silverbulletmd/silverbullet/type/client";
 
 export class DocumentEditorHook implements Hook<DocumentEditorT> {
diff --git a/client/hooks/event.ts b/client/plugos/hooks/event.ts
similarity index 94%
rename from client/hooks/event.ts
rename to client/plugos/hooks/event.ts
index 847e39df..c81d3c25 100644
--- a/client/hooks/event.ts
+++ b/client/plugos/hooks/event.ts
@@ -1,9 +1,9 @@
 // deno-lint-ignore-file ban-types
-import type { Manifest } from "../../lib/plugos/types.ts";
-import type { System } from "../../lib/plugos/system.ts";
-import type { EventHookI } from "../../lib/plugos/eventhook.ts";
-import type { EventHookT } from "../../lib/manifest.ts";
-import type { Config } from "../config.ts";
+import type { Manifest } from "../types.ts";
+import type { System } from "../system.ts";
+import type { EventHookI } from "../eventhook.ts";
+import type { EventHookT } from "@silverbulletmd/silverbullet/type/manifest";
+import type { Config } from "../../config.ts";
 
 // System events:
 // - plug:load (plugName: string)
diff --git a/lib/plugos/hooks/mq.ts b/client/plugos/hooks/mq.ts
similarity index 92%
rename from lib/plugos/hooks/mq.ts
rename to client/plugos/hooks/mq.ts
index ba6535fc..c3d9377a 100644
--- a/lib/plugos/hooks/mq.ts
+++ b/client/plugos/hooks/mq.ts
@@ -1,9 +1,9 @@
 import type { Hook, Manifest } from "../types.ts";
 import type { System } from "../system.ts";
-import { throttle } from "../../async.ts";
-import type { MQHookT } from "../../manifest.ts";
+import { throttle } from "@silverbulletmd/silverbullet/lib/async";
+import type { MQHookT } from "@silverbulletmd/silverbullet/type/manifest";
 import type { DataStoreMQ, QueueWorker } from "../../data/mq.datastore.ts";
-import type { MQMessage } from "../../../plug-api/types/datastore.ts";
+import type { MQMessage } from "@silverbulletmd/silverbullet/type/datastore";
 
 export class MQHook implements Hook<MQHookT> {
   subscriptions: QueueWorker[] = [];
diff --git a/client/hooks/plug_namespace.ts b/client/plugos/hooks/plug_namespace.ts
similarity index 86%
rename from client/hooks/plug_namespace.ts
rename to client/plugos/hooks/plug_namespace.ts
index e7ba7ae1..ee4f9338 100644
--- a/client/hooks/plug_namespace.ts
+++ b/client/plugos/hooks/plug_namespace.ts
@@ -1,8 +1,8 @@
-import type { NamespaceOperation } from "../../lib/plugos/namespace.ts";
-import type { PlugNamespaceHookT } from "../../lib/manifest.ts";
-import type { Plug } from "../../lib/plugos/plug.ts";
-import type { System } from "../../lib/plugos/system.ts";
-import type { Hook, Manifest } from "../../lib/plugos/types.ts";
+import type { NamespaceOperation } from "@silverbulletmd/silverbullet/type/namespace";
+import type { PlugNamespaceHookT } from "@silverbulletmd/silverbullet/type/manifest";
+import type { Plug } from "../plug.ts";
+import type { System } from "../system.ts";
+import type { Hook, Manifest } from "../types.ts";
 
 type SpaceFunction = {
   operation: NamespaceOperation;
diff --git a/client/hooks/slash_command.ts b/client/plugos/hooks/slash_command.ts
similarity index 93%
rename from client/hooks/slash_command.ts
rename to client/plugos/hooks/slash_command.ts
index 2ff3f1c2..0d90db9e 100644
--- a/client/hooks/slash_command.ts
+++ b/client/plugos/hooks/slash_command.ts
@@ -1,15 +1,15 @@
-import type { Hook, Manifest } from "../../lib/plugos/types.ts";
-import type { System } from "../../lib/plugos/system.ts";
+import type { Hook, Manifest } from "../types.ts";
+import type { System } from "../system.ts";
 import type {
   Completion,
   CompletionContext,
   CompletionResult,
 } from "@codemirror/autocomplete";
-import type { Client } from "../client.ts";
+import type { Client } from "../../client.ts";
 import { syntaxTree } from "@codemirror/language";
-import { safeRun, throttle } from "../../lib/async.ts";
-import type { SlashCommandHookT } from "../../lib/manifest.ts";
-import type { SlashCommand } from "../types/command.ts";
+import { safeRun, throttle } from "@silverbulletmd/silverbullet/lib/async";
+import type { SlashCommandHookT } from "@silverbulletmd/silverbullet/type/manifest";
+import type { SlashCommand } from "../../types/command.ts";
 import type {
   SlashCompletionOption,
   SlashCompletions,
diff --git a/client/hooks/syscall.ts b/client/plugos/hooks/syscall.ts
similarity index 90%
rename from client/hooks/syscall.ts
rename to client/plugos/hooks/syscall.ts
index 73bbac2b..925b7810 100644
--- a/client/hooks/syscall.ts
+++ b/client/plugos/hooks/syscall.ts
@@ -1,6 +1,6 @@
-import type { Hook, Manifest } from "../../lib/plugos/types.ts";
-import type { SysCallMapping, System } from "../../lib/plugos/system.ts";
-import type { SyscallHookT } from "../../lib/manifest.ts";
+import type { Hook, Manifest } from "../types.ts";
+import type { SysCallMapping, System } from "../system.ts";
+import type { SyscallHookT } from "@silverbulletmd/silverbullet/type/manifest";
 
 export class SyscallHook implements Hook<SyscallHookT> {
   apply(system: System<SyscallHookT>): void {
diff --git a/lib/plugos/manifest_cache.ts b/client/plugos/manifest_cache.ts
similarity index 100%
rename from lib/plugos/manifest_cache.ts
rename to client/plugos/manifest_cache.ts
diff --git a/lib/plugos/plug.ts b/client/plugos/plug.ts
similarity index 100%
rename from lib/plugos/plug.ts
rename to client/plugos/plug.ts
diff --git a/lib/plugos/plug_compile.ts b/client/plugos/plug_compile.ts
similarity index 100%
rename from lib/plugos/plug_compile.ts
rename to client/plugos/plug_compile.ts
diff --git a/lib/plugos/protocol.ts b/client/plugos/protocol.ts
similarity index 89%
rename from lib/plugos/protocol.ts
rename to client/plugos/protocol.ts
index 64a35915..aa059ff5 100644
--- a/lib/plugos/protocol.ts
+++ b/client/plugos/protocol.ts
@@ -1,4 +1,4 @@
-import type { Manifest } from "../manifest.ts";
+import type { Manifest } from "@silverbulletmd/silverbullet/type/manifest";
 
 // Messages received from the worker
 export type ControllerMessage =
diff --git a/lib/plugos/sandboxes/deno_worker_sandbox.ts b/client/plugos/sandboxes/deno_worker_sandbox.ts
similarity index 100%
rename from lib/plugos/sandboxes/deno_worker_sandbox.ts
rename to client/plugos/sandboxes/deno_worker_sandbox.ts
diff --git a/lib/plugos/sandboxes/no_sandbox.ts b/client/plugos/sandboxes/no_sandbox.ts
similarity index 98%
rename from lib/plugos/sandboxes/no_sandbox.ts
rename to client/plugos/sandboxes/no_sandbox.ts
index 7229b57a..73e5538b 100644
--- a/lib/plugos/sandboxes/no_sandbox.ts
+++ b/client/plugos/sandboxes/no_sandbox.ts
@@ -2,7 +2,7 @@ import type { Plug } from "../plug.ts";
 import type { Sandbox, SandboxFactory } from "./sandbox.ts";
 import type { Manifest } from "../types.ts";
 import type { System } from "../system.ts";
-import { PromiseQueue } from "../../async.ts";
+import { PromiseQueue } from "@silverbulletmd/silverbullet/lib/async";
 
 /**
  * This implements a "no sandbox" sandbox that actually runs code the main thread, without any isolation.
diff --git a/lib/plugos/sandboxes/sandbox.ts b/client/plugos/sandboxes/sandbox.ts
similarity index 100%
rename from lib/plugos/sandboxes/sandbox.ts
rename to client/plugos/sandboxes/sandbox.ts
diff --git a/lib/plugos/sandboxes/web_worker_sandbox.ts b/client/plugos/sandboxes/web_worker_sandbox.ts
similarity index 100%
rename from lib/plugos/sandboxes/web_worker_sandbox.ts
rename to client/plugos/sandboxes/web_worker_sandbox.ts
diff --git a/lib/plugos/sandboxes/worker_sandbox.ts b/client/plugos/sandboxes/worker_sandbox.ts
similarity index 98%
rename from lib/plugos/sandboxes/worker_sandbox.ts
rename to client/plugos/sandboxes/worker_sandbox.ts
index e69c567d..7487a1c4 100644
--- a/lib/plugos/sandboxes/worker_sandbox.ts
+++ b/client/plugos/sandboxes/worker_sandbox.ts
@@ -3,7 +3,7 @@ import type { ControllerMessage, WorkerMessage } from "../protocol.ts";
 import type { Plug } from "../plug.ts";
 import { AssetBundle, type AssetJson } from "../../asset_bundle/bundle.ts";
 import type { Sandbox } from "./sandbox.ts";
-import { race, timeout } from "../../async.ts";
+import { race, timeout } from "@silverbulletmd/silverbullet/lib/async";
 
 /**
  * Represents a "safe" execution environment for plug code
diff --git a/lib/plugos/syscalls/asset.ts b/client/plugos/syscalls/asset.ts
similarity index 100%
rename from lib/plugos/syscalls/asset.ts
rename to client/plugos/syscalls/asset.ts
diff --git a/client/syscalls/clientStore.ts b/client/plugos/syscalls/clientStore.ts
similarity index 70%
rename from client/syscalls/clientStore.ts
rename to client/plugos/syscalls/clientStore.ts
index 12dcbe46..3e945a33 100644
--- a/client/syscalls/clientStore.ts
+++ b/client/plugos/syscalls/clientStore.ts
@@ -1,7 +1,7 @@
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
-import type { DataStore } from "../../lib/data/datastore.ts";
+import type { SysCallMapping } from "../../plugos/system.ts";
+import type { DataStore } from "../../data/datastore.ts";
 
-import type { KvKey } from "../../plug-api/types/datastore.ts";
+import type { KvKey } from "@silverbulletmd/silverbullet/type/datastore";
 
 export function clientStoreSyscalls(
   ds: DataStore,
diff --git a/client/plugos/syscalls/client_code_widget.ts b/client/plugos/syscalls/client_code_widget.ts
new file mode 100644
index 00000000..eba58916
--- /dev/null
+++ b/client/plugos/syscalls/client_code_widget.ts
@@ -0,0 +1,12 @@
+import type { SysCallMapping } from "../../plugos/system.ts";
+import { reloadAllWidgets } from "../../cm_plugins/code_widget.ts";
+import { broadcastReload } from "../../components/widget_sandbox_iframe.ts";
+
+export function clientCodeWidgetSyscalls(): SysCallMapping {
+  return {
+    "codeWidget.refreshAll": () => {
+      broadcastReload();
+      return reloadAllWidgets();
+    },
+  };
+}
diff --git a/client/syscalls/code_widget.ts b/client/plugos/syscalls/code_widget.ts
similarity index 90%
rename from client/syscalls/code_widget.ts
rename to client/plugos/syscalls/code_widget.ts
index e16fba49..7ccd3fca 100644
--- a/client/syscalls/code_widget.ts
+++ b/client/plugos/syscalls/code_widget.ts
@@ -1,4 +1,4 @@
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
+import type { SysCallMapping } from "../system.ts";
 import type { CodeWidgetHook } from "../hooks/code_widget.ts";
 import type { CodeWidgetContent } from "@silverbulletmd/silverbullet/type/client";
 
diff --git a/client/syscalls/config.ts b/client/plugos/syscalls/config.ts
similarity index 86%
rename from client/syscalls/config.ts
rename to client/plugos/syscalls/config.ts
index bf470c15..eff7ac79 100644
--- a/client/syscalls/config.ts
+++ b/client/plugos/syscalls/config.ts
@@ -1,5 +1,5 @@
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
-import type { Config } from "../config.ts";
+import type { SysCallMapping } from "../system.ts";
+import type { Config } from "../../config.ts";
 
 export function configSyscalls(config: Config): SysCallMapping {
   return {
diff --git a/client/syscalls/datastore.ts b/client/plugos/syscalls/datastore.ts
similarity index 83%
rename from client/syscalls/datastore.ts
rename to client/plugos/syscalls/datastore.ts
index 49d7e6e5..2b6eca39 100644
--- a/client/syscalls/datastore.ts
+++ b/client/plugos/syscalls/datastore.ts
@@ -1,19 +1,19 @@
 import {
   type LuaCollectionQuery,
   queryLua,
-} from "../../lib/space_lua/query_collection.ts";
-import type { DataStore } from "../../lib/data/datastore.ts";
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
+} from "../../space_lua/query_collection.ts";
+import type { DataStore } from "../../data/datastore.ts";
+import type { SysCallMapping } from "../system.ts";
 import {
   jsToLuaValue,
   LuaEnv,
   LuaStackFrame,
   luaValueToJS,
-} from "../../lib/space_lua/runtime.ts";
-import type { KvQueryOptions } from "../../lib/data/kv_primitives.ts";
-import type { ClientSystem } from "../client_system.ts";
+} from "../../space_lua/runtime.ts";
+import type { KvQueryOptions } from "../../data/kv_primitives.ts";
+import type { ClientSystem } from "../../client_system.ts";
 
-import type { KV, KvKey } from "../../plug-api/types/datastore.ts";
+import type { KV, KvKey } from "@silverbulletmd/silverbullet/type/datastore";
 
 /**
  * Exposes the datastore API to plugs, but scoping everything to a prefix based on the plug's name
diff --git a/client/syscalls/editor.ts b/client/plugos/syscalls/editor.ts
similarity index 98%
rename from client/syscalls/editor.ts
rename to client/plugos/syscalls/editor.ts
index 1f64a82e..307f8136 100644
--- a/client/syscalls/editor.ts
+++ b/client/plugos/syscalls/editor.ts
@@ -1,4 +1,4 @@
-import type { Client } from "../client.ts";
+import type { Client } from "../../client.ts";
 import {
   foldAll,
   foldCode,
@@ -18,7 +18,7 @@ import {
 import type { Transaction } from "@codemirror/state";
 import { EditorView } from "@codemirror/view";
 import { getCM as vimGetCm, Vim } from "@replit/codemirror-vim";
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
+import type { SysCallMapping } from "../system.ts";
 import type {
   FilterOption,
   UploadFile,
@@ -31,8 +31,8 @@ import {
   type Ref,
 } from "@silverbulletmd/silverbullet/lib/ref";
 import { insertNewlineContinueMarkup } from "@codemirror/lang-markdown";
-import type { VimConfig } from "../../plug-api/types/config.ts";
-import type { PageMeta } from "../../plug-api/types/index.ts";
+import type { VimConfig } from "@silverbulletmd/silverbullet/type/config";
+import type { PageMeta } from "@silverbulletmd/silverbullet/type/index";
 
 export function editorSyscalls(client: Client): SysCallMapping {
   const syscalls: SysCallMapping = {
diff --git a/client/syscalls/event.ts b/client/plugos/syscalls/event.ts
similarity index 58%
rename from client/syscalls/event.ts
rename to client/plugos/syscalls/event.ts
index a7ea47fe..86be4366 100644
--- a/client/syscalls/event.ts
+++ b/client/plugos/syscalls/event.ts
@@ -1,14 +1,20 @@
-// deno-lint-ignore-file ban-types
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
-import { LuaStackFrame, luaValueToJS } from "../../lib/space_lua/runtime.ts";
-import type { Client } from "../client.ts";
-
+import type { SysCallMapping } from "../system.ts";
+import type { EventHookI } from "../eventhook.ts";
 import type { EventSubscription } from "@silverbulletmd/silverbullet/type/event";
+import { LuaStackFrame, luaValueToJS } from "../../space_lua/runtime.ts";
+import type { Client } from "../../client.ts";
 
-export function eventListenerSyscalls(
+export function eventSyscalls(
+  eventHook: EventHookI,
   client: Client,
 ): SysCallMapping {
   return {
+    "event.dispatch": (_ctx, eventName: string, data: any) => {
+      return eventHook.dispatchEvent(eventName, data);
+    },
+    "event.listEvents": () => {
+      return eventHook.listEvents();
+    },
     /**
      * Define a Lua event listener
      */
@@ -17,6 +23,7 @@ export function eventListenerSyscalls(
       def: EventSubscription,
     ) => {
       // console.log("Registering Lua event listener: ", def.name);
+      // deno-lint-ignore ban-types
       const listeners = client.config.get<Function[]>([
         "eventListeners",
         def.name,
diff --git a/client/syscalls/fetch.ts b/client/plugos/syscalls/fetch.ts
similarity index 91%
rename from client/syscalls/fetch.ts
rename to client/plugos/syscalls/fetch.ts
index 3f6ce828..74b5c99a 100644
--- a/client/syscalls/fetch.ts
+++ b/client/plugos/syscalls/fetch.ts
@@ -1,13 +1,16 @@
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
+import type { SysCallMapping } from "../system.ts";
 import type {
   ProxyFetchRequest,
   ProxyFetchRequest64,
   ProxyFetchResponse,
   ProxyFetchResponse64,
-} from "../../lib/proxy_fetch.ts";
-import type { Client } from "../client.ts";
-import { base64Decode, base64Encode } from "../../lib/crypto.ts";
-import { fsEndpoint } from "../../lib/spaces/constants.ts";
+} from "../../proxy_fetch.ts";
+import type { Client } from "../../client.ts";
+import {
+  base64Decode,
+  base64Encode,
+} from "@silverbulletmd/silverbullet/lib/crypto";
+import { fsEndpoint } from "../../spaces/constants.ts";
 
 export function sandboxFetchSyscalls(
   client: Client,
diff --git a/client/syscalls/index.ts b/client/plugos/syscalls/index.ts
similarity index 88%
rename from client/syscalls/index.ts
rename to client/plugos/syscalls/index.ts
index 303e5469..ec0779bd 100644
--- a/client/syscalls/index.ts
+++ b/client/plugos/syscalls/index.ts
@@ -1,16 +1,16 @@
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
+import type { SysCallMapping } from "../system.ts";
 import type {
   LuaCollectionQuery,
   LuaQueryCollection,
-} from "../../lib/space_lua/query_collection.ts";
+} from "../../space_lua/query_collection.ts";
 import {
   jsToLuaValue,
   type LuaEnv,
   type LuaStackFrame,
   type LuaTable,
-} from "../../lib/space_lua/runtime.ts";
+} from "../../space_lua/runtime.ts";
 
-import type { Client } from "../client.ts";
+import type { Client } from "../../client.ts";
 
 export function indexSyscalls(client: Client): SysCallMapping {
   return {
diff --git a/client/syscalls/jsonschema.ts b/client/plugos/syscalls/jsonschema.ts
similarity index 94%
rename from client/syscalls/jsonschema.ts
rename to client/plugos/syscalls/jsonschema.ts
index 6028dbf5..590e38f6 100644
--- a/client/syscalls/jsonschema.ts
+++ b/client/plugos/syscalls/jsonschema.ts
@@ -1,4 +1,4 @@
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
+import type { SysCallMapping } from "../system.ts";
 import { Ajv } from "ajv";
 
 const ajv = new Ajv();
diff --git a/client/syscalls/language.ts b/client/plugos/syscalls/language.ts
similarity index 63%
rename from client/syscalls/language.ts
rename to client/plugos/syscalls/language.ts
index 19fb8059..c59dc958 100644
--- a/client/syscalls/language.ts
+++ b/client/plugos/syscalls/language.ts
@@ -1,7 +1,7 @@
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
-import { parse } from "../markdown_parser/parse_tree.ts";
-import type { ParseTree } from "../../plug-api/lib/tree.ts";
-import { builtinLanguages, languageFor } from "../languages.ts";
+import type { SysCallMapping } from "../system.ts";
+import { parse } from "../../markdown_parser/parse_tree.ts";
+import type { ParseTree } from "@silverbulletmd/silverbullet/lib/tree";
+import { builtinLanguages, languageFor } from "../../languages.ts";
 
 export function languageSyscalls(): SysCallMapping {
   return {
diff --git a/client/syscalls/lua.ts b/client/plugos/syscalls/lua.ts
similarity index 75%
rename from client/syscalls/lua.ts
rename to client/plugos/syscalls/lua.ts
index ff9a771a..e39fe723 100644
--- a/client/syscalls/lua.ts
+++ b/client/plugos/syscalls/lua.ts
@@ -1,15 +1,15 @@
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
-import { evalExpression } from "../../lib/space_lua/eval.ts";
-import { parse, parseExpressionString } from "../../lib/space_lua/parse.ts";
+import type { SysCallMapping } from "../system.ts";
+import { evalExpression } from "../../space_lua/eval.ts";
+import { parse, parseExpressionString } from "../../space_lua/parse.ts";
 import {
   LuaStackFrame,
   luaToString,
   luaValueToJS,
-} from "../../lib/space_lua/runtime.ts";
-import { buildThreadLocalEnv } from "../space_lua_api.ts";
-import { isSendable } from "../../lib/plugos/util.ts";
-import type { LuaBlock, LuaExpression } from "../../lib/space_lua/ast.ts";
-import type { ClientSystem } from "../client_system.ts";
+} from "../../space_lua/runtime.ts";
+import { buildThreadLocalEnv } from "../../space_lua_api.ts";
+import { isSendable } from "../util.ts";
+import type { LuaBlock, LuaExpression } from "../../space_lua/ast.ts";
+import type { ClientSystem } from "../../client_system.ts";
 
 export function luaSyscalls(clientSystem: ClientSystem): SysCallMapping {
   return {
diff --git a/client/syscalls/markdown.ts b/client/plugos/syscalls/markdown.ts
similarity index 66%
rename from client/syscalls/markdown.ts
rename to client/plugos/syscalls/markdown.ts
index 9d41a302..5c317c4d 100644
--- a/client/syscalls/markdown.ts
+++ b/client/plugos/syscalls/markdown.ts
@@ -1,14 +1,17 @@
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
-import { parse } from "../markdown_parser/parse_tree.ts";
-import { type ParseTree, renderToText } from "../../plug-api/lib/tree.ts";
-import { extendedMarkdownLanguage } from "../markdown_parser/parser.ts";
-import { expandMarkdown } from "../markdown/inline.ts";
-import type { Client } from "../client.ts";
-import { LuaEnv, LuaStackFrame } from "../../lib/space_lua/runtime.ts";
+import type { SysCallMapping } from "../system.ts";
+import { parse } from "../../markdown_parser/parse_tree.ts";
+import {
+  type ParseTree,
+  renderToText,
+} from "@silverbulletmd/silverbullet/lib/tree";
+import { extendedMarkdownLanguage } from "../../markdown_parser/parser.ts";
+import { expandMarkdown } from "../../markdown/inline.ts";
+import type { Client } from "../../client.ts";
+import { LuaEnv, LuaStackFrame } from "../../space_lua/runtime.ts";
 import {
   type MarkdownRenderOptions,
   renderMarkdownToHtml,
-} from "../markdown/markdown_render.ts";
+} from "../../markdown/markdown_render.ts";
 
 export function markdownSyscalls(client: Client): SysCallMapping {
   return {
diff --git a/lib/plugos/syscalls/mq.ts b/client/plugos/syscalls/mq.ts
similarity index 100%
rename from lib/plugos/syscalls/mq.ts
rename to client/plugos/syscalls/mq.ts
diff --git a/client/syscalls/shell.ts b/client/plugos/syscalls/shell.ts
similarity index 84%
rename from client/syscalls/shell.ts
rename to client/plugos/syscalls/shell.ts
index efdba03a..f9841a25 100644
--- a/client/syscalls/shell.ts
+++ b/client/plugos/syscalls/shell.ts
@@ -1,6 +1,6 @@
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
-import type { Client } from "../client.ts";
-import { fsEndpoint } from "../../lib/spaces/constants.ts";
+import type { SysCallMapping } from "../system.ts";
+import type { Client } from "../../client.ts";
+import { fsEndpoint } from "../../spaces/constants.ts";
 
 export function shellSyscalls(
   client: Client,
diff --git a/client/syscalls/space.ts b/client/plugos/syscalls/space.ts
similarity index 95%
rename from client/syscalls/space.ts
rename to client/plugos/syscalls/space.ts
index 86ef98a8..77d385c3 100644
--- a/client/syscalls/space.ts
+++ b/client/plugos/syscalls/space.ts
@@ -1,11 +1,11 @@
-import type { Client } from "../client.ts";
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
+import type { Client } from "../../client.ts";
+import type { SysCallMapping } from "../system.ts";
 
 import type {
   DocumentMeta,
   FileMeta,
   PageMeta,
-} from "../../plug-api/types/index.ts";
+} from "@silverbulletmd/silverbullet/type/index";
 
 export function spaceReadSyscalls(editor: Client): SysCallMapping {
   return {
diff --git a/client/syscalls/sync.ts b/client/plugos/syscalls/sync.ts
similarity index 95%
rename from client/syscalls/sync.ts
rename to client/plugos/syscalls/sync.ts
index 9ee4baee..75832a70 100644
--- a/client/syscalls/sync.ts
+++ b/client/plugos/syscalls/sync.ts
@@ -1,5 +1,5 @@
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
-import type { Client } from "../client.ts";
+import type { SysCallMapping } from "../system.ts";
+import type { Client } from "../../client.ts";
 
 // TODO: Reimplement this
 export function syncSyscalls(client: Client): SysCallMapping {
diff --git a/client/syscalls/system.ts b/client/plugos/syscalls/system.ts
similarity index 93%
rename from client/syscalls/system.ts
rename to client/plugos/syscalls/system.ts
index 5be25e79..509f3915 100644
--- a/client/syscalls/system.ts
+++ b/client/plugos/syscalls/system.ts
@@ -1,8 +1,8 @@
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
-import type { Client } from "../client.ts";
-import { publicVersion } from "../../public_version.ts";
-import type { CommandDef } from "../../lib/manifest.ts";
-import type { SyscallMeta } from "../../plug-api/types/index.ts";
+import type { SysCallMapping } from "../system.ts";
+import type { Client } from "../../client.ts";
+import { publicVersion } from "../../../public_version.ts";
+import type { CommandDef } from "@silverbulletmd/silverbullet/type/manifest";
+import type { SyscallMeta } from "@silverbulletmd/silverbullet/type/index";
 
 export function systemSyscalls(
   client: Client,
diff --git a/client/syscalls/yaml.ts b/client/plugos/syscalls/yaml.ts
similarity index 94%
rename from client/syscalls/yaml.ts
rename to client/plugos/syscalls/yaml.ts
index 4f5caf60..f4a2b173 100644
--- a/client/syscalls/yaml.ts
+++ b/client/plugos/syscalls/yaml.ts
@@ -1,6 +1,6 @@
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
+import type { SysCallMapping } from "../system.ts";
 import YAML from "js-yaml";
-import { applyPatches, type SetKeyPatch } from "../../lib/yaml.ts";
+import { applyPatches, type SetKeyPatch } from "../../../plug-api/lib/yaml.ts";
 
 type YamlStringifyOptions = {
   /** indentation width to use (in spaces). */
diff --git a/lib/plugos/system.ts b/client/plugos/system.ts
similarity index 100%
rename from lib/plugos/system.ts
rename to client/plugos/system.ts
diff --git a/lib/plugos/types.ts b/client/plugos/types.ts
similarity index 100%
rename from lib/plugos/types.ts
rename to client/plugos/types.ts
diff --git a/lib/plugos/util.ts b/client/plugos/util.ts
similarity index 100%
rename from lib/plugos/util.ts
rename to client/plugos/util.ts
diff --git a/lib/plugos/worker_runtime.ts b/client/plugos/worker_runtime.ts
similarity index 98%
rename from lib/plugos/worker_runtime.ts
rename to client/plugos/worker_runtime.ts
index 502d5923..ac37773c 100644
--- a/lib/plugos/worker_runtime.ts
+++ b/client/plugos/worker_runtime.ts
@@ -4,7 +4,7 @@ import type {
   ProxyFetchRequest64,
   ProxyFetchResponse64,
 } from "../proxy_fetch.ts";
-import { base64Decode, base64Encode } from "../crypto.ts";
+import { base64Decode, base64Encode } from "../../plug-api/lib/crypto.ts";
 import { initLogger } from "../logger.ts";
 
 declare global {
diff --git a/lib/proxy_fetch.ts b/client/proxy_fetch.ts
similarity index 94%
rename from lib/proxy_fetch.ts
rename to client/proxy_fetch.ts
index 31af441e..c28d9397 100644
--- a/lib/proxy_fetch.ts
+++ b/client/proxy_fetch.ts
@@ -1,4 +1,4 @@
-import { base64Decode, base64Encode } from "./crypto.ts";
+import { base64Decode, base64Encode } from "../plug-api/lib/crypto.ts";
 
 export type ProxyFetchRequest64 = {
   method?: string;
diff --git a/client/service_worker.ts b/client/service_worker.ts
index 4b9ee2e2..3d4e6bd6 100644
--- a/client/service_worker.ts
+++ b/client/service_worker.ts
@@ -1,4 +1,4 @@
-import { initLogger } from "../lib/logger.ts";
+import { initLogger } from "./logger.ts";
 import { ProxyRouter } from "./service_worker/proxy_router.ts";
 
 import { SyncEngine } from "./service_worker/sync_engine.ts";
@@ -6,12 +6,12 @@ import type {
   ServiceWorkerSourceMessage,
   ServiceWorkerTargetMessage,
 } from "./ui_types.ts";
-import { simpleHash } from "../lib/crypto.ts";
-import { IndexedDBKvPrimitives } from "../lib/data/indexeddb_kv_primitives.ts";
-import { fsEndpoint } from "../lib/spaces/constants.ts";
-import { DataStoreSpacePrimitives } from "../lib/spaces/datastore_space_primitives.ts";
-import { HttpSpacePrimitives } from "../lib/spaces/http_space_primitives.ts";
-import { throttleImmediately } from "../lib/async.ts";
+import { simpleHash } from "@silverbulletmd/silverbullet/lib/crypto";
+import { IndexedDBKvPrimitives } from "./data/indexeddb_kv_primitives.ts";
+import { fsEndpoint } from "./spaces/constants.ts";
+import { DataStoreSpacePrimitives } from "./spaces/datastore_space_primitives.ts";
+import { HttpSpacePrimitives } from "./spaces/http_space_primitives.ts";
+import { throttleImmediately } from "@silverbulletmd/silverbullet/lib/async";
 
 const logger = initLogger("[Service Worker]");
 
diff --git a/client/service_worker/proxy_router.ts b/client/service_worker/proxy_router.ts
index f084ef9d..e74c81a2 100644
--- a/client/service_worker/proxy_router.ts
+++ b/client/service_worker/proxy_router.ts
@@ -1,10 +1,13 @@
-import { fsEndpoint } from "../../lib/spaces/constants.ts";
+import { fsEndpoint } from "../spaces/constants.ts";
 import { decodePageURI } from "@silverbulletmd/silverbullet/lib/ref";
-import type { SpacePrimitives } from "../../lib/spaces/space_primitives.ts";
-import { fileMetaToHeaders, headersToFileMeta } from "../../lib/util.ts";
-import { notFoundError, offlineError } from "../../lib/constants.ts";
+import type { SpacePrimitives } from "../spaces/space_primitives.ts";
+import { fileMetaToHeaders, headersToFileMeta } from "../util.ts";
+import {
+  notFoundError,
+  offlineError,
+} from "@silverbulletmd/silverbullet/constants";
 import type { SyncEngine } from "./sync_engine.ts";
-import { EventEmitter } from "../../lib/plugos/event.ts";
+import { EventEmitter } from "../plugos/event.ts";
 import type { FileMeta } from "@silverbulletmd/silverbullet/type/index";
 
 const alwaysProxy = [
diff --git a/client/service_worker/sync_engine.ts b/client/service_worker/sync_engine.ts
index 881d9f88..8a7e3f59 100644
--- a/client/service_worker/sync_engine.ts
+++ b/client/service_worker/sync_engine.ts
@@ -1,14 +1,10 @@
 import { compile as gitIgnoreCompiler } from "gitignore-parser";
-import { jitter, sleep } from "../../lib/async.ts";
-import type { KvPrimitives } from "../../lib/data/kv_primitives.ts";
-import { EventEmitter } from "../../lib/plugos/event.ts";
-import { plugPrefix, stdLibPrefix } from "../../lib/spaces/constants.ts";
-import type { SpacePrimitives } from "../../lib/spaces/space_primitives.ts";
-import {
-  SpaceSync,
-  SyncSnapshot,
-  type SyncStatus,
-} from "../../lib/spaces/sync.ts";
+import { jitter, sleep } from "@silverbulletmd/silverbullet/lib/async";
+import type { KvPrimitives } from "../data/kv_primitives.ts";
+import { EventEmitter } from "../plugos/event.ts";
+import { plugPrefix, stdLibPrefix } from "../spaces/constants.ts";
+import type { SpacePrimitives } from "../spaces/space_primitives.ts";
+import { SpaceSync, SyncSnapshot, type SyncStatus } from "../spaces/sync.ts";
 
 const syncSnapshotKey = ["$sync", "snapshot"];
 const syncInterval = 20;
diff --git a/client/space.ts b/client/space.ts
index e360ba4d..6dc53def 100644
--- a/client/space.ts
+++ b/client/space.ts
@@ -1,14 +1,14 @@
-import { plugPrefix } from "../lib/spaces/constants.ts";
+import { plugPrefix } from "./spaces/constants.ts";
 
-import type { EventHook } from "../client/hooks/event.ts";
-import { jitter, safeRun } from "../lib/async.ts";
-import { localDateString } from "../lib/dates.ts";
+import type { EventHook } from "./plugos/hooks/event.ts";
+import { jitter, safeRun } from "@silverbulletmd/silverbullet/lib/async";
+import { localDateString } from "@silverbulletmd/silverbullet/lib/dates";
 import type {
   DocumentMeta,
   FileMeta,
   PageMeta,
-} from "../plug-api/types/index.ts";
-import type { SpacePrimitives } from "../lib/spaces/space_primitives.ts";
+} from "@silverbulletmd/silverbullet/type/index";
+import type { SpacePrimitives } from "./spaces/space_primitives.ts";
 import {
   getPathExtension,
   type Path,
diff --git a/client/space_lua.ts b/client/space_lua.ts
index 9e314ded..2b6c3cc7 100644
--- a/client/space_lua.ts
+++ b/client/space_lua.ts
@@ -1,23 +1,16 @@
-import type { System } from "../lib/plugos/system.ts";
+import type { System } from "./plugos/system.ts";
 import type { ScriptObject } from "../plugs/index/script.ts";
-import {
-  LuaEnv,
-  LuaRuntimeError,
-  LuaStackFrame,
-} from "../lib/space_lua/runtime.ts";
-import {
-  parse as parseLua,
-  parseExpressionString,
-} from "../lib/space_lua/parse.ts";
-import { evalStatement } from "../lib/space_lua/eval.ts";
+import { LuaEnv, LuaRuntimeError, LuaStackFrame } from "./space_lua/runtime.ts";
+import { parse as parseLua, parseExpressionString } from "./space_lua/parse.ts";
+import { evalStatement } from "./space_lua/eval.ts";
 import {
   encodeRef,
   parseToRef,
   type Ref,
 } from "@silverbulletmd/silverbullet/lib/ref";
-import type { ASTCtx } from "../lib/space_lua/ast.ts";
+import type { ASTCtx } from "./space_lua/ast.ts";
 import { buildLuaEnv } from "./space_lua_api.ts";
-import type { LuaCollectionQuery } from "../lib/space_lua/query_collection.ts";
+import type { LuaCollectionQuery } from "./space_lua/query_collection.ts";
 
 export class SpaceLuaEnvironment {
   env: LuaEnv;
diff --git a/lib/space_lua/ast.ts b/client/space_lua/ast.ts
similarity index 100%
rename from lib/space_lua/ast.ts
rename to client/space_lua/ast.ts
diff --git a/lib/space_lua/eval.test.ts b/client/space_lua/eval.test.ts
similarity index 100%
rename from lib/space_lua/eval.test.ts
rename to client/space_lua/eval.test.ts
diff --git a/lib/space_lua/eval.ts b/client/space_lua/eval.ts
similarity index 100%
rename from lib/space_lua/eval.ts
rename to client/space_lua/eval.ts
diff --git a/lib/space_lua/language_core_test.lua b/client/space_lua/language_core_test.lua
similarity index 100%
rename from lib/space_lua/language_core_test.lua
rename to client/space_lua/language_core_test.lua
diff --git a/lib/space_lua/lua.grammar b/client/space_lua/lua.grammar
similarity index 100%
rename from lib/space_lua/lua.grammar
rename to client/space_lua/lua.grammar
diff --git a/lib/space_lua/lua.test.ts b/client/space_lua/lua.test.ts
similarity index 100%
rename from lib/space_lua/lua.test.ts
rename to client/space_lua/lua.test.ts
diff --git a/lib/space_lua/lume_test.lua b/client/space_lua/lume_test.lua
similarity index 100%
rename from lib/space_lua/lume_test.lua
rename to client/space_lua/lume_test.lua
diff --git a/lib/space_lua/parse-lua.js b/client/space_lua/parse-lua.js
similarity index 100%
rename from lib/space_lua/parse-lua.js
rename to client/space_lua/parse-lua.js
diff --git a/lib/space_lua/parse-lua.terms.js b/client/space_lua/parse-lua.terms.js
similarity index 100%
rename from lib/space_lua/parse-lua.terms.js
rename to client/space_lua/parse-lua.terms.js
diff --git a/lib/space_lua/parse.test.ts b/client/space_lua/parse.test.ts
similarity index 100%
rename from lib/space_lua/parse.test.ts
rename to client/space_lua/parse.test.ts
diff --git a/lib/space_lua/parse.ts b/client/space_lua/parse.ts
similarity index 100%
rename from lib/space_lua/parse.ts
rename to client/space_lua/parse.ts
diff --git a/lib/space_lua/query_collection.test.ts b/client/space_lua/query_collection.test.ts
similarity index 100%
rename from lib/space_lua/query_collection.test.ts
rename to client/space_lua/query_collection.test.ts
diff --git a/lib/space_lua/query_collection.ts b/client/space_lua/query_collection.ts
similarity index 100%
rename from lib/space_lua/query_collection.ts
rename to client/space_lua/query_collection.ts
diff --git a/lib/space_lua/query_test.lua b/client/space_lua/query_test.lua
similarity index 100%
rename from lib/space_lua/query_test.lua
rename to client/space_lua/query_test.lua
diff --git a/lib/space_lua/runtime.test.ts b/client/space_lua/runtime.test.ts
similarity index 100%
rename from lib/space_lua/runtime.test.ts
rename to client/space_lua/runtime.test.ts
diff --git a/lib/space_lua/runtime.ts b/client/space_lua/runtime.ts
similarity index 100%
rename from lib/space_lua/runtime.ts
rename to client/space_lua/runtime.ts
diff --git a/lib/space_lua/stdlib.ts b/client/space_lua/stdlib.ts
similarity index 100%
rename from lib/space_lua/stdlib.ts
rename to client/space_lua/stdlib.ts
diff --git a/lib/space_lua/stdlib/encoding.ts b/client/space_lua/stdlib/encoding.ts
similarity index 88%
rename from lib/space_lua/stdlib/encoding.ts
rename to client/space_lua/stdlib/encoding.ts
index ffc182f6..77f43ad9 100644
--- a/lib/space_lua/stdlib/encoding.ts
+++ b/client/space_lua/stdlib/encoding.ts
@@ -1,5 +1,5 @@
 import { LuaBuiltinFunction, LuaTable } from "../runtime.ts";
-import { base64Decode, base64Encode } from "../../crypto.ts";
+import { base64Decode, base64Encode } from "../../../plug-api/lib/crypto.ts";
 
 export const encodingApi = new LuaTable({
   base64Encode: new LuaBuiltinFunction(
diff --git a/lib/space_lua/stdlib/encoding_test.lua b/client/space_lua/stdlib/encoding_test.lua
similarity index 100%
rename from lib/space_lua/stdlib/encoding_test.lua
rename to client/space_lua/stdlib/encoding_test.lua
diff --git a/lib/space_lua/stdlib/global_test.lua b/client/space_lua/stdlib/global_test.lua
similarity index 100%
rename from lib/space_lua/stdlib/global_test.lua
rename to client/space_lua/stdlib/global_test.lua
diff --git a/lib/space_lua/stdlib/js.ts b/client/space_lua/stdlib/js.ts
similarity index 100%
rename from lib/space_lua/stdlib/js.ts
rename to client/space_lua/stdlib/js.ts
diff --git a/lib/space_lua/stdlib/js_test.lua b/client/space_lua/stdlib/js_test.lua
similarity index 100%
rename from lib/space_lua/stdlib/js_test.lua
rename to client/space_lua/stdlib/js_test.lua
diff --git a/lib/space_lua/stdlib/math.ts b/client/space_lua/stdlib/math.ts
similarity index 100%
rename from lib/space_lua/stdlib/math.ts
rename to client/space_lua/stdlib/math.ts
diff --git a/lib/space_lua/stdlib/math_test.lua b/client/space_lua/stdlib/math_test.lua
similarity index 100%
rename from lib/space_lua/stdlib/math_test.lua
rename to client/space_lua/stdlib/math_test.lua
diff --git a/lib/space_lua/stdlib/os.ts b/client/space_lua/stdlib/os.ts
similarity index 100%
rename from lib/space_lua/stdlib/os.ts
rename to client/space_lua/stdlib/os.ts
diff --git a/lib/space_lua/stdlib/os_test.lua b/client/space_lua/stdlib/os_test.lua
similarity index 100%
rename from lib/space_lua/stdlib/os_test.lua
rename to client/space_lua/stdlib/os_test.lua
diff --git a/lib/space_lua/stdlib/printf.ts b/client/space_lua/stdlib/printf.ts
similarity index 100%
rename from lib/space_lua/stdlib/printf.ts
rename to client/space_lua/stdlib/printf.ts
diff --git a/lib/space_lua/stdlib/space_lua.ts b/client/space_lua/stdlib/space_lua.ts
similarity index 100%
rename from lib/space_lua/stdlib/space_lua.ts
rename to client/space_lua/stdlib/space_lua.ts
diff --git a/lib/space_lua/stdlib/space_lua_test.lua b/client/space_lua/stdlib/space_lua_test.lua
similarity index 100%
rename from lib/space_lua/stdlib/space_lua_test.lua
rename to client/space_lua/stdlib/space_lua_test.lua
diff --git a/lib/space_lua/stdlib/string.ts b/client/space_lua/stdlib/string.ts
similarity index 100%
rename from lib/space_lua/stdlib/string.ts
rename to client/space_lua/stdlib/string.ts
diff --git a/lib/space_lua/stdlib/string_test.lua b/client/space_lua/stdlib/string_test.lua
similarity index 100%
rename from lib/space_lua/stdlib/string_test.lua
rename to client/space_lua/stdlib/string_test.lua
diff --git a/lib/space_lua/stdlib/string_test2.lua b/client/space_lua/stdlib/string_test2.lua
similarity index 100%
rename from lib/space_lua/stdlib/string_test2.lua
rename to client/space_lua/stdlib/string_test2.lua
diff --git a/lib/space_lua/stdlib/table.ts b/client/space_lua/stdlib/table.ts
similarity index 100%
rename from lib/space_lua/stdlib/table.ts
rename to client/space_lua/stdlib/table.ts
diff --git a/lib/space_lua/stdlib/table_test.lua b/client/space_lua/stdlib/table_test.lua
similarity index 100%
rename from lib/space_lua/stdlib/table_test.lua
rename to client/space_lua/stdlib/table_test.lua
diff --git a/lib/space_lua/util.test.ts b/client/space_lua/util.test.ts
similarity index 100%
rename from lib/space_lua/util.test.ts
rename to client/space_lua/util.test.ts
diff --git a/lib/space_lua/util.ts b/client/space_lua/util.ts
similarity index 100%
rename from lib/space_lua/util.ts
rename to client/space_lua/util.ts
diff --git a/client/space_lua_api.ts b/client/space_lua_api.ts
index 8fcd8d64..d3cc0d96 100644
--- a/client/space_lua_api.ts
+++ b/client/space_lua_api.ts
@@ -1,4 +1,4 @@
-import { luaBuildStandardEnv } from "../lib/space_lua/stdlib.ts";
+import { luaBuildStandardEnv } from "./space_lua/stdlib.ts";
 import {
   LuaBuiltinFunction,
   LuaEnv,
@@ -6,8 +6,8 @@ import {
   type LuaRuntimeError,
   LuaStackFrame,
   LuaTable,
-} from "../lib/space_lua/runtime.ts";
-import type { System } from "../lib/plugos/system.ts";
+} from "./space_lua/runtime.ts";
+import type { System } from "./plugos/system.ts";
 import { resolveASTReference } from "./space_lua.ts";
 
 export function buildLuaEnv(system: System<any>) {
diff --git a/lib/spaces/asset_bundle_space_primitives.ts b/client/spaces/asset_bundle_space_primitives.ts
similarity index 94%
rename from lib/spaces/asset_bundle_space_primitives.ts
rename to client/spaces/asset_bundle_space_primitives.ts
index 613346ec..9529e230 100644
--- a/lib/spaces/asset_bundle_space_primitives.ts
+++ b/client/spaces/asset_bundle_space_primitives.ts
@@ -1,7 +1,7 @@
 import type { SpacePrimitives } from "./space_primitives.ts";
-import type { AssetBundle } from "../../lib/asset_bundle/bundle.ts";
+import type { AssetBundle } from "../asset_bundle/bundle.ts";
 
-import type { FileMeta } from "../../plug-api/types/index.ts";
+import type { FileMeta } from "@silverbulletmd/silverbullet/type/index";
 
 export class AssetBundlePlugSpacePrimitives implements SpacePrimitives {
   constructor(
diff --git a/lib/spaces/checked_space_primitives.ts b/client/spaces/checked_space_primitives.ts
similarity index 100%
rename from lib/spaces/checked_space_primitives.ts
rename to client/spaces/checked_space_primitives.ts
diff --git a/lib/spaces/constants.ts b/client/spaces/constants.ts
similarity index 100%
rename from lib/spaces/constants.ts
rename to client/spaces/constants.ts
diff --git a/lib/spaces/datastore_space_primitives.test.ts b/client/spaces/datastore_space_primitives.test.ts
similarity index 100%
rename from lib/spaces/datastore_space_primitives.test.ts
rename to client/spaces/datastore_space_primitives.test.ts
diff --git a/lib/spaces/datastore_space_primitives.ts b/client/spaces/datastore_space_primitives.ts
similarity index 95%
rename from lib/spaces/datastore_space_primitives.ts
rename to client/spaces/datastore_space_primitives.ts
index 0eb28f0d..74a6f887 100644
--- a/lib/spaces/datastore_space_primitives.ts
+++ b/client/spaces/datastore_space_primitives.ts
@@ -1,7 +1,7 @@
 import type { SpacePrimitives } from "./space_primitives.ts";
 import { mime } from "mimetypes";
-import type { FileMeta } from "../../plug-api/types/index.ts";
-import { notFoundError } from "../constants.ts";
+import type { FileMeta } from "@silverbulletmd/silverbullet/type/index";
+import { notFoundError } from "@silverbulletmd/silverbullet/constants";
 import type { KvPrimitives } from "../data/kv_primitives.ts";
 
 const filesMetaPrefix = ["meta"];
diff --git a/lib/spaces/disk_space_primitives.test.ts b/client/spaces/disk_space_primitives.test.ts
similarity index 100%
rename from lib/spaces/disk_space_primitives.test.ts
rename to client/spaces/disk_space_primitives.test.ts
diff --git a/lib/spaces/disk_space_primitives.ts b/client/spaces/disk_space_primitives.ts
similarity index 98%
rename from lib/spaces/disk_space_primitives.ts
rename to client/spaces/disk_space_primitives.ts
index 2e514318..e120ebbc 100644
--- a/lib/spaces/disk_space_primitives.ts
+++ b/client/spaces/disk_space_primitives.ts
@@ -4,7 +4,7 @@ import type { SpacePrimitives } from "./space_primitives.ts";
 import { mime } from "mimetypes";
 
 import type { FileMeta } from "../../plug-api/types/index.ts";
-import { notFoundError } from "../constants.ts";
+import { notFoundError } from "@silverbulletmd/silverbullet/constants";
 
 function lookupContentType(path: string): string {
   return mime.getType(path) || "application/octet-stream";
diff --git a/lib/spaces/evented_space_primitives.ts b/client/spaces/evented_space_primitives.ts
similarity index 97%
rename from lib/spaces/evented_space_primitives.ts
rename to client/spaces/evented_space_primitives.ts
index 3bf76144..a63b8339 100644
--- a/lib/spaces/evented_space_primitives.ts
+++ b/client/spaces/evented_space_primitives.ts
@@ -1,9 +1,9 @@
-import type { EventHook } from "../../client/hooks/event.ts";
+import type { EventHook } from "../plugos/hooks/event.ts";
 
 import type { SpacePrimitives } from "./space_primitives.ts";
-import type { FileMeta } from "../../plug-api/types/index.ts";
+import type { FileMeta } from "@silverbulletmd/silverbullet/type/index";
 import type { DataStore } from "../data/datastore.ts";
-import { notFoundError } from "../constants.ts";
+import { notFoundError } from "@silverbulletmd/silverbullet/constants";
 
 /**
  * Events exposed:
diff --git a/lib/spaces/filtered_space_primitives.ts b/client/spaces/filtered_space_primitives.ts
similarity index 100%
rename from lib/spaces/filtered_space_primitives.ts
rename to client/spaces/filtered_space_primitives.ts
diff --git a/lib/spaces/http_space_primitives.ts b/client/spaces/http_space_primitives.ts
similarity index 97%
rename from lib/spaces/http_space_primitives.ts
rename to client/spaces/http_space_primitives.ts
index e61cc377..53a67e81 100644
--- a/lib/spaces/http_space_primitives.ts
+++ b/client/spaces/http_space_primitives.ts
@@ -3,9 +3,12 @@ import { encodePageURI } from "@silverbulletmd/silverbullet/lib/ref";
 import {
   flushCachesAndUnregisterServiceWorker,
 } from "../../client/service_worker/util.ts";
-import type { FileMeta } from "../../plug-api/types/index.ts";
-import { notFoundError, offlineError } from "../constants.ts";
-import { headersToFileMeta } from "../../lib/util.ts";
+import type { FileMeta } from "@silverbulletmd/silverbullet/type/index";
+import {
+  notFoundError,
+  offlineError,
+} from "@silverbulletmd/silverbullet/constants";
+import { headersToFileMeta } from "../util.ts";
 
 const defaultFetchTimeout = 30000; // 30 seconds
 
diff --git a/lib/spaces/plug_space_primitives.ts b/client/spaces/plug_space_primitives.ts
similarity index 93%
rename from lib/spaces/plug_space_primitives.ts
rename to client/spaces/plug_space_primitives.ts
index 0a83d06f..ec8ca434 100644
--- a/lib/spaces/plug_space_primitives.ts
+++ b/client/spaces/plug_space_primitives.ts
@@ -1,7 +1,7 @@
 import type { SpacePrimitives } from "./space_primitives.ts";
-import type { NamespaceOperation } from "../plugos/namespace.ts";
-import type { PlugNamespaceHook } from "../../client/hooks/plug_namespace.ts";
-import type { FileMeta } from "../../plug-api/types/index.ts";
+import type { NamespaceOperation } from "@silverbulletmd/silverbullet/type/namespace";
+import type { PlugNamespaceHook } from "../plugos/hooks/plug_namespace.ts";
+import type { FileMeta } from "@silverbulletmd/silverbullet/type/index";
 
 export class PlugSpacePrimitives implements SpacePrimitives {
   constructor(
diff --git a/lib/spaces/ro_space_primitives.ts b/client/spaces/ro_space_primitives.ts
similarity index 100%
rename from lib/spaces/ro_space_primitives.ts
rename to client/spaces/ro_space_primitives.ts
diff --git a/lib/spaces/space_primitives.test.ts b/client/spaces/space_primitives.test.ts
similarity index 98%
rename from lib/spaces/space_primitives.test.ts
rename to client/spaces/space_primitives.test.ts
index 855b19eb..740864e6 100644
--- a/lib/spaces/space_primitives.test.ts
+++ b/client/spaces/space_primitives.test.ts
@@ -1,7 +1,7 @@
 import { assert, assertEquals } from "@std/assert";
 import type { SpacePrimitives } from "./space_primitives.ts";
-import type { FileMeta } from "../../plug-api/types/index.ts";
-import { notFoundError } from "../constants.ts";
+import type { FileMeta } from "@silverbulletmd/silverbullet/type/index";
+import { notFoundError } from "@silverbulletmd/silverbullet/constants";
 
 export async function testSpacePrimitives(spacePrimitives: SpacePrimitives) {
   await testBasicOperations(spacePrimitives);
diff --git a/lib/spaces/space_primitives.ts b/client/spaces/space_primitives.ts
similarity index 100%
rename from lib/spaces/space_primitives.ts
rename to client/spaces/space_primitives.ts
diff --git a/lib/spaces/sync.test.ts b/client/spaces/sync.test.ts
similarity index 99%
rename from lib/spaces/sync.test.ts
rename to client/spaces/sync.test.ts
index 82db37cf..73a989a0 100644
--- a/lib/spaces/sync.test.ts
+++ b/client/spaces/sync.test.ts
@@ -1,7 +1,7 @@
 import { SpaceSync, SyncSnapshot } from "./sync.ts";
 import { DiskSpacePrimitives } from "./disk_space_primitives.ts";
 import { assertEquals } from "@std/assert";
-import { sleep } from "../async.ts";
+import { sleep } from "@silverbulletmd/silverbullet/lib/async";
 import { assert } from "node:console";
 
 Deno.test("Test sync with no filtering", async () => {
diff --git a/lib/spaces/sync.ts b/client/spaces/sync.ts
similarity index 98%
rename from lib/spaces/sync.ts
rename to client/spaces/sync.ts
index 53129875..9c832de5 100644
--- a/lib/spaces/sync.ts
+++ b/client/spaces/sync.ts
@@ -1,9 +1,9 @@
 import type { SpacePrimitives } from "./space_primitives.ts";
 import { EventEmitter } from "../plugos/event.ts";
 import { plugPrefix } from "./constants.ts";
-import type { FileMeta } from "../../plug-api/types/index.ts";
-import { notFoundError } from "../constants.ts";
-import { processWithConcurrency } from "../async.ts";
+import type { FileMeta } from "@silverbulletmd/silverbullet/type/index";
+import { notFoundError } from "@silverbulletmd/silverbullet/constants";
+import { processWithConcurrency } from "@silverbulletmd/silverbullet/lib/async";
 
 const syncConcurrency = 3;
 
diff --git a/client/syscalls/client_code_widget.ts b/client/syscalls/client_code_widget.ts
deleted file mode 100644
index 90ec2f94..00000000
--- a/client/syscalls/client_code_widget.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { SysCallMapping } from "../../lib/plugos/system.ts";
-import { reloadAllWidgets } from "../cm_plugins/code_widget.ts";
-import { broadcastReload } from "../components/widget_sandbox_iframe.ts";
-
-export function clientCodeWidgetSyscalls(): SysCallMapping {
-  return {
-    "codeWidget.refreshAll": () => {
-      broadcastReload();
-      return reloadAllWidgets();
-    },
-  };
-}
diff --git a/client/types/command.ts b/client/types/command.ts
index 8464eebf..e7da17dc 100644
--- a/client/types/command.ts
+++ b/client/types/command.ts
@@ -1,4 +1,7 @@
-import type { CommandDef, SlashCommandDef } from "../../lib/manifest.ts";
+import type {
+  CommandDef,
+  SlashCommandDef,
+} from "@silverbulletmd/silverbullet/type/manifest";
 
 import type { SlashCompletions } from "@silverbulletmd/silverbullet/type/client";
 
diff --git a/client/ui_types.ts b/client/ui_types.ts
index 79801537..f23a3003 100644
--- a/client/ui_types.ts
+++ b/client/ui_types.ts
@@ -3,11 +3,14 @@ import type {
   FilterOption,
   Notification,
   PanelMode,
-} from "../plug-api/types/client.ts";
+} from "@silverbulletmd/silverbullet/type/client";
 
-import type { DocumentMeta, PageMeta } from "../plug-api/types/index.ts";
+import type {
+  DocumentMeta,
+  PageMeta,
+} from "@silverbulletmd/silverbullet/type/index";
 import type { Path } from "@silverbulletmd/silverbullet/lib/ref";
-import type { SyncStatus } from "../lib/spaces/sync.ts";
+import type { SyncStatus } from "./spaces/sync.ts";
 
 export type PanelConfig = {
   mode?: PanelMode;
diff --git a/lib/url_prefix.test.ts b/client/url_prefix.test.ts
similarity index 100%
rename from lib/url_prefix.test.ts
rename to client/url_prefix.test.ts
diff --git a/lib/url_prefix.ts b/client/url_prefix.ts
similarity index 100%
rename from lib/url_prefix.ts
rename to client/url_prefix.ts
diff --git a/lib/util.ts b/client/util.ts
similarity index 100%
rename from lib/util.ts
rename to client/util.ts
diff --git a/deno.json b/deno.json
index 2dbcb369..14957730 100644
--- a/deno.json
+++ b/deno.json
@@ -41,15 +41,22 @@
   "exports": {
     "./syscall": "./plug-api/syscall.ts",
     "./syscalls": "./plug-api/syscalls.ts",
+    "./constants": "./plug-api/constants.ts",
     "./lib/json": "./plug-api/lib/json.ts",
     "./lib/tree": "./plug-api/lib/tree.ts",
     "./lib/attribute": "./plug-api/lib/attribute.ts",
     "./lib/ref": "./plug-api/lib/ref.ts",
     "./lib/resolve": "./plug-api/lib/resolve.ts",
+    "./lib/dates": "./plug-api/lib/dates.ts",
+    "./lib/async": "./plug-api/lib/async.ts",
     "./lib/frontmatter": "./plug-api/lib/frontmatter.ts",
+    "./lib/crypto": "./plug-api/lib/crypto.ts",
+    "./lib/limited_map": "./plug-api/lib/limited_map.ts",
     "./lib/tags": "./plug-api/lib/tags.ts",
     "./type/client": "./plug-api/types/client.ts",
     "./type/config": "./plug-api/types/config.ts",
+    "./type/manifest": "./plug-api/types/manifest.ts",
+    "./type/namespace": "./plug-api/types/namespace.ts",
     "./type/datastore": "./plug-api/types/datastore.ts",
     "./type/event": "./plug-api/types/event.ts",
     "./type/index": "./plug-api/types/index.ts"
@@ -57,15 +64,22 @@
   "imports": {
     "@silverbulletmd/silverbullet/syscall": "./plug-api/syscall.ts",
     "@silverbulletmd/silverbullet/syscalls": "./plug-api/syscalls.ts",
+    "@silverbulletmd/silverbullet/constants": "./plug-api/constants.ts",
     "@silverbulletmd/silverbullet/type/client": "./plug-api/types/client.ts",
     "@silverbulletmd/silverbullet/type/config": "./plug-api/types/config.ts",
     "@silverbulletmd/silverbullet/type/datastore": "./plug-api/types/datastore.ts",
     "@silverbulletmd/silverbullet/type/event": "./plug-api/types/event.ts",
     "@silverbulletmd/silverbullet/type/index": "./plug-api/types/index.ts",
+    "@silverbulletmd/silverbullet/type/manifest": "./plug-api/types/manifest.ts",
+    "@silverbulletmd/silverbullet/type/namespace": "./plug-api/types/namespace.ts",
     "@silverbulletmd/silverbullet/lib/json": "./plug-api/lib/json.ts",
     "@silverbulletmd/silverbullet/lib/tree": "./plug-api/lib/tree.ts",
     "@silverbulletmd/silverbullet/lib/attribute": "./plug-api/lib/attribute.ts",
+    "@silverbulletmd/silverbullet/lib/limited_map": "./plug-api/lib/limited_map.ts",
     "@silverbulletmd/silverbullet/lib/ref": "./plug-api/lib/ref.ts",
+    "@silverbulletmd/silverbullet/lib/async": "./plug-api/lib/async.ts",
+    "@silverbulletmd/silverbullet/lib/crypto": "./plug-api/lib/crypto.ts",
+    "@silverbulletmd/silverbullet/lib/dates": "./plug-api/lib/dates.ts",
     "@silverbulletmd/silverbullet/lib/resolve": "./plug-api/lib/resolve.ts",
     "@silverbulletmd/silverbullet/lib/query_expression": "./plug-api/lib/query_expression.ts",
     "@silverbulletmd/silverbullet/lib/native_fetch": "./plug-api/lib/native_fetch.ts",
diff --git a/lib/README.md b/lib/README.md
deleted file mode 100644
index 4e240624..00000000
--- a/lib/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-This folder contains library functions that is generally reusable, not specific to SilverBullet. This code can be used
-from within plugs or the core code base. It may move out of this repo at some point.
\ No newline at end of file
diff --git a/lib/plugos/syscalls/event.ts b/lib/plugos/syscalls/event.ts
deleted file mode 100644
index df1a19fc..00000000
--- a/lib/plugos/syscalls/event.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { SysCallMapping } from "../system.ts";
-import type { EventHookI } from "../eventhook.ts";
-
-export function eventSyscalls(eventHook: EventHookI): SysCallMapping {
-  return {
-    "event.dispatch": (_ctx, eventName: string, data: any) => {
-      return eventHook.dispatchEvent(eventName, data);
-    },
-    "event.listEvents": () => {
-      return eventHook.listEvents();
-    },
-  };
-}
diff --git a/lib/constants.ts b/plug-api/constants.ts
similarity index 100%
rename from lib/constants.ts
rename to plug-api/constants.ts
diff --git a/lib/async.test.ts b/plug-api/lib/async.test.ts
similarity index 100%
rename from lib/async.test.ts
rename to plug-api/lib/async.test.ts
diff --git a/lib/async.ts b/plug-api/lib/async.ts
similarity index 100%
rename from lib/async.ts
rename to plug-api/lib/async.ts
diff --git a/lib/crypto.ts b/plug-api/lib/crypto.ts
similarity index 100%
rename from lib/crypto.ts
rename to plug-api/lib/crypto.ts
diff --git a/lib/dates.test.ts b/plug-api/lib/dates.test.ts
similarity index 100%
rename from lib/dates.test.ts
rename to plug-api/lib/dates.test.ts
diff --git a/lib/dates.ts b/plug-api/lib/dates.ts
similarity index 100%
rename from lib/dates.ts
rename to plug-api/lib/dates.ts
diff --git a/lib/limited_map.test.ts b/plug-api/lib/limited_map.test.ts
similarity index 100%
rename from lib/limited_map.test.ts
rename to plug-api/lib/limited_map.test.ts
diff --git a/lib/limited_map.ts b/plug-api/lib/limited_map.ts
similarity index 100%
rename from lib/limited_map.ts
rename to plug-api/lib/limited_map.ts
diff --git a/lib/memory_cache.test.ts b/plug-api/lib/memory_cache.test.ts
similarity index 100%
rename from lib/memory_cache.test.ts
rename to plug-api/lib/memory_cache.test.ts
diff --git a/lib/memory_cache.ts b/plug-api/lib/memory_cache.ts
similarity index 100%
rename from lib/memory_cache.ts
rename to plug-api/lib/memory_cache.ts
diff --git a/lib/yaml.test.ts b/plug-api/lib/yaml.test.ts
similarity index 100%
rename from lib/yaml.test.ts
rename to plug-api/lib/yaml.test.ts
diff --git a/lib/yaml.ts b/plug-api/lib/yaml.ts
similarity index 100%
rename from lib/yaml.ts
rename to plug-api/lib/yaml.ts
diff --git a/plug-api/syscalls/asset.ts b/plug-api/syscalls/asset.ts
index 8b3aeff9..3a614eec 100644
--- a/plug-api/syscalls/asset.ts
+++ b/plug-api/syscalls/asset.ts
@@ -1,4 +1,4 @@
-import { base64DecodeDataUrl } from "../../lib/crypto.ts";
+import { base64DecodeDataUrl } from "../lib/crypto.ts";
 import { syscall } from "../syscall.ts";
 
 import type { FileMeta } from "../../plug-api/types/index.ts";
diff --git a/plug-api/syscalls/datastore.ts b/plug-api/syscalls/datastore.ts
index 6827c356..b7f568a6 100644
--- a/plug-api/syscalls/datastore.ts
+++ b/plug-api/syscalls/datastore.ts
@@ -1,4 +1,4 @@
-import type { LuaCollectionQuery } from "../../lib/space_lua/query_collection.ts";
+import type { LuaCollectionQuery } from "../../client/space_lua/query_collection.ts";
 import { syscall } from "../syscall.ts";
 
 import type { KV, KvKey, KvQuery } from "../../plug-api/types/datastore.ts";
diff --git a/plug-api/syscalls/index.ts b/plug-api/syscalls/index.ts
index 27f5abd0..e14155eb 100644
--- a/plug-api/syscalls/index.ts
+++ b/plug-api/syscalls/index.ts
@@ -1,4 +1,4 @@
-import type { LuaCollectionQuery } from "../../lib/space_lua/query_collection.ts";
+import type { LuaCollectionQuery } from "../../client/space_lua/query_collection.ts";
 import { syscall } from "@silverbulletmd/silverbullet/syscall";
 import type { ObjectValue } from "../../plug-api/types/index.ts";
 
diff --git a/plug-api/syscalls/lua.ts b/plug-api/syscalls/lua.ts
index ee663c1a..5ee5c764 100644
--- a/plug-api/syscalls/lua.ts
+++ b/plug-api/syscalls/lua.ts
@@ -1,5 +1,5 @@
 import { syscall } from "../syscall.ts";
-import type { LuaBlock, LuaExpression } from "../../lib/space_lua/ast.ts";
+import type { LuaBlock, LuaExpression } from "../../client/space_lua/ast.ts";
 
 export function parse(
   code: string,
diff --git a/plug-api/syscalls/system.ts b/plug-api/syscalls/system.ts
index c61568e7..373552b2 100644
--- a/plug-api/syscalls/system.ts
+++ b/plug-api/syscalls/system.ts
@@ -1,6 +1,6 @@
 import { syscall } from "../syscall.ts";
-import type { CommandDef } from "../../lib/manifest.ts";
-import type { SyscallMeta } from "../../plug-api/types/index.ts";
+import type { CommandDef } from "../types/manifest.ts";
+import type { SyscallMeta } from "@silverbulletmd/silverbullet/type/index";
 
 /**
  * System level syscalls
diff --git a/plug-api/types/event.ts b/plug-api/types/event.ts
index 7ffa1b38..010af508 100644
--- a/plug-api/types/event.ts
+++ b/plug-api/types/event.ts
@@ -1,5 +1,5 @@
 import type { ParseTree } from "@silverbulletmd/silverbullet/lib/tree";
-import type { EventSubscriptionDef } from "../../lib/manifest.ts";
+import type { EventSubscriptionDef } from "./manifest.ts";
 
 export type IndexTreeEvent = {
   name: string;
diff --git a/lib/manifest.ts b/plug-api/types/manifest.ts
similarity index 94%
rename from lib/manifest.ts
rename to plug-api/types/manifest.ts
index 8cac1c17..0eb45572 100644
--- a/lib/manifest.ts
+++ b/plug-api/types/manifest.ts
@@ -1,5 +1,5 @@
-import type { Manifest as PlugosManifest } from "./plugos/types.ts";
-import type { NamespaceOperation } from "./plugos/namespace.ts";
+import type { Manifest as PlugosManifest } from "../../client/plugos/types.ts";
+import type { NamespaceOperation } from "./namespace.ts";
 
 export type CodeWidgetT = {
   codeWidget?: string;
diff --git a/lib/plugos/namespace.ts b/plug-api/types/namespace.ts
similarity index 100%
rename from lib/plugos/namespace.ts
rename to plug-api/types/namespace.ts
diff --git a/plugs/editor/page.ts b/plugs/editor/page.ts
index 20828397..bd20d413 100644
--- a/plugs/editor/page.ts
+++ b/plugs/editor/page.ts
@@ -1,5 +1,5 @@
 import { editor, space } from "@silverbulletmd/silverbullet/syscalls";
-import { notFoundError } from "../../lib/constants.ts";
+import { notFoundError } from "@silverbulletmd/silverbullet/constants";
 
 export async function deletePage() {
   const pageName = await editor.getCurrentPage();
diff --git a/plugs/editor/upload.ts b/plugs/editor/upload.ts
index a5803260..9a513097 100644
--- a/plugs/editor/upload.ts
+++ b/plugs/editor/upload.ts
@@ -1,5 +1,8 @@
 import { editor, space, system } from "@silverbulletmd/silverbullet/syscalls";
-import { defaultLinkStyle, maximumDocumentSize } from "../../lib/constants.ts";
+import {
+  defaultLinkStyle,
+  maximumDocumentSize,
+} from "@silverbulletmd/silverbullet/constants";
 import { resolveMarkdownLink } from "@silverbulletmd/silverbullet/lib/resolve";
 import {
   encodePageURI,
diff --git a/plugs/index/api.ts b/plugs/index/api.ts
index 80b3f520..57b1115d 100644
--- a/plugs/index/api.ts
+++ b/plugs/index/api.ts
@@ -1,6 +1,6 @@
 import { datastore, markdown } from "@silverbulletmd/silverbullet/syscalls";
-import { ttlCache } from "../../lib/memory_cache.ts";
-import type { LuaCollectionQuery } from "../../lib/space_lua/query_collection.ts";
+import { ttlCache } from "../../plug-api/lib/memory_cache.ts";
+import type { LuaCollectionQuery } from "../../client/space_lua/query_collection.ts";
 import {
   extractFrontMatter as extractFrontmatterFromTree,
   type FrontMatter,
@@ -10,7 +10,7 @@ import {
   collectNodesOfType,
   renderToText,
 } from "@silverbulletmd/silverbullet/lib/tree";
-import { applyPatches, type SetKeyPatch } from "../../lib/yaml.ts";
+import { applyPatches, type SetKeyPatch } from "../../plug-api/lib/yaml.ts";
 import type { ObjectValue } from "../../plug-api/types/index.ts";
 
 import type { KV, KvKey, KvQuery } from "../../plug-api/types/datastore.ts";
diff --git a/plugs/index/queue.ts b/plugs/index/queue.ts
index 62f2963c..8ecd3057 100644
--- a/plugs/index/queue.ts
+++ b/plugs/index/queue.ts
@@ -6,8 +6,8 @@ import {
   space,
   system,
 } from "@silverbulletmd/silverbullet/syscalls";
-import { sleep } from "../../lib/async.ts";
-import type { MQMessage } from "../../plug-api/types/datastore.ts";
+import { sleep } from "@silverbulletmd/silverbullet/lib/async";
+import type { MQMessage } from "@silverbulletmd/silverbullet/type/datastore";
 import type { IndexTreeEvent } from "@silverbulletmd/silverbullet/type/event";
 import { clearFileIndex } from "./api.ts";
 
diff --git a/plugs/index/refactor.ts b/plugs/index/refactor.ts
index a507db73..85ac2c9d 100644
--- a/plugs/index/refactor.ts
+++ b/plugs/index/refactor.ts
@@ -19,7 +19,7 @@ import {
 import { queryLuaObjects } from "./api.ts";
 import type { ObjectValue } from "@silverbulletmd/silverbullet/type/index";
 import { isValidPath } from "@silverbulletmd/silverbullet/lib/ref";
-import { notFoundError } from "../../lib/constants.ts";
+import { notFoundError } from "@silverbulletmd/silverbullet/constants";
 
 /**
  * Renames a single page.
diff --git a/plugs/search/search.ts b/plugs/search/search.ts
index 83bcee98..24a179d5 100644
--- a/plugs/search/search.ts
+++ b/plugs/search/search.ts
@@ -6,7 +6,7 @@ import type {
 import { renderToText } from "@silverbulletmd/silverbullet/lib/tree";
 import { editor, system } from "@silverbulletmd/silverbullet/syscalls";
 import { ftsIndexPage, ftsSearch } from "./engine.ts";
-import { PromiseQueue } from "../../lib/async.ts";
+import { PromiseQueue } from "@silverbulletmd/silverbullet/lib/async";
 
 const searchPrefix = "search:";
 
diff --git a/plugs/tasks/task.ts b/plugs/tasks/task.ts
index 51ab9ef7..32a0e9c9 100644
--- a/plugs/tasks/task.ts
+++ b/plugs/tasks/task.ts
@@ -21,7 +21,7 @@ import {
   replaceNodesMatching,
   traverseTreeAsync,
 } from "@silverbulletmd/silverbullet/lib/tree";
-import { niceDate } from "../../lib/dates.ts";
+import { niceDate } from "@silverbulletmd/silverbullet/lib/dates";
 import {
   cleanAttributes,
   extractAttributes,