diff --git a/app/gateway/config/schema.go b/app/gateway/config/schema.go
index 1783ea035..9d6de2ae3 100644
--- a/app/gateway/config/schema.go
+++ b/app/gateway/config/schema.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"strings"
 
+	"github.com/onsonr/sonr/app/vault/types"
 	"github.com/onsonr/sonr/pkg/common/models"
-	"github.com/onsonr/sonr/pkg/vault/types"
 )
 
 // DefaultSchema returns the default schema
diff --git a/app/gateway/config/vault.go b/app/gateway/config/vault.go
index 9fb5861c1..1bbda65af 100644
--- a/app/gateway/config/vault.go
+++ b/app/gateway/config/vault.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/ipfs/boxo/files"
 	"github.com/onsonr/sonr/app/gateway/config/internal"
-	"github.com/onsonr/sonr/pkg/vault/types"
+	"github.com/onsonr/sonr/app/vault/types"
 )
 
 const SchemaVersion = 1
diff --git a/pkg/vault/fetch.go b/app/vault/fetch.go
similarity index 100%
rename from pkg/vault/fetch.go
rename to app/vault/fetch.go
diff --git a/pkg/vault/handlers/accounts_handler.go b/app/vault/handlers/accounts_handler.go
similarity index 100%
rename from pkg/vault/handlers/accounts_handler.go
rename to app/vault/handlers/accounts_handler.go
diff --git a/pkg/vault/handlers/authorization_handler.go b/app/vault/handlers/authorization_handler.go
similarity index 100%
rename from pkg/vault/handlers/authorization_handler.go
rename to app/vault/handlers/authorization_handler.go
diff --git a/pkg/vault/handlers/connect_handler.go b/app/vault/handlers/connect_handler.go
similarity index 100%
rename from pkg/vault/handlers/connect_handler.go
rename to app/vault/handlers/connect_handler.go
diff --git a/pkg/vault/handlers/credentials_handler.go b/app/vault/handlers/credentials_handler.go
similarity index 100%
rename from pkg/vault/handlers/credentials_handler.go
rename to app/vault/handlers/credentials_handler.go
diff --git a/pkg/vault/handlers/dash_handler.go b/app/vault/handlers/dash_handler.go
similarity index 100%
rename from pkg/vault/handlers/dash_handler.go
rename to app/vault/handlers/dash_handler.go
diff --git a/pkg/vault/handlers/index_handler.go b/app/vault/handlers/index_handler.go
similarity index 93%
rename from pkg/vault/handlers/index_handler.go
rename to app/vault/handlers/index_handler.go
index 94318a0cd..44f26b449 100644
--- a/pkg/vault/handlers/index_handler.go
+++ b/app/vault/handlers/index_handler.go
@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/labstack/echo/v4"
+	session "github.com/onsonr/sonr/app/vault/internal"
+	"github.com/onsonr/sonr/app/vault/internal/pages/index"
 	"github.com/onsonr/sonr/pkg/common/response"
-	session "github.com/onsonr/sonr/pkg/vault/internal"
-	"github.com/onsonr/sonr/pkg/vault/pages/index"
 )
 
 func HandleIndex(c echo.Context) error {
diff --git a/pkg/vault/handlers/resolver_handler.go b/app/vault/handlers/resolver_handler.go
similarity index 100%
rename from pkg/vault/handlers/resolver_handler.go
rename to app/vault/handlers/resolver_handler.go
diff --git a/pkg/vault/handlers/transaction_handler.go b/app/vault/handlers/transaction_handler.go
similarity index 100%
rename from pkg/vault/handlers/transaction_handler.go
rename to app/vault/handlers/transaction_handler.go
diff --git a/pkg/vault/handlers/wallet_handler.go b/app/vault/handlers/wallet_handler.go
similarity index 100%
rename from pkg/vault/handlers/wallet_handler.go
rename to app/vault/handlers/wallet_handler.go
diff --git a/pkg/vault/internal/context.go b/app/vault/internal/context.go
similarity index 100%
rename from pkg/vault/internal/context.go
rename to app/vault/internal/context.go
diff --git a/pkg/vault/internal/middleware.go b/app/vault/internal/middleware.go
similarity index 98%
rename from pkg/vault/internal/middleware.go
rename to app/vault/internal/middleware.go
index 2c7d4cdbf..6c1602686 100644
--- a/pkg/vault/internal/middleware.go
+++ b/app/vault/internal/middleware.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/labstack/echo/v4"
 
+	"github.com/onsonr/sonr/app/vault/types"
 	"github.com/onsonr/sonr/pkg/common"
-	"github.com/onsonr/sonr/pkg/vault/types"
 )
 
 type SessionCtx interface {
diff --git a/pkg/vault/pages/authenticate/model.go b/app/vault/internal/pages/authenticate/model.go
similarity index 100%
rename from pkg/vault/pages/authenticate/model.go
rename to app/vault/internal/pages/authenticate/model.go
diff --git a/pkg/vault/pages/authorize/model.go b/app/vault/internal/pages/authorize/model.go
similarity index 100%
rename from pkg/vault/pages/authorize/model.go
rename to app/vault/internal/pages/authorize/model.go
diff --git a/pkg/vault/pages/dashboard/page.templ b/app/vault/internal/pages/dashboard/page.templ
similarity index 100%
rename from pkg/vault/pages/dashboard/page.templ
rename to app/vault/internal/pages/dashboard/page.templ
diff --git a/pkg/vault/pages/dashboard/page_templ.go b/app/vault/internal/pages/dashboard/page_templ.go
similarity index 100%
rename from pkg/vault/pages/dashboard/page_templ.go
rename to app/vault/internal/pages/dashboard/page_templ.go
diff --git a/pkg/vault/pages/index/error.templ b/app/vault/internal/pages/index/error.templ
similarity index 100%
rename from pkg/vault/pages/index/error.templ
rename to app/vault/internal/pages/index/error.templ
diff --git a/pkg/vault/pages/index/error_templ.go b/app/vault/internal/pages/index/error_templ.go
similarity index 100%
rename from pkg/vault/pages/index/error_templ.go
rename to app/vault/internal/pages/index/error_templ.go
diff --git a/pkg/vault/pages/index/page.templ b/app/vault/internal/pages/index/page.templ
similarity index 100%
rename from pkg/vault/pages/index/page.templ
rename to app/vault/internal/pages/index/page.templ
diff --git a/pkg/vault/pages/index/page_templ.go b/app/vault/internal/pages/index/page_templ.go
similarity index 100%
rename from pkg/vault/pages/index/page_templ.go
rename to app/vault/internal/pages/index/page_templ.go
diff --git a/pkg/vault/pages/wallet/model.go b/app/vault/internal/pages/wallet/model.go
similarity index 100%
rename from pkg/vault/pages/wallet/model.go
rename to app/vault/internal/pages/wallet/model.go
diff --git a/pkg/vault/pages/wallet/page.templ b/app/vault/internal/pages/wallet/page.templ
similarity index 100%
rename from pkg/vault/pages/wallet/page.templ
rename to app/vault/internal/pages/wallet/page.templ
diff --git a/pkg/vault/pages/wallet/page_templ.go b/app/vault/internal/pages/wallet/page_templ.go
similarity index 100%
rename from pkg/vault/pages/wallet/page_templ.go
rename to app/vault/internal/pages/wallet/page_templ.go
diff --git a/pkg/vault/pages/wallet/scripts.templ b/app/vault/internal/pages/wallet/scripts.templ
similarity index 100%
rename from pkg/vault/pages/wallet/scripts.templ
rename to app/vault/internal/pages/wallet/scripts.templ
diff --git a/pkg/vault/pages/wallet/scripts_templ.go b/app/vault/internal/pages/wallet/scripts_templ.go
similarity index 100%
rename from pkg/vault/pages/wallet/scripts_templ.go
rename to app/vault/internal/pages/wallet/scripts_templ.go
diff --git a/pkg/vault/internal/session.go b/app/vault/internal/session.go
similarity index 100%
rename from pkg/vault/internal/session.go
rename to app/vault/internal/session.go
diff --git a/pkg/vault/routes.go b/app/vault/routes.go
similarity index 84%
rename from pkg/vault/routes.go
rename to app/vault/routes.go
index 961b8d6b7..9c313bb02 100644
--- a/pkg/vault/routes.go
+++ b/app/vault/routes.go
@@ -7,9 +7,9 @@ package vault
 import (
 	"github.com/labstack/echo/v4"
 
-	"github.com/onsonr/sonr/pkg/vault/handlers"
-	"github.com/onsonr/sonr/pkg/vault/internal/session"
-	"github.com/onsonr/sonr/pkg/vault/types"
+	"github.com/onsonr/sonr/app/vault/handlers"
+	session "github.com/onsonr/sonr/app/vault/internal"
+	"github.com/onsonr/sonr/app/vault/types"
 )
 
 // RegisterRoutes registers the Decentralized Web Node API routes.
diff --git a/pkg/vault/types/Config.pkl.go b/app/vault/types/Config.pkl.go
similarity index 100%
rename from pkg/vault/types/Config.pkl.go
rename to app/vault/types/Config.pkl.go
diff --git a/pkg/vault/types/DWN.pkl.go b/app/vault/types/DWN.pkl.go
similarity index 100%
rename from pkg/vault/types/DWN.pkl.go
rename to app/vault/types/DWN.pkl.go
diff --git a/pkg/vault/types/Environment.pkl.go b/app/vault/types/Environment.pkl.go
similarity index 100%
rename from pkg/vault/types/Environment.pkl.go
rename to app/vault/types/Environment.pkl.go
diff --git a/pkg/vault/types/Schema.pkl.go b/app/vault/types/Schema.pkl.go
similarity index 100%
rename from pkg/vault/types/Schema.pkl.go
rename to app/vault/types/Schema.pkl.go
diff --git a/pkg/vault/types/init.pkl.go b/app/vault/types/init.pkl.go
similarity index 100%
rename from pkg/vault/types/init.pkl.go
rename to app/vault/types/init.pkl.go
diff --git a/pkg/vault/wasm.go b/app/vault/wasm.go
similarity index 100%
rename from pkg/vault/wasm.go
rename to app/vault/wasm.go
diff --git a/cmd/hway/main.go b/cmd/hway/main.go
index dd37b997d..6c40a7915 100644
--- a/cmd/hway/main.go
+++ b/cmd/hway/main.go
@@ -12,8 +12,8 @@ import (
 	"github.com/onsonr/sonr/app/gateway"
 	"github.com/onsonr/sonr/app/gateway/config"
 	"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/didauth/producer"
 )
 
 //go:embed config.pkl
diff --git a/cmd/motr/main.go b/cmd/motr/main.go
index 1c28aaa8a..9526a6d8a 100644
--- a/cmd/motr/main.go
+++ b/cmd/motr/main.go
@@ -8,9 +8,9 @@ import (
 	"syscall/js"
 
 	"github.com/labstack/echo/v4"
-	"github.com/onsonr/sonr/pkg/common/didauth/controller"
-	"github.com/onsonr/sonr/pkg/vault"
-	"github.com/onsonr/sonr/pkg/vault/types"
+	"github.com/onsonr/sonr/app/vault"
+	"github.com/onsonr/sonr/app/vault/types"
+	"github.com/onsonr/sonr/pkg/didauth/controller"
 )
 
 var (
diff --git a/pkg/common/didauth/controller/config.go b/pkg/didauth/controller/config.go
similarity index 100%
rename from pkg/common/didauth/controller/config.go
rename to pkg/didauth/controller/config.go
diff --git a/pkg/common/didauth/controller/middleware.go b/pkg/didauth/controller/middleware.go
similarity index 100%
rename from pkg/common/didauth/controller/middleware.go
rename to pkg/didauth/controller/middleware.go
diff --git a/pkg/common/didauth/exports.go b/pkg/didauth/exports.go
similarity index 100%
rename from pkg/common/didauth/exports.go
rename to pkg/didauth/exports.go
diff --git a/pkg/common/didauth/producer/context.go b/pkg/didauth/producer/context.go
similarity index 100%
rename from pkg/common/didauth/producer/context.go
rename to pkg/didauth/producer/context.go
diff --git a/pkg/common/didauth/producer/middleware.go b/pkg/didauth/producer/middleware.go
similarity index 100%
rename from pkg/common/didauth/producer/middleware.go
rename to pkg/didauth/producer/middleware.go
diff --git a/pkg/common/didauth/resolver/conn.go b/pkg/didauth/resolver/conn.go
similarity index 94%
rename from pkg/common/didauth/resolver/conn.go
rename to pkg/didauth/resolver/conn.go
index 5f2423a98..525d55462 100644
--- a/pkg/common/didauth/resolver/conn.go
+++ b/pkg/didauth/resolver/conn.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/labstack/echo/v4"
-	"github.com/onsonr/sonr/pkg/gateway/config"
+	"github.com/onsonr/sonr/app/gateway/config"
 	"google.golang.org/grpc"
 )
 
diff --git a/pkg/common/didauth/resolver/grpc.go b/pkg/didauth/resolver/grpc.go
similarity index 100%
rename from pkg/common/didauth/resolver/grpc.go
rename to pkg/didauth/resolver/grpc.go
diff --git a/pkl/sonr.hway/Env.pkl b/pkl/sonr.hway/Env.pkl
index d1c73749f..b4b6491dc 100644
--- a/pkl/sonr.hway/Env.pkl
+++ b/pkl/sonr.hway/Env.pkl
@@ -1,4 +1,4 @@
-@go.Package { name = "github.com/onsonr/sonr/pkg/gateway/config" }
+@go.Package { name = "github.com/onsonr/sonr/app/gateway/config" }
 
 
 open module sonr.hway.Env
diff --git a/pkl/sonr.motr/DWN.pkl b/pkl/sonr.motr/DWN.pkl
index 5564fbbcc..c4d7626eb 100644
--- a/pkl/sonr.motr/DWN.pkl
+++ b/pkl/sonr.motr/DWN.pkl
@@ -1,4 +1,4 @@
-@go.Package { name = "github.com/onsonr/sonr/pkg/vault/types" }
+@go.Package { name = "github.com/onsonr/sonr/app/vault/types" }
 
 module sonr.motr.DWN