diff --git a/packages/app/package.json b/packages/app/package.json
index ca86e33a..87d953c8 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -11,8 +11,8 @@
     "@scure/bip39": "^1.1.1",
     "@snort/shared": "workspace:*",
     "@snort/system": "workspace:*",
-    "@snort/system-query": "workspace:*",
     "@snort/system-react": "workspace:*",
+    "@snort/system-wasm": "workspace:*",
     "@szhsin/react-menu": "^3.3.1",
     "@types/use-sync-external-store": "^0.0.4",
     "@void-cat/api": "^1.0.4",
diff --git a/packages/app/src/benchmarks.ts b/packages/app/src/benchmarks.ts
index 1b6acb80..7754d8a8 100644
--- a/packages/app/src/benchmarks.ts
+++ b/packages/app/src/benchmarks.ts
@@ -1,7 +1,7 @@
 import { bytesToHex } from "@noble/hashes/utils";
 import { DefaultQueryOptimizer, FlatReqFilter, QueryOptimizer, ReqFilter } from "@snort/system";
-import { compress, expand_filter, flat_merge, get_diff, default as wasmInit } from "@snort/system-query";
-import WasmPath from "@snort/system-query/pkg/system_query_bg.wasm";
+import { compress, expand_filter, flat_merge, get_diff, default as wasmInit } from "@snort/system-wasm";
+import WasmPath from "@snort/system-wasm/pkg/system_wasm_bg.wasm";
 import { Bench } from "tinybench";
 
 const WasmQueryOptimizer = {
diff --git a/packages/app/src/index.tsx b/packages/app/src/index.tsx
index bb5c6c5a..c47ca3a7 100644
--- a/packages/app/src/index.tsx
+++ b/packages/app/src/index.tsx
@@ -2,8 +2,8 @@ import "./index.css";
 import "@szhsin/react-menu/dist/index.css";
 import "./fonts/inter.css";
 
-import { compress, expand_filter, flat_merge, get_diff, default as wasmInit } from "@snort/system-query";
-import WasmPath from "@snort/system-query/pkg/system_query_bg.wasm";
+import { compress, expand_filter, flat_merge, get_diff, default as wasmInit } from "@snort/system-wasm";
+import WasmPath from "@snort/system-wasm/pkg/system_wasm_bg.wasm";
 
 import { StrictMode } from "react";
 import * as ReactDOM from "react-dom/client";
diff --git a/packages/system-query/README.md b/packages/system-query/README.md
deleted file mode 100644
index f3891463..00000000
--- a/packages/system-query/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# system-query
diff --git a/packages/system-query/package.json b/packages/system-query/package.json
deleted file mode 100644
index 84379625..00000000
--- a/packages/system-query/package.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "@snort/system-query",
-  "version": "1.0.0",
-  "packageManager": "yarn@3.6.3",
-  "author": "Kieran",
-  "license": "MIT",
-  "scripts": {
-    "build": "wasm-pack build -t web -s snort"
-  },
-  "files": [
-    "pkg/system_query_bg.wasm",
-    "pkg/system_query.js",
-    "pkg/system_query.d.ts"
-  ],
-  "module": "pkg/system_query.js",
-  "types": "pkg/system_query.d.ts"
-}
diff --git a/packages/system-query/pkg/README.md b/packages/system-query/pkg/README.md
deleted file mode 100644
index f3891463..00000000
--- a/packages/system-query/pkg/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# system-query
diff --git a/packages/system-query/pkg/package.json b/packages/system-query/pkg/package.json
deleted file mode 100644
index 74743550..00000000
--- a/packages/system-query/pkg/package.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "name": "@snort/system-query",
-  "version": "0.1.0",
-  "files": [
-    "system_query_bg.wasm",
-    "system_query.js",
-    "system_query.d.ts"
-  ],
-  "module": "system_query.js",
-  "types": "system_query.d.ts",
-  "sideEffects": [
-    "./snippets/*"
-  ]
-}
diff --git a/packages/system-query/pkg/system_query.d.ts b/packages/system-query/pkg/system_query.d.ts
deleted file mode 100644
index b1781e0d..00000000
--- a/packages/system-query/pkg/system_query.d.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * @param {any} prev
- * @param {any} next
- * @returns {any}
- */
-export function diff_filters(prev: any, next: any): any;
-/**
- * @param {any} val
- * @returns {any}
- */
-export function expand_filter(val: any): any;
-/**
- * @param {any} prev
- * @param {any} next
- * @returns {any}
- */
-export function get_diff(prev: any, next: any): any;
-/**
- * @param {any} val
- * @returns {any}
- */
-export function flat_merge(val: any): any;
-/**
- * @param {any} val
- * @returns {any}
- */
-export function compress(val: any): any;
-
-export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
-
-export interface InitOutput {
-  readonly memory: WebAssembly.Memory;
-  readonly diff_filters: (a: number, b: number, c: number) => void;
-  readonly expand_filter: (a: number, b: number) => void;
-  readonly get_diff: (a: number, b: number, c: number) => void;
-  readonly flat_merge: (a: number, b: number) => void;
-  readonly compress: (a: number, b: number) => void;
-  readonly __wbindgen_malloc: (a: number, b: number) => number;
-  readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
-  readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
-  readonly __wbindgen_exn_store: (a: number) => void;
-}
-
-export type SyncInitInput = BufferSource | WebAssembly.Module;
-/**
- * Instantiates the given `module`, which can either be bytes or
- * a precompiled `WebAssembly.Module`.
- *
- * @param {SyncInitInput} module
- *
- * @returns {InitOutput}
- */
-export function initSync(module: SyncInitInput): InitOutput;
-
-/**
- * If `module_or_path` is {RequestInfo} or {URL}, makes a request and
- * for everything else, calls `WebAssembly.instantiate` directly.
- *
- * @param {InitInput | Promise<InitInput>} module_or_path
- *
- * @returns {Promise<InitOutput>}
- */
-export default function __wbg_init(module_or_path?: InitInput | Promise<InitInput>): Promise<InitOutput>;
diff --git a/packages/system-query/pkg/system_query.js b/packages/system-query/pkg/system_query.js
deleted file mode 100644
index 67836cbd..00000000
--- a/packages/system-query/pkg/system_query.js
+++ /dev/null
@@ -1,586 +0,0 @@
-let wasm;
-
-const heap = new Array(128).fill(undefined);
-
-heap.push(undefined, null, true, false);
-
-function getObject(idx) {
-  return heap[idx];
-}
-
-let heap_next = heap.length;
-
-function dropObject(idx) {
-  if (idx < 132) return;
-  heap[idx] = heap_next;
-  heap_next = idx;
-}
-
-function takeObject(idx) {
-  const ret = getObject(idx);
-  dropObject(idx);
-  return ret;
-}
-
-let WASM_VECTOR_LEN = 0;
-
-let cachedUint8Memory0 = null;
-
-function getUint8Memory0() {
-  if (cachedUint8Memory0 === null || cachedUint8Memory0.byteLength === 0) {
-    cachedUint8Memory0 = new Uint8Array(wasm.memory.buffer);
-  }
-  return cachedUint8Memory0;
-}
-
-const cachedTextEncoder =
-  typeof TextEncoder !== "undefined"
-    ? new TextEncoder("utf-8")
-    : {
-        encode: () => {
-          throw Error("TextEncoder not available");
-        },
-      };
-
-const encodeString =
-  typeof cachedTextEncoder.encodeInto === "function"
-    ? function (arg, view) {
-        return cachedTextEncoder.encodeInto(arg, view);
-      }
-    : function (arg, view) {
-        const buf = cachedTextEncoder.encode(arg);
-        view.set(buf);
-        return {
-          read: arg.length,
-          written: buf.length,
-        };
-      };
-
-function passStringToWasm0(arg, malloc, realloc) {
-  if (realloc === undefined) {
-    const buf = cachedTextEncoder.encode(arg);
-    const ptr = malloc(buf.length, 1) >>> 0;
-    getUint8Memory0()
-      .subarray(ptr, ptr + buf.length)
-      .set(buf);
-    WASM_VECTOR_LEN = buf.length;
-    return ptr;
-  }
-
-  let len = arg.length;
-  let ptr = malloc(len, 1) >>> 0;
-
-  const mem = getUint8Memory0();
-
-  let offset = 0;
-
-  for (; offset < len; offset++) {
-    const code = arg.charCodeAt(offset);
-    if (code > 0x7f) break;
-    mem[ptr + offset] = code;
-  }
-
-  if (offset !== len) {
-    if (offset !== 0) {
-      arg = arg.slice(offset);
-    }
-    ptr = realloc(ptr, len, (len = offset + arg.length * 3), 1) >>> 0;
-    const view = getUint8Memory0().subarray(ptr + offset, ptr + len);
-    const ret = encodeString(arg, view);
-
-    offset += ret.written;
-  }
-
-  WASM_VECTOR_LEN = offset;
-  return ptr;
-}
-
-function isLikeNone(x) {
-  return x === undefined || x === null;
-}
-
-let cachedInt32Memory0 = null;
-
-function getInt32Memory0() {
-  if (cachedInt32Memory0 === null || cachedInt32Memory0.byteLength === 0) {
-    cachedInt32Memory0 = new Int32Array(wasm.memory.buffer);
-  }
-  return cachedInt32Memory0;
-}
-
-const cachedTextDecoder =
-  typeof TextDecoder !== "undefined"
-    ? new TextDecoder("utf-8", { ignoreBOM: true, fatal: true })
-    : {
-        decode: () => {
-          throw Error("TextDecoder not available");
-        },
-      };
-
-if (typeof TextDecoder !== "undefined") {
-  cachedTextDecoder.decode();
-}
-
-function getStringFromWasm0(ptr, len) {
-  ptr = ptr >>> 0;
-  return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
-}
-
-function addHeapObject(obj) {
-  if (heap_next === heap.length) heap.push(heap.length + 1);
-  const idx = heap_next;
-  heap_next = heap[idx];
-
-  heap[idx] = obj;
-  return idx;
-}
-
-let cachedFloat64Memory0 = null;
-
-function getFloat64Memory0() {
-  if (cachedFloat64Memory0 === null || cachedFloat64Memory0.byteLength === 0) {
-    cachedFloat64Memory0 = new Float64Array(wasm.memory.buffer);
-  }
-  return cachedFloat64Memory0;
-}
-
-function debugString(val) {
-  // primitive types
-  const type = typeof val;
-  if (type == "number" || type == "boolean" || val == null) {
-    return `${val}`;
-  }
-  if (type == "string") {
-    return `"${val}"`;
-  }
-  if (type == "symbol") {
-    const description = val.description;
-    if (description == null) {
-      return "Symbol";
-    } else {
-      return `Symbol(${description})`;
-    }
-  }
-  if (type == "function") {
-    const name = val.name;
-    if (typeof name == "string" && name.length > 0) {
-      return `Function(${name})`;
-    } else {
-      return "Function";
-    }
-  }
-  // objects
-  if (Array.isArray(val)) {
-    const length = val.length;
-    let debug = "[";
-    if (length > 0) {
-      debug += debugString(val[0]);
-    }
-    for (let i = 1; i < length; i++) {
-      debug += ", " + debugString(val[i]);
-    }
-    debug += "]";
-    return debug;
-  }
-  // Test for built-in
-  const builtInMatches = /\[object ([^\]]+)\]/.exec(toString.call(val));
-  let className;
-  if (builtInMatches.length > 1) {
-    className = builtInMatches[1];
-  } else {
-    // Failed to match the standard '[object ClassName]'
-    return toString.call(val);
-  }
-  if (className == "Object") {
-    // we're a user defined class or Object
-    // JSON.stringify avoids problems with cycles, and is generally much
-    // easier than looping through ownProperties of `val`.
-    try {
-      return "Object(" + JSON.stringify(val) + ")";
-    } catch (_) {
-      return "Object";
-    }
-  }
-  // errors
-  if (val instanceof Error) {
-    return `${val.name}: ${val.message}\n${val.stack}`;
-  }
-  // TODO we could test for more things here, like `Set`s and `Map`s.
-  return className;
-}
-/**
- * @param {any} prev
- * @param {any} next
- * @returns {any}
- */
-export function diff_filters(prev, next) {
-  try {
-    const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-    wasm.diff_filters(retptr, addHeapObject(prev), addHeapObject(next));
-    var r0 = getInt32Memory0()[retptr / 4 + 0];
-    var r1 = getInt32Memory0()[retptr / 4 + 1];
-    var r2 = getInt32Memory0()[retptr / 4 + 2];
-    if (r2) {
-      throw takeObject(r1);
-    }
-    return takeObject(r0);
-  } finally {
-    wasm.__wbindgen_add_to_stack_pointer(16);
-  }
-}
-
-/**
- * @param {any} val
- * @returns {any}
- */
-export function expand_filter(val) {
-  try {
-    const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-    wasm.expand_filter(retptr, addHeapObject(val));
-    var r0 = getInt32Memory0()[retptr / 4 + 0];
-    var r1 = getInt32Memory0()[retptr / 4 + 1];
-    var r2 = getInt32Memory0()[retptr / 4 + 2];
-    if (r2) {
-      throw takeObject(r1);
-    }
-    return takeObject(r0);
-  } finally {
-    wasm.__wbindgen_add_to_stack_pointer(16);
-  }
-}
-
-/**
- * @param {any} prev
- * @param {any} next
- * @returns {any}
- */
-export function get_diff(prev, next) {
-  try {
-    const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-    wasm.get_diff(retptr, addHeapObject(prev), addHeapObject(next));
-    var r0 = getInt32Memory0()[retptr / 4 + 0];
-    var r1 = getInt32Memory0()[retptr / 4 + 1];
-    var r2 = getInt32Memory0()[retptr / 4 + 2];
-    if (r2) {
-      throw takeObject(r1);
-    }
-    return takeObject(r0);
-  } finally {
-    wasm.__wbindgen_add_to_stack_pointer(16);
-  }
-}
-
-/**
- * @param {any} val
- * @returns {any}
- */
-export function flat_merge(val) {
-  try {
-    const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-    wasm.flat_merge(retptr, addHeapObject(val));
-    var r0 = getInt32Memory0()[retptr / 4 + 0];
-    var r1 = getInt32Memory0()[retptr / 4 + 1];
-    var r2 = getInt32Memory0()[retptr / 4 + 2];
-    if (r2) {
-      throw takeObject(r1);
-    }
-    return takeObject(r0);
-  } finally {
-    wasm.__wbindgen_add_to_stack_pointer(16);
-  }
-}
-
-/**
- * @param {any} val
- * @returns {any}
- */
-export function compress(val) {
-  try {
-    const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-    wasm.compress(retptr, addHeapObject(val));
-    var r0 = getInt32Memory0()[retptr / 4 + 0];
-    var r1 = getInt32Memory0()[retptr / 4 + 1];
-    var r2 = getInt32Memory0()[retptr / 4 + 2];
-    if (r2) {
-      throw takeObject(r1);
-    }
-    return takeObject(r0);
-  } finally {
-    wasm.__wbindgen_add_to_stack_pointer(16);
-  }
-}
-
-function handleError(f, args) {
-  try {
-    return f.apply(this, args);
-  } catch (e) {
-    wasm.__wbindgen_exn_store(addHeapObject(e));
-  }
-}
-
-async function __wbg_load(module, imports) {
-  if (typeof Response === "function" && module instanceof Response) {
-    if (typeof WebAssembly.instantiateStreaming === "function") {
-      try {
-        return await WebAssembly.instantiateStreaming(module, imports);
-      } catch (e) {
-        if (module.headers.get("Content-Type") != "application/wasm") {
-          console.warn(
-            "`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n",
-            e,
-          );
-        } else {
-          throw e;
-        }
-      }
-    }
-
-    const bytes = await module.arrayBuffer();
-    return await WebAssembly.instantiate(bytes, imports);
-  } else {
-    const instance = await WebAssembly.instantiate(module, imports);
-
-    if (instance instanceof WebAssembly.Instance) {
-      return { instance, module };
-    } else {
-      return instance;
-    }
-  }
-}
-
-function __wbg_get_imports() {
-  const imports = {};
-  imports.wbg = {};
-  imports.wbg.__wbindgen_object_drop_ref = function (arg0) {
-    takeObject(arg0);
-  };
-  imports.wbg.__wbindgen_string_get = function (arg0, arg1) {
-    const obj = getObject(arg1);
-    const ret = typeof obj === "string" ? obj : undefined;
-    var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    var len1 = WASM_VECTOR_LEN;
-    getInt32Memory0()[arg0 / 4 + 1] = len1;
-    getInt32Memory0()[arg0 / 4 + 0] = ptr1;
-  };
-  imports.wbg.__wbindgen_is_object = function (arg0) {
-    const val = getObject(arg0);
-    const ret = typeof val === "object" && val !== null;
-    return ret;
-  };
-  imports.wbg.__wbindgen_is_undefined = function (arg0) {
-    const ret = getObject(arg0) === undefined;
-    return ret;
-  };
-  imports.wbg.__wbindgen_in = function (arg0, arg1) {
-    const ret = getObject(arg0) in getObject(arg1);
-    return ret;
-  };
-  imports.wbg.__wbindgen_error_new = function (arg0, arg1) {
-    const ret = new Error(getStringFromWasm0(arg0, arg1));
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbindgen_object_clone_ref = function (arg0) {
-    const ret = getObject(arg0);
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbindgen_jsval_loose_eq = function (arg0, arg1) {
-    const ret = getObject(arg0) == getObject(arg1);
-    return ret;
-  };
-  imports.wbg.__wbindgen_boolean_get = function (arg0) {
-    const v = getObject(arg0);
-    const ret = typeof v === "boolean" ? (v ? 1 : 0) : 2;
-    return ret;
-  };
-  imports.wbg.__wbindgen_number_get = function (arg0, arg1) {
-    const obj = getObject(arg1);
-    const ret = typeof obj === "number" ? obj : undefined;
-    getFloat64Memory0()[arg0 / 8 + 1] = isLikeNone(ret) ? 0 : ret;
-    getInt32Memory0()[arg0 / 4 + 0] = !isLikeNone(ret);
-  };
-  imports.wbg.__wbindgen_number_new = function (arg0) {
-    const ret = arg0;
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbindgen_string_new = function (arg0, arg1) {
-    const ret = getStringFromWasm0(arg0, arg1);
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbg_getwithrefkey_5e6d9547403deab8 = function (arg0, arg1) {
-    const ret = getObject(arg0)[getObject(arg1)];
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbg_set_841ac57cff3d672b = function (arg0, arg1, arg2) {
-    getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
-  };
-  imports.wbg.__wbg_get_44be0491f933a435 = function (arg0, arg1) {
-    const ret = getObject(arg0)[arg1 >>> 0];
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbg_length_fff51ee6522a1a18 = function (arg0) {
-    const ret = getObject(arg0).length;
-    return ret;
-  };
-  imports.wbg.__wbg_new_898a68150f225f2e = function () {
-    const ret = new Array();
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbindgen_is_function = function (arg0) {
-    const ret = typeof getObject(arg0) === "function";
-    return ret;
-  };
-  imports.wbg.__wbg_next_526fc47e980da008 = function (arg0) {
-    const ret = getObject(arg0).next;
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbg_next_ddb3312ca1c4e32a = function () {
-    return handleError(function (arg0) {
-      const ret = getObject(arg0).next();
-      return addHeapObject(ret);
-    }, arguments);
-  };
-  imports.wbg.__wbg_done_5c1f01fb660d73b5 = function (arg0) {
-    const ret = getObject(arg0).done;
-    return ret;
-  };
-  imports.wbg.__wbg_value_1695675138684bd5 = function (arg0) {
-    const ret = getObject(arg0).value;
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbg_iterator_97f0c81209c6c35a = function () {
-    const ret = Symbol.iterator;
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbg_get_97b561fb56f034b5 = function () {
-    return handleError(function (arg0, arg1) {
-      const ret = Reflect.get(getObject(arg0), getObject(arg1));
-      return addHeapObject(ret);
-    }, arguments);
-  };
-  imports.wbg.__wbg_call_cb65541d95d71282 = function () {
-    return handleError(function (arg0, arg1) {
-      const ret = getObject(arg0).call(getObject(arg1));
-      return addHeapObject(ret);
-    }, arguments);
-  };
-  imports.wbg.__wbg_new_b51585de1b234aff = function () {
-    const ret = new Object();
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbg_set_502d29070ea18557 = function (arg0, arg1, arg2) {
-    getObject(arg0)[arg1 >>> 0] = takeObject(arg2);
-  };
-  imports.wbg.__wbg_isArray_4c24b343cb13cfb1 = function (arg0) {
-    const ret = Array.isArray(getObject(arg0));
-    return ret;
-  };
-  imports.wbg.__wbg_instanceof_ArrayBuffer_39ac22089b74fddb = function (arg0) {
-    let result;
-    try {
-      result = getObject(arg0) instanceof ArrayBuffer;
-    } catch {
-      result = false;
-    }
-    const ret = result;
-    return ret;
-  };
-  imports.wbg.__wbg_isSafeInteger_bb8e18dd21c97288 = function (arg0) {
-    const ret = Number.isSafeInteger(getObject(arg0));
-    return ret;
-  };
-  imports.wbg.__wbg_buffer_085ec1f694018c4f = function (arg0) {
-    const ret = getObject(arg0).buffer;
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbg_new_8125e318e6245eed = function (arg0) {
-    const ret = new Uint8Array(getObject(arg0));
-    return addHeapObject(ret);
-  };
-  imports.wbg.__wbg_set_5cf90238115182c3 = function (arg0, arg1, arg2) {
-    getObject(arg0).set(getObject(arg1), arg2 >>> 0);
-  };
-  imports.wbg.__wbg_length_72e2208bbc0efc61 = function (arg0) {
-    const ret = getObject(arg0).length;
-    return ret;
-  };
-  imports.wbg.__wbg_instanceof_Uint8Array_d8d9cb2b8e8ac1d4 = function (arg0) {
-    let result;
-    try {
-      result = getObject(arg0) instanceof Uint8Array;
-    } catch {
-      result = false;
-    }
-    const ret = result;
-    return ret;
-  };
-  imports.wbg.__wbindgen_debug_string = function (arg0, arg1) {
-    const ret = debugString(getObject(arg1));
-    const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len1 = WASM_VECTOR_LEN;
-    getInt32Memory0()[arg0 / 4 + 1] = len1;
-    getInt32Memory0()[arg0 / 4 + 0] = ptr1;
-  };
-  imports.wbg.__wbindgen_throw = function (arg0, arg1) {
-    throw new Error(getStringFromWasm0(arg0, arg1));
-  };
-  imports.wbg.__wbindgen_memory = function () {
-    const ret = wasm.memory;
-    return addHeapObject(ret);
-  };
-
-  return imports;
-}
-
-function __wbg_init_memory(imports, maybe_memory) {}
-
-function __wbg_finalize_init(instance, module) {
-  wasm = instance.exports;
-  __wbg_init.__wbindgen_wasm_module = module;
-  cachedFloat64Memory0 = null;
-  cachedInt32Memory0 = null;
-  cachedUint8Memory0 = null;
-
-  return wasm;
-}
-
-function initSync(module) {
-  if (wasm !== undefined) return wasm;
-
-  const imports = __wbg_get_imports();
-
-  __wbg_init_memory(imports);
-
-  if (!(module instanceof WebAssembly.Module)) {
-    module = new WebAssembly.Module(module);
-  }
-
-  const instance = new WebAssembly.Instance(module, imports);
-
-  return __wbg_finalize_init(instance, module);
-}
-
-async function __wbg_init(input) {
-  if (wasm !== undefined) return wasm;
-
-  if (typeof input === "undefined") {
-    input = new URL("system_query_bg.wasm", import.meta.url);
-  }
-  const imports = __wbg_get_imports();
-
-  if (
-    typeof input === "string" ||
-    (typeof Request === "function" && input instanceof Request) ||
-    (typeof URL === "function" && input instanceof URL)
-  ) {
-    input = fetch(input);
-  }
-
-  __wbg_init_memory(imports);
-
-  const { instance, module } = await __wbg_load(await input, imports);
-
-  return __wbg_finalize_init(instance, module);
-}
-
-export { initSync };
-export default __wbg_init;
diff --git a/packages/system-query/pkg/system_query_bg.wasm b/packages/system-query/pkg/system_query_bg.wasm
deleted file mode 100644
index 15d2cdbf..00000000
Binary files a/packages/system-query/pkg/system_query_bg.wasm and /dev/null differ
diff --git a/packages/system-query/pkg/system_query_bg.wasm.d.ts b/packages/system-query/pkg/system_query_bg.wasm.d.ts
deleted file mode 100644
index 3071e5fd..00000000
--- a/packages/system-query/pkg/system_query_bg.wasm.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-export const memory: WebAssembly.Memory;
-export function diff_filters(a: number, b: number, c: number): void;
-export function expand_filter(a: number, b: number): void;
-export function get_diff(a: number, b: number, c: number): void;
-export function flat_merge(a: number, b: number): void;
-export function compress(a: number, b: number): void;
-export function __wbindgen_malloc(a: number, b: number): number;
-export function __wbindgen_realloc(a: number, b: number, c: number, d: number): number;
-export function __wbindgen_add_to_stack_pointer(a: number): number;
-export function __wbindgen_exn_store(a: number): void;
diff --git a/packages/system-query/.gitignore b/packages/system-wasm/.gitignore
similarity index 100%
rename from packages/system-query/.gitignore
rename to packages/system-wasm/.gitignore
diff --git a/packages/system-query/Cargo.lock b/packages/system-wasm/Cargo.lock
similarity index 99%
rename from packages/system-query/Cargo.lock
rename to packages/system-wasm/Cargo.lock
index 067a7bdd..ce049505 100644
--- a/packages/system-query/Cargo.lock
+++ b/packages/system-wasm/Cargo.lock
@@ -588,7 +588,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "system-query"
+name = "system-wasm"
 version = "0.1.0"
 dependencies = [
  "criterion",
diff --git a/packages/system-query/Cargo.toml b/packages/system-wasm/Cargo.toml
similarity index 95%
rename from packages/system-query/Cargo.toml
rename to packages/system-wasm/Cargo.toml
index eb5f616d..81a968a6 100644
--- a/packages/system-query/Cargo.toml
+++ b/packages/system-wasm/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "system-query"
+name = "system-wasm"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/packages/system-wasm/README.md b/packages/system-wasm/README.md
new file mode 100644
index 00000000..35c32495
--- /dev/null
+++ b/packages/system-wasm/README.md
@@ -0,0 +1 @@
+# system-wasm
diff --git a/packages/system-query/benches/basic.rs b/packages/system-wasm/benches/basic.rs
similarity index 100%
rename from packages/system-query/benches/basic.rs
rename to packages/system-wasm/benches/basic.rs
diff --git a/packages/system-wasm/package.json b/packages/system-wasm/package.json
new file mode 100644
index 00000000..be57befa
--- /dev/null
+++ b/packages/system-wasm/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "@snort/system-wasm",
+  "version": "1.0.0",
+  "packageManager": "yarn@3.6.3",
+  "author": "Kieran",
+  "license": "MIT",
+  "scripts": {
+    "build": "wasm-pack build -t web -s snort"
+  },
+  "files": [
+    "pkg/system_wasm_bg.wasm",
+    "pkg/system_wasm.js",
+    "pkg/system_wasm.d.ts"
+  ],
+  "module": "pkg/system_wasm.js",
+  "types": "pkg/system_wasm.d.ts"
+}
diff --git a/packages/system-query/src/diff.rs b/packages/system-wasm/src/diff.rs
similarity index 100%
rename from packages/system-query/src/diff.rs
rename to packages/system-wasm/src/diff.rs
diff --git a/packages/system-query/src/filter.rs b/packages/system-wasm/src/filter.rs
similarity index 100%
rename from packages/system-query/src/filter.rs
rename to packages/system-wasm/src/filter.rs
diff --git a/packages/system-query/src/lib.rs b/packages/system-wasm/src/lib.rs
similarity index 100%
rename from packages/system-query/src/lib.rs
rename to packages/system-wasm/src/lib.rs
diff --git a/packages/system-query/src/merge.rs b/packages/system-wasm/src/merge.rs
similarity index 100%
rename from packages/system-query/src/merge.rs
rename to packages/system-wasm/src/merge.rs
diff --git a/packages/system-query/src/utils.rs b/packages/system-wasm/src/utils.rs
similarity index 100%
rename from packages/system-query/src/utils.rs
rename to packages/system-wasm/src/utils.rs
diff --git a/packages/system-query/system-query.iml b/packages/system-wasm/system-query.iml
similarity index 100%
rename from packages/system-query/system-query.iml
rename to packages/system-wasm/system-query.iml
diff --git a/yarn.lock b/yarn.lock
index 8ba3aaa3..2d992d76 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2690,8 +2690,8 @@ __metadata:
     "@scure/bip39": ^1.1.1
     "@snort/shared": "workspace:*"
     "@snort/system": "workspace:*"
-    "@snort/system-query": "workspace:*"
     "@snort/system-react": "workspace:*"
+    "@snort/system-wasm": "workspace:*"
     "@szhsin/react-menu": ^3.3.1
     "@types/debug": ^4.1.8
     "@types/jest": ^29.5.1
@@ -2770,12 +2770,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@snort/system-query@workspace:*, @snort/system-query@workspace:packages/system-query":
-  version: 0.0.0-use.local
-  resolution: "@snort/system-query@workspace:packages/system-query"
-  languageName: unknown
-  linkType: soft
-
 "@snort/system-react@workspace:*, @snort/system-react@workspace:packages/system-react":
   version: 0.0.0-use.local
   resolution: "@snort/system-react@workspace:packages/system-react"
@@ -2799,6 +2793,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@snort/system-wasm@workspace:*, @snort/system-wasm@workspace:packages/system-wasm":
+  version: 0.0.0-use.local
+  resolution: "@snort/system-wasm@workspace:packages/system-wasm"
+  languageName: unknown
+  linkType: soft
+
 "@snort/system@^1.0.21, @snort/system@workspace:*, @snort/system@workspace:packages/system":
   version: 0.0.0-use.local
   resolution: "@snort/system@workspace:packages/system"