diff --git a/Makefile b/Makefile
index 8f8f64cb1..1e5f9676b 100644
--- a/Makefile
+++ b/Makefile
@@ -322,7 +322,7 @@ build-hway: gen-templ gen-pkl
 
 build-motr: gen-templ gen-pkl
 	@echo "(dwn) Building motr.wasm -> Service Worker IPFS Vault"
-	GOOS=js GOARCH=wasm go build -o ./pkg/dwn/app.wasm ./pkg/dwn/wasm/main.go
+	GOOS=js GOARCH=wasm go build -o ./pkg/dwn/app.wasm ./cmd/motr/main.go
 
 build-nebula:
 	@echo "(nebula) Building nebula"
diff --git a/pkg/dwn/wasm/main.go b/cmd/motr/main.go
similarity index 98%
rename from pkg/dwn/wasm/main.go
rename to cmd/motr/main.go
index c053c393f..9ea76b077 100644
--- a/pkg/dwn/wasm/main.go
+++ b/cmd/motr/main.go
@@ -15,14 +15,14 @@ import (
 	"github.com/labstack/echo/v4"
 	promise "github.com/nlepage/go-js-promise"
 
-	"github.com/onsonr/sonr/internal/session"
+	"github.com/onsonr/sonr/internal/ctx"
 	"github.com/onsonr/sonr/pkg/nebula/routes"
 	"github.com/onsonr/sonr/pkg/nebula/worker"
 )
 
 func main() {
 	e := echo.New()
-	e.Use(session.UseSession)
+	e.Use(ctx.UseSession)
 	registerViews(e)
 	registerState(e)
 	Serve(e)
diff --git a/internal/channel/broadcast.go b/internal/bch/broadcast.go
similarity index 100%
rename from internal/channel/broadcast.go
rename to internal/bch/broadcast.go
diff --git a/internal/channel/middleware.go b/internal/bch/middleware.go
similarity index 100%
rename from internal/channel/middleware.go
rename to internal/bch/middleware.go
diff --git a/internal/session/cookies.go b/internal/ctx/cookies.go
similarity index 97%
rename from internal/session/cookies.go
rename to internal/ctx/cookies.go
index 42136f476..b747f657c 100644
--- a/internal/session/cookies.go
+++ b/internal/ctx/cookies.go
@@ -1,4 +1,4 @@
-package session
+package ctx
 
 import (
 	"net/http"
diff --git a/internal/session/middleware.go b/internal/ctx/middleware.go
similarity index 86%
rename from internal/session/middleware.go
rename to internal/ctx/middleware.go
index 561205a4a..069cb1d97 100644
--- a/internal/session/middleware.go
+++ b/internal/ctx/middleware.go
@@ -1,10 +1,8 @@
-package session
+package ctx
 
 import (
 	"github.com/labstack/echo/v4"
 	"github.com/segmentio/ksuid"
-
-	"github.com/onsonr/sonr/internal/headers"
 )
 
 // GetSession returns the current Session
@@ -16,7 +14,7 @@ func GetSession(c echo.Context) *Session {
 func UseSession(next echo.HandlerFunc) echo.HandlerFunc {
 	return func(c echo.Context) error {
 		sc := initSession(c)
-		headers := new(headers.RequestHeaders)
+		headers := new(RequestHeaders)
 		err := sc.Bind(headers)
 		if err != nil {
 			return err
diff --git a/internal/headers/request.go b/internal/ctx/request.go
similarity index 98%
rename from internal/headers/request.go
rename to internal/ctx/request.go
index cdbb59ffc..65c0c391d 100644
--- a/internal/headers/request.go
+++ b/internal/ctx/request.go
@@ -1,4 +1,4 @@
-package headers
+package ctx
 
 type RequestHeaders struct {
 	CacheControl  *string `header:"Cache-Control"`
diff --git a/internal/headers/response.go b/internal/ctx/response.go
similarity index 98%
rename from internal/headers/response.go
rename to internal/ctx/response.go
index 271d5431e..177e5f5a4 100644
--- a/internal/headers/response.go
+++ b/internal/ctx/response.go
@@ -1,4 +1,4 @@
-package headers
+package ctx
 
 type ResponseHeaders struct {
 	// HTMX Specific
diff --git a/internal/swtkn/macaroon.go b/internal/swt/macaroon.go
similarity index 100%
rename from internal/swtkn/macaroon.go
rename to internal/swt/macaroon.go
diff --git a/internal/swtkn/middleware.go b/internal/swt/middleware.go
similarity index 100%
rename from internal/swtkn/middleware.go
rename to internal/swt/middleware.go
diff --git a/web/server.go b/web/server.go
index 6fa1a8fcc..4271c43a8 100644
--- a/web/server.go
+++ b/web/server.go
@@ -4,14 +4,14 @@ package main
 
 import (
 	"github.com/labstack/echo/v4"
-	"github.com/onsonr/sonr/internal/session"
+	"github.com/onsonr/sonr/internal/ctx"
 	"github.com/onsonr/sonr/pkg/nebula/routes"
 	"github.com/syumai/workers"
 )
 
 func main() {
 	s := echo.New()
-	s.Use(session.UseSession)
+	s.Use(ctx.UseSession)
 
 	s.GET("/", routes.Home)
 	s.GET("/login", routes.LoginStart)