diff --git a/pkg/clients/client.go b/clients/client.go
similarity index 100%
rename from pkg/clients/client.go
rename to clients/client.go
diff --git a/pkg/clients/errors.go b/clients/errors.go
similarity index 100%
rename from pkg/clients/errors.go
rename to clients/errors.go
diff --git a/pkg/clients/events.go b/clients/events.go
similarity index 100%
rename from pkg/clients/events.go
rename to clients/events.go
diff --git a/pkg/clients/middleware/access_logging_middleware.go b/clients/middleware/access_logging_middleware.go
similarity index 98%
rename from pkg/clients/middleware/access_logging_middleware.go
rename to clients/middleware/access_logging_middleware.go
index 66379ef014588aa0b6bcdb92863e00ba9f428fc5..3fb88df840d8be0d7791bcd911288f411e590684 100644
--- a/pkg/clients/middleware/access_logging_middleware.go
+++ b/clients/middleware/access_logging_middleware.go
@@ -10,8 +10,8 @@ import (
 	"context"
 	"time"
 
+	"git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/auth"
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/clients/middleware/caching_middleware.go b/clients/middleware/caching_middleware.go
similarity index 98%
rename from pkg/clients/middleware/caching_middleware.go
rename to clients/middleware/caching_middleware.go
index 0dd4f15b4e24affb13562c57a1d69b0e3adce33d..2ec13cdbbdf44074472f2ce5bcb664caa8b8de28 100644
--- a/pkg/clients/middleware/caching_middleware.go
+++ b/clients/middleware/caching_middleware.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"strings"
 
+	service "git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/cache"
-	service "git.perx.ru/perxis/perxis-go/pkg/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/data"
 )
 
diff --git a/pkg/clients/middleware/caching_middleware_test.go b/clients/middleware/caching_middleware_test.go
similarity index 99%
rename from pkg/clients/middleware/caching_middleware_test.go
rename to clients/middleware/caching_middleware_test.go
index 821d2cb29579029f10e1726291212b6ccaeaceae..4b7659eb0c12b6324517b98cc9eb8bb5f6d5f705 100644
--- a/pkg/clients/middleware/caching_middleware_test.go
+++ b/clients/middleware/caching_middleware_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
+	"git.perx.ru/perxis/perxis-go/clients"
+	csmocks "git.perx.ru/perxis/perxis-go/clients/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/cache"
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
-	csmocks "git.perx.ru/perxis/perxis-go/pkg/clients/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
diff --git a/pkg/clients/middleware/error_logging_middleware.go b/clients/middleware/error_logging_middleware.go
similarity index 98%
rename from pkg/clients/middleware/error_logging_middleware.go
rename to clients/middleware/error_logging_middleware.go
index 3e60cc1d8e49f0712362a7e3e8f072571333a97a..6b6b178eaaddaec508b73ccbeee1ccb0f35f0010 100644
--- a/pkg/clients/middleware/error_logging_middleware.go
+++ b/clients/middleware/error_logging_middleware.go
@@ -9,7 +9,7 @@ package middleware
 import (
 	"context"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/clients"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/clients/middleware/logging_middleware.go b/clients/middleware/logging_middleware.go
similarity index 98%
rename from pkg/clients/middleware/logging_middleware.go
rename to clients/middleware/logging_middleware.go
index 8cc5e384fa8fcadee5dc86c84444dead233bcb81..78763be72e8ea65d52dfc2bf5c8c7467ad371d59 100644
--- a/pkg/clients/middleware/logging_middleware.go
+++ b/clients/middleware/logging_middleware.go
@@ -3,8 +3,8 @@ package middleware
 import (
 	"context"
 
+	"git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/id"
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
 	logzap "git.perx.ru/perxis/perxis-go/zap"
 	"go.uber.org/zap"
 )
diff --git a/pkg/clients/middleware/middleware.go b/clients/middleware/middleware.go
similarity index 94%
rename from pkg/clients/middleware/middleware.go
rename to clients/middleware/middleware.go
index 945ae1f2afde7274140b6cbd3c84fff260d0b1cb..4565f619205a3a623ec5fab2130df51fb44df138 100644
--- a/pkg/clients/middleware/middleware.go
+++ b/clients/middleware/middleware.go
@@ -7,7 +7,7 @@ package middleware
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/clients -i Clients -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
 
 import (
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/clients"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/clients/middleware/recovering_middleware.go b/clients/middleware/recovering_middleware.go
similarity index 98%
rename from pkg/clients/middleware/recovering_middleware.go
rename to clients/middleware/recovering_middleware.go
index 2406ca994112a148e6a204589ee1844a782922fc..9aa1e78a41c86d38d5e5a541a8baade30e9710b3 100644
--- a/pkg/clients/middleware/recovering_middleware.go
+++ b/clients/middleware/recovering_middleware.go
@@ -10,7 +10,7 @@ import (
 	"context"
 	"fmt"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/clients"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/clients/middleware/telemetry_middleware.go b/clients/middleware/telemetry_middleware.go
similarity index 99%
rename from pkg/clients/middleware/telemetry_middleware.go
rename to clients/middleware/telemetry_middleware.go
index cbb217153db160631a1e71ebf9d48d68cd787ebc..d1aff776079f4b55e8887af093d95112bf71bfc0 100644
--- a/pkg/clients/middleware/telemetry_middleware.go
+++ b/clients/middleware/telemetry_middleware.go
@@ -10,9 +10,9 @@ import (
 	"context"
 	"time"
 
+	"git.perx.ru/perxis/perxis-go/clients"
 	oid "git.perx.ru/perxis/perxis-go/id"
 	"git.perx.ru/perxis/perxis-go/pkg/auth"
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
diff --git a/pkg/clients/mocks/Clients.go b/clients/mocks/Clients.go
similarity index 98%
rename from pkg/clients/mocks/Clients.go
rename to clients/mocks/Clients.go
index 289555adbc9e75dde72d65485e7e7961f5a12062..2ef13b1b64a43ab9c552ae969ed1ba6ba9f39a3f 100644
--- a/pkg/clients/mocks/Clients.go
+++ b/clients/mocks/Clients.go
@@ -5,7 +5,7 @@ package mocks
 import (
 	context "context"
 
-	clients "git.perx.ru/perxis/perxis-go/pkg/clients"
+	clients "git.perx.ru/perxis/perxis-go/clients"
 
 	mock "github.com/stretchr/testify/mock"
 )
diff --git a/pkg/clients/mocks/Middleware.go b/clients/mocks/Middleware.go
similarity index 95%
rename from pkg/clients/mocks/Middleware.go
rename to clients/mocks/Middleware.go
index 7a409ad308e232500469b0cd69589e4f3ccbe89d..d42be357397576cf2f98ae6e4739fdbd6eb1b518 100644
--- a/pkg/clients/mocks/Middleware.go
+++ b/clients/mocks/Middleware.go
@@ -3,7 +3,7 @@
 package mocks
 
 import (
-	clients "git.perx.ru/perxis/perxis-go/pkg/clients"
+	clients "git.perx.ru/perxis/perxis-go/clients"
 
 	mock "github.com/stretchr/testify/mock"
 )
diff --git a/pkg/clients/mocks/Storage.go b/clients/mocks/Storage.go
similarity index 98%
rename from pkg/clients/mocks/Storage.go
rename to clients/mocks/Storage.go
index d5cb616c077940ecdd4bfe969c98db0d974c53b2..c5406ecec2bf8bfa9629b284bc09212cb5b9eace 100644
--- a/pkg/clients/mocks/Storage.go
+++ b/clients/mocks/Storage.go
@@ -5,7 +5,7 @@ package mocks
 import (
 	context "context"
 
-	clients "git.perx.ru/perxis/perxis-go/pkg/clients"
+	clients "git.perx.ru/perxis/perxis-go/clients"
 
 	mock "github.com/stretchr/testify/mock"
 
diff --git a/pkg/clients/service.go b/clients/service.go
similarity index 100%
rename from pkg/clients/service.go
rename to clients/service.go
diff --git a/pkg/clients/storage.go b/clients/storage.go
similarity index 100%
rename from pkg/clients/storage.go
rename to clients/storage.go
diff --git a/pkg/clients/transport/client.go b/clients/transport/client.go
similarity index 97%
rename from pkg/clients/transport/client.go
rename to clients/transport/client.go
index 008f60b019deac5e9e86aff7a6687a3c3fe8361a..daa5545e681c29d8a4a0cd685d86bcde9c66274b 100644
--- a/pkg/clients/transport/client.go
+++ b/clients/transport/client.go
@@ -4,7 +4,7 @@ package transport
 
 import (
 	"context"
-	clients "git.perx.ru/perxis/perxis-go/pkg/clients"
+	clients "git.perx.ru/perxis/perxis-go/clients"
 )
 
 func (set EndpointsSet) Create(arg0 context.Context, arg1 *clients.Client) (res0 *clients.Client, res1 error) {
diff --git a/pkg/clients/transport/endpoints.microgen.go b/clients/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/clients/transport/endpoints.microgen.go
rename to clients/transport/endpoints.microgen.go
diff --git a/pkg/clients/transport/exchanges.microgen.go b/clients/transport/exchanges.microgen.go
similarity index 95%
rename from pkg/clients/transport/exchanges.microgen.go
rename to clients/transport/exchanges.microgen.go
index 2a1a8e65967661b117a20ff62fc6e20837afce2b..bdfd0cbc0db69fc7c40e0e58c8a1442c2b083c65 100644
--- a/pkg/clients/transport/exchanges.microgen.go
+++ b/clients/transport/exchanges.microgen.go
@@ -2,7 +2,7 @@
 
 package transport
 
-import clients "git.perx.ru/perxis/perxis-go/pkg/clients"
+import clients "git.perx.ru/perxis/perxis-go/clients"
 
 type (
 	CreateRequest struct {
diff --git a/pkg/clients/transport/grpc/client.go b/clients/transport/grpc/client.go
similarity index 92%
rename from pkg/clients/transport/grpc/client.go
rename to clients/transport/grpc/client.go
index fe6ba6fc8a14622b002b7f96b73f124c2ff2d5b2..b1d2aefd636e20e72553b43559682b4459e49b51 100644
--- a/pkg/clients/transport/grpc/client.go
+++ b/clients/transport/grpc/client.go
@@ -3,7 +3,7 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/clients/transport"
+	transport "git.perx.ru/perxis/perxis-go/clients/transport"
 	grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
 	grpckit "github.com/go-kit/kit/transport/grpc"
 	grpc "google.golang.org/grpc"
diff --git a/pkg/clients/transport/grpc/client.microgen.go b/clients/transport/grpc/client.microgen.go
similarity index 96%
rename from pkg/clients/transport/grpc/client.microgen.go
rename to clients/transport/grpc/client.microgen.go
index c2fa38b4ec74518f3ece6cee511da55cff8cca81..e20052694a34c487200819e4fad39cdc85848f52 100644
--- a/pkg/clients/transport/grpc/client.microgen.go
+++ b/clients/transport/grpc/client.microgen.go
@@ -3,7 +3,7 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/clients/transport"
+	transport "git.perx.ru/perxis/perxis-go/clients/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/clients"
 	grpckit "github.com/go-kit/kit/transport/grpc"
 	grpc "google.golang.org/grpc"
diff --git a/pkg/clients/transport/grpc/protobuf_endpoint_converters.microgen.go b/clients/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 98%
rename from pkg/clients/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to clients/transport/grpc/protobuf_endpoint_converters.microgen.go
index 3e9e5219e1f5a60570c8f9c8937b44c33cab3681..1450f2f210155eccf1f17c4de74d8aa9f02795c7 100644
--- a/pkg/clients/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/clients/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"errors"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
-	transport "git.perx.ru/perxis/perxis-go/pkg/clients/transport"
+	"git.perx.ru/perxis/perxis-go/clients"
+	transport "git.perx.ru/perxis/perxis-go/clients/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/clients"
 	empty "google.golang.org/protobuf/types/known/emptypb"
 )
diff --git a/pkg/clients/transport/grpc/protobuf_type_converters.microgen.go b/clients/transport/grpc/protobuf_type_converters.microgen.go
similarity index 98%
rename from pkg/clients/transport/grpc/protobuf_type_converters.microgen.go
rename to clients/transport/grpc/protobuf_type_converters.microgen.go
index bad21c1b4d45655d872771d3ea3656c09ff36b29..08c381dd06c16673fb4fa57b10159a2747ab5a92 100644
--- a/pkg/clients/transport/grpc/protobuf_type_converters.microgen.go
+++ b/clients/transport/grpc/protobuf_type_converters.microgen.go
@@ -5,7 +5,7 @@
 package transportgrpc
 
 import (
-	service "git.perx.ru/perxis/perxis-go/pkg/clients"
+	service "git.perx.ru/perxis/perxis-go/clients"
 	permission "git.perx.ru/perxis/perxis-go/pkg/permission"
 	pb "git.perx.ru/perxis/perxis-go/proto/clients"
 	commonpb "git.perx.ru/perxis/perxis-go/proto/common"
diff --git a/pkg/clients/transport/grpc/server.go b/clients/transport/grpc/server.go
similarity index 89%
rename from pkg/clients/transport/grpc/server.go
rename to clients/transport/grpc/server.go
index ee019551141c4e3c6af7d4805cb6924a19e4d010..a30930a4946593022b628090054d736010ad535e 100644
--- a/pkg/clients/transport/grpc/server.go
+++ b/clients/transport/grpc/server.go
@@ -1,8 +1,8 @@
 package transportgrpc
 
 import (
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
-	"git.perx.ru/perxis/perxis-go/pkg/clients/transport"
+	"git.perx.ru/perxis/perxis-go/clients"
+	"git.perx.ru/perxis/perxis-go/clients/transport"
 	grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
 	pb "git.perx.ru/perxis/perxis-go/proto/clients"
 	grpckit "github.com/go-kit/kit/transport/grpc"
diff --git a/pkg/clients/transport/grpc/server.microgen.go b/clients/transport/grpc/server.microgen.go
similarity index 97%
rename from pkg/clients/transport/grpc/server.microgen.go
rename to clients/transport/grpc/server.microgen.go
index 17bb2b0b66393528911dde4bc6c04d16e5b11532..4248ea74723cf2432543980abed6ac5092cbe577 100644
--- a/pkg/clients/transport/grpc/server.microgen.go
+++ b/clients/transport/grpc/server.microgen.go
@@ -4,7 +4,7 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/clients/transport"
+	transport "git.perx.ru/perxis/perxis-go/clients/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/clients"
 	grpc "github.com/go-kit/kit/transport/grpc"
 	context "golang.org/x/net/context"
diff --git a/pkg/clients/transport/server.microgen.go b/clients/transport/server.microgen.go
similarity index 97%
rename from pkg/clients/transport/server.microgen.go
rename to clients/transport/server.microgen.go
index 4c8b6a3e538dd5d1f28c3e7fd2b9f56af54cae8e..647b85253e8e2eb202153403b0891f8bbc10edfb 100644
--- a/pkg/clients/transport/server.microgen.go
+++ b/clients/transport/server.microgen.go
@@ -4,7 +4,7 @@ package transport
 
 import (
 	"context"
-	clients "git.perx.ru/perxis/perxis-go/pkg/clients"
+	clients "git.perx.ru/perxis/perxis-go/clients"
 	endpoint "github.com/go-kit/kit/endpoint"
 )
 
diff --git a/id/system/system.go b/id/system/system.go
index c33995d905a615b6c24422e27239da34141d4752..3c37522897f40ad0b59e7a963550c51a1cd5676a 100644
--- a/id/system/system.go
+++ b/id/system/system.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"reflect"
 
+	"git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/id"
 	"git.perx.ru/perxis/perxis-go/pkg/auth"
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/collections"
 	"git.perx.ru/perxis/perxis-go/pkg/environments"
 	"git.perx.ru/perxis/perxis-go/pkg/items"
diff --git a/id/test/object_id_test.go b/id/test/object_id_test.go
index 2f01fa125e376623ceb710bbe594235b8434d853..2e454d58e3a571908e855c8839e87ad87ebeb3f9 100644
--- a/id/test/object_id_test.go
+++ b/id/test/object_id_test.go
@@ -3,9 +3,9 @@ package test
 import (
 	"testing"
 
+	"git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/id"
 	_ "git.perx.ru/perxis/perxis-go/id/system"
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/collections"
 	"git.perx.ru/perxis/perxis-go/pkg/environments"
 	"git.perx.ru/perxis/perxis-go/pkg/items"
diff --git a/pkg/auth/client.go b/pkg/auth/client.go
index 9db7a5683681137c346f6cba91ec3d40c6a331d6..076b1c734a557f584ad8a0b27158e14b307d2d8d 100644
--- a/pkg/auth/client.go
+++ b/pkg/auth/client.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/collaborators"
 	"git.perx.ru/perxis/perxis-go/pkg/environments"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
diff --git a/pkg/auth/factory.go b/pkg/auth/factory.go
index 2394c62a2f15ca7605959b3f5b31996a5c79a164..2226cb567b7d2392b47dd123d0b110bd2ae3eb39 100644
--- a/pkg/auth/factory.go
+++ b/pkg/auth/factory.go
@@ -3,7 +3,7 @@ package auth
 import (
 	"strings"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/collaborators"
 	"git.perx.ru/perxis/perxis-go/pkg/environments"
 	"git.perx.ru/perxis/perxis-go/pkg/members"
diff --git a/pkg/content/client.go b/pkg/content/client.go
index adc5f784dff8fccd5b505867bf65efb373a9149d..64d88c6d7ca5c3378acde2e44b1914ab36804bf7 100644
--- a/pkg/content/client.go
+++ b/pkg/content/client.go
@@ -3,9 +3,9 @@ package content
 import (
 	"time"
 
+	clientsSvc "git.perx.ru/perxis/perxis-go/clients/middleware"
+	clientsTransportGrpc "git.perx.ru/perxis/perxis-go/clients/transport/grpc"
 	"git.perx.ru/perxis/perxis-go/pkg/cache"
-	clientsSvc "git.perx.ru/perxis/perxis-go/pkg/clients/middleware"
-	clientsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/clients/transport/grpc"
 	collaboratorsSvc "git.perx.ru/perxis/perxis-go/pkg/collaborators/middleware"
 	collaboratorsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/collaborators/transport/grpc"
 	collectionsSvc "git.perx.ru/perxis/perxis-go/pkg/collections/middleware"
diff --git a/pkg/content/content.go b/pkg/content/content.go
index 1d351e9308da0ea2c81f8afa80fb2be219c633ea..8736d35da7ee75eba990cb3db93d0f8a1c9b073a 100644
--- a/pkg/content/content.go
+++ b/pkg/content/content.go
@@ -1,8 +1,8 @@
 package content
 
 import (
+	"git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/auth"
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/collaborators"
 	"git.perx.ru/perxis/perxis-go/pkg/collections"
 	"git.perx.ru/perxis/perxis-go/pkg/environments"
diff --git a/pkg/extension/service/extension.go b/pkg/extension/service/extension.go
index 5d57e56c86190403cfe18a8084c902497280c993..e371637673b4d15d6eaf4469e189cf4c24bf71ed 100644
--- a/pkg/extension/service/extension.go
+++ b/pkg/extension/service/extension.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/collections"
 	"git.perx.ru/perxis/perxis-go/pkg/content"
 	"git.perx.ru/perxis/perxis-go/pkg/extension"
diff --git a/pkg/items/context.go b/pkg/items/context.go
index 87e600e5b40da50381245a626e8228ab20485de8..09a0300b5ebf44276821c7637b01e12b4fef13de 100644
--- a/pkg/items/context.go
+++ b/pkg/items/context.go
@@ -3,7 +3,7 @@ package items
 import (
 	"context"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/environments"
 	"git.perx.ru/perxis/perxis-go/pkg/spaces"
 )
diff --git a/pkg/setup/client.go b/pkg/setup/client.go
index c40ad506fb1e2bee225cf6acd2930d7364bbb8b0..afea81858d0eb1118dd6c0f96b983fd171f06b83 100644
--- a/pkg/setup/client.go
+++ b/pkg/setup/client.go
@@ -6,7 +6,7 @@ import (
 
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/clients"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/setup/client_test.go b/pkg/setup/client_test.go
index 6626ec18429955e063139fa24f729ac6d9476dcc..461c48469f3012d233c7bca3754d58eee7271c4f 100644
--- a/pkg/setup/client_test.go
+++ b/pkg/setup/client_test.go
@@ -3,8 +3,8 @@ package setup
 import (
 	"testing"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
-	clientsMock "git.perx.ru/perxis/perxis-go/pkg/clients/mocks"
+	"git.perx.ru/perxis/perxis-go/clients"
+	clientsMock "git.perx.ru/perxis/perxis-go/clients/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
diff --git a/pkg/setup/setup_test.go b/pkg/setup/setup_test.go
index ff73b745deb0fcec807fa0c0f28b2ba5a0dd7258..92c251ea2d32e7848031f1c2c621ae8ecf8e9a78 100644
--- a/pkg/setup/setup_test.go
+++ b/pkg/setup/setup_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	clientsMock "git.perx.ru/perxis/perxis-go/pkg/clients/mocks"
+	clientsMock "git.perx.ru/perxis/perxis-go/clients/mocks"
 	collectionMock "git.perx.ru/perxis/perxis-go/pkg/collections/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/data"
 	environmentMock "git.perx.ru/perxis/perxis-go/pkg/environments/mocks"
@@ -17,7 +17,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/collections"
 	"git.perx.ru/perxis/perxis-go/pkg/content"
 	"git.perx.ru/perxis/perxis-go/pkg/items"