diff --git a/pkg/vault/handlers/index_handler.go b/pkg/vault/handlers/index_handler.go
index 4bd3f7fc5..94318a0cd 100644
--- a/pkg/vault/handlers/index_handler.go
+++ b/pkg/vault/handlers/index_handler.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/onsonr/sonr/pkg/common/response"
-	"github.com/onsonr/sonr/pkg/vault/internal/pages/index"
-	"github.com/onsonr/sonr/pkg/vault/internal/session"
+	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/internal/session/context.go b/pkg/vault/internal/context.go
similarity index 100%
rename from pkg/vault/internal/session/context.go
rename to pkg/vault/internal/context.go
diff --git a/pkg/vault/internal/session/middleware.go b/pkg/vault/internal/middleware.go
similarity index 100%
rename from pkg/vault/internal/session/middleware.go
rename to pkg/vault/internal/middleware.go
diff --git a/pkg/vault/internal/session/session.go b/pkg/vault/internal/session.go
similarity index 100%
rename from pkg/vault/internal/session/session.go
rename to pkg/vault/internal/session.go
diff --git a/pkg/vault/internal/pages/authenticate/model.go b/pkg/vault/pages/authenticate/model.go
similarity index 100%
rename from pkg/vault/internal/pages/authenticate/model.go
rename to pkg/vault/pages/authenticate/model.go
diff --git a/pkg/vault/internal/pages/authorize/model.go b/pkg/vault/pages/authorize/model.go
similarity index 100%
rename from pkg/vault/internal/pages/authorize/model.go
rename to pkg/vault/pages/authorize/model.go
diff --git a/pkg/vault/internal/pages/dashboard/page.templ b/pkg/vault/pages/dashboard/page.templ
similarity index 100%
rename from pkg/vault/internal/pages/dashboard/page.templ
rename to pkg/vault/pages/dashboard/page.templ
diff --git a/pkg/vault/internal/pages/dashboard/page_templ.go b/pkg/vault/pages/dashboard/page_templ.go
similarity index 100%
rename from pkg/vault/internal/pages/dashboard/page_templ.go
rename to pkg/vault/pages/dashboard/page_templ.go
diff --git a/pkg/vault/internal/pages/index/error.templ b/pkg/vault/pages/index/error.templ
similarity index 100%
rename from pkg/vault/internal/pages/index/error.templ
rename to pkg/vault/pages/index/error.templ
diff --git a/pkg/vault/internal/pages/index/error_templ.go b/pkg/vault/pages/index/error_templ.go
similarity index 100%
rename from pkg/vault/internal/pages/index/error_templ.go
rename to pkg/vault/pages/index/error_templ.go
diff --git a/pkg/vault/internal/pages/index/page.templ b/pkg/vault/pages/index/page.templ
similarity index 100%
rename from pkg/vault/internal/pages/index/page.templ
rename to pkg/vault/pages/index/page.templ
diff --git a/pkg/vault/internal/pages/index/page_templ.go b/pkg/vault/pages/index/page_templ.go
similarity index 100%
rename from pkg/vault/internal/pages/index/page_templ.go
rename to pkg/vault/pages/index/page_templ.go
diff --git a/pkg/vault/internal/pages/wallet/model.go b/pkg/vault/pages/wallet/model.go
similarity index 100%
rename from pkg/vault/internal/pages/wallet/model.go
rename to pkg/vault/pages/wallet/model.go
diff --git a/pkg/vault/internal/pages/wallet/page.templ b/pkg/vault/pages/wallet/page.templ
similarity index 100%
rename from pkg/vault/internal/pages/wallet/page.templ
rename to pkg/vault/pages/wallet/page.templ
diff --git a/pkg/vault/internal/pages/wallet/page_templ.go b/pkg/vault/pages/wallet/page_templ.go
similarity index 100%
rename from pkg/vault/internal/pages/wallet/page_templ.go
rename to pkg/vault/pages/wallet/page_templ.go
diff --git a/pkg/vault/internal/pages/wallet/scripts.templ b/pkg/vault/pages/wallet/scripts.templ
similarity index 100%
rename from pkg/vault/internal/pages/wallet/scripts.templ
rename to pkg/vault/pages/wallet/scripts.templ
diff --git a/pkg/vault/internal/pages/wallet/scripts_templ.go b/pkg/vault/pages/wallet/scripts_templ.go
similarity index 100%
rename from pkg/vault/internal/pages/wallet/scripts_templ.go
rename to pkg/vault/pages/wallet/scripts_templ.go