diff --git a/cmd/hway/main.go b/cmd/hway/main.go
index 63dcecbd8..a59f82cdd 100644
--- a/cmd/hway/main.go
+++ b/cmd/hway/main.go
@@ -10,8 +10,8 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/onsonr/sonr/crypto/ucan"
+	"github.com/onsonr/sonr/pkg/common/didauth/producer"
 	"github.com/onsonr/sonr/pkg/common/ipfs"
-	"github.com/onsonr/sonr/pkg/common/producer"
 	"github.com/onsonr/sonr/pkg/gateway"
 	"github.com/onsonr/sonr/pkg/gateway/config"
 )
diff --git a/cmd/motr/main.go b/cmd/motr/main.go
index fa8936612..1c28aaa8a 100644
--- a/cmd/motr/main.go
+++ b/cmd/motr/main.go
@@ -8,7 +8,7 @@ import (
 	"syscall/js"
 
 	"github.com/labstack/echo/v4"
-	"github.com/onsonr/sonr/pkg/common/dids"
+	"github.com/onsonr/sonr/pkg/common/didauth/controller"
 	"github.com/onsonr/sonr/pkg/vault"
 	"github.com/onsonr/sonr/pkg/vault/types"
 )
@@ -48,7 +48,7 @@ func main() {
 
 	e := echo.New()
 	e.Use(vault.WasmContextMiddleware)
-	e.Use(dids.Middleware(nil))
+	e.Use(controller.Middleware(nil))
 	vault.RegisterRoutes(e, config)
 	vault.ServeFetch(e)
 }
diff --git a/pkg/common/dids/config.go b/pkg/common/didauth/controller/config.go
similarity index 98%
rename from pkg/common/dids/config.go
rename to pkg/common/didauth/controller/config.go
index ffffc2ebc..7c86443fa 100644
--- a/pkg/common/dids/config.go
+++ b/pkg/common/didauth/controller/config.go
@@ -1,4 +1,4 @@
-package dids
+package controller
 
 import (
 	"github.com/labstack/echo/v4"
diff --git a/pkg/common/dids/middleware.go b/pkg/common/didauth/controller/middleware.go
similarity index 99%
rename from pkg/common/dids/middleware.go
rename to pkg/common/didauth/controller/middleware.go
index 117dfb087..41bccac1e 100644
--- a/pkg/common/dids/middleware.go
+++ b/pkg/common/didauth/controller/middleware.go
@@ -1,7 +1,7 @@
 //go:build js && wasm
 // +build js,wasm
 
-package dids
+package controller
 
 import (
 	"fmt"
diff --git a/pkg/common/didauth/exports.go b/pkg/common/didauth/exports.go
new file mode 100644
index 000000000..4789df4ca
--- /dev/null
+++ b/pkg/common/didauth/exports.go
@@ -0,0 +1,2 @@
+// Package didauth provides middleware and utilities for DID-based authentication
+package didauth
diff --git a/pkg/common/producer/context.go b/pkg/common/didauth/producer/context.go
similarity index 100%
rename from pkg/common/producer/context.go
rename to pkg/common/didauth/producer/context.go
diff --git a/pkg/common/producer/middleware.go b/pkg/common/didauth/producer/middleware.go
similarity index 81%
rename from pkg/common/producer/middleware.go
rename to pkg/common/didauth/producer/middleware.go
index 9f10d1483..f79b34255 100644
--- a/pkg/common/producer/middleware.go
+++ b/pkg/common/didauth/producer/middleware.go
@@ -1,6 +1,7 @@
 package producer
 
 import (
+	"github.com/onsonr/sonr/crypto/mpc"
 	"github.com/onsonr/sonr/crypto/ucan"
 	"github.com/onsonr/sonr/crypto/ucan/store"
 	"github.com/onsonr/sonr/pkg/common/ipfs"
@@ -27,3 +28,11 @@ func Middleware(ipfs ipfs.Client, perms ucan.Permissions) echo.MiddlewareFunc {
 		}
 	}
 }
+
+func NewKeyset(c echo.Context) (mpc.Keyset, error) {
+	ks, err := mpc.NewKeyset()
+	if err != nil {
+		return nil, err
+	}
+	return ks, nil
+}
diff --git a/pkg/common/resolver/conn.go b/pkg/common/didauth/resolver/conn.go
similarity index 100%
rename from pkg/common/resolver/conn.go
rename to pkg/common/didauth/resolver/conn.go
diff --git a/pkg/common/resolver/grpc.go b/pkg/common/didauth/resolver/grpc.go
similarity index 100%
rename from pkg/common/resolver/grpc.go
rename to pkg/common/didauth/resolver/grpc.go
diff --git a/pkg/common/producer/spawner.go b/pkg/common/producer/spawner.go
deleted file mode 100644
index 67c538066..000000000
--- a/pkg/common/producer/spawner.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package producer
-
-import (
-	"github.com/labstack/echo/v4"
-	"github.com/onsonr/sonr/crypto/mpc"
-)
-
-func NewKeyset(c echo.Context) (mpc.Keyset, error) {
-	ks, err := mpc.NewKeyset()
-	if err != nil {
-		return nil, err
-	}
-	return ks, nil
-}
-
-//
-// func GetKeyset(c echo.Context) (mpc.Keyset, error) {
-// 	cc, ok := c.(*SignerContext)
-// 	if !ok {
-// 		return nil, errors.New("not an SignerContext")
-// 	}
-// 	if !cc.hasKeyset {
-// 		return nil, fmt.Errorf("keyset not found")
-// 	}
-// 	if cc.keyset == nil {
-// 		return nil, fmt.Errorf("keyset is nil")
-// 	}
-// 	return cc.keyset, nil
-// }
-//
-// func NewSource(c echo.Context) (mpc.KeyshareSource, error) {
-// 	cc, ok := c.(*SignerContext)
-// 	if !ok {
-// 		return nil, errors.New("not an SignerContext")
-// 	}
-// 	if !cc.hasKeyset {
-// 		return nil, fmt.Errorf("keyset not found")
-// 	}
-// 	if cc.keyset == nil {
-// 		return nil, fmt.Errorf("keyset is nil")
-// 	}
-// 	src, err := mpc.NewSource(cc.keyset)
-// 	if err != nil {
-// 		return nil, err
-// 	}
-// 	cc.signer = src
-// 	cc.hasSigner = true
-// 	return src, nil
-// }
-//
-// func GetSource(c echo.Context) (mpc.KeyshareSource, error) {
-// 	cc, ok := c.(*SignerContext)
-// 	if !ok {
-// 		return nil, errors.New("not an SignerContext")
-// 	}
-// 	if !cc.hasSigner {
-// 		return nil, fmt.Errorf("signer not found")
-// 	}
-// 	if cc.signer == nil {
-// 		return nil, fmt.Errorf("signer is nil")
-// 	}
-// 	return cc.signer, nil
-// }