diff --git a/Cargo.toml b/Cargo.toml
index a8b5346..1cae753 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,3 @@
 [workspace]
-members = ["base", "db", "cli", "tools/upend_wasm"]
+members = ["base", "db", "cli", "wasm"]
 resolver = "2"
\ No newline at end of file
diff --git a/Earthfile b/Earthfile
index 0a8b666..dc2ff4c 100644
--- a/Earthfile
+++ b/Earthfile
@@ -14,21 +14,20 @@ base-rust:
   COPY base/Cargo.toml base/Cargo.toml
   COPY cli/Cargo.toml cli/Cargo.toml
   COPY db/Cargo.toml db/Cargo.toml
-  COPY tools/upend_wasm/Cargo.toml tools/upend_wasm/Cargo.toml
+  COPY wasm/Cargo.toml wasm/Cargo.toml
   RUN cargo fetch --locked
 
 base-backend:
   FROM +base-rust
-  COPY --dir base cli db .
-  COPY --dir tools/upend_wasm tools/
+  COPY --dir base cli db wasm .
 
 base-node:
   FROM node:lts-iron
   RUN npm install -g pnpm
   WORKDIR /upend
   CACHE $HOME/.local/share/pnpm
-  COPY +wasmlib/pkg-web tools/upend_wasm/pkg-web
-  COPY +wasmlib/pkg-node tools/upend_wasm/pkg-node
+  COPY +wasmlib/pkg-web wasm/pkg-web
+  COPY +wasmlib/pkg-node wasm/pkg-node
   COPY sdks/js/package.json sdks/js/pnpm-lock.yaml sdks/js/
   RUN cd sdks/js && rm -rf node_modules && pnpm install --frozen-lockfile
   COPY webui/package.json webui/pnpm-lock.yaml webui/
@@ -59,16 +58,15 @@ webui:
 
 wasmlib:
   FROM --platform=linux/amd64 +base-rust
-  COPY --dir base .
-  COPY --dir tools/upend_wasm tools/
-  WORKDIR tools/upend_wasm
+  COPY --dir base wasm .
+  WORKDIR wasm
   CACHE target
   RUN wasm-pack build --target web --out-dir pkg-web && \
       wasm-pack build --target nodejs --out-dir pkg-node
   RUN sed -e 's%"name": "upend_wasm"%"name": "@upnd/wasm-web"%' -i pkg-web/package.json && \
       sed -e 's%"name": "upend_wasm"%"name": "@upnd/wasm-node"%' -i pkg-node/package.json
-  SAVE ARTIFACT pkg-web AS LOCAL tools/upend_wasm/pkg-web
-  SAVE ARTIFACT pkg-node AS LOCAL tools/upend_wasm/pkg-node
+  SAVE ARTIFACT pkg-web AS LOCAL wasm/pkg-web
+  SAVE ARTIFACT pkg-node AS LOCAL wasm/pkg-node
 
 jslib:
   FROM +base-node
@@ -222,9 +220,9 @@ publish-js-lib:
 
 publish-js-wasm:
   FROM +base-npm-publish
-  WORKDIR /upend/tools/upend_wasm/pkg-web
+  WORKDIR /upend/wasm/pkg-web
   DO +NPM_PUBLISH --pkg_name=@upnd/wasm-web
-  WORKDIR /upend/tools/upend_wasm/pkg-node
+  WORKDIR /upend/wasm/pkg-node
   DO +NPM_PUBLISH --pkg_name=@upnd/wasm-node
 
 base-npm-publish:
diff --git a/tools/.gitignore b/tools/.gitignore
deleted file mode 100644
index 72a40c3..0000000
--- a/tools/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*/dist
diff --git a/tools/dev/create_stresstest.sh b/tools/create_stresstest.sh
similarity index 100%
rename from tools/dev/create_stresstest.sh
rename to tools/create_stresstest.sh
diff --git a/tools/upend_wasm/.earthlyignore b/wasm/.earthlyignore
similarity index 100%
rename from tools/upend_wasm/.earthlyignore
rename to wasm/.earthlyignore
diff --git a/tools/upend_wasm/.gitignore b/wasm/.gitignore
similarity index 100%
rename from tools/upend_wasm/.gitignore
rename to wasm/.gitignore
diff --git a/tools/upend_wasm/Cargo.toml b/wasm/Cargo.toml
similarity index 76%
rename from tools/upend_wasm/Cargo.toml
rename to wasm/Cargo.toml
index d0feeb7..f664a54 100644
--- a/tools/upend_wasm/Cargo.toml
+++ b/wasm/Cargo.toml
@@ -9,5 +9,5 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 wasm-bindgen = "0.2.87"
-upend-base = { path = "../../base", features = ["wasm"] }
+upend-base = { path = "../base", features = ["wasm"] }
 wee_alloc = "0.4.5"
diff --git a/tools/upend_wasm/src/lib.rs b/wasm/src/lib.rs
similarity index 100%
rename from tools/upend_wasm/src/lib.rs
rename to wasm/src/lib.rs