diff --git a/id/system/system.go b/id/system/system.go
index c33995d905a615b6c24422e27239da34141d4752..21ca8c10063b644382faeb8f0ff25385d9ddcd47 100644
--- a/id/system/system.go
+++ b/id/system/system.go
@@ -14,7 +14,7 @@ import (
 	"git.perx.ru/perxis/perxis-go/pkg/organizations"
 	"git.perx.ru/perxis/perxis-go/pkg/roles"
 	"git.perx.ru/perxis/perxis-go/pkg/spaces"
-	"git.perx.ru/perxis/perxis-go/pkg/users"
+	"git.perx.ru/perxis/perxis-go/users"
 )
 
 func Handler(obj any) *id.ObjectId {
diff --git a/id/test/object_id_test.go b/id/test/object_id_test.go
index 2f01fa125e376623ceb710bbe594235b8434d853..36c37508f4cfda998798ecbf8f1fc88ad988ceb7 100644
--- a/id/test/object_id_test.go
+++ b/id/test/object_id_test.go
@@ -13,7 +13,7 @@ import (
 	"git.perx.ru/perxis/perxis-go/pkg/organizations"
 	"git.perx.ru/perxis/perxis-go/pkg/roles"
 	"git.perx.ru/perxis/perxis-go/pkg/spaces"
-	"git.perx.ru/perxis/perxis-go/pkg/users"
+	"git.perx.ru/perxis/perxis-go/users"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/logs/zap/example_test.go b/logs/zap/example_test.go
index dc182fb0fb764b9b7ca3a232678564c8878a72b0..eae560d6eb4e9e4442d4f966320f800845d7b373 100644
--- a/logs/zap/example_test.go
+++ b/logs/zap/example_test.go
@@ -11,8 +11,8 @@ import (
 	logmocks "git.perx.ru/perxis/perxis-go/logs/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/auth"
 	"git.perx.ru/perxis/perxis-go/pkg/items"
-	"git.perx.ru/perxis/perxis-go/pkg/users"
-	usersmocks "git.perx.ru/perxis/perxis-go/pkg/users/mocks"
+	"git.perx.ru/perxis/perxis-go/users"
+	usersmocks "git.perx.ru/perxis/perxis-go/users/mocks"
 	logzap "git.perx.ru/perxis/perxis-go/zap"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
diff --git a/pkg/account/account.go b/pkg/account/account.go
index 9eb54c317274789cb34ee30632df61c152aef93a..c1786375a39f82dba467fe0ca954af9dbf229e3a 100644
--- a/pkg/account/account.go
+++ b/pkg/account/account.go
@@ -5,8 +5,8 @@ import (
 	"git.perx.ru/perxis/perxis-go/pkg/members"
 	msobserver "git.perx.ru/perxis/perxis-go/pkg/members/observer"
 	"git.perx.ru/perxis/perxis-go/pkg/organizations"
-	"git.perx.ru/perxis/perxis-go/pkg/users"
 	"git.perx.ru/perxis/perxis-go/pkg/version"
+	"git.perx.ru/perxis/perxis-go/users"
 	"google.golang.org/grpc"
 )
 
diff --git a/pkg/account/client.go b/pkg/account/client.go
index 5349ed2917ed691f6661930ea0ffce72a79ab814..0bd54d1cdc167133db229896ef6c36059daefdbf 100644
--- a/pkg/account/client.go
+++ b/pkg/account/client.go
@@ -9,8 +9,8 @@ import (
 	membersTransport "git.perx.ru/perxis/perxis-go/pkg/members/transport/grpc"
 	serviceOrganizations "git.perx.ru/perxis/perxis-go/pkg/organizations/middleware"
 	organizationsTransport "git.perx.ru/perxis/perxis-go/pkg/organizations/transport/grpc"
-	serviceUsers "git.perx.ru/perxis/perxis-go/pkg/users/middleware"
-	usersTransport "git.perx.ru/perxis/perxis-go/pkg/users/transport/grpc"
+	serviceUsers "git.perx.ru/perxis/perxis-go/users/middleware"
+	usersTransport "git.perx.ru/perxis/perxis-go/users/transport/grpc"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 )
diff --git a/pkg/auth/factory.go b/pkg/auth/factory.go
index 2394c62a2f15ca7605959b3f5b31996a5c79a164..c69b25cb70ebe1bd7cc5b9af16a77d7ba781f655 100644
--- a/pkg/auth/factory.go
+++ b/pkg/auth/factory.go
@@ -9,7 +9,7 @@ import (
 	"git.perx.ru/perxis/perxis-go/pkg/members"
 	"git.perx.ru/perxis/perxis-go/pkg/roles"
 	"git.perx.ru/perxis/perxis-go/pkg/spaces"
-	"git.perx.ru/perxis/perxis-go/pkg/users"
+	"git.perx.ru/perxis/perxis-go/users"
 )
 
 type PrincipalFactory struct {
diff --git a/pkg/auth/user.go b/pkg/auth/user.go
index 29e879457bebc4da201ce126c6c140e02989f2c0..421c465f691bd8a776dd7d937c7c1a3844c3d71c 100644
--- a/pkg/auth/user.go
+++ b/pkg/auth/user.go
@@ -12,7 +12,7 @@ import (
 	"git.perx.ru/perxis/perxis-go/pkg/roles"
 	"git.perx.ru/perxis/perxis-go/pkg/service"
 	"git.perx.ru/perxis/perxis-go/pkg/spaces"
-	"git.perx.ru/perxis/perxis-go/pkg/users"
+	"git.perx.ru/perxis/perxis-go/users"
 )
 
 type UserPrincipal struct {
diff --git a/pkg/users/errors.go b/users/errors.go
similarity index 100%
rename from pkg/users/errors.go
rename to users/errors.go
diff --git a/pkg/users/events.go b/users/events.go
similarity index 100%
rename from pkg/users/events.go
rename to users/events.go
diff --git a/pkg/users/middleware/access_logging_middleware.go b/users/middleware/access_logging_middleware.go
similarity index 94%
rename from pkg/users/middleware/access_logging_middleware.go
rename to users/middleware/access_logging_middleware.go
index dd8d4a14c73915d553381b239770fcf05c02aca5..414eee670caa12f83fc92978a15ce009a677c668 100644
--- a/pkg/users/middleware/access_logging_middleware.go
+++ b/users/middleware/access_logging_middleware.go
@@ -4,7 +4,7 @@
 
 package middleware
 
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/users -i Users -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/users -i Users -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
 
 import (
 	"context"
@@ -12,7 +12,7 @@ import (
 
 	"git.perx.ru/perxis/perxis-go/pkg/auth"
 	"git.perx.ru/perxis/perxis-go/pkg/options"
-	"git.perx.ru/perxis/perxis-go/pkg/users"
+	"git.perx.ru/perxis/perxis-go/users"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/users/middleware/caching_middleware.go b/users/middleware/caching_middleware.go
similarity index 97%
rename from pkg/users/middleware/caching_middleware.go
rename to users/middleware/caching_middleware.go
index 825da6a28caabeee0f71d9030b60c8152e884570..8f006bf2de3b1383c0814fb59757f137a4f82a6e 100644
--- a/pkg/users/middleware/caching_middleware.go
+++ b/users/middleware/caching_middleware.go
@@ -5,7 +5,7 @@ import (
 
 	"git.perx.ru/perxis/perxis-go/pkg/cache"
 	services "git.perx.ru/perxis/perxis-go/pkg/options"
-	service "git.perx.ru/perxis/perxis-go/pkg/users"
+	service "git.perx.ru/perxis/perxis-go/users"
 )
 
 func CachingMiddleware(cache cache.Cache) Middleware {
diff --git a/pkg/users/middleware/caching_middleware_test.go b/users/middleware/caching_middleware_test.go
similarity index 98%
rename from pkg/users/middleware/caching_middleware_test.go
rename to users/middleware/caching_middleware_test.go
index c5755407c6ffbc163f86ed548ad4b50c5d8bfc94..dd70d0cda7b10c353f63a6136ae69846b53e6e0d 100644
--- a/pkg/users/middleware/caching_middleware_test.go
+++ b/users/middleware/caching_middleware_test.go
@@ -7,8 +7,8 @@ import (
 
 	"git.perx.ru/perxis/perxis-go/pkg/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
-	"git.perx.ru/perxis/perxis-go/pkg/users"
-	"git.perx.ru/perxis/perxis-go/pkg/users/mocks"
+	"git.perx.ru/perxis/perxis-go/users"
+	"git.perx.ru/perxis/perxis-go/users/mocks"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
diff --git a/pkg/users/middleware/error_logging_middleware.go b/users/middleware/error_logging_middleware.go
similarity index 91%
rename from pkg/users/middleware/error_logging_middleware.go
rename to users/middleware/error_logging_middleware.go
index c499b9f3bf60726a10d30ced82e24bced6702236..5eeb6cbc22c31be43f2ed7fddb809f6d1591b9bc 100644
--- a/pkg/users/middleware/error_logging_middleware.go
+++ b/users/middleware/error_logging_middleware.go
@@ -4,13 +4,13 @@
 
 package middleware
 
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/users -i Users -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/users -i Users -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
 
 import (
 	"context"
 
 	"git.perx.ru/perxis/perxis-go/pkg/options"
-	"git.perx.ru/perxis/perxis-go/pkg/users"
+	"git.perx.ru/perxis/perxis-go/users"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/users/middleware/logging_middleware.go b/users/middleware/logging_middleware.go
similarity index 98%
rename from pkg/users/middleware/logging_middleware.go
rename to users/middleware/logging_middleware.go
index 3350d36d87b5715c043455428cc6e4aa0c0f981d..ef078e60c23db194e649331421439d9735493aee 100644
--- a/pkg/users/middleware/logging_middleware.go
+++ b/users/middleware/logging_middleware.go
@@ -5,7 +5,7 @@ import (
 
 	"git.perx.ru/perxis/perxis-go/id"
 	"git.perx.ru/perxis/perxis-go/pkg/options"
-	"git.perx.ru/perxis/perxis-go/pkg/users"
+	"git.perx.ru/perxis/perxis-go/users"
 	logzap "git.perx.ru/perxis/perxis-go/zap"
 	"go.uber.org/zap"
 )
diff --git a/pkg/users/middleware/middleware.go b/users/middleware/middleware.go
similarity index 73%
rename from pkg/users/middleware/middleware.go
rename to users/middleware/middleware.go
index ed64ceeddae0ab089c1746356ece1d85a0c69e83..0bd145238944e594462c3b2758d9bdcdb6ed0daa 100644
--- a/pkg/users/middleware/middleware.go
+++ b/users/middleware/middleware.go
@@ -4,10 +4,10 @@
 
 package middleware
 
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/users -i Users -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/users -i Users -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
 
 import (
-	"git.perx.ru/perxis/perxis-go/pkg/users"
+	"git.perx.ru/perxis/perxis-go/users"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/users/middleware/recovering_middleware.go b/users/middleware/recovering_middleware.go
similarity index 92%
rename from pkg/users/middleware/recovering_middleware.go
rename to users/middleware/recovering_middleware.go
index 7dac51f0c84fca93e796fc79fe7facb6872d0df1..97e2fc22310751ffd438485ba7d243d029461a49 100644
--- a/pkg/users/middleware/recovering_middleware.go
+++ b/users/middleware/recovering_middleware.go
@@ -4,14 +4,14 @@
 
 package middleware
 
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/users -i Users -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/users -i Users -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
 
 import (
 	"context"
 	"fmt"
 
 	"git.perx.ru/perxis/perxis-go/pkg/options"
-	"git.perx.ru/perxis/perxis-go/pkg/users"
+	"git.perx.ru/perxis/perxis-go/users"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/users/middleware/telemetry_middleware.go b/users/middleware/telemetry_middleware.go
similarity index 97%
rename from pkg/users/middleware/telemetry_middleware.go
rename to users/middleware/telemetry_middleware.go
index 8ad677e704656503e246943bf12d30e133d4c11f..eecdfd36b3f770f94848de4e32789ac387d96c52 100644
--- a/pkg/users/middleware/telemetry_middleware.go
+++ b/users/middleware/telemetry_middleware.go
@@ -4,7 +4,7 @@
 
 package middleware
 
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/users -i Users -t ../../../assets/templates/middleware/telemetry_default -o telemetry_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/users -i Users -t ../../../assets/templates/middleware/telemetry_default -o telemetry_middleware.go -l ""
 
 import (
 	"context"
@@ -14,7 +14,7 @@ import (
 	"git.perx.ru/perxis/perxis-go/pkg/auth"
 	"git.perx.ru/perxis/perxis-go/pkg/options"
 	"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
-	"git.perx.ru/perxis/perxis-go/pkg/users"
+	"git.perx.ru/perxis/perxis-go/users"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/users/mocks/Middleware.go b/users/mocks/Middleware.go
similarity index 95%
rename from pkg/users/mocks/Middleware.go
rename to users/mocks/Middleware.go
index 63d457eb9c26bfa2b297a44ba994cc2be35e2055..4c49362e3f22bb81822c0a9f721c6766d1109f43 100644
--- a/pkg/users/mocks/Middleware.go
+++ b/users/mocks/Middleware.go
@@ -3,7 +3,7 @@
 package mocks
 
 import (
-	users "git.perx.ru/perxis/perxis-go/pkg/users"
+	users "git.perx.ru/perxis/perxis-go/users"
 	mock "github.com/stretchr/testify/mock"
 )
 
diff --git a/pkg/users/mocks/Storage.go b/users/mocks/Storage.go
similarity index 98%
rename from pkg/users/mocks/Storage.go
rename to users/mocks/Storage.go
index a1001d78cacac9825e7a5cfdfc7f0a712a661d8a..61b50728d651dcfd48a23fda6668bfffcb654036 100644
--- a/pkg/users/mocks/Storage.go
+++ b/users/mocks/Storage.go
@@ -8,7 +8,7 @@ import (
 	options "git.perx.ru/perxis/perxis-go/pkg/options"
 	mock "github.com/stretchr/testify/mock"
 
-	users "git.perx.ru/perxis/perxis-go/pkg/users"
+	users "git.perx.ru/perxis/perxis-go/users"
 )
 
 // Storage is an autogenerated mock type for the Storage type
diff --git a/pkg/users/mocks/Users.go b/users/mocks/Users.go
similarity index 98%
rename from pkg/users/mocks/Users.go
rename to users/mocks/Users.go
index 4db80b6d31f883092ab690f2d4ffe1616a339d35..99767b3eecf2865da7cf8083ea8bd7b1a60ec35a 100644
--- a/pkg/users/mocks/Users.go
+++ b/users/mocks/Users.go
@@ -8,7 +8,7 @@ import (
 	options "git.perx.ru/perxis/perxis-go/pkg/options"
 	mock "github.com/stretchr/testify/mock"
 
-	users "git.perx.ru/perxis/perxis-go/pkg/users"
+	users "git.perx.ru/perxis/perxis-go/users"
 )
 
 // Users is an autogenerated mock type for the Users type
diff --git a/pkg/users/service.go b/users/service.go
similarity index 100%
rename from pkg/users/service.go
rename to users/service.go
diff --git a/pkg/users/storage.go b/users/storage.go
similarity index 100%
rename from pkg/users/storage.go
rename to users/storage.go
diff --git a/pkg/users/transport/client.go b/users/transport/client.go
similarity index 97%
rename from pkg/users/transport/client.go
rename to users/transport/client.go
index 01537b1123040311fcd9fb036c8765066d2f65b1..7a6973dc5cd4862c299343295f5b28b0089716d2 100644
--- a/pkg/users/transport/client.go
+++ b/users/transport/client.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	options "git.perx.ru/perxis/perxis-go/pkg/options"
-	users "git.perx.ru/perxis/perxis-go/pkg/users"
+	users "git.perx.ru/perxis/perxis-go/users"
 )
 
 func (set EndpointsSet) Create(arg0 context.Context, arg1 *users.User) (res0 *users.User, res1 error) {
diff --git a/pkg/users/transport/endpoints.microgen.go b/users/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/users/transport/endpoints.microgen.go
rename to users/transport/endpoints.microgen.go
diff --git a/pkg/users/transport/exchanges.microgen.go b/users/transport/exchanges.microgen.go
similarity index 95%
rename from pkg/users/transport/exchanges.microgen.go
rename to users/transport/exchanges.microgen.go
index f70b8cdfe93eb8b843ec66136e8fa63bccc735ee..8cd6e6b7d1877e31f59eaca7849ffa4b1d09053e 100644
--- a/pkg/users/transport/exchanges.microgen.go
+++ b/users/transport/exchanges.microgen.go
@@ -4,7 +4,7 @@ package transport
 
 import (
 	options "git.perx.ru/perxis/perxis-go/pkg/options"
-	users "git.perx.ru/perxis/perxis-go/pkg/users"
+	users "git.perx.ru/perxis/perxis-go/users"
 )
 
 type (
diff --git a/pkg/users/transport/grpc/client.go b/users/transport/grpc/client.go
similarity index 92%
rename from pkg/users/transport/grpc/client.go
rename to users/transport/grpc/client.go
index 7364d5fce73a58580ed59bd71539bab3a1e68668..e24f9dc4ee13fc8188847bf5896bc29dbc158ee6 100644
--- a/pkg/users/transport/grpc/client.go
+++ b/users/transport/grpc/client.go
@@ -4,7 +4,7 @@ package transportgrpc
 
 import (
 	grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
-	transport "git.perx.ru/perxis/perxis-go/pkg/users/transport"
+	transport "git.perx.ru/perxis/perxis-go/users/transport"
 	grpckit "github.com/go-kit/kit/transport/grpc"
 	grpc "google.golang.org/grpc"
 )
diff --git a/pkg/users/transport/grpc/client.microgen.go b/users/transport/grpc/client.microgen.go
similarity index 95%
rename from pkg/users/transport/grpc/client.microgen.go
rename to users/transport/grpc/client.microgen.go
index 4fcd2868c5d20dbb1b60187940c50a6327529da5..008e493841817f75950e5b583cd471960709d887 100644
--- a/pkg/users/transport/grpc/client.microgen.go
+++ b/users/transport/grpc/client.microgen.go
@@ -3,8 +3,8 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/users/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/users"
+	transport "git.perx.ru/perxis/perxis-go/users/transport"
 	grpckit "github.com/go-kit/kit/transport/grpc"
 	grpc "google.golang.org/grpc"
 	empty "google.golang.org/protobuf/types/known/emptypb"
diff --git a/pkg/users/transport/grpc/protobuf_endpoint_converters.microgen.go b/users/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 99%
rename from pkg/users/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to users/transport/grpc/protobuf_endpoint_converters.microgen.go
index 2b45912bd1ab18ab8651b18cd17fbc6679b2d883..d0787cd4adf57d64fcdf56fb8ead3663f6dcf96e 100644
--- a/pkg/users/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/users/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"errors"
 
-	transport "git.perx.ru/perxis/perxis-go/pkg/users/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/users"
+	transport "git.perx.ru/perxis/perxis-go/users/transport"
 	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
diff --git a/pkg/users/transport/grpc/protobuf_type_converters.microgen.go b/users/transport/grpc/protobuf_type_converters.microgen.go
similarity index 98%
rename from pkg/users/transport/grpc/protobuf_type_converters.microgen.go
rename to users/transport/grpc/protobuf_type_converters.microgen.go
index 5f98e2486e50a16049db5ee136cc4d2c943264d7..d59a293ac53f0ff025640d3ba6bfff6005d841f7 100644
--- a/pkg/users/transport/grpc/protobuf_type_converters.microgen.go
+++ b/users/transport/grpc/protobuf_type_converters.microgen.go
@@ -6,9 +6,9 @@ package transportgrpc
 
 import (
 	options "git.perx.ru/perxis/perxis-go/pkg/options"
-	service "git.perx.ru/perxis/perxis-go/pkg/users"
 	common "git.perx.ru/perxis/perxis-go/proto/common"
 	pb "git.perx.ru/perxis/perxis-go/proto/users"
+	service "git.perx.ru/perxis/perxis-go/users"
 	wrappers "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
diff --git a/pkg/users/transport/grpc/server.go b/users/transport/grpc/server.go
similarity index 89%
rename from pkg/users/transport/grpc/server.go
rename to users/transport/grpc/server.go
index 07211008e3d631e1c23a658a31fa67f8f983a058..e7eb3050705b99ffbb09cc88c7415e901f680da8 100644
--- a/pkg/users/transport/grpc/server.go
+++ b/users/transport/grpc/server.go
@@ -2,9 +2,9 @@ package transportgrpc
 
 import (
 	grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
-	"git.perx.ru/perxis/perxis-go/pkg/users"
-	"git.perx.ru/perxis/perxis-go/pkg/users/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/users"
+	"git.perx.ru/perxis/perxis-go/users"
+	"git.perx.ru/perxis/perxis-go/users/transport"
 	grpckit "github.com/go-kit/kit/transport/grpc"
 )
 
diff --git a/pkg/users/transport/grpc/server.microgen.go b/users/transport/grpc/server.microgen.go
similarity index 97%
rename from pkg/users/transport/grpc/server.microgen.go
rename to users/transport/grpc/server.microgen.go
index 8817f6d832fc1d971ed9f36e80de1e5375e7d00d..ef1d6f45665da26159b47c9eb690aa539bea0fa1 100644
--- a/pkg/users/transport/grpc/server.microgen.go
+++ b/users/transport/grpc/server.microgen.go
@@ -4,8 +4,8 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/users/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/users"
+	transport "git.perx.ru/perxis/perxis-go/users/transport"
 	grpc "github.com/go-kit/kit/transport/grpc"
 	context "golang.org/x/net/context"
 	empty "google.golang.org/protobuf/types/known/emptypb"
diff --git a/pkg/users/transport/server.microgen.go b/users/transport/server.microgen.go
similarity index 97%
rename from pkg/users/transport/server.microgen.go
rename to users/transport/server.microgen.go
index e12645efc79921da957e359848d9dca606f6364b..95667744561409a4cb978fdcd0579ee2a6411eb8 100644
--- a/pkg/users/transport/server.microgen.go
+++ b/users/transport/server.microgen.go
@@ -5,7 +5,7 @@ package transport
 import (
 	"context"
 
-	users "git.perx.ru/perxis/perxis-go/pkg/users"
+	users "git.perx.ru/perxis/perxis-go/users"
 	endpoint "github.com/go-kit/kit/endpoint"
 )
 
diff --git a/pkg/users/user.go b/users/user.go
similarity index 100%
rename from pkg/users/user.go
rename to users/user.go
diff --git a/zap/field_test.go b/zap/field_test.go
index 46c4ee50722934e7d9ddd5ea759d01f3836706f8..776781261d50e00698dbd7543ad73c5d51934c31 100644
--- a/zap/field_test.go
+++ b/zap/field_test.go
@@ -7,7 +7,7 @@ import (
 	"git.perx.ru/perxis/perxis-go/id"
 	"git.perx.ru/perxis/perxis-go/pkg/auth"
 	"git.perx.ru/perxis/perxis-go/pkg/items"
-	"git.perx.ru/perxis/perxis-go/pkg/users"
+	"git.perx.ru/perxis/perxis-go/users"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"