diff --git a/internal/gateway/context/middleware.go b/internal/gateway/context/middleware.go
index b39237542..7c7d26a90 100644
--- a/internal/gateway/context/middleware.go
+++ b/internal/gateway/context/middleware.go
@@ -4,13 +4,13 @@ import (
 	"net/http"
 
 	"github.com/labstack/echo/v4"
-	"github.com/onsonr/sonr/internal/gateway/config"
+	config "github.com/onsonr/sonr/pkg/config/hway"
 	"github.com/onsonr/sonr/pkg/database/sessions"
 	"gorm.io/gorm"
 )
 
 // Middleware creates a new session middleware
-func Middleware(db *gorm.DB, env config.Env) echo.MiddlewareFunc {
+func Middleware(db *gorm.DB, env config.Hway) echo.MiddlewareFunc {
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
 			cc := NewHTTPContext(c, db)
@@ -27,7 +27,7 @@ type HTTPContext struct {
 	echo.Context
 	db   *gorm.DB
 	sess *sessions.Session
-	env  config.Env
+	env  config.Hway
 }
 
 // Get returns the HTTPContext from the echo context
diff --git a/internal/gateway/routes.go b/internal/gateway/routes.go
index 3c4190222..59d941e07 100644
--- a/internal/gateway/routes.go
+++ b/internal/gateway/routes.go
@@ -3,15 +3,15 @@ package gateway
 
 import (
 	"github.com/labstack/echo/v4"
-	"github.com/onsonr/sonr/internal/gateway/config"
 	"github.com/onsonr/sonr/internal/gateway/context"
 	"github.com/onsonr/sonr/internal/gateway/handlers/index"
 	"github.com/onsonr/sonr/internal/gateway/handlers/register"
 	"github.com/onsonr/sonr/pkg/common/response"
+	config "github.com/onsonr/sonr/pkg/config/hway"
 	"gorm.io/gorm"
 )
 
-func RegisterRoutes(e *echo.Echo, env config.Env, db *gorm.DB) error {
+func RegisterRoutes(e *echo.Echo, env config.Hway, db *gorm.DB) error {
 	// Custom error handler for gateway
 	e.HTTPErrorHandler = response.RedirectOnError("http://localhost:3000")
 
diff --git a/internal/vault/embed/fs.go b/pkg/config/embed/fs.go
similarity index 100%
rename from internal/vault/embed/fs.go
rename to pkg/config/embed/fs.go
diff --git a/internal/vault/embed/index.html b/pkg/config/embed/index.html
similarity index 100%
rename from internal/vault/embed/index.html
rename to pkg/config/embed/index.html
diff --git a/internal/vault/embed/main.js b/pkg/config/embed/main.js
similarity index 100%
rename from internal/vault/embed/main.js
rename to pkg/config/embed/main.js
diff --git a/internal/vault/embed/manifest.go b/pkg/config/embed/manifest.go
similarity index 100%
rename from internal/vault/embed/manifest.go
rename to pkg/config/embed/manifest.go
diff --git a/internal/vault/embed/schema.go b/pkg/config/embed/schema.go
similarity index 100%
rename from internal/vault/embed/schema.go
rename to pkg/config/embed/schema.go
diff --git a/internal/vault/embed/static.go b/pkg/config/embed/static.go
similarity index 100%
rename from internal/vault/embed/static.go
rename to pkg/config/embed/static.go
diff --git a/internal/vault/embed/sw.js b/pkg/config/embed/sw.js
similarity index 100%
rename from internal/vault/embed/sw.js
rename to pkg/config/embed/sw.js
diff --git a/pkg/database/sessions/sqlite.go b/pkg/database/sessions/sqlite.go
index 8bb73d528..109275a9f 100644
--- a/pkg/database/sessions/sqlite.go
+++ b/pkg/database/sessions/sqlite.go
@@ -4,13 +4,13 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/onsonr/sonr/internal/gateway/config"
+	config "github.com/onsonr/sonr/pkg/config/hway"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 )
 
 // NewGormDB initializes and returns a configured database connection
-func NewGormDB(env config.Env) (*gorm.DB, error) {
+func NewGormDB(env config.Hway) (*gorm.DB, error) {
 	path := formatDBPath(env.GetSqliteFile())
 	db, err := gorm.Open(sqlite.Open(path), &gorm.Config{})
 	if err != nil {
diff --git a/pkg/didauth/resolver/conn.go b/pkg/didauth/resolver/conn.go
index 69f6601a7..067bc3d90 100644
--- a/pkg/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/internal/gateway/config"
+	config "github.com/onsonr/sonr/pkg/config/hway"
 	"google.golang.org/grpc"
 )
 
@@ -25,7 +25,7 @@ func GetClientConn(c echo.Context) (*grpc.ClientConn, error) {
 	return grpcConn, nil
 }
 
-func Middleware(env config.Env) echo.MiddlewareFunc {
+func Middleware(env config.Hway) echo.MiddlewareFunc {
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
 			cc := &ClientsContext{Context: c, addr: env.GetSonrGrpcUrl()}