diff --git a/cmd/hway/cmds.go b/cmd/hway/cmds.go
index 19bcee349..e31677449 100644
--- a/cmd/hway/cmds.go
+++ b/cmd/hway/cmds.go
@@ -9,10 +9,10 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/onsonr/sonr/crypto/ucan"
-	"github.com/onsonr/sonr/internal/database/sessions"
 	"github.com/onsonr/sonr/internal/gateway"
 	"github.com/onsonr/sonr/internal/gateway/config"
 	"github.com/onsonr/sonr/pkg/common/ipfs"
+	"github.com/onsonr/sonr/pkg/database/sessions"
 	"github.com/onsonr/sonr/pkg/didauth/producer"
 	"github.com/spf13/cobra"
 )
diff --git a/internal/gateway/context/context.go b/internal/gateway/context/context.go
index 0d75c5683..709e083d3 100644
--- a/internal/gateway/context/context.go
+++ b/internal/gateway/context/context.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	"github.com/labstack/echo/v4"
-	"github.com/onsonr/sonr/internal/database/sessions"
 	"github.com/onsonr/sonr/pkg/common"
+	"github.com/onsonr/sonr/pkg/database/sessions"
 	"github.com/segmentio/ksuid"
 )
 
diff --git a/internal/gateway/context/middleware.go b/internal/gateway/context/middleware.go
index 589d77a16..b39237542 100644
--- a/internal/gateway/context/middleware.go
+++ b/internal/gateway/context/middleware.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 
 	"github.com/labstack/echo/v4"
-	"github.com/onsonr/sonr/internal/database/sessions"
 	"github.com/onsonr/sonr/internal/gateway/config"
+	"github.com/onsonr/sonr/pkg/database/sessions"
 	"gorm.io/gorm"
 )
 
diff --git a/internal/gateway/context/session.go b/internal/gateway/context/session.go
index 8b3982f78..f312bdfb6 100644
--- a/internal/gateway/context/session.go
+++ b/internal/gateway/context/session.go
@@ -2,7 +2,7 @@ package context
 
 import (
 	"github.com/labstack/echo/v4"
-	"github.com/onsonr/sonr/internal/database/sessions"
+	"github.com/onsonr/sonr/pkg/database/sessions"
 )
 
 // ╭───────────────────────────────────────────────────────╮
diff --git a/internal/vault/types/Config.pkl.go b/internal/vault/config/Config.pkl.go
similarity index 97%
rename from internal/vault/types/Config.pkl.go
rename to internal/vault/config/Config.pkl.go
index 5b938a5cd..b2b410bdf 100644
--- a/internal/vault/types/Config.pkl.go
+++ b/internal/vault/config/Config.pkl.go
@@ -1,5 +1,5 @@
 // Code generated from Pkl module `sonr.motr.DWN`. DO NOT EDIT.
-package types
+package config
 
 type Config struct {
 	IpfsGatewayUrl string `pkl:"ipfsGatewayUrl" json:"ipfsGatewayUrl,omitempty"`
diff --git a/internal/vault/types/DWN.pkl.go b/internal/vault/config/DWN.pkl.go
similarity index 98%
rename from internal/vault/types/DWN.pkl.go
rename to internal/vault/config/DWN.pkl.go
index 250885748..4f5e265cc 100644
--- a/internal/vault/types/DWN.pkl.go
+++ b/internal/vault/config/DWN.pkl.go
@@ -1,5 +1,5 @@
 // Code generated from Pkl module `sonr.motr.DWN`. DO NOT EDIT.
-package types
+package config
 
 import (
 	"context"
diff --git a/internal/vault/types/Environment.pkl.go b/internal/vault/config/Environment.pkl.go
similarity index 96%
rename from internal/vault/types/Environment.pkl.go
rename to internal/vault/config/Environment.pkl.go
index c3b703d88..9bbcbdf5d 100644
--- a/internal/vault/types/Environment.pkl.go
+++ b/internal/vault/config/Environment.pkl.go
@@ -1,5 +1,5 @@
 // Code generated from Pkl module `sonr.motr.DWN`. DO NOT EDIT.
-package types
+package config
 
 type Environment struct {
 	IsDevelopment bool `pkl:"isDevelopment" json:"isDevelopment,omitempty"`
diff --git a/internal/vault/types/Schema.pkl.go b/internal/vault/config/Schema.pkl.go
similarity index 97%
rename from internal/vault/types/Schema.pkl.go
rename to internal/vault/config/Schema.pkl.go
index ca6cb99d5..adb9b185a 100644
--- a/internal/vault/types/Schema.pkl.go
+++ b/internal/vault/config/Schema.pkl.go
@@ -1,5 +1,5 @@
 // Code generated from Pkl module `sonr.motr.DWN`. DO NOT EDIT.
-package types
+package config
 
 type Schema struct {
 	Version int `pkl:"version"`
diff --git a/internal/gateway/config/vault.go b/internal/vault/config/fs.go
similarity index 82%
rename from internal/gateway/config/vault.go
rename to internal/vault/config/fs.go
index cd8b1cbc5..b78f5d2c4 100644
--- a/internal/gateway/config/vault.go
+++ b/internal/vault/config/fs.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/ipfs/boxo/files"
 	"github.com/onsonr/sonr/internal/vault/embed"
-	"github.com/onsonr/sonr/internal/vault/types"
 )
 
 const SchemaVersion = 1
@@ -18,7 +17,7 @@ const (
 )
 
 // spawnVaultDirectory creates a new directory with the default files
-func NewFS(cfg *types.Config) (files.Directory, error) {
+func NewVaultFS(cfg *Config) (files.Directory, error) {
 	manifestBz, err := newWebManifestBytes()
 	if err != nil {
 		return nil, err
@@ -36,9 +35,9 @@ func NewFS(cfg *types.Config) (files.Directory, error) {
 	}), nil
 }
 
-// GetVaultConfig returns the default vault config
-func GetVaultConfig(addr string, ucanCID string) *types.Config {
-	return &types.Config{
+// NewVaultConfig returns the default vault config
+func NewVaultConfig(addr string, ucanCID string) *Config {
+	return &Config{
 		MotrToken:      ucanCID,
 		MotrAddress:    addr,
 		IpfsGatewayUrl: "http://localhost:80",
diff --git a/internal/vault/types/init.pkl.go b/internal/vault/config/init.pkl.go
similarity index 95%
rename from internal/vault/types/init.pkl.go
rename to internal/vault/config/init.pkl.go
index eef43b76f..7fc1ae454 100644
--- a/internal/vault/types/init.pkl.go
+++ b/internal/vault/config/init.pkl.go
@@ -1,5 +1,5 @@
 // Code generated from Pkl module `sonr.motr.DWN`. DO NOT EDIT.
-package types
+package config
 
 import "github.com/apple/pkl-go/pkl"
 
diff --git a/internal/gateway/config/manifest.go b/internal/vault/config/manifest.go
similarity index 100%
rename from internal/gateway/config/manifest.go
rename to internal/vault/config/manifest.go
diff --git a/internal/gateway/config/schema.go b/internal/vault/config/schema.go
similarity index 90%
rename from internal/gateway/config/schema.go
rename to internal/vault/config/schema.go
index 97e6ac9e1..6eac6dde1 100644
--- a/internal/gateway/config/schema.go
+++ b/internal/vault/config/schema.go
@@ -4,13 +4,12 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/onsonr/sonr/internal/vault/types"
 	"github.com/onsonr/sonr/pkg/common/models"
 )
 
 // DefaultSchema returns the default schema
-func DefaultSchema() *types.Schema {
-	return &types.Schema{
+func DefaultSchema() *Schema {
+	return &Schema{
 		Version:    SchemaVersion,
 		Account:    getSchema(&models.Account{}),
 		Asset:      getSchema(&models.Asset{}),
diff --git a/internal/database/sessions/models.go b/pkg/database/sessions/models.go
similarity index 100%
rename from internal/database/sessions/models.go
rename to pkg/database/sessions/models.go
diff --git a/internal/database/sessions/sqlite.go b/pkg/database/sessions/sqlite.go
similarity index 100%
rename from internal/database/sessions/sqlite.go
rename to pkg/database/sessions/sqlite.go
diff --git a/pkl/sonr.motr/DWN.pkl b/pkl/sonr.motr/DWN.pkl
index 02ddf1947..233bb6b9f 100644
--- a/pkl/sonr.motr/DWN.pkl
+++ b/pkl/sonr.motr/DWN.pkl
@@ -1,4 +1,4 @@
-@go.Package { name = "github.com/onsonr/sonr/internal/vault/types" }
+@go.Package { name = "github.com/onsonr/sonr/internal/vault/config" }
 
 module sonr.motr.DWN