diff --git a/app/gateway/routes.go b/app/gateway/routes.go
index 1e5841da9..569c733bf 100644
--- a/app/gateway/routes.go
+++ b/app/gateway/routes.go
@@ -3,11 +3,11 @@ package gateway
 
 import (
 	"github.com/labstack/echo/v4"
+	"github.com/onsonr/sonr/app/gateway/config"
+	"github.com/onsonr/sonr/app/gateway/handlers"
+	"github.com/onsonr/sonr/app/gateway/internal/database"
+	"github.com/onsonr/sonr/app/gateway/internal/session"
 	"github.com/onsonr/sonr/pkg/common/response"
-	"github.com/onsonr/sonr/pkg/gateway/config"
-	"github.com/onsonr/sonr/pkg/gateway/handlers"
-	"github.com/onsonr/sonr/pkg/gateway/internal/database"
-	"github.com/onsonr/sonr/pkg/gateway/internal/session"
 )
 
 func RegisterRoutes(e *echo.Echo, env config.Env) error {
diff --git a/cmd/hway/main.go b/cmd/hway/main.go
index a59f82cdd..dd37b997d 100644
--- a/cmd/hway/main.go
+++ b/cmd/hway/main.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
+	"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/gateway"
-	"github.com/onsonr/sonr/pkg/gateway/config"
 )
 
 //go:embed config.pkl