diff --git a/crypto/accaddr/addr.go b/crypto/accaddr/addr.go
deleted file mode 100644
index 50b2ad3ae..000000000
--- a/crypto/accaddr/addr.go
+++ /dev/null
@@ -1 +0,0 @@
-package bip32
diff --git a/crypto/accaddr/bip32.go b/crypto/address/bip32.go
similarity index 99%
rename from crypto/accaddr/bip32.go
rename to crypto/address/bip32.go
index c840c753a..de96387ab 100644
--- a/crypto/accaddr/bip32.go
+++ b/crypto/address/bip32.go
@@ -1,4 +1,4 @@
-package bip32
+package address
 
 import (
 	"crypto/hmac"
diff --git a/crypto/accaddr/codec.go b/crypto/address/codec.go
similarity index 96%
rename from crypto/accaddr/codec.go
rename to crypto/address/codec.go
index f61aab4d7..3aebcb924 100644
--- a/crypto/accaddr/codec.go
+++ b/crypto/address/codec.go
@@ -1,4 +1,4 @@
-package bip32
+package address
 
 type CoinType uint32
 
diff --git a/pkg/gateway/middleware/ipfs.go b/pkg/gateway/middleware/ipfs_client.go
similarity index 100%
rename from pkg/gateway/middleware/ipfs.go
rename to pkg/gateway/middleware/ipfs_client.go
diff --git a/pkg/gateway/middleware/sonr_client.go b/pkg/gateway/middleware/sonr_client.go
new file mode 100644
index 000000000..c870d7c16
--- /dev/null
+++ b/pkg/gateway/middleware/sonr_client.go
@@ -0,0 +1 @@
+package middleware
diff --git a/pkg/vault/middleware/wasm_ctx.go b/pkg/vault/middleware/wasm_ctx.go
new file mode 100644
index 000000000..c870d7c16
--- /dev/null
+++ b/pkg/vault/middleware/wasm_ctx.go
@@ -0,0 +1 @@
+package middleware
diff --git a/pkg/vault/middleware/web_apis.go b/pkg/vault/middleware/web_apis.go
new file mode 100644
index 000000000..c870d7c16
--- /dev/null
+++ b/pkg/vault/middleware/web_apis.go
@@ -0,0 +1 @@
+package middleware