diff --git a/pkg/account/account.go b/pkg/account/account.go
index 0461807e492425d636715ac4ae56620e5fc7c901..707ed0a4f2ef7eed8783c61271e6421b5eeb8f52 100644
--- a/pkg/account/account.go
+++ b/pkg/account/account.go
@@ -1,7 +1,7 @@
 package account
 
 import (
-	"git.perx.ru/perxis/perxis-go/pkg/account/versions"
+	"git.perx.ru/perxis/perxis-go/pkg/account/version"
 	"git.perx.ru/perxis/perxis-go/pkg/auth"
 	"git.perx.ru/perxis/perxis-go/pkg/members"
 	msobserver "git.perx.ru/perxis/perxis-go/pkg/members/observer"
@@ -14,7 +14,7 @@ type Account struct {
 	users.Users
 	members.Members
 	organizations.Organizations
-	versions.Versions
+	version.Versions
 
 	// сервис, отвечающий за отслеживание сервисом `members` событий от других сервисов
 	MembersObserver msobserver.Observer
diff --git a/pkg/account/versions/mocks/Versions.go b/pkg/account/version/mocks/Versions.go
similarity index 100%
rename from pkg/account/versions/mocks/Versions.go
rename to pkg/account/version/mocks/Versions.go
diff --git a/pkg/account/versions/service.go b/pkg/account/version/service.go
similarity index 94%
rename from pkg/account/versions/service.go
rename to pkg/account/version/service.go
index 573fb51331a58548673730302252f3df52a7c297..0f0f4447d1aeab8e965bd12d2bc9a614ec15b43a 100644
--- a/pkg/account/versions/service.go
+++ b/pkg/account/version/service.go
@@ -1,4 +1,4 @@
-package versions
+package version
 
 import (
 	"context"
diff --git a/pkg/account/versions/transport/client.microgen.go b/pkg/account/version/transport/client.microgen.go
similarity index 100%
rename from pkg/account/versions/transport/client.microgen.go
rename to pkg/account/version/transport/client.microgen.go
diff --git a/pkg/account/versions/transport/endpoints.microgen.go b/pkg/account/version/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/account/versions/transport/endpoints.microgen.go
rename to pkg/account/version/transport/endpoints.microgen.go
diff --git a/pkg/account/versions/transport/exchanges.microgen.go b/pkg/account/version/transport/exchanges.microgen.go
similarity index 100%
rename from pkg/account/versions/transport/exchanges.microgen.go
rename to pkg/account/version/transport/exchanges.microgen.go
diff --git a/pkg/account/versions/transport/grpc/client.microgen.go b/pkg/account/version/transport/grpc/client.microgen.go
similarity index 88%
rename from pkg/account/versions/transport/grpc/client.microgen.go
rename to pkg/account/version/transport/grpc/client.microgen.go
index 2e029d6ca5a7d432e146c103f97da52599a1a8e5..b18f2ad7db4e20f6945a71a10a1d66ff04c54ae6 100644
--- a/pkg/account/versions/transport/grpc/client.microgen.go
+++ b/pkg/account/version/transport/grpc/client.microgen.go
@@ -3,7 +3,7 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/account/versions/transport"
+	transport "git.perx.ru/perxis/perxis-go/pkg/account/version/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/account"
 	grpckit "github.com/go-kit/kit/transport/grpc"
 	grpc "google.golang.org/grpc"
diff --git a/pkg/account/versions/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/account/version/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 94%
rename from pkg/account/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to pkg/account/version/transport/grpc/protobuf_endpoint_converters.microgen.go
index 90db56d6b50d6157e83a7ba1077a7ad15788911c..053ed90709c8cfdc7e5d09226ab50d337ba380a8 100644
--- a/pkg/account/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/account/version/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"errors"
 
-	transport2 "git.perx.ru/perxis/perxis-go/pkg/account/versions/transport"
+	transport2 "git.perx.ru/perxis/perxis-go/pkg/account/version/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/account"
 	empty "github.com/golang/protobuf/ptypes/empty"
 )
diff --git a/pkg/account/versions/transport/grpc/protobuf_type_converters.microgen.go b/pkg/account/version/transport/grpc/protobuf_type_converters.microgen.go
similarity index 100%
rename from pkg/account/versions/transport/grpc/protobuf_type_converters.microgen.go
rename to pkg/account/version/transport/grpc/protobuf_type_converters.microgen.go
diff --git a/pkg/account/versions/transport/grpc/server.microgen.go b/pkg/account/version/transport/grpc/server.microgen.go
similarity index 91%
rename from pkg/account/versions/transport/grpc/server.microgen.go
rename to pkg/account/version/transport/grpc/server.microgen.go
index 9de34e92049e1c1278e4573862b4a7502289f260..c35071fe8d18afeb8bf8b1a3054ade8a65b24f33 100644
--- a/pkg/account/versions/transport/grpc/server.microgen.go
+++ b/pkg/account/version/transport/grpc/server.microgen.go
@@ -4,7 +4,7 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/account/versions/transport"
+	transport "git.perx.ru/perxis/perxis-go/pkg/account/version/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/account"
 	grpc "github.com/go-kit/kit/transport/grpc"
 	empty "github.com/golang/protobuf/ptypes/empty"
diff --git a/pkg/account/versions/transport/server.microgen.go b/pkg/account/version/transport/server.microgen.go
similarity index 88%
rename from pkg/account/versions/transport/server.microgen.go
rename to pkg/account/version/transport/server.microgen.go
index 71354622a432ec451d7c630959fe6c0f6c642826..7c9a442e4f901ba1c9f1bfaaf6ec1a23b928d94e 100644
--- a/pkg/account/versions/transport/server.microgen.go
+++ b/pkg/account/version/transport/server.microgen.go
@@ -5,7 +5,7 @@ package transport
 import (
 	"context"
 
-	versions "git.perx.ru/perxis/perxis-go/pkg/account/versions"
+	versions "git.perx.ru/perxis/perxis-go/pkg/account/version"
 	endpoint "github.com/go-kit/kit/endpoint"
 )
 
diff --git a/pkg/content/content.go b/pkg/content/content.go
index 9a796b0dbf5f9b57a20d6a38e7282874453c118f..16c09e2ab8ce5df301a975ec5a9a76842a7504bd 100644
--- a/pkg/content/content.go
+++ b/pkg/content/content.go
@@ -5,7 +5,7 @@ import (
 	"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/content/versions"
+	"git.perx.ru/perxis/perxis-go/pkg/content/version"
 	"git.perx.ru/perxis/perxis-go/pkg/environments"
 	"git.perx.ru/perxis/perxis-go/pkg/invitations"
 	"git.perx.ru/perxis/perxis-go/pkg/items"
@@ -31,7 +31,7 @@ type Content struct {
 	roles.Roles
 	spaces.Spaces
 	clients.Clients
-	versions.Versions
+	version.Versions
 
 	PrincipalFactory *auth.PrincipalFactory
 
diff --git a/pkg/content/versions/mocks/Versions.go b/pkg/content/version/mocks/Versions.go
similarity index 100%
rename from pkg/content/versions/mocks/Versions.go
rename to pkg/content/version/mocks/Versions.go
diff --git a/pkg/content/versions/service.go b/pkg/content/version/service.go
similarity index 94%
rename from pkg/content/versions/service.go
rename to pkg/content/version/service.go
index 154ecdbcb423767df52d557e2bd502e3bae9206e..9ac74e5a6907ce0b1df7cee45dc63663ee6ebb39 100644
--- a/pkg/content/versions/service.go
+++ b/pkg/content/version/service.go
@@ -1,4 +1,4 @@
-package versions
+package version
 
 import (
 	"context"
diff --git a/pkg/content/versions/transport/client.microgen.go b/pkg/content/version/transport/client.microgen.go
similarity index 100%
rename from pkg/content/versions/transport/client.microgen.go
rename to pkg/content/version/transport/client.microgen.go
diff --git a/pkg/content/versions/transport/endpoints.microgen.go b/pkg/content/version/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/content/versions/transport/endpoints.microgen.go
rename to pkg/content/version/transport/endpoints.microgen.go
diff --git a/pkg/content/versions/transport/exchanges.microgen.go b/pkg/content/version/transport/exchanges.microgen.go
similarity index 100%
rename from pkg/content/versions/transport/exchanges.microgen.go
rename to pkg/content/version/transport/exchanges.microgen.go
diff --git a/pkg/content/versions/transport/grpc/client.microgen.go b/pkg/content/version/transport/grpc/client.microgen.go
similarity index 88%
rename from pkg/content/versions/transport/grpc/client.microgen.go
rename to pkg/content/version/transport/grpc/client.microgen.go
index 830223124ccc4f41a793e4f80078bb8a5dd78ddf..6506d6886735592fd16be0ae9d8d22160e5b7754 100644
--- a/pkg/content/versions/transport/grpc/client.microgen.go
+++ b/pkg/content/version/transport/grpc/client.microgen.go
@@ -3,8 +3,8 @@
 package transportgrpc
 
 import (
+	transport "git.perx.ru/perxis/perxis-go/pkg/content/version/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
-	transport "git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
 	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/pkg/content/version/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 94%
rename from pkg/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to pkg/content/version/transport/grpc/protobuf_endpoint_converters.microgen.go
index f440344087ae579ab7d8854acd856e8e3eb4a263..ed459d237d058508983f03627da117c0f2c751ec 100644
--- a/pkg/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/content/version/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"errors"
 
+	transport "git.perx.ru/perxis/perxis-go/pkg/content/version/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
-	transport "git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
 	empty "github.com/golang/protobuf/ptypes/empty"
 )
 
diff --git a/pkg/content/versions/transport/grpc/protobuf_type_converters.microgen.go b/pkg/content/version/transport/grpc/protobuf_type_converters.microgen.go
similarity index 100%
rename from pkg/content/versions/transport/grpc/protobuf_type_converters.microgen.go
rename to pkg/content/version/transport/grpc/protobuf_type_converters.microgen.go
index 87862edb1c9eab760d0d5234ffe052c847a4da3f..4868510051fc294697066f312467bbe244a7d62c 100644
--- a/pkg/content/versions/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/content/version/transport/grpc/protobuf_type_converters.microgen.go
@@ -5,8 +5,8 @@
 package transportgrpc
 
 import (
-	"git.perx.ru/perxis/perxis-go/proto/common"
 	"git.perx.ru/perxis/perxis-go/pkg/version"
+	"git.perx.ru/perxis/perxis-go/proto/common"
 )
 
 func PtrVersionsVersionToProto(version *version.Version) (*common.Version, error) {
diff --git a/pkg/content/versions/transport/grpc/server.microgen.go b/pkg/content/version/transport/grpc/server.microgen.go
similarity index 91%
rename from pkg/content/versions/transport/grpc/server.microgen.go
rename to pkg/content/version/transport/grpc/server.microgen.go
index 0ab4210780f7131af9c829d5b6b02bd7b46eebe4..696a839b0cde2b1166f4908a90e53dbe8eb5a526 100644
--- a/pkg/content/versions/transport/grpc/server.microgen.go
+++ b/pkg/content/version/transport/grpc/server.microgen.go
@@ -4,8 +4,8 @@
 package transportgrpc
 
 import (
+	transport "git.perx.ru/perxis/perxis-go/pkg/content/version/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
-	transport "git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
 	grpc "github.com/go-kit/kit/transport/grpc"
 	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
diff --git a/pkg/content/versions/transport/server.microgen.go b/pkg/content/version/transport/server.microgen.go
similarity index 88%
rename from pkg/content/versions/transport/server.microgen.go
rename to pkg/content/version/transport/server.microgen.go
index 9bc6e47832efacbac2fed09a4ffe495c1bc7f266..1cfff4c720d4ef535dbf1f76218919249c7a96ca 100644
--- a/pkg/content/versions/transport/server.microgen.go
+++ b/pkg/content/version/transport/server.microgen.go
@@ -5,7 +5,7 @@ package transport
 import (
 	"context"
 
-	versions "git.perx.ru/perxis/perxis-go/pkg/content/versions"
+	versions "git.perx.ru/perxis/perxis-go/pkg/content/version"
 	endpoint "github.com/go-kit/kit/endpoint"
 )