diff --git a/Makefile b/Makefile
index 80290c607..ec2f376a3 100644
--- a/Makefile
+++ b/Makefile
@@ -301,7 +301,7 @@ sh-testnet: mod-tidy
 
 dwn:
 	@echo "(dwn) Building dwn.wasm -> IPFS Vault"
-	GOOS=js GOARCH=wasm go build -o ./x/vault/internal/app.wasm ./x/vault/client/dwn/main.go
+	GOOS=js GOARCH=wasm go build -o ./x/vault/internal/app.wasm ./x/vault/client/htmx/dwn.go
 
 templ:
 	@echo "(templ) Generating templ files"
diff --git a/x/did/types/controller.go b/x/did/types/controller.go
index ef91f6d95..c76f872c9 100644
--- a/x/did/types/controller.go
+++ b/x/did/types/controller.go
@@ -7,55 +7,6 @@ import (
 	didv1 "github.com/onsonr/sonr/api/did/v1"
 )
 
-type controller struct {
-	userKs    mpc.Share
-	valKs     mpc.Share
-	address   string
-	chainID   string
-	ethAddr   string
-	btcAddr   string
-	publicKey []byte
-}
-
-func (c *controller) GetTableEntry() (*didv1.Controller, error) {
-	valKs, err := c.valKs.Marshal()
-	if err != nil {
-		return nil, err
-	}
-	return &didv1.Controller{
-		KsVal:       valKs,
-		Did:         fmt.Sprintf("did:sonr:%s", c.address),
-		SonrAddress: c.address,
-		EthAddress:  c.ethAddr,
-		BtcAddress:  c.btcAddr,
-		PublicKey:   c.publicKey,
-	}, nil
-}
-
-func (c *controller) ExportUserKs() (string, error) {
-	return c.userKs.Marshal()
-}
-
-func (c *controller) ChainID() string {
-	return c.chainID
-}
-
-func (c *controller) SonrAddress() string {
-	return c.address
-}
-
-func (c *controller) EthAddress() string {
-	return c.ethAddr
-}
-
-func (c *controller) BtcAddress() string {
-	return c.btcAddr
-}
-
-func (c *controller) PublicKey() []byte {
-	return c.publicKey
-}
-
 type ControllerI interface {
 	ChainID() string
 	SonrAddress() string
@@ -99,3 +50,52 @@ func NewController(shares []mpc.Share) (ControllerI, error) {
 		publicKey: pbBz,
 	}, nil
 }
+
+type controller struct {
+	userKs    mpc.Share
+	valKs     mpc.Share
+	address   string
+	chainID   string
+	ethAddr   string
+	btcAddr   string
+	publicKey []byte
+}
+
+func (c *controller) BtcAddress() string {
+	return c.btcAddr
+}
+
+func (c *controller) ChainID() string {
+	return c.chainID
+}
+
+func (c *controller) EthAddress() string {
+	return c.ethAddr
+}
+
+func (c *controller) ExportUserKs() (string, error) {
+	return c.userKs.Marshal()
+}
+
+func (c *controller) GetTableEntry() (*didv1.Controller, error) {
+	valKs, err := c.valKs.Marshal()
+	if err != nil {
+		return nil, err
+	}
+	return &didv1.Controller{
+		KsVal:       valKs,
+		Did:         fmt.Sprintf("did:sonr:%s", c.address),
+		SonrAddress: c.address,
+		EthAddress:  c.ethAddr,
+		BtcAddress:  c.btcAddr,
+		PublicKey:   c.publicKey,
+	}, nil
+}
+
+func (c *controller) PublicKey() []byte {
+	return c.publicKey
+}
+
+func (c *controller) SonrAddress() string {
+	return c.address
+}
diff --git a/x/did/types/identifier.go b/x/did/types/identifier.go
new file mode 100644
index 000000000..ab1254f4c
--- /dev/null
+++ b/x/did/types/identifier.go
@@ -0,0 +1 @@
+package types
diff --git a/x/vault/client/dwn/main.go b/x/vault/client/htmx/dwn.go
similarity index 96%
rename from x/vault/client/dwn/main.go
rename to x/vault/client/htmx/dwn.go
index d44b2ed7f..a7cde6a41 100644
--- a/x/vault/client/dwn/main.go
+++ b/x/vault/client/htmx/dwn.go
@@ -15,8 +15,8 @@ import (
 	"github.com/labstack/echo/v4"
 	promise "github.com/nlepage/go-js-promise"
 	"github.com/onsonr/sonr/nebula/pages"
-	"github.com/onsonr/sonr/x/vault/client/dwn/middleware"
-	"github.com/onsonr/sonr/x/vault/client/dwn/state"
+	"github.com/onsonr/sonr/x/vault/client/htmx/middleware"
+	"github.com/onsonr/sonr/x/vault/client/htmx/state"
 )
 
 func main() {
diff --git a/x/vault/client/dwn/middleware/headers.go b/x/vault/client/htmx/middleware/headers.go
similarity index 100%
rename from x/vault/client/dwn/middleware/headers.go
rename to x/vault/client/htmx/middleware/headers.go
diff --git a/x/vault/client/dwn/middleware/middleware.go b/x/vault/client/htmx/middleware/middleware.go
similarity index 100%
rename from x/vault/client/dwn/middleware/middleware.go
rename to x/vault/client/htmx/middleware/middleware.go
diff --git a/x/vault/client/dwn/middleware/session.go b/x/vault/client/htmx/middleware/session.go
similarity index 100%
rename from x/vault/client/dwn/middleware/session.go
rename to x/vault/client/htmx/middleware/session.go
diff --git a/x/vault/client/dwn/middleware/token.go b/x/vault/client/htmx/middleware/token.go
similarity index 100%
rename from x/vault/client/dwn/middleware/token.go
rename to x/vault/client/htmx/middleware/token.go
diff --git a/x/vault/client/dwn/state/auth.go b/x/vault/client/htmx/state/auth.go
similarity index 100%
rename from x/vault/client/dwn/state/auth.go
rename to x/vault/client/htmx/state/auth.go
diff --git a/x/vault/client/dwn/state/manifest.go b/x/vault/client/htmx/state/manifest.go
similarity index 100%
rename from x/vault/client/dwn/state/manifest.go
rename to x/vault/client/htmx/state/manifest.go
diff --git a/x/vault/client/dwn/state/openid.go b/x/vault/client/htmx/state/openid.go
similarity index 100%
rename from x/vault/client/dwn/state/openid.go
rename to x/vault/client/htmx/state/openid.go
diff --git a/x/vault/client/dwn/state/routes.go b/x/vault/client/htmx/state/routes.go
similarity index 71%
rename from x/vault/client/dwn/state/routes.go
rename to x/vault/client/htmx/state/routes.go
index 3e0589f35..a653024c2 100644
--- a/x/vault/client/dwn/state/routes.go
+++ b/x/vault/client/htmx/state/routes.go
@@ -2,7 +2,6 @@ package state
 
 import (
 	"github.com/labstack/echo/v4"
-	middleware "github.com/onsonr/sonr/x/vault/client/dwn/middleware"
 )
 
 func RegisterHandlers(e *echo.Echo) {
@@ -15,8 +14,3 @@ func RegisterHandlers(e *echo.Echo) {
 	g.POST("/register/:subject", handleCredentialCreation)
 	g.POST("/register/:subject/check", checkSubjectIsValid)
 }
-
-func RegisterSync(e *echo.Echo) {
-	g := e.Group("sync")
-	g.Use(middleware.MacaroonMiddleware("test", "test"))
-}
diff --git a/x/vault/client/dwn/state/views.go b/x/vault/client/htmx/state/views.go
similarity index 100%
rename from x/vault/client/dwn/state/views.go
rename to x/vault/client/htmx/state/views.go
diff --git a/x/vault/client/dwn/state/wellknown.go b/x/vault/client/htmx/state/wellknown.go
similarity index 100%
rename from x/vault/client/dwn/state/wellknown.go
rename to x/vault/client/htmx/state/wellknown.go