diff --git a/crm/rest/router.go b/crm/rest/router.go
index 22da00d9f..6449c451e 100644
--- a/crm/rest/router.go
+++ b/crm/rest/router.go
@@ -2,12 +2,13 @@ package rest
 
 import (
 	"github.com/crusttech/crust/auth"
+	"github.com/crusttech/crust/auth/types"
 	"github.com/crusttech/crust/crm/rest/handlers"
 	"github.com/crusttech/crust/crm/service"
 	"github.com/go-chi/chi"
 )
 
-func MountRoutes(jwtAuth auth.TokenEncoder) func(chi.Router) {
+func MountRoutes(jwtAuth types.TokenEncoder) func(chi.Router) {
 	var (
 		fieldSvc   = service.Field()
 		moduleSvc  = service.Module()
diff --git a/sam/rest/auth.go b/sam/rest/auth.go
index 9d5b0ec7a..95f2e1bd7 100644
--- a/sam/rest/auth.go
+++ b/sam/rest/auth.go
@@ -2,7 +2,7 @@ package rest
 
 import (
 	"context"
-	"github.com/crusttech/crust/auth"
+	auth "github.com/crusttech/crust/auth/types"
 	"github.com/crusttech/crust/sam/rest/request"
 	"github.com/crusttech/crust/sam/types"
 	"github.com/pkg/errors"
@@ -12,11 +12,8 @@ var _ = errors.Wrap
 
 type (
 	Auth struct {
-		svc struct {
-			user authUserBasics
-
-			token auth.TokenEncoder
-		}
+		user  authUserBasics
+		token auth.TokenEncoder
 	}
 
 	authUserBasics interface {
@@ -26,22 +23,21 @@ type (
 )
 
 func (Auth) New(credValidator authUserBasics, tknEncoder auth.TokenEncoder) *Auth {
-	auth := &Auth{}
-	auth.svc.user = credValidator
-	auth.svc.token = tknEncoder
-
-	return auth
+	return &Auth{
+		credValidator,
+		tknEncoder,
+	}
 }
 
 func (ctrl *Auth) Login(ctx context.Context, r *request.AuthLogin) (interface{}, error) {
-	return ctrl.tokenize(ctrl.svc.user.ValidateCredentials(ctx, r.Username, r.Password))
+	return ctrl.tokenize(ctrl.user.ValidateCredentials(ctx, r.Username, r.Password))
 }
 
 func (ctrl *Auth) Create(ctx context.Context, r *request.AuthCreate) (interface{}, error) {
 	user := &types.User{Username: r.Username}
 	user.GeneratePassword(r.Password)
 
-	return ctrl.tokenize(ctrl.svc.user.Create(ctx, user))
+	return ctrl.tokenize(ctrl.user.Create(ctx, user))
 }
 
 // Wraps user return value and appends JWT
@@ -54,7 +50,7 @@ func (ctrl *Auth) tokenize(user *types.User, err error) (interface{}, error) {
 		JWT  string
 		User *types.User `json:"user"`
 	}{
-		JWT:  ctrl.svc.token.Encode(user),
+		JWT:  ctrl.token.Encode(user),
 		User: user,
 	}, nil
 }
diff --git a/sam/rest/router.go b/sam/rest/router.go
index ab6a16d46..472d54b5f 100644
--- a/sam/rest/router.go
+++ b/sam/rest/router.go
@@ -2,12 +2,13 @@ package rest
 
 import (
 	"github.com/crusttech/crust/auth"
+	"github.com/crusttech/crust/auth/types"
 	"github.com/crusttech/crust/sam/rest/handlers"
 	"github.com/crusttech/crust/sam/service"
 	"github.com/go-chi/chi"
 )
 
-func MountRoutes(jwtAuth auth.TokenEncoder) func(chi.Router) {
+func MountRoutes(jwtAuth types.TokenEncoder) func(chi.Router) {
 	// Initialize services
 	var (
 		channelSvc      = service.Channel()