diff --git a/pkg/content/client.go b/content/client.go
similarity index 100%
rename from pkg/content/client.go
rename to content/client.go
diff --git a/pkg/content/config.go b/content/config.go
similarity index 100%
rename from pkg/content/config.go
rename to content/config.go
diff --git a/pkg/content/content.go b/content/content.go
similarity index 100%
rename from pkg/content/content.go
rename to content/content.go
diff --git a/pkg/content/versions/transport/client.go b/content/versions/transport/client.go
similarity index 100%
rename from pkg/content/versions/transport/client.go
rename to content/versions/transport/client.go
diff --git a/pkg/content/versions/transport/endpoints.microgen.go b/content/versions/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/content/versions/transport/endpoints.microgen.go
rename to content/versions/transport/endpoints.microgen.go
diff --git a/pkg/content/versions/transport/exchanges.microgen.go b/content/versions/transport/exchanges.microgen.go
similarity index 100%
rename from pkg/content/versions/transport/exchanges.microgen.go
rename to content/versions/transport/exchanges.microgen.go
diff --git a/pkg/content/versions/transport/grpc/client.go b/content/versions/transport/grpc/client.go
similarity index 85%
rename from pkg/content/versions/transport/grpc/client.go
rename to content/versions/transport/grpc/client.go
index ffa435b90b00b707f097021f39fcea705e647ed6..6cec6dc4a9125ff72bf156b1767b357bba6b9df5 100644
--- a/pkg/content/versions/transport/grpc/client.go
+++ b/content/versions/transport/grpc/client.go
@@ -3,7 +3,7 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
+	"git.perx.ru/perxis/perxis-go/content/versions/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/content/versions/transport/grpc/client.microgen.go b/content/versions/transport/grpc/client.microgen.go
similarity index 89%
rename from pkg/content/versions/transport/grpc/client.microgen.go
rename to content/versions/transport/grpc/client.microgen.go
index abe65ad7be87b50c6f1b80804045b949b173c742..b7d00cec4aeb4acaae19dab69c120f53f5bfcb02 100644
--- a/pkg/content/versions/transport/grpc/client.microgen.go
+++ b/content/versions/transport/grpc/client.microgen.go
@@ -3,7 +3,7 @@
 package transportgrpc
 
 import (
-	"git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
+	"git.perx.ru/perxis/perxis-go/content/versions/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
 	grpckit "github.com/go-kit/kit/transport/grpc"
 	grpc "google.golang.org/grpc"
diff --git a/pkg/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go b/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 95%
rename from pkg/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
index 714c861c8a40f360cdaecbde68ed312a5625efe0..8893ca0944b705d8eb23530af6d267b9b9d222d3 100644
--- a/pkg/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"errors"
 
-	"git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
+	"git.perx.ru/perxis/perxis-go/content/versions/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
 	empty "google.golang.org/protobuf/types/known/emptypb"
 )
diff --git a/pkg/content/versions/transport/grpc/protobuf_type_converters.microgen.go b/content/versions/transport/grpc/protobuf_type_converters.microgen.go
similarity index 100%
rename from pkg/content/versions/transport/grpc/protobuf_type_converters.microgen.go
rename to content/versions/transport/grpc/protobuf_type_converters.microgen.go
diff --git a/pkg/content/versions/transport/grpc/server.go b/content/versions/transport/grpc/server.go
similarity index 76%
rename from pkg/content/versions/transport/grpc/server.go
rename to content/versions/transport/grpc/server.go
index 26b30d26150d8e8cb7cc4544f3d59f351ec4b56a..299a5763d42edb9a3581d255d0eda7f55501e850 100644
--- a/pkg/content/versions/transport/grpc/server.go
+++ b/content/versions/transport/grpc/server.go
@@ -1,7 +1,7 @@
 package transportgrpc
 
 import (
-	"git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
+	transport2 "git.perx.ru/perxis/perxis-go/content/versions/transport"
 	grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
 	versions "git.perx.ru/perxis/perxis-go/pkg/version"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
@@ -9,8 +9,8 @@ import (
 )
 
 func NewServer(svc versions.Versions, opts ...grpckit.ServerOption) pb.VersionsServer {
-	eps := transport.Endpoints(svc)
-	eps = transport.EndpointsSet{
+	eps := transport2.Endpoints(svc)
+	eps = transport2.EndpointsSet{
 		GetEndpoint: grpcerr.ServerMiddleware(eps.GetEndpoint),
 	}
 	return NewGRPCServer(&eps, opts...)
diff --git a/pkg/content/versions/transport/grpc/server.microgen.go b/content/versions/transport/grpc/server.microgen.go
similarity index 92%
rename from pkg/content/versions/transport/grpc/server.microgen.go
rename to content/versions/transport/grpc/server.microgen.go
index 8e773515ce78e75e8f61c53de33a128a56193a62..ee8c43591566a07b85ccabd003c85c9ff8100179 100644
--- a/pkg/content/versions/transport/grpc/server.microgen.go
+++ b/content/versions/transport/grpc/server.microgen.go
@@ -4,7 +4,7 @@
 package transportgrpc
 
 import (
-	"git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
+	"git.perx.ru/perxis/perxis-go/content/versions/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
 	grpc "github.com/go-kit/kit/transport/grpc"
 	context "golang.org/x/net/context"
diff --git a/pkg/content/versions/transport/server.microgen.go b/content/versions/transport/server.microgen.go
similarity index 100%
rename from pkg/content/versions/transport/server.microgen.go
rename to content/versions/transport/server.microgen.go
diff --git a/pkg/delivery/client/config.go b/pkg/delivery/client/config.go
index ca1a65421a5a988a2171f32edd9e0abdf2ed0e2c..7560b5bd0b3f63170fb04ad2a506a93c4c726c80 100644
--- a/pkg/delivery/client/config.go
+++ b/pkg/delivery/client/config.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	contentclient "git.perx.ru/perxis/perxis-go/pkg/content"
+	contentclient "git.perx.ru/perxis/perxis-go/content"
 	"github.com/go-kit/kit/transport/grpc"
 )
 
diff --git a/pkg/extension/extension.go b/pkg/extension/extension.go
index 432078899448d7f4875991e06fba44dd17830917..47efb3c885cbe46128ec44cad0b8faf7d1712ad6 100644
--- a/pkg/extension/extension.go
+++ b/pkg/extension/extension.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"io/fs"
 
+	"git.perx.ru/perxis/perxis-go/content"
 	"go.uber.org/zap"
 
 	"git.perx.ru/perxis/perxis-go"
 	"git.perx.ru/perxis/perxis-go/pkg/collections"
-	"git.perx.ru/perxis/perxis-go/pkg/content"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	"git.perx.ru/perxis/perxis-go/pkg/schema"
 	"git.perx.ru/perxis/perxis-go/pkg/setup"
diff --git a/pkg/extension/service/extension.go b/pkg/extension/service/extension.go
index 5d57e56c86190403cfe18a8084c902497280c993..d3aa219d98afcde9ca4b64141a5605531649eb64 100644
--- a/pkg/extension/service/extension.go
+++ b/pkg/extension/service/extension.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
+	"git.perx.ru/perxis/perxis-go/content"
 	"git.perx.ru/perxis/perxis-go/pkg/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"
 	"git.perx.ru/perxis/perxis-go/pkg/roles"
 	"git.perx.ru/perxis/perxis-go/pkg/setup"
diff --git a/pkg/extension/storage.go b/pkg/extension/storage.go
index c7dd628566b54c9ce2f43e03ff4129a544046a1c..03eca12850ddafcf2dd436867ce41a14b28eba85 100644
--- a/pkg/extension/storage.go
+++ b/pkg/extension/storage.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"strings"
 
+	"git.perx.ru/perxis/perxis-go/content"
 	"git.perx.ru/perxis/perxis-go/pkg/collections"
 	"git.perx.ru/perxis/perxis-go/pkg/data"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
@@ -11,7 +12,6 @@ import (
 	pb "git.perx.ru/perxis/perxis-go/proto/extensions"
 	"go.uber.org/zap"
 
-	"git.perx.ru/perxis/perxis-go/pkg/content"
 	"git.perx.ru/perxis/perxis-go/pkg/items"
 )
 
diff --git a/pkg/setup/collection_test.go b/pkg/setup/collection_test.go
index f1d9e4da1182938249192f8ef410ceecc81c743a..7b405d15cc18d6d4c76b8a141a586b0cb45cb2c0 100644
--- a/pkg/setup/collection_test.go
+++ b/pkg/setup/collection_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
+	"git.perx.ru/perxis/perxis-go/content"
 	mockscollections "git.perx.ru/perxis/perxis-go/pkg/collections/mocks"
-	"git.perx.ru/perxis/perxis-go/pkg/content"
 	"git.perx.ru/perxis/perxis-go/pkg/environments"
 	envmocks "git.perx.ru/perxis/perxis-go/pkg/environments/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
diff --git a/pkg/setup/item_test.go b/pkg/setup/item_test.go
index 0a128625e7871d20aad0bceff7561197e97c01ea..53c8154012660c5d8867b0148d83fdb7e7954b36 100644
--- a/pkg/setup/item_test.go
+++ b/pkg/setup/item_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"git.perx.ru/perxis/perxis-go/pkg/content"
+	"git.perx.ru/perxis/perxis-go/content"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	itemsMock "git.perx.ru/perxis/perxis-go/pkg/items/mocks"
 	"github.com/stretchr/testify/mock"
diff --git a/pkg/setup/role_test.go b/pkg/setup/role_test.go
index 1c218270b5b50bf2bc8c6cd27364a65cd2d9b60b..7276234d05d058d584391565eadfb2acc89db46b 100644
--- a/pkg/setup/role_test.go
+++ b/pkg/setup/role_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"git.perx.ru/perxis/perxis-go/pkg/content"
+	"git.perx.ru/perxis/perxis-go/content"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	"git.perx.ru/perxis/perxis-go/pkg/roles"
 	rolesMock "git.perx.ru/perxis/perxis-go/pkg/roles/mocks"
diff --git a/pkg/setup/setup.go b/pkg/setup/setup.go
index 8855269638d1901b553ee4a6ecc6ed2c488f3d17..ea786069b07f90dd6ed333abed6ac1eb3d872a75 100644
--- a/pkg/setup/setup.go
+++ b/pkg/setup/setup.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io/fs"
 
-	"git.perx.ru/perxis/perxis-go/pkg/content"
+	"git.perx.ru/perxis/perxis-go/content"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	"git.perx.ru/perxis/perxis-go/pkg/spaces"
 	"go.uber.org/zap"
diff --git a/pkg/setup/setup_test.go b/pkg/setup/setup_test.go
index ff73b745deb0fcec807fa0c0f28b2ba5a0dd7258..1c78183f7a8e2e4cc9c20430d90e162c0dae80b2 100644
--- a/pkg/setup/setup_test.go
+++ b/pkg/setup/setup_test.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"testing"
 
+	"git.perx.ru/perxis/perxis-go/content"
 	clientsMock "git.perx.ru/perxis/perxis-go/pkg/clients/mocks"
 	collectionMock "git.perx.ru/perxis/perxis-go/pkg/collections/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/data"
@@ -19,7 +20,6 @@ import (
 
 	"git.perx.ru/perxis/perxis-go/pkg/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"
 	"git.perx.ru/perxis/perxis-go/pkg/roles"
 	"git.perx.ru/perxis/perxis-go/pkg/schema"
diff --git a/pkg/template/builder.go b/pkg/template/builder.go
index 64530be62337de21dc5b93956df261ce5211a302..b048831bce3491534ce24181909e913313feb4d9 100644
--- a/pkg/template/builder.go
+++ b/pkg/template/builder.go
@@ -5,8 +5,8 @@ import (
 	"context"
 	"text/template"
 
+	"git.perx.ru/perxis/perxis-go/content"
 	"git.perx.ru/perxis/perxis-go/pkg/collections"
-	"git.perx.ru/perxis/perxis-go/pkg/content"
 	"git.perx.ru/perxis/perxis-go/pkg/environments"
 	"git.perx.ru/perxis/perxis-go/pkg/spaces"
 )
diff --git a/pkg/template/builder_test.go b/pkg/template/builder_test.go
index 128f706423f3ecc67097a76b8926fbed619eb1ce..cd48d0a3c526c9d44b66b8b7bab044c86fe43a3c 100644
--- a/pkg/template/builder_test.go
+++ b/pkg/template/builder_test.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"testing"
 
+	"git.perx.ru/perxis/perxis-go/content"
 	"git.perx.ru/perxis/perxis-go/pkg/collections"
 	colsmocks "git.perx.ru/perxis/perxis-go/pkg/collections/mocks"
-	"git.perx.ru/perxis/perxis-go/pkg/content"
 	"git.perx.ru/perxis/perxis-go/pkg/environments"
 	envsmocks "git.perx.ru/perxis/perxis-go/pkg/environments/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/items"