diff --git a/Makefile b/Makefile
index 1e5f9676b..4a3919d17 100644
--- a/Makefile
+++ b/Makefile
@@ -316,8 +316,8 @@ gen-pkl:
 
 build-hway: gen-templ gen-pkl
 	@echo "(motr) Building Highway gateway"
-	go run github.com/syumai/workers/cmd/workers-assets-gen@v0.23.1 -o ./web/build -mode go
-	GOOS=js GOARCH=wasm go build -o ./web/build/app.wasm ./web/server.go
+	go run github.com/syumai/workers/cmd/workers-assets-gen@v0.23.1 -o ./cmd/hway/build -mode go
+	GOOS=js GOARCH=wasm go build -o ./cmd/hway/build/app.wasm ./cmd/hway/server.go
 
 
 build-motr: gen-templ gen-pkl
diff --git a/web/bun.lockb b/cmd/hway/bun.lockb
similarity index 100%
rename from web/bun.lockb
rename to cmd/hway/bun.lockb
diff --git a/web/package.json b/cmd/hway/package.json
similarity index 100%
rename from web/package.json
rename to cmd/hway/package.json
diff --git a/web/server.go b/cmd/hway/server.go
similarity index 100%
rename from web/server.go
rename to cmd/hway/server.go
diff --git a/web/wrangler.toml b/cmd/hway/wrangler.toml
similarity index 100%
rename from web/wrangler.toml
rename to cmd/hway/wrangler.toml
diff --git a/pkg/idpvr/search.go b/pkg/idpvr/search.go
new file mode 100644
index 000000000..96400f5c1
--- /dev/null
+++ b/pkg/idpvr/search.go
@@ -0,0 +1 @@
+package idpvr
diff --git a/pkg/idpvr/txns.go b/pkg/idpvr/txns.go
new file mode 100644
index 000000000..96400f5c1
--- /dev/null
+++ b/pkg/idpvr/txns.go
@@ -0,0 +1 @@
+package idpvr
diff --git a/web/provider/search.go b/web/provider/search.go
deleted file mode 100644
index 5ac8282f4..000000000
--- a/web/provider/search.go
+++ /dev/null
@@ -1 +0,0 @@
-package handlers
diff --git a/web/provider/txns.go b/web/provider/txns.go
deleted file mode 100644
index 5ac8282f4..000000000
--- a/web/provider/txns.go
+++ /dev/null
@@ -1 +0,0 @@
-package handlers