diff --git a/system/rest/auth.go b/system/rest/auth.go
index e5c4d42f0..b2e6898fd 100644
--- a/system/rest/auth.go
+++ b/system/rest/auth.go
@@ -2,16 +2,29 @@ package rest
 
 import (
 	"context"
+	"net/http"
 
 	"github.com/pkg/errors"
+	"github.com/titpetric/factory/resputil"
 
+	"github.com/crusttech/crust/internal/auth"
+	"github.com/crusttech/crust/internal/payload"
+	"github.com/crusttech/crust/internal/payload/outgoing"
 	"github.com/crusttech/crust/system/rest/handlers"
 	"github.com/crusttech/crust/system/rest/request"
+	"github.com/crusttech/crust/system/service"
 )
 
 var _ = errors.Wrap
 
-type Auth struct{}
+type (
+	Auth struct{}
+
+	checkResponse struct {
+		JWT  string         `json:"jwt"`
+		User *outgoing.User `json:"user"`
+	}
+)
 
 func (Auth) New() *Auth {
 	return &Auth{}
diff --git a/system/rest/router.go b/system/rest/router.go
index 5449e1599..55ba4a0fc 100644
--- a/system/rest/router.go
+++ b/system/rest/router.go
@@ -3,26 +3,16 @@ package rest
 import (
 	"context"
 	"log"
-	"net/http"
 
 	"github.com/go-chi/chi"
-	"github.com/titpetric/factory/resputil"
 
 	"github.com/crusttech/crust/internal/auth"
 	"github.com/crusttech/crust/internal/config"
-	"github.com/crusttech/crust/internal/payload"
-	"github.com/crusttech/crust/internal/payload/outgoing"
 	"github.com/crusttech/crust/system/repository"
+	"github.com/crusttech/crust/system/rest/handlers"
 	"github.com/crusttech/crust/system/service"
 )
 
-type (
-	checkResponse struct {
-		JWT  string         `json:"jwt"`
-		User *outgoing.User `json:"user"`
-	}
-)
-
 func MountRoutes(oidcConfig *config.OIDC, jwtAuth jwtEncodeCookieSetter) func(chi.Router) {
 	var userSvc = service.User()
 	var ctx = context.Background()