Move api-v2 files into v2 subdir

This subdir contains generated proto files
and small wrappers.

service/v2/marshal.go

@@ -1,21 +0,0 @@
-package v2
-
-func (m *RequestMetaHeader) StableMarshal(buf []byte) ([]byte, error) {
-	// fixme: implement stable
-	return m.Marshal()
-}
-
-func (m *RequestMetaHeader) StableSize() int {
-	// fixme: implement stable
-	return m.Size()
-}
-
-func (m *RequestVerificationHeader) StableMarshal(buf []byte) ([]byte, error) {
-	// fixme: implement stable
-	return m.Marshal()
-}
-
-func (m *RequestVerificationHeader) StableSize() int {
-	// fixme: implement stable
-	return m.Size()
-}

service/v2/signature.go

@@ -1,17 +0,0 @@
-package v2
-
-func (m *RequestMetaHeader) ReadSignedData(buf []byte) ([]byte, error) {
-	return m.StableMarshal(buf)
-}
-
-func (m *RequestMetaHeader) SignedDataSize() int {
-	return m.StableSize()
-}
-
-func (m *RequestVerificationHeader) ReadSignedData(buf []byte) ([]byte, error) {
-	return m.StableMarshal(buf)
-}
-
-func (m *RequestVerificationHeader) SignedDataSize() int {
-	return m.StableSize()
-}

v2/accounting/service.go

@@ -1,8 +1,8 @@
-package v2
+package accounting
 
 import (
-	refs "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/refs"
-	service "github.com/nspcc-dev/neofs-api-go/service/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/service"
 )
 
 // SetValue sets value of the decimal number.

v2/accounting/service.pb.go

@@ -1,14 +1,14 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: accounting/v2/service.proto
+// source: v2/accounting/service.proto
 
-package v2
+package accounting
 
 import (
 	context "context"
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	v21 "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	refs "github.com/nspcc-dev/neofs-api-go/v2/refs"
-	v2 "github.com/nspcc-dev/neofs-api-go/service/v2"
+	service "github.com/nspcc-dev/neofs-api-go/v2/service"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -40,21 +40,21 @@ type BalanceRequest struct {
 	Body *BalanceRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"`
 	// Carries request meta information. Header data is used only to regulate
 	// message transport and does not affect request execution.
-	MetaHeader *v2.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"`
+	MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"`
 	// Carries request verification information. This header is used to
 	// authenticate the nodes of the message route and check the correctness
 	// of transmission.
-	VerifyHeader         *v2.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"`
+	VerifyHeader         *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_NoUnkeyedLiteral struct{}                           `json:"-"`
-	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_unrecognized     []byte                             `json:"-"`
-	XXX_sizecache        int32                         `json:"-"`
+	XXX_sizecache        int32                              `json:"-"`
 }
 
 func (m *BalanceRequest) Reset()         { *m = BalanceRequest{} }
 func (m *BalanceRequest) String() string { return proto.CompactTextString(m) }
 func (*BalanceRequest) ProtoMessage()    {}
 func (*BalanceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bac189e9286e823b, []int{0}
+	return fileDescriptor_484f6b0e24e3172f, []int{0}
 }
 func (m *BalanceRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -90,14 +90,14 @@ func (m *BalanceRequest) GetBody() *BalanceRequest_Body {
 	return nil
 }
 
-func (m *BalanceRequest) GetMetaHeader() *v2.RequestMetaHeader {
+func (m *BalanceRequest) GetMetaHeader() *service.RequestMetaHeader {
 	if m != nil {
 		return m.MetaHeader
 	}
 	return nil
 }
 
-func (m *BalanceRequest) GetVerifyHeader() *v2.RequestVerificationHeader {
+func (m *BalanceRequest) GetVerifyHeader() *service.RequestVerificationHeader {
 	if m != nil {
 		return m.VerifyHeader
 	}
@@ -107,17 +107,17 @@ func (m *BalanceRequest) GetVerifyHeader() *v2.RequestVerificationHeader {
 type BalanceRequest_Body struct {
 	// Carries user identifier in NeoFS system for which the balance
 	// is requested.
-	OwnerId              *v21.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
+	OwnerId              *refs.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
-	XXX_unrecognized     []byte       `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
-	XXX_sizecache        int32        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
 }
 
 func (m *BalanceRequest_Body) Reset()         { *m = BalanceRequest_Body{} }
 func (m *BalanceRequest_Body) String() string { return proto.CompactTextString(m) }
 func (*BalanceRequest_Body) ProtoMessage()    {}
 func (*BalanceRequest_Body) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bac189e9286e823b, []int{0, 0}
+	return fileDescriptor_484f6b0e24e3172f, []int{0, 0}
 }
 func (m *BalanceRequest_Body) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -146,7 +146,7 @@ func (m *BalanceRequest_Body) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_BalanceRequest_Body proto.InternalMessageInfo
 
-func (m *BalanceRequest_Body) GetOwnerId() *v21.OwnerID {
+func (m *BalanceRequest_Body) GetOwnerId() *refs.OwnerID {
 	if m != nil {
 		return m.OwnerId
 	}
@@ -168,7 +168,7 @@ func (m *Decimal) Reset()         { *m = Decimal{} }
 func (m *Decimal) String() string { return proto.CompactTextString(m) }
 func (*Decimal) ProtoMessage()    {}
 func (*Decimal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bac189e9286e823b, []int{1}
+	return fileDescriptor_484f6b0e24e3172f, []int{1}
 }
 func (m *Decimal) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -219,21 +219,21 @@ type BalanceResponse struct {
 	Body *BalanceResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"`
 	// Carries response meta information. Header data is used only to regulate
 	// message transport and does not affect request execution.
-	MetaHeader *v2.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"`
+	MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"`
 	// Carries response verification information. This header is used to
 	// authenticate the nodes of the message route and check the correctness
 	// of transmission.
-	VerifyHeader         *v2.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"`
+	VerifyHeader         *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_NoUnkeyedLiteral struct{}                            `json:"-"`
-	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_unrecognized     []byte                              `json:"-"`
-	XXX_sizecache        int32                          `json:"-"`
+	XXX_sizecache        int32                               `json:"-"`
 }
 
 func (m *BalanceResponse) Reset()         { *m = BalanceResponse{} }
 func (m *BalanceResponse) String() string { return proto.CompactTextString(m) }
 func (*BalanceResponse) ProtoMessage()    {}
 func (*BalanceResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bac189e9286e823b, []int{2}
+	return fileDescriptor_484f6b0e24e3172f, []int{2}
 }
 func (m *BalanceResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -269,14 +269,14 @@ func (m *BalanceResponse) GetBody() *BalanceResponse_Body {
 	return nil
 }
 
-func (m *BalanceResponse) GetMetaHeader() *v2.ResponseMetaHeader {
+func (m *BalanceResponse) GetMetaHeader() *service.ResponseMetaHeader {
 	if m != nil {
 		return m.MetaHeader
 	}
 	return nil
 }
 
-func (m *BalanceResponse) GetVerifyHeader() *v2.ResponseVerificationHeader {
+func (m *BalanceResponse) GetVerifyHeader() *service.ResponseVerificationHeader {
 	if m != nil {
 		return m.VerifyHeader
 	}
@@ -295,7 +295,7 @@ func (m *BalanceResponse_Body) Reset()         { *m = BalanceResponse_Body{} }
 func (m *BalanceResponse_Body) String() string { return proto.CompactTextString(m) }
 func (*BalanceResponse_Body) ProtoMessage()    {}
 func (*BalanceResponse_Body) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bac189e9286e823b, []int{2, 0}
+	return fileDescriptor_484f6b0e24e3172f, []int{2, 0}
 }
 func (m *BalanceResponse_Body) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -332,46 +332,46 @@ func (m *BalanceResponse_Body) GetBalance() *Decimal {
 }
 
 func init() {
-	proto.RegisterType((*BalanceRequest)(nil), "accounting.v2.BalanceRequest")
+	proto.RegisterType((*BalanceRequest)(nil), "neo.fs.v2.accounting.BalanceRequest")
-	proto.RegisterType((*BalanceRequest_Body)(nil), "accounting.v2.BalanceRequest.Body")
+	proto.RegisterType((*BalanceRequest_Body)(nil), "neo.fs.v2.accounting.BalanceRequest.Body")
-	proto.RegisterType((*Decimal)(nil), "accounting.v2.Decimal")
+	proto.RegisterType((*Decimal)(nil), "neo.fs.v2.accounting.Decimal")
-	proto.RegisterType((*BalanceResponse)(nil), "accounting.v2.BalanceResponse")
+	proto.RegisterType((*BalanceResponse)(nil), "neo.fs.v2.accounting.BalanceResponse")
-	proto.RegisterType((*BalanceResponse_Body)(nil), "accounting.v2.BalanceResponse.Body")
+	proto.RegisterType((*BalanceResponse_Body)(nil), "neo.fs.v2.accounting.BalanceResponse.Body")
 }
 
-func init() { proto.RegisterFile("accounting/v2/service.proto", fileDescriptor_bac189e9286e823b) }
+func init() { proto.RegisterFile("v2/accounting/service.proto", fileDescriptor_484f6b0e24e3172f) }
 
-var fileDescriptor_bac189e9286e823b = []byte{
+var fileDescriptor_484f6b0e24e3172f = []byte{
-	// 457 bytes of a gzipped FileDescriptorProto
+	// 464 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xdf, 0x6a, 0x13, 0x41,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xdf, 0x6a, 0x13, 0x41,
-	0x14, 0xc6, 0xdd, 0xb4, 0x1a, 0x3d, 0x35, 0x2a, 0x63, 0xd5, 0x12, 0xed, 0x22, 0x11, 0x45, 0x90,
+	0x18, 0xc5, 0xdd, 0xb4, 0x1a, 0xfd, 0x6a, 0x15, 0xc6, 0x48, 0x4b, 0xd4, 0x20, 0xa1, 0x05, 0x15,
-	0xcc, 0xca, 0x16, 0xd4, 0x1b, 0x95, 0x86, 0x22, 0x8d, 0xe2, 0x1f, 0x56, 0x28, 0xe2, 0x4d, 0x99,
+	0x33, 0x03, 0xeb, 0x85, 0x20, 0x54, 0x69, 0xa8, 0xc5, 0x5c, 0xf8, 0x6f, 0x85, 0x22, 0xde, 0x94,
-	0xcc, 0x9e, 0xa4, 0x03, 0xc9, 0xcc, 0xba, 0xb3, 0x59, 0xc9, 0x23, 0x78, 0xeb, 0x95, 0xcf, 0xe0,
+	0xc9, 0xec, 0x97, 0x74, 0x20, 0x99, 0x59, 0x77, 0x36, 0x2b, 0x79, 0x13, 0x5f, 0xc0, 0x1b, 0x2f,
-	0x93, 0x78, 0xe9, 0x23, 0x48, 0x7c, 0x11, 0x99, 0x3f, 0x49, 0xba, 0xb2, 0x6d, 0xef, 0x76, 0xce,
+	0x7c, 0x0e, 0x2f, 0x7d, 0x04, 0x89, 0x2f, 0x22, 0x3b, 0x33, 0x49, 0x36, 0xb0, 0x6d, 0x73, 0xb7,
-	0xf9, 0xce, 0x37, 0xe7, 0xfb, 0xb1, 0x03, 0xb7, 0x19, 0xe7, 0x6a, 0x2a, 0x0b, 0x21, 0x47, 0x51,
+	0x33, 0x73, 0xce, 0x99, 0xef, 0xfc, 0xd8, 0x81, 0x7b, 0x79, 0xc8, 0xb8, 0x10, 0x7a, 0xa2, 0x32,
-	0x19, 0x47, 0x1a, 0xf3, 0x52, 0x70, 0xa4, 0x59, 0xae, 0x0a, 0x45, 0x5a, 0xab, 0x26, 0x2d, 0xe3,
+	0xa9, 0x86, 0xcc, 0x60, 0x9a, 0x4b, 0x81, 0x34, 0x49, 0x75, 0xa6, 0x49, 0x43, 0xa1, 0xa6, 0x03,
-	0xf6, 0xf5, 0x1c, 0x87, 0xda, 0xa8, 0x8a, 0x59, 0x86, 0xda, 0x69, 0xda, 0x37, 0xfc, 0x88, 0xa9,
+	0x43, 0xf3, 0x90, 0x2e, 0x35, 0xcd, 0x3b, 0x79, 0xc8, 0x52, 0x1c, 0x18, 0x96, 0x4d, 0x13, 0x34,
-	0x4f, 0xb0, 0x60, 0xbe, 0x7c, 0xeb, 0x58, 0xb9, 0xc4, 0x5c, 0x0c, 0x67, 0xae, 0xd1, 0xf9, 0xd6,
+	0x4e, 0xda, 0xbc, 0x9b, 0x87, 0x73, 0x33, 0x1b, 0x63, 0xc6, 0xfd, 0xf6, 0x4e, 0x69, 0x3b, 0xc7,
-	0x80, 0x2b, 0x3d, 0x36, 0x66, 0x92, 0x63, 0x82, 0x5f, 0xa6, 0xa8, 0x0b, 0xf2, 0x04, 0xd6, 0x07,
+	0x54, 0x0e, 0xa6, 0xee, 0xa0, 0xfd, 0xa3, 0x06, 0xb7, 0xba, 0x7c, 0xc4, 0x95, 0xc0, 0x08, 0xbf,
-	0x2a, 0x9d, 0x6d, 0x05, 0x77, 0x83, 0x87, 0x1b, 0x71, 0x87, 0x56, 0x6e, 0xa5, 0x55, 0x31, 0xed,
+	0x4e, 0xd0, 0x64, 0xe4, 0x00, 0x36, 0xfb, 0x3a, 0x9e, 0xee, 0x06, 0x0f, 0x83, 0x47, 0x5b, 0xe1,
-	0xa9, 0x74, 0x96, 0x58, 0x3d, 0x79, 0x01, 0x1b, 0xe6, 0xc6, 0xc3, 0x23, 0x64, 0x29, 0xe6, 0x5b,
+	0x63, 0x5a, 0x75, 0x39, 0x5d, 0xf5, 0xd0, 0xae, 0x8e, 0xa7, 0x91, 0xb5, 0x91, 0xd7, 0xb0, 0x55,
-	0x0d, 0x3b, 0xbe, 0x4d, 0x17, 0x19, 0xca, 0x98, 0xfa, 0xa1, 0xb7, 0x58, 0xb0, 0x7d, 0x2b, 0x4a,
+	0x5c, 0x7c, 0x7a, 0x86, 0x3c, 0xc6, 0x74, 0xb7, 0x66, 0x53, 0xf6, 0x4a, 0x29, 0xf3, 0x6e, 0xde,
-	0x60, 0xb2, 0xfc, 0x26, 0xaf, 0xa1, 0xe5, 0x56, 0x5b, 0x38, 0xac, 0x59, 0x87, 0xfb, 0x35, 0x0e,
+	0xfb, 0x16, 0x33, 0xfe, 0xc6, 0x6a, 0x23, 0x18, 0x2f, 0xbe, 0xc9, 0x47, 0xd8, 0x76, 0x83, 0xce,
-	0x07, 0x46, 0x27, 0x38, 0x2b, 0x84, 0x92, 0xde, 0xe9, 0xb2, 0x9b, 0x75, 0xa7, 0xf6, 0x0e, 0xac,
+	0x83, 0x36, 0x6c, 0xd0, 0xd3, 0xf3, 0x83, 0x4e, 0x0a, 0xb9, 0x14, 0x3c, 0x93, 0x5a, 0xf9, 0xc0,
-	0x9b, 0xcd, 0xc8, 0x23, 0xb8, 0xa8, 0xbe, 0x4a, 0xcc, 0x0f, 0x45, 0xea, 0xf3, 0x5c, 0xa3, 0x06,
+	0x9b, 0x2e, 0xc2, 0xad, 0x9a, 0x2f, 0x60, 0xb3, 0x98, 0x93, 0x84, 0x70, 0x5d, 0x7f, 0x53, 0x98,
-	0x9b, 0xf1, 0x7a, 0x6f, 0x1a, 0xfd, 0xbd, 0xa4, 0x69, 0x15, 0xfd, 0xb4, 0xf3, 0x1c, 0x9a, 0x7b,
+	0x9e, 0xca, 0xd8, 0x97, 0xdc, 0x29, 0xa5, 0x16, 0x48, 0xe9, 0xfb, 0xe2, 0xbc, 0x77, 0x14, 0xd5,
-	0xc8, 0xc5, 0x84, 0x8d, 0xc9, 0x26, 0x9c, 0x2f, 0xd9, 0x78, 0x8a, 0x76, 0x68, 0x2d, 0x71, 0x07,
+	0xad, 0xb0, 0x17, 0xb7, 0x0f, 0xa0, 0x7e, 0x84, 0x42, 0x8e, 0xf9, 0x88, 0x34, 0xe0, 0x6a, 0xce,
-	0x72, 0x07, 0x2e, 0x65, 0x39, 0x72, 0xa1, 0x85, 0x92, 0x36, 0x5f, 0x2b, 0x59, 0x15, 0x3a, 0xdf,
+	0x47, 0x13, 0xb4, 0xde, 0x8d, 0xc8, 0x2d, 0xc8, 0x7d, 0xb8, 0x91, 0xa4, 0x28, 0xa4, 0x91, 0x5a,
-	0x1b, 0x70, 0x75, 0x49, 0x47, 0x67, 0x4a, 0x6a, 0x24, 0x4f, 0x2b, 0x2c, 0xef, 0x9d, 0xc4, 0xd2,
+	0xd9, 0xd2, 0xdb, 0xd1, 0x72, 0xa3, 0xfd, 0xab, 0x06, 0xb7, 0x17, 0xc8, 0x4c, 0xa2, 0x95, 0x41,
-	0xa9, 0x8f, 0xc3, 0x7c, 0x59, 0x07, 0x33, 0xac, 0xa2, 0x70, 0x53, 0x27, 0xd0, 0x7c, 0x53, 0x4f,
+	0xf2, 0x72, 0x85, 0xf3, 0x93, 0x4b, 0x38, 0x3b, 0x53, 0x19, 0xf4, 0x71, 0x15, 0xe8, 0xfd, 0x4a,
-	0xf3, 0x41, 0x9d, 0xc5, 0x99, 0x38, 0x9f, 0x79, 0x9c, 0x8f, 0xa1, 0x39, 0x70, 0x3b, 0xfb, 0x44,
+	0x3e, 0xce, 0x7c, 0x0e, 0xe9, 0xa8, 0x9a, 0x74, 0xe7, 0x82, 0xa4, 0x4b, 0x51, 0xbf, 0xf2, 0xa8,
-	0x37, 0xff, 0x4b, 0xe4, 0xf9, 0x25, 0x0b, 0x59, 0x7c, 0x00, 0xb0, 0xbb, 0x54, 0x90, 0x7d, 0x68,
+	0x9f, 0x43, 0xbd, 0xef, 0x1a, 0xf8, 0x9a, 0x0f, 0xaa, 0x6b, 0x7a, 0xb6, 0xd1, 0x5c, 0x1d, 0xc6,
-	0xfa, 0xcc, 0x64, 0xfb, 0xd4, 0xff, 0xaa, 0x1d, 0x9e, 0x8e, 0xaa, 0xf7, 0xe9, 0xd7, 0x3c, 0x0c,
+	0x00, 0x87, 0x8b, 0x63, 0x72, 0x02, 0x75, 0x0f, 0x82, 0xec, 0xad, 0xf3, 0x3f, 0x36, 0xf7, 0xd7,
-	0x7e, 0xcf, 0xc3, 0xe0, 0xcf, 0x3c, 0x0c, 0x7e, 0xfc, 0x0d, 0xcf, 0x7d, 0x8e, 0x46, 0xa2, 0x38,
+	0xa2, 0xd9, 0xfd, 0xfc, 0x7b, 0xd6, 0x0a, 0xfe, 0xcc, 0x5a, 0xc1, 0xdf, 0x59, 0x2b, 0xf8, 0xfe,
-	0x9a, 0x0e, 0x28, 0x57, 0x93, 0x48, 0xea, 0x8c, 0xf3, 0x6e, 0x8a, 0x65, 0x24, 0x51, 0x0d, 0x75,
+	0xaf, 0x75, 0xe5, 0x0b, 0x1b, 0xca, 0xec, 0x6c, 0xd2, 0xa7, 0x42, 0x8f, 0x99, 0x32, 0x89, 0x10,
-	0x97, 0x65, 0xa2, 0x3b, 0x52, 0x51, 0xe5, 0x71, 0xfd, 0x6c, 0x6c, 0xbe, 0x43, 0xf5, 0xea, 0x23,
+	0x9d, 0x18, 0x73, 0xa6, 0x50, 0x0f, 0x4c, 0x87, 0x27, 0xb2, 0x33, 0xd4, 0x6c, 0xe5, 0xa5, 0xfe,
-	0xdd, 0xfd, 0xd0, 0xa7, 0xab, 0x1d, 0x07, 0x17, 0xec, 0xc3, 0xd8, 0xf9, 0x17, 0x00, 0x00, 0xff,
+	0xac, 0x35, 0xde, 0xa1, 0x3e, 0xfe, 0x44, 0x0f, 0x3f, 0xf4, 0xe8, 0x72, 0xe2, 0xfe, 0x35, 0xfb,
-	0xff, 0x07, 0x70, 0x83, 0xd8, 0x8b, 0x03, 0x00, 0x00,
+	0xbc, 0x9e, 0xfd, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x4f, 0x91, 0xf3, 0x3d, 0xd8, 0x03, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -400,7 +400,7 @@ func NewAccountingClient(cc *grpc.ClientConn) AccountingClient {
 
 func (c *accountingClient) Balance(ctx context.Context, in *BalanceRequest, opts ...grpc.CallOption) (*BalanceResponse, error) {
 	out := new(BalanceResponse)
-	err := c.cc.Invoke(ctx, "/accounting.v2.Accounting/Balance", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/neo.fs.v2.accounting.Accounting/Balance", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -435,7 +435,7 @@ func _Accounting_Balance_Handler(srv interface{}, ctx context.Context, dec func(
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/accounting.v2.Accounting/Balance",
+		FullMethod: "/neo.fs.v2.accounting.Accounting/Balance",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(AccountingServer).Balance(ctx, req.(*BalanceRequest))
@@ -444,7 +444,7 @@ func _Accounting_Balance_Handler(srv interface{}, ctx context.Context, dec func(
 }
 
 var _Accounting_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "accounting.v2.Accounting",
+	ServiceName: "neo.fs.v2.accounting.Accounting",
 	HandlerType: (*AccountingServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -453,7 +453,7 @@ var _Accounting_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "accounting/v2/service.proto",
+	Metadata: "v2/accounting/service.proto",
 }
 
 func (m *BalanceRequest) Marshal() (dAtA []byte, err error) {
@@ -907,7 +907,7 @@ func (m *BalanceRequest) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.MetaHeader == nil {
-				m.MetaHeader = &v2.RequestMetaHeader{}
+				m.MetaHeader = &service.RequestMetaHeader{}
 			}
 			if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -943,7 +943,7 @@ func (m *BalanceRequest) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.VerifyHeader == nil {
-				m.VerifyHeader = &v2.RequestVerificationHeader{}
+				m.VerifyHeader = &service.RequestVerificationHeader{}
 			}
 			if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1033,7 +1033,7 @@ func (m *BalanceRequest_Body) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.OwnerId == nil {
-				m.OwnerId = &v21.OwnerID{}
+				m.OwnerId = &refs.OwnerID{}
 			}
 			if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1251,7 +1251,7 @@ func (m *BalanceResponse) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.MetaHeader == nil {
-				m.MetaHeader = &v2.ResponseMetaHeader{}
+				m.MetaHeader = &service.ResponseMetaHeader{}
 			}
 			if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1287,7 +1287,7 @@ func (m *BalanceResponse) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.VerifyHeader == nil {
-				m.VerifyHeader = &v2.ResponseVerificationHeader{}
+				m.VerifyHeader = &service.ResponseVerificationHeader{}
 			}
 			if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err

v2/accounting/service.proto

@@ -1,13 +1,13 @@
 syntax = "proto3";
 
-package accounting.v2;
+package neo.fs.v2.accounting;
 
-option go_package = "github.com/nspcc-dev/neofs-api-go/accounting/v2";
+option go_package = "github.com/nspcc-dev/neofs-api-go/v2/accounting";
 option csharp_namespace = "NeoFS.API.Accounting";
 
-import "refs/v2/types.proto";
+import "v2/refs/types.proto";
-import "service/v2/meta.proto";
+import "v2/service/meta.proto";
-import "service/v2/verify.proto";
+import "v2/service/verify.proto";
 
 // The service provides methods for obtaining information
 // about the account balance in NeoFS system.
@@ -27,7 +27,7 @@ message BalanceRequest {
   message Body {
     // Carries user identifier in NeoFS system for which the balance
     // is requested.
-    refs.v2.OwnerID owner_id = 1;
+    neo.fs.v2.refs.OwnerID owner_id = 1;
   }
 
   // Body of the balance request message.
@@ -35,12 +35,12 @@ message BalanceRequest {
 
   // Carries request meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.RequestMetaHeader meta_header = 2;
+  neo.fs.v2.service.RequestMetaHeader meta_header = 2;
 
   // Carries request verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.RequestVerificationHeader verify_header = 3;
+  neo.fs.v2.service.RequestVerificationHeader verify_header = 3;
 }
 
 // Decimal represents the decimal numbers.
@@ -66,10 +66,10 @@ message BalanceResponse {
 
   // Carries response meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.ResponseMetaHeader meta_header = 2;
+  neo.fs.v2.service.ResponseMetaHeader meta_header = 2;
 
   // Carries response verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.ResponseVerificationHeader verify_header = 3;
+  neo.fs.v2.service.ResponseVerificationHeader verify_header = 3;
 }

v2/acl/types.go

@@ -1,7 +1,7 @@
-package v2
+package acl
 
 import (
-	refs "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/refs"
 )
 
 // SetContainerId sets container identifier of the eACL table.

v2/acl/types.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: acl/v2/types.proto
+// source: v2/acl/types.proto
 
-package v2
+package acl
 
 import (
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	v2 "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	refs "github.com/nspcc-dev/neofs-api-go/v2/refs"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -29,7 +29,7 @@ type Target int32
 const (
 	// Unknown target, default value.
 	Target_UNKNOWN Target = 0
-	// User target rule is applied if sender is the owner of the container.v2.
+	// User target rule is applied if sender is the owner of the container.
 	Target_USER Target = 1
 	// System target rule is applied if sender is the storage node within the
 	// container or inner ring node.
@@ -57,7 +57,7 @@ func (x Target) String() string {
 }
 
 func (Target) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ab60484daff20d3c, []int{0}
+	return fileDescriptor_d237ab7979f0d6cf, []int{0}
 }
 
 // Operation is an enumeration of operation types.
@@ -101,7 +101,7 @@ func (x EACLRecord_Operation) String() string {
 }
 
 func (EACLRecord_Operation) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ab60484daff20d3c, []int{0, 0}
+	return fileDescriptor_d237ab7979f0d6cf, []int{0, 0}
 }
 
 // Action is an enumeration of EACL actions.
@@ -130,7 +130,7 @@ func (x EACLRecord_Action) String() string {
 }
 
 func (EACLRecord_Action) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ab60484daff20d3c, []int{0, 1}
+	return fileDescriptor_d237ab7979f0d6cf, []int{0, 1}
 }
 
 // Header is an enumeration of filtering header types.
@@ -159,7 +159,7 @@ func (x EACLRecord_FilterInfo_Header) String() string {
 }
 
 func (EACLRecord_FilterInfo_Header) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ab60484daff20d3c, []int{0, 0, 0}
+	return fileDescriptor_d237ab7979f0d6cf, []int{0, 0, 0}
 }
 
 // MatchType is an enumeration of match types.
@@ -188,15 +188,15 @@ func (x EACLRecord_FilterInfo_MatchType) String() string {
 }
 
 func (EACLRecord_FilterInfo_MatchType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ab60484daff20d3c, []int{0, 0, 1}
+	return fileDescriptor_d237ab7979f0d6cf, []int{0, 0, 1}
 }
 
 // EACLRecord groups information about extended ACL rule.
 type EACLRecord struct {
 	// Operation carries type of operation.
-	Operation EACLRecord_Operation `protobuf:"varint,1,opt,name=operation,json=Operation,proto3,enum=acl.v2.EACLRecord_Operation" json:"operation,omitempty"`
+	Operation EACLRecord_Operation `protobuf:"varint,1,opt,name=operation,json=Operation,proto3,enum=neo.fs.v2.acl.EACLRecord_Operation" json:"operation,omitempty"`
 	// Action carries ACL target action.
-	Action EACLRecord_Action `protobuf:"varint,2,opt,name=action,json=Action,proto3,enum=acl.v2.EACLRecord_Action" json:"action,omitempty"`
+	Action EACLRecord_Action `protobuf:"varint,2,opt,name=action,json=Action,proto3,enum=neo.fs.v2.acl.EACLRecord_Action" json:"action,omitempty"`
 	// filters carries set of filters.
 	Filters []*EACLRecord_FilterInfo `protobuf:"bytes,3,rep,name=filters,json=Filters,proto3" json:"filters,omitempty"`
 	// targets carries information about extended ACL target list.
@@ -210,7 +210,7 @@ func (m *EACLRecord) Reset()         { *m = EACLRecord{} }
 func (m *EACLRecord) String() string { return proto.CompactTextString(m) }
 func (*EACLRecord) ProtoMessage()    {}
 func (*EACLRecord) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ab60484daff20d3c, []int{0}
+	return fileDescriptor_d237ab7979f0d6cf, []int{0}
 }
 func (m *EACLRecord) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -270,9 +270,9 @@ func (m *EACLRecord) GetTargets() []*EACLRecord_TargetInfo {
 // FilterInfo groups information about filter.
 type EACLRecord_FilterInfo struct {
 	// Header carries type of header.
-	Header EACLRecord_FilterInfo_Header `protobuf:"varint,1,opt,name=header,json=HeaderType,proto3,enum=acl.v2.EACLRecord_FilterInfo_Header" json:"header,omitempty"`
+	Header EACLRecord_FilterInfo_Header `protobuf:"varint,1,opt,name=header,json=HeaderType,proto3,enum=neo.fs.v2.acl.EACLRecord_FilterInfo_Header" json:"header,omitempty"`
 	// MatchType carries type of match.
-	MatchType EACLRecord_FilterInfo_MatchType `protobuf:"varint,2,opt,name=match_type,json=MatchType,proto3,enum=acl.v2.EACLRecord_FilterInfo_MatchType" json:"match_type,omitempty"`
+	MatchType EACLRecord_FilterInfo_MatchType `protobuf:"varint,2,opt,name=match_type,json=MatchType,proto3,enum=neo.fs.v2.acl.EACLRecord_FilterInfo_MatchType" json:"match_type,omitempty"`
 	// header_name carries name of filtering header.
 	HeaderName string `protobuf:"bytes,3,opt,name=header_name,json=Name,proto3" json:"header_name,omitempty"`
 	// header_val carries value of filtering header.
@@ -286,7 +286,7 @@ func (m *EACLRecord_FilterInfo) Reset()         { *m = EACLRecord_FilterInfo{} }
 func (m *EACLRecord_FilterInfo) String() string { return proto.CompactTextString(m) }
 func (*EACLRecord_FilterInfo) ProtoMessage()    {}
 func (*EACLRecord_FilterInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ab60484daff20d3c, []int{0, 0}
+	return fileDescriptor_d237ab7979f0d6cf, []int{0, 0}
 }
 func (m *EACLRecord_FilterInfo) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -346,7 +346,7 @@ func (m *EACLRecord_FilterInfo) GetHeaderVal() string {
 // TargetInfo groups information about extended ACL target.
 type EACLRecord_TargetInfo struct {
 	// target carries target of ACL rule.
-	Target Target `protobuf:"varint,1,opt,name=target,json=Role,proto3,enum=acl.v2.Target" json:"target,omitempty"`
+	Target Target `protobuf:"varint,1,opt,name=target,json=Role,proto3,enum=neo.fs.v2.acl.Target" json:"target,omitempty"`
 	// key_list carries public keys of ACL target.
 	KeyList              [][]byte `protobuf:"bytes,2,rep,name=key_list,json=Keys,proto3" json:"key_list,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -358,7 +358,7 @@ func (m *EACLRecord_TargetInfo) Reset()         { *m = EACLRecord_TargetInfo{} }
 func (m *EACLRecord_TargetInfo) String() string { return proto.CompactTextString(m) }
 func (*EACLRecord_TargetInfo) ProtoMessage()    {}
 func (*EACLRecord_TargetInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ab60484daff20d3c, []int{0, 1}
+	return fileDescriptor_d237ab7979f0d6cf, []int{0, 1}
 }
 func (m *EACLRecord_TargetInfo) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -405,7 +405,7 @@ func (m *EACLRecord_TargetInfo) GetKeyList() [][]byte {
 type EACLTable struct {
 	// Carries identifier of the container that should use given
 	// access control rules.
-	ContainerId *v2.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=ContainerID,proto3" json:"container_id,omitempty"`
+	ContainerId *refs.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=ContainerID,proto3" json:"container_id,omitempty"`
 	// Records carries list of extended ACL rule records.
 	Records              []*EACLRecord `protobuf:"bytes,2,rep,name=records,json=Records,proto3" json:"records,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
@@ -417,7 +417,7 @@ func (m *EACLTable) Reset()         { *m = EACLTable{} }
 func (m *EACLTable) String() string { return proto.CompactTextString(m) }
 func (*EACLTable) ProtoMessage()    {}
 func (*EACLTable) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ab60484daff20d3c, []int{1}
+	return fileDescriptor_d237ab7979f0d6cf, []int{1}
 }
 func (m *EACLTable) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -446,7 +446,7 @@ func (m *EACLTable) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_EACLTable proto.InternalMessageInfo
 
-func (m *EACLTable) GetContainerId() *v2.ContainerID {
+func (m *EACLTable) GetContainerId() *refs.ContainerID {
 	if m != nil {
 		return m.ContainerId
 	}
@@ -461,64 +461,64 @@ func (m *EACLTable) GetRecords() []*EACLRecord {
 }
 
 func init() {
-	proto.RegisterEnum("acl.v2.Target", Target_name, Target_value)
+	proto.RegisterEnum("neo.fs.v2.acl.Target", Target_name, Target_value)
-	proto.RegisterEnum("acl.v2.EACLRecord_Operation", EACLRecord_Operation_name, EACLRecord_Operation_value)
+	proto.RegisterEnum("neo.fs.v2.acl.EACLRecord_Operation", EACLRecord_Operation_name, EACLRecord_Operation_value)
-	proto.RegisterEnum("acl.v2.EACLRecord_Action", EACLRecord_Action_name, EACLRecord_Action_value)
+	proto.RegisterEnum("neo.fs.v2.acl.EACLRecord_Action", EACLRecord_Action_name, EACLRecord_Action_value)
-	proto.RegisterEnum("acl.v2.EACLRecord_FilterInfo_Header", EACLRecord_FilterInfo_Header_name, EACLRecord_FilterInfo_Header_value)
+	proto.RegisterEnum("neo.fs.v2.acl.EACLRecord_FilterInfo_Header", EACLRecord_FilterInfo_Header_name, EACLRecord_FilterInfo_Header_value)
-	proto.RegisterEnum("acl.v2.EACLRecord_FilterInfo_MatchType", EACLRecord_FilterInfo_MatchType_name, EACLRecord_FilterInfo_MatchType_value)
+	proto.RegisterEnum("neo.fs.v2.acl.EACLRecord_FilterInfo_MatchType", EACLRecord_FilterInfo_MatchType_name, EACLRecord_FilterInfo_MatchType_value)
-	proto.RegisterType((*EACLRecord)(nil), "acl.v2.EACLRecord")
+	proto.RegisterType((*EACLRecord)(nil), "neo.fs.v2.acl.EACLRecord")
-	proto.RegisterType((*EACLRecord_FilterInfo)(nil), "acl.v2.EACLRecord.FilterInfo")
+	proto.RegisterType((*EACLRecord_FilterInfo)(nil), "neo.fs.v2.acl.EACLRecord.FilterInfo")
-	proto.RegisterType((*EACLRecord_TargetInfo)(nil), "acl.v2.EACLRecord.TargetInfo")
+	proto.RegisterType((*EACLRecord_TargetInfo)(nil), "neo.fs.v2.acl.EACLRecord.TargetInfo")
-	proto.RegisterType((*EACLTable)(nil), "acl.v2.EACLTable")
+	proto.RegisterType((*EACLTable)(nil), "neo.fs.v2.acl.EACLTable")
 }
 
-func init() { proto.RegisterFile("acl/v2/types.proto", fileDescriptor_ab60484daff20d3c) }
+func init() { proto.RegisterFile("v2/acl/types.proto", fileDescriptor_d237ab7979f0d6cf) }
 
-var fileDescriptor_ab60484daff20d3c = []byte{
+var fileDescriptor_d237ab7979f0d6cf = []byte{
-	// 674 bytes of a gzipped FileDescriptorProto
+	// 683 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0xdd, 0x6e, 0xda, 0x4a,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcd, 0x6e, 0xda, 0x40,
-	0x10, 0x8e, 0x8d, 0x63, 0x60, 0x20, 0x68, 0xb3, 0x27, 0xe7, 0x88, 0x44, 0xa7, 0x08, 0xa1, 0x48,
+	0x10, 0x8e, 0x8d, 0x63, 0x60, 0x20, 0xd1, 0x66, 0xdb, 0x54, 0x24, 0x95, 0x10, 0xa2, 0x3d, 0xa0,
-	0x45, 0x55, 0x63, 0x14, 0xaa, 0x2a, 0x52, 0xaf, 0xea, 0xc0, 0xf2, 0x93, 0x10, 0x93, 0xac, 0x4d,
+	0x46, 0x31, 0x2a, 0x51, 0xd5, 0x9e, 0x22, 0x39, 0xb0, 0x01, 0x12, 0x30, 0xc9, 0xda, 0x34, 0x4a,
-	0xa3, 0xf4, 0x06, 0x6d, 0xcc, 0x92, 0xa0, 0x1a, 0x8c, 0x6c, 0x07, 0x89, 0x37, 0xe9, 0x33, 0xf4,
+	0x2f, 0xc8, 0x31, 0x4b, 0x82, 0x6a, 0x6c, 0x64, 0x3b, 0x48, 0xdc, 0xfa, 0x18, 0x7d, 0x86, 0x3e,
-	0xb2, 0x4f, 0x51, 0xa9, 0x37, 0x7d, 0x84, 0x2a, 0x7d, 0x91, 0x6a, 0xbd, 0x10, 0x50, 0x9a, 0xe6,
+	0x49, 0x8f, 0xbd, 0xf6, 0x56, 0x25, 0x2f, 0x52, 0xad, 0x17, 0x82, 0x1b, 0x29, 0x6a, 0x4e, 0x3b,
-	0x6a, 0xc7, 0x33, 0xdf, 0xb7, 0x33, 0xdf, 0xcc, 0x78, 0x01, 0x33, 0xd7, 0xab, 0xcc, 0xaa, 0x95,
+	0xde, 0xf9, 0xbe, 0xf9, 0xf9, 0x66, 0xbc, 0x80, 0x67, 0xb5, 0xaa, 0xed, 0xb8, 0xd5, 0x68, 0x3e,
-	0x68, 0x3e, 0xe5, 0xa1, 0x31, 0x0d, 0xfc, 0xc8, 0xc7, 0x3a, 0x73, 0x3d, 0x63, 0x56, 0xdd, 0xfb,
+	0x65, 0xa1, 0x36, 0x0d, 0xfc, 0xc8, 0xc7, 0x1b, 0x1e, 0xf3, 0xb5, 0x51, 0xa8, 0xcd, 0x6a, 0x9a,
-	0x27, 0xe0, 0xc3, 0xf0, 0x51, 0xb0, 0xf4, 0x55, 0x07, 0x20, 0x66, 0xad, 0x43, 0xb9, 0xeb, 0x07,
+	0xed, 0xb8, 0xbb, 0x2f, 0x66, 0xb5, 0x6a, 0xc0, 0x46, 0x61, 0x12, 0x53, 0xbe, 0x57, 0x01, 0x88,
-	0x03, 0xfc, 0x0e, 0xd2, 0xfe, 0x94, 0x07, 0x2c, 0x1a, 0xf9, 0x93, 0xbc, 0x52, 0x54, 0xca, 0xb9,
+	0x5e, 0xef, 0x50, 0xe6, 0xf8, 0xc1, 0x10, 0xeb, 0x90, 0xf5, 0xa7, 0x2c, 0xb0, 0xa3, 0xb1, 0xef,
-	0xea, 0xff, 0x86, 0xe4, 0x1b, 0x2b, 0x98, 0xd1, 0x5d, 0x62, 0x68, 0xfa, 0xc1, 0xc4, 0x87, 0xa0,
+	0x15, 0xa4, 0x92, 0x54, 0xd9, 0xac, 0xbd, 0xd1, 0xfe, 0x09, 0xa3, 0xad, 0xd0, 0x5a, 0x6f, 0x09,
-	0x33, 0x37, 0x26, 0xaa, 0x31, 0x71, 0xf7, 0x09, 0xa2, 0x19, 0x03, 0xa8, 0x2e, 0x4f, 0x7c, 0x04,
+	0xa5, 0xd9, 0x07, 0x13, 0x7f, 0x02, 0xd5, 0x76, 0x62, 0xbe, 0x1c, 0xf3, 0x4b, 0x4f, 0xf3, 0xf5,
-	0xc9, 0xe1, 0xc8, 0x8b, 0x78, 0x10, 0xe6, 0x13, 0xc5, 0x44, 0x39, 0x53, 0x7d, 0xf1, 0x04, 0xa7,
+	0x18, 0x47, 0x55, 0x71, 0xe2, 0x43, 0x48, 0x8f, 0xc6, 0x6e, 0xc4, 0x82, 0xb0, 0x90, 0x2a, 0xa5,
-	0x11, 0x23, 0xda, 0x93, 0xa1, 0x4f, 0x93, 0xd2, 0x0e, 0x05, 0x31, 0x62, 0xc1, 0x0d, 0x8f, 0xc2,
+	0x2a, 0xb9, 0xda, 0xdb, 0xa7, 0xa9, 0xc7, 0x31, 0xb0, 0xed, 0x8d, 0x7c, 0x9a, 0x16, 0x76, 0xc8,
-	0xbc, 0xf6, 0x57, 0xa2, 0x13, 0x23, 0x24, 0x51, 0xda, 0xe1, 0xde, 0x77, 0x15, 0x60, 0x75, 0x21,
+	0xf9, 0x91, 0x1d, 0x5c, 0xb3, 0x28, 0x2c, 0x28, 0xff, 0xe3, 0x5b, 0x31, 0x50, 0xf0, 0x85, 0x1d,
-	0x7e, 0x0f, 0xfa, 0x2d, 0x67, 0x03, 0x1e, 0x2c, 0xc4, 0xee, 0x3f, 0x9b, 0xdf, 0x68, 0xc5, 0x58,
+	0xee, 0xfe, 0x96, 0x01, 0x56, 0x71, 0x71, 0x13, 0xd4, 0x1b, 0x66, 0x0f, 0x59, 0xb0, 0x10, 0x62,
-	0x0a, 0xf2, 0x74, 0xe6, 0x53, 0x8e, 0x1b, 0x00, 0x63, 0x16, 0xb9, 0xb7, 0x7d, 0xd1, 0xd5, 0x85,
+	0xef, 0x39, 0xd5, 0x68, 0xad, 0x98, 0x42, 0x41, 0x9c, 0xd6, 0x7c, 0xca, 0x70, 0x17, 0x60, 0x62,
-	0xf2, 0x97, 0xcf, 0xdf, 0x72, 0x26, 0xf0, 0x82, 0x4c, 0xd3, 0x0f, 0x26, 0xde, 0x85, 0x8c, 0xac,
+	0x47, 0xce, 0xcd, 0x80, 0x0b, 0xbf, 0x50, 0x45, 0x7b, 0x56, 0xb0, 0x2e, 0xa7, 0xf1, 0x18, 0x34,
-	0xa4, 0x3f, 0x61, 0x63, 0x9e, 0x4f, 0x14, 0x95, 0x72, 0x9a, 0x6a, 0x16, 0x1b, 0x8b, 0x10, 0x2c,
+	0xfb, 0x60, 0xe2, 0x1d, 0xc8, 0x89, 0xba, 0x06, 0x9e, 0x3d, 0x61, 0x85, 0x54, 0x49, 0xaa, 0x64,
-	0x42, 0x33, 0xe6, 0xe5, 0xb5, 0x38, 0xb2, 0xf9, 0x81, 0x79, 0x77, 0xbc, 0xf4, 0x16, 0x74, 0x59,
+	0xa9, 0x62, 0xd8, 0x13, 0xee, 0x82, 0x85, 0x6b, 0x66, 0xbb, 0x05, 0x25, 0xf6, 0xac, 0x7f, 0xb6,
-	0x0b, 0xc6, 0x90, 0x6b, 0x11, 0xb3, 0x4e, 0x68, 0xbf, 0x67, 0x9d, 0x5a, 0xdd, 0x4b, 0x0b, 0x6d,
+	0xdd, 0x5b, 0x56, 0xfe, 0x00, 0xaa, 0x28, 0x09, 0x63, 0xd8, 0x6c, 0x11, 0xbd, 0x41, 0xe8, 0xa0,
-	0xe0, 0x0c, 0x24, 0x29, 0xb9, 0xe8, 0x11, 0xdb, 0x41, 0x0a, 0x06, 0xd0, 0xbb, 0xc7, 0x27, 0xa4,
+	0x6f, 0x9c, 0x1a, 0xbd, 0x0b, 0x03, 0xad, 0xe1, 0x1c, 0xa4, 0x29, 0x39, 0xef, 0x13, 0xd3, 0x42,
-	0xe6, 0x20, 0xb5, 0xd4, 0x80, 0xb5, 0xcc, 0xdb, 0xb0, 0x75, 0x66, 0x3a, 0xb5, 0xd6, 0x1a, 0x11,
+	0x12, 0x06, 0x50, 0x7b, 0x47, 0x27, 0xa4, 0x6e, 0x21, 0xb9, 0x7c, 0x0c, 0x89, 0xcc, 0x5b, 0xb0,
-	0x41, 0xd6, 0x76, 0x68, 0xdb, 0x6a, 0xf6, 0xc9, 0x45, 0xcf, 0xec, 0x20, 0x05, 0xef, 0x00, 0x5a,
+	0xd1, 0xd5, 0xad, 0x7a, 0x2b, 0x41, 0x44, 0x90, 0x37, 0x2d, 0xda, 0x36, 0x9a, 0x03, 0x72, 0xde,
-	0x78, 0xac, 0xae, 0xb3, 0xf0, 0xaa, 0x7b, 0x27, 0x00, 0xab, 0x26, 0xe3, 0x7d, 0xd0, 0xe5, 0x50,
+	0xd7, 0x3b, 0x48, 0xc2, 0x2f, 0x01, 0x2d, 0x6e, 0x8c, 0x9e, 0xb5, 0xb8, 0x95, 0x77, 0xcf, 0x01,
-	0x16, 0xcd, 0xcc, 0x2d, 0xdb, 0x20, 0x31, 0x54, 0xa3, 0xbe, 0xc7, 0xf1, 0x7f, 0x90, 0xfa, 0xc4,
+	0x56, 0x92, 0xe3, 0x3d, 0x50, 0xc5, 0xa4, 0x16, 0xd2, 0x6e, 0x3f, 0x52, 0x43, 0x40, 0xa9, 0x42,
-	0xe7, 0x7d, 0x6f, 0x14, 0x46, 0x79, 0xb5, 0x98, 0x28, 0x67, 0xa9, 0x76, 0xca, 0xe7, 0x61, 0x69,
+	0x7d, 0x97, 0xe1, 0x57, 0x90, 0xf9, 0xca, 0xe6, 0x03, 0x77, 0x1c, 0x46, 0x05, 0xb9, 0x94, 0xaa,
-	0x06, 0x6b, 0xbb, 0xf4, 0x2f, 0x6c, 0x77, 0xcf, 0x09, 0x35, 0x9d, 0x76, 0xd7, 0x5a, 0xab, 0x2b,
+	0xe4, 0xa9, 0x72, 0xca, 0xe6, 0x61, 0x79, 0x06, 0x89, 0xad, 0xdb, 0x86, 0xad, 0xde, 0x19, 0xa1,
-	0x09, 0x89, 0x26, 0x11, 0x62, 0x52, 0xa0, 0x09, 0xb5, 0x48, 0x15, 0xae, 0xf3, 0x9e, 0x83, 0x12,
+	0xba, 0xd5, 0xee, 0x19, 0x89, 0xf2, 0xd2, 0x90, 0x6a, 0x12, 0xde, 0x53, 0x06, 0x14, 0xde, 0x34,
-	0x42, 0x5f, 0x9d, 0x74, 0x88, 0x43, 0x90, 0x26, 0x6c, 0x9b, 0x98, 0xb4, 0xd6, 0x42, 0x9b, 0x38,
+	0x92, 0xf9, 0xd5, 0x59, 0xdf, 0x42, 0x29, 0xde, 0x66, 0x83, 0x74, 0x88, 0x45, 0x90, 0xc2, 0x6d,
-	0x0b, 0xa9, 0x26, 0x71, 0xa8, 0x69, 0x35, 0x09, 0xd2, 0x85, 0xb2, 0xe5, 0x57, 0xcb, 0xb4, 0x5b,
+	0x93, 0xe8, 0xb4, 0xde, 0x42, 0xeb, 0x38, 0x0f, 0x99, 0x26, 0xb1, 0xa8, 0x6e, 0x34, 0x09, 0x52,
-	0x28, 0x59, 0x3a, 0x84, 0xe5, 0x36, 0x62, 0xc8, 0x99, 0xb5, 0x47, 0x19, 0xd3, 0xb0, 0x69, 0x76,
+	0x79, 0x83, 0xcb, 0xaf, 0x96, 0x6e, 0xb6, 0x50, 0xba, 0xfc, 0x1e, 0x96, 0x0b, 0x8b, 0x61, 0x53,
-	0x3a, 0xdd, 0x4b, 0x99, 0xb3, 0x4e, 0xac, 0x2b, 0xa4, 0x96, 0x02, 0x48, 0x8b, 0xc9, 0x3a, 0xec,
+	0xaf, 0x3f, 0xca, 0x98, 0x85, 0x75, 0xbd, 0xd3, 0xe9, 0x5d, 0x88, 0x9c, 0x0d, 0x62, 0x5c, 0x22,
-	0xda, 0xe3, 0xf8, 0x08, 0xb2, 0xae, 0x3f, 0x89, 0xd8, 0x68, 0xc2, 0x83, 0xfe, 0x68, 0x10, 0x6b,
+	0xb9, 0xfc, 0x4d, 0x82, 0x2c, 0x9f, 0xb0, 0x65, 0x5f, 0xb9, 0x0c, 0x1f, 0x42, 0xde, 0xf1, 0xbd,
-	0xcf, 0x54, 0x77, 0x0c, 0xf1, 0xb7, 0x09, 0xf1, 0xb5, 0x65, 0xb0, 0x5d, 0xa7, 0x99, 0xb5, 0x0f,
+	0xc8, 0x1e, 0x7b, 0x2c, 0x18, 0x8c, 0x87, 0xb1, 0x06, 0xb9, 0xda, 0xeb, 0x84, 0x06, 0xfc, 0x37,
-	0xfc, 0x1a, 0x92, 0x41, 0xbc, 0x1b, 0x61, 0xdc, 0x87, 0x4c, 0x15, 0xff, 0xb9, 0x36, 0x34, 0x29,
+	0xd5, 0xea, 0x4b, 0x4c, 0xbb, 0x41, 0x73, 0x89, 0x0f, 0x7c, 0x00, 0xe9, 0x20, 0x5e, 0x95, 0x30,
-	0xcf, 0xf0, 0xd5, 0x11, 0xe8, 0xb2, 0x8d, 0x62, 0xaa, 0xab, 0xfa, 0x52, 0xa0, 0xf5, 0x6c, 0x42,
+	0xd6, 0x23, 0x57, 0xdb, 0x79, 0x72, 0x99, 0x68, 0x5a, 0x9c, 0xe1, 0xbb, 0x8f, 0xa0, 0x0a, 0x55,
-	0xe5, 0x7c, 0xed, 0x2b, 0xdb, 0x21, 0x67, 0x48, 0x8d, 0x67, 0xed, 0xb4, 0x08, 0xb5, 0x51, 0xe2,
+	0xf9, 0xac, 0x57, 0xe5, 0x66, 0x40, 0xe9, 0x9b, 0x84, 0x8a, 0xa9, 0x9b, 0x97, 0xa6, 0x45, 0xba,
-	0xf8, 0xe4, 0xdb, 0x7d, 0x41, 0xf9, 0x71, 0x5f, 0x50, 0x7e, 0xde, 0x17, 0x94, 0xcf, 0xbf, 0x0a,
+	0x48, 0x8e, 0x37, 0xc0, 0x6a, 0x11, 0x6a, 0xa2, 0xd4, 0xd1, 0xc9, 0xcf, 0xbb, 0xa2, 0xf4, 0xeb,
-	0x1b, 0x1f, 0xcb, 0x37, 0xa3, 0xe8, 0xf6, 0xee, 0xda, 0x70, 0xfd, 0x71, 0x65, 0x12, 0x4e, 0x5d,
+	0xae, 0x28, 0xfd, 0xb9, 0x2b, 0x4a, 0xdf, 0xef, 0x8b, 0x6b, 0x5f, 0x2a, 0xd7, 0xe3, 0xe8, 0xe6,
-	0xf7, 0x60, 0xc0, 0x67, 0x95, 0x09, 0xf7, 0x87, 0xe1, 0x01, 0x9b, 0x8e, 0x0e, 0x6e, 0xfc, 0x8a,
+	0xf6, 0x4a, 0x73, 0xfc, 0x49, 0xd5, 0x0b, 0xa7, 0x8e, 0xb3, 0x3f, 0x64, 0xb3, 0xaa, 0xc7, 0xfc,
-	0x7c, 0x46, 0xbe, 0xa8, 0x5b, 0x16, 0xf7, 0x1b, 0xb6, 0x61, 0x9e, 0xb7, 0x0d, 0xd3, 0xf5, 0xae,
+	0x51, 0xb8, 0x6f, 0x4f, 0xc7, 0xfb, 0xd7, 0x7e, 0x55, 0xbc, 0x46, 0x3f, 0xe4, 0x0d, 0x83, 0xf9,
-	0xf5, 0xf8, 0xd1, 0x78, 0xf3, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xc3, 0x1e, 0x3c, 0xb6, 0x67, 0x04,
+	0xc7, 0xa6, 0xa6, 0x9f, 0xb5, 0x35, 0xdd, 0x71, 0xaf, 0xd4, 0xf8, 0xd1, 0x39, 0xf8, 0x1b, 0x00,
-	0x00, 0x00,
+	0x00, 0xff, 0xff, 0x60, 0xb0, 0x68, 0x1a, 0xae, 0x04, 0x00, 0x00,
 }
 
 func (m *EACLRecord) Marshal() (dAtA []byte, err error) {
@@ -1327,7 +1327,7 @@ func (m *EACLTable) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.ContainerId == nil {
-				m.ContainerId = &v2.ContainerID{}
+				m.ContainerId = &refs.ContainerID{}
 			}
 			if err := m.ContainerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err

v2/acl/types.proto

@@ -1,18 +1,18 @@
 syntax = "proto3";
 
-package acl.v2;
+package neo.fs.v2.acl;
 
-option go_package = "github.com/nspcc-dev/neofs-api-go/acl/v2";
+option go_package = "github.com/nspcc-dev/neofs-api-go/v2/acl";
 option csharp_namespace = "NeoFS.API.Acl";
 
-import "refs/v2/types.proto";
+import "v2/refs/types.proto";
 
 // Target of the access control rule in access control list.
 enum Target {
   // Unknown target, default value.
   UNKNOWN = 0;
 
-  // User target rule is applied if sender is the owner of the container.v2.
+  // User target rule is applied if sender is the owner of the container.
   USER = 1;
 
   // System target rule is applied if sender is the storage node within the
@@ -85,7 +85,7 @@ message EACLRecord {
   // TargetInfo groups information about extended ACL target.
   message TargetInfo {
     // target carries target of ACL rule.
-    acl.v2.Target target = 1 [json_name="Role"];
+    Target target = 1 [json_name="Role"];
 
     // key_list carries public keys of ACL target.
     repeated bytes key_list = 2 [json_name="Keys"];
@@ -99,7 +99,7 @@ message EACLRecord {
 message EACLTable {
   // Carries identifier of the container that should use given
   // access control rules.
-  refs.v2.ContainerID container_id = 1 [json_name="ContainerID"];
+  neo.fs.v2.refs.ContainerID container_id = 1 [json_name="ContainerID"];
 
   // Records carries list of extended ACL rule records.
   repeated EACLRecord records = 2 [json_name="Records"];

v2/container/marshal.go

@@ -1,4 +1,4 @@
-package v2
+package container
 
 import (
 	"encoding/binary"

v2/container/marshal_test.go

@@ -1,10 +1,10 @@
-package v2
+package container
 
 import (
 	"testing"
 
-	netmap "github.com/nspcc-dev/neofs-api-go/netmap/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/netmap"
-	refs "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/refs"
 	"github.com/stretchr/testify/require"
 )
 

v2/container/service.go

@@ -1,9 +1,9 @@
-package v2
+package container
 
 import (
-	acl "github.com/nspcc-dev/neofs-api-go/acl/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/acl"
-	refs "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/refs"
-	service "github.com/nspcc-dev/neofs-api-go/service/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/service"
 )
 
 // SetContainer sets container of the request.

v2/container/service.proto

@@ -1,15 +1,15 @@
 syntax = "proto3";
 
-package container.v2;
+package neo.fs.v2.container;
 
-option go_package = "github.com/nspcc-dev/neofs-api-go/container/v2";
+option go_package = "github.com/nspcc-dev/neofs-api-go/v2/container";
 option csharp_namespace = "NeoFS.API.Container";
 
-import "acl/v2/types.proto";
+import "v2/acl/types.proto";
-import "container/v2/types.proto";
+import "v2/container/types.proto";
-import "refs/v2/types.proto";
+import "v2/refs/types.proto";
-import "service/v2/meta.proto";
+import "v2/service/meta.proto";
-import "service/v2/verify.proto";
+import "v2/service/verify.proto";
 
 // Service provides API to access container smart-contract in morph chain
 // via NeoFS node.
@@ -46,7 +46,7 @@ service Service {
 message PutRequest {
   message Body {
     // Container to create in NeoFS.
-    container.v2.Container container = 1;
+    neo.fs.v2.container.Container container = 1;
 
     // Public Key of container owner. It can be public key of the owner
     // or it can be public key that bound in neofs.id smart-contract.
@@ -61,18 +61,18 @@ message PutRequest {
 
   // Carries request meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.RequestMetaHeader meta_header = 2;
+  neo.fs.v2.service.RequestMetaHeader meta_header = 2;
 
   // Carries request verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.RequestVerificationHeader verify_header = 3;
+  neo.fs.v2.service.RequestVerificationHeader verify_header = 3;
 }
 
 message PutResponse {
   message Body {
-    // container_id carries identifier of the new container.v2.
+    // container_id carries identifier of the new container.
-    refs.v2.ContainerID container_id = 1;
+    neo.fs.v2.refs.ContainerID container_id = 1;
   }
 
   // Body of container put response message.
@@ -80,19 +80,19 @@ message PutResponse {
 
   // Carries response meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.ResponseMetaHeader meta_header = 2;
+  neo.fs.v2.service.ResponseMetaHeader meta_header = 2;
 
   // Carries response verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.ResponseVerificationHeader verify_header = 3;
+  neo.fs.v2.service.ResponseVerificationHeader verify_header = 3;
 }
 
 message DeleteRequest {
   message Body {
     // container_id carries identifier of the container to delete
     // from NeoFS.
-    refs.v2.ContainerID container_id = 1;
+    neo.fs.v2.refs.ContainerID container_id = 1;
 
     // Signature of container id according to RFC-6979.
     bytes signature = 2;
@@ -103,12 +103,12 @@ message DeleteRequest {
 
   // Carries request meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.RequestMetaHeader meta_header = 2;
+  neo.fs.v2.service.RequestMetaHeader meta_header = 2;
 
   // Carries request verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.RequestVerificationHeader verify_header = 3;
+  neo.fs.v2.service.RequestVerificationHeader verify_header = 3;
 }
 
 // DeleteResponse is empty because delete operation is asynchronous and done
@@ -121,18 +121,18 @@ message DeleteResponse {
 
   // Carries response meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.ResponseMetaHeader meta_header = 2;
+  neo.fs.v2.service.ResponseMetaHeader meta_header = 2;
 
   // Carries response verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.ResponseVerificationHeader verify_header = 3;
+  neo.fs.v2.service.ResponseVerificationHeader verify_header = 3;
 }
 
 message GetRequest {
   message Body {
     // container_id carries identifier of the container to get.
-    refs.v2.ContainerID container_id = 1;
+    neo.fs.v2.refs.ContainerID container_id = 1;
   }
 
   // Body of container get request message.
@@ -140,18 +140,18 @@ message GetRequest {
 
   // Carries request meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.RequestMetaHeader meta_header = 2;
+  neo.fs.v2.service.RequestMetaHeader meta_header = 2;
 
   // Carries request verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.RequestVerificationHeader verify_header = 3;
+  neo.fs.v2.service.RequestVerificationHeader verify_header = 3;
 }
 
 message GetResponse {
   message Body {
     // Container that has been requested.
-    container.v2.Container container = 1;
+    neo.fs.v2.container.Container container = 1;
   }
 
   // Body of container get response message.
@@ -159,18 +159,18 @@ message GetResponse {
 
   // Carries response meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.ResponseMetaHeader meta_header = 2;
+  neo.fs.v2.service.ResponseMetaHeader meta_header = 2;
 
   // Carries response verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.ResponseVerificationHeader verify_header = 3;
+  neo.fs.v2.service.ResponseVerificationHeader verify_header = 3;
 }
 
 message ListRequest {
   message Body {
     // owner_id carries identifier of the container owner.
-    refs.v2.OwnerID owner_id = 1;
+    neo.fs.v2.refs.OwnerID owner_id = 1;
   }
 
   // Body of list containers request message.
@@ -178,18 +178,18 @@ message ListRequest {
 
   // Carries request meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.RequestMetaHeader meta_header = 2;
+  neo.fs.v2.service.RequestMetaHeader meta_header = 2;
 
   // Carries request verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.RequestVerificationHeader verify_header = 3;
+  neo.fs.v2.service.RequestVerificationHeader verify_header = 3;
 }
 
 message ListResponse {
   message Body {
     // ContainerIDs carries list of identifiers of the containers that belong to the owner.
-    repeated refs.v2.ContainerID container_ids = 1;
+    repeated refs.ContainerID container_ids = 1;
   }
 
   // Body of list containers response message.
@@ -197,18 +197,18 @@ message ListResponse {
 
   // Carries response meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.ResponseMetaHeader meta_header = 2;
+  neo.fs.v2.service.ResponseMetaHeader meta_header = 2;
 
   // Carries response verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.ResponseVerificationHeader verify_header = 3;
+  neo.fs.v2.service.ResponseVerificationHeader verify_header = 3;
 }
 
 message SetExtendedACLRequest {
   message Body {
-    // Extended ACL to set for the container.v2.
+    // Extended ACL to set for the container.
-    acl.v2.EACLTable eacl = 1;
+    neo.fs.v2.acl.EACLTable eacl = 1;
 
     // Signature of stable-marshalled Extended ACL according to RFC-6979.
     bytes signature = 2;
@@ -219,12 +219,12 @@ message SetExtendedACLRequest {
 
   // Carries request meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.RequestMetaHeader meta_header = 2;
+  neo.fs.v2.service.RequestMetaHeader meta_header = 2;
 
   // Carries request verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.RequestVerificationHeader verify_header = 3;
+  neo.fs.v2.service.RequestVerificationHeader verify_header = 3;
 }
 
 message SetExtendedACLResponse {
@@ -235,18 +235,18 @@ message SetExtendedACLResponse {
 
   // Carries response meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.ResponseMetaHeader meta_header = 2;
+  neo.fs.v2.service.ResponseMetaHeader meta_header = 2;
 
   // Carries response verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.ResponseVerificationHeader verify_header = 3;
+  neo.fs.v2.service.ResponseVerificationHeader verify_header = 3;
 }
 
 message GetExtendedACLRequest {
   message Body {
     // container_id carries identifier of the container that has Extended ACL.
-    refs.v2.ContainerID container_id = 1;
+    neo.fs.v2.refs.ContainerID container_id = 1;
   }
 
   // Body of get extended acl request message.
@@ -254,18 +254,18 @@ message GetExtendedACLRequest {
 
   // Carries request meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.RequestMetaHeader meta_header = 2;
+  neo.fs.v2.service.RequestMetaHeader meta_header = 2;
 
   // Carries request verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.RequestVerificationHeader verify_header = 3;
+  neo.fs.v2.service.RequestVerificationHeader verify_header = 3;
 }
 
 message GetExtendedACLResponse {
   message Body {
     // Extended ACL that has been requested if it was set up.
-    acl.v2.EACLTable eacl = 1;
+   neo.fs.v2.acl.EACLTable eacl = 1;
 
     // Signature of stable-marshalled Extended ACL according to RFC-6979.
     bytes signature = 2;
@@ -276,10 +276,10 @@ message GetExtendedACLResponse {
 
   // Carries response meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.ResponseMetaHeader meta_header = 2;
+  neo.fs.v2.service.ResponseMetaHeader meta_header = 2;
 
   // Carries response verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.ResponseVerificationHeader verify_header = 3;
+  neo.fs.v2.service.ResponseVerificationHeader verify_header = 3;
 }

v2/container/signature.go

@@ -1,4 +1,4 @@
-package v2
+package container
 
 func (m *Container) ReadSignedData(buf []byte) ([]byte, error) {
 	return m.StableMarshal(buf)

v2/container/types.go

@@ -1,8 +1,8 @@
-package v2
+package container
 
 import (
-	netmap "github.com/nspcc-dev/neofs-api-go/netmap/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/netmap"
-	refs "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/refs"
 )
 
 // SetKey sets key to the container attribute.

v2/container/types.pb.go

@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: container/v2/types.proto
+// source: v2/container/types.proto
 
-package v2
+package container
 
 import (
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	v21 "github.com/nspcc-dev/neofs-api-go/netmap/v2"
+	netmap "github.com/nspcc-dev/neofs-api-go/v2/netmap"
-	v2 "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	refs "github.com/nspcc-dev/neofs-api-go/v2/refs"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -30,26 +30,26 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 // SHA256 hash of stable-marshalled container message.
 type Container struct {
 	// OwnerID carries identifier of the container owner.
-	OwnerId *v2.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
+	OwnerId *refs.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
 	// Nonce is a 16 byte UUID, used to avoid collisions of container id.
 	Nonce []byte `protobuf:"bytes,2,opt,name=nonce,proto3" json:"nonce,omitempty"`
 	// BasicACL contains access control rules for owner, system, others groups and
 	// permission bits for bearer token and Extended ACL.
 	BasicAcl uint32 `protobuf:"varint,3,opt,name=basic_acl,json=basicAcl,proto3" json:"basic_acl,omitempty"`
-	// Attributes define any immutable characteristics of container.v2.
+	// Attributes define any immutable characteristics of container.
 	Attributes []*Container_Attribute `protobuf:"bytes,4,rep,name=attributes,proto3" json:"attributes,omitempty"`
-	// Rules define storage policy for the object inside the container.v2.
+	// Rules define storage policy for the object inside the container.
-	Rules                *v21.PlacementRule `protobuf:"bytes,5,opt,name=rules,proto3" json:"rules,omitempty"`
+	Rules                *netmap.PlacementRule `protobuf:"bytes,5,opt,name=rules,proto3" json:"rules,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_NoUnkeyedLiteral struct{}              `json:"-"`
-	XXX_unrecognized     []byte             `json:"-"`
+	XXX_unrecognized     []byte                `json:"-"`
-	XXX_sizecache        int32              `json:"-"`
+	XXX_sizecache        int32                 `json:"-"`
 }
 
 func (m *Container) Reset()         { *m = Container{} }
 func (m *Container) String() string { return proto.CompactTextString(m) }
 func (*Container) ProtoMessage()    {}
 func (*Container) Descriptor() ([]byte, []int) {
-	return fileDescriptor_4fee8fa43abbe82f, []int{0}
+	return fileDescriptor_ece71f25e6ae314e, []int{0}
 }
 func (m *Container) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -78,7 +78,7 @@ func (m *Container) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_Container proto.InternalMessageInfo
 
-func (m *Container) GetOwnerId() *v2.OwnerID {
+func (m *Container) GetOwnerId() *refs.OwnerID {
 	if m != nil {
 		return m.OwnerId
 	}
@@ -106,7 +106,7 @@ func (m *Container) GetAttributes() []*Container_Attribute {
 	return nil
 }
 
-func (m *Container) GetRules() *v21.PlacementRule {
+func (m *Container) GetRules() *netmap.PlacementRule {
 	if m != nil {
 		return m.Rules
 	}
@@ -128,7 +128,7 @@ func (m *Container_Attribute) Reset()         { *m = Container_Attribute{} }
 func (m *Container_Attribute) String() string { return proto.CompactTextString(m) }
 func (*Container_Attribute) ProtoMessage()    {}
 func (*Container_Attribute) Descriptor() ([]byte, []int) {
-	return fileDescriptor_4fee8fa43abbe82f, []int{0, 0}
+	return fileDescriptor_ece71f25e6ae314e, []int{0, 0}
 }
 func (m *Container_Attribute) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -172,35 +172,36 @@ func (m *Container_Attribute) GetValue() string {
 }
 
 func init() {
-	proto.RegisterType((*Container)(nil), "container.v2.Container")
+	proto.RegisterType((*Container)(nil), "neo.fs.v2.container.Container")
-	proto.RegisterType((*Container_Attribute)(nil), "container.v2.Container.Attribute")
+	proto.RegisterType((*Container_Attribute)(nil), "neo.fs.v2.container.Container.Attribute")
 }
 
-func init() { proto.RegisterFile("container/v2/types.proto", fileDescriptor_4fee8fa43abbe82f) }
+func init() { proto.RegisterFile("v2/container/types.proto", fileDescriptor_ece71f25e6ae314e) }
 
-var fileDescriptor_4fee8fa43abbe82f = []byte{
+var fileDescriptor_ece71f25e6ae314e = []byte{
-	// 334 bytes of a gzipped FileDescriptorProto
+	// 345 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0xd1, 0x4a, 0xc3, 0x30,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0xd1, 0x4a, 0xc3, 0x30,
-	0x18, 0x85, 0xed, 0xe6, 0x74, 0xcd, 0x26, 0x8c, 0x4c, 0x21, 0x4c, 0x28, 0xd5, 0xab, 0x82, 0x2c,
+	0x14, 0x86, 0xed, 0xe6, 0x74, 0xcd, 0x14, 0xa4, 0x53, 0x2c, 0x13, 0x6a, 0xf1, 0xaa, 0x37, 0x4b,
-	0x85, 0xee, 0x09, 0xaa, 0x22, 0xec, 0x46, 0x47, 0x04, 0x2f, 0xbc, 0x19, 0x69, 0xf6, 0x6f, 0x16,
+	0x20, 0xc3, 0x07, 0x98, 0x8a, 0xb8, 0x1b, 0x1d, 0x11, 0xbc, 0xf0, 0x66, 0xa4, 0xd9, 0xd9, 0x2c,
-	0xbb, 0xa4, 0x34, 0x69, 0x65, 0xcf, 0xe1, 0x8d, 0xcf, 0xe0, 0x93, 0x78, 0xe9, 0x23, 0xc8, 0x7c,
+	0x76, 0x49, 0x69, 0xd2, 0xca, 0xde, 0xc4, 0x47, 0x10, 0x9f, 0xc4, 0x4b, 0x1f, 0x41, 0xe6, 0x8b,
-	0x11, 0x69, 0xcb, 0xe6, 0xd8, 0x5d, 0xfe, 0xff, 0x9c, 0x13, 0xce, 0x97, 0x20, 0x22, 0x94, 0x34,
+	0x48, 0x5b, 0xb6, 0xf5, 0xc2, 0xbb, 0x9c, 0x93, 0xff, 0x3f, 0x39, 0x5f, 0x7e, 0xe4, 0xe6, 0x94,
-	0x3c, 0x96, 0x90, 0xf9, 0x45, 0xe0, 0x9b, 0x55, 0x0a, 0x9a, 0xa6, 0x99, 0x32, 0x0a, 0x77, 0xb7,
+	0x08, 0x25, 0x0d, 0x8f, 0x24, 0xa4, 0xc4, 0x2c, 0x13, 0xd0, 0x38, 0x49, 0x95, 0x51, 0x4e, 0x57,
-	0x0a, 0x2d, 0x82, 0xc1, 0x99, 0x04, 0xb3, 0xe4, 0xe9, 0x9e, 0x69, 0xd0, 0xcf, 0x60, 0xae, 0xf7,
+	0x82, 0xc2, 0x33, 0x8d, 0x73, 0x8a, 0x37, 0x82, 0xde, 0x49, 0x4e, 0x89, 0x04, 0xb3, 0xe0, 0x49,
-	0x96, 0x97, 0xef, 0x0d, 0x64, 0xdf, 0x6c, 0xc2, 0xf8, 0x0a, 0xb5, 0xd5, 0x9b, 0x84, 0x6c, 0x1a,
+	0x5d, 0xdb, 0xeb, 0xe6, 0x94, 0xa4, 0x30, 0xd3, 0xf5, 0xe6, 0xc5, 0x47, 0x03, 0xd9, 0xd7, 0x6b,
-	0xcf, 0x88, 0xe5, 0x5a, 0x5e, 0x27, 0xe8, 0xd1, 0x32, 0x45, 0x8b, 0x80, 0x3e, 0x94, 0xc2, 0xf8,
+	0xa7, 0x43, 0x51, 0x5b, 0xbd, 0x49, 0x48, 0x27, 0xd1, 0xd4, 0xb5, 0x7c, 0x2b, 0xe8, 0xd0, 0x53,
-	0x96, 0x1d, 0x57, 0x8e, 0xf1, 0x0c, 0x9f, 0xa2, 0x96, 0x54, 0x52, 0x00, 0x69, 0xb8, 0x96, 0xd7,
+	0xbc, 0x7d, 0xa1, 0x30, 0xe3, 0x87, 0xe2, 0x7e, 0x74, 0xc3, 0xf6, 0x4b, 0xe1, 0x68, 0xea, 0x1c,
-	0x65, 0xf5, 0x80, 0xcf, 0x91, 0x1d, 0x71, 0x1d, 0x8b, 0x29, 0x17, 0x09, 0x69, 0xba, 0x96, 0x77,
+	0xa3, 0x96, 0x54, 0x52, 0x80, 0xdb, 0xf0, 0xad, 0xe0, 0x80, 0x55, 0x85, 0x73, 0x86, 0xec, 0x90,
-	0xc2, 0xda, 0xd5, 0x22, 0x14, 0x09, 0x0e, 0x11, 0xe2, 0xc6, 0x64, 0x71, 0x94, 0x1b, 0xd0, 0xe4,
+	0xeb, 0x48, 0x4c, 0xb8, 0x88, 0xdd, 0xa6, 0x6f, 0x05, 0x87, 0xac, 0x5d, 0x36, 0x86, 0x22, 0x76,
-	0xd0, 0x6d, 0x7a, 0x9d, 0xe0, 0x82, 0xee, 0x96, 0xa7, 0xdb, 0x32, 0x34, 0xdc, 0x38, 0xd9, 0x4e,
+	0xee, 0x10, 0xe2, 0xc6, 0xa4, 0x51, 0x98, 0x19, 0xd0, 0xee, 0xae, 0xdf, 0x0c, 0x3a, 0x34, 0xc0,
-	0x08, 0x53, 0xd4, 0xca, 0xf2, 0x04, 0x34, 0x69, 0x55, 0xfd, 0x08, 0xad, 0x61, 0xcb, 0xe8, 0x24,
+	0xff, 0xa0, 0xe0, 0xcd, 0x6a, 0x78, 0xb8, 0x36, 0xb0, 0x9a, 0xd7, 0xb9, 0x44, 0xad, 0x34, 0x8b,
-	0xe1, 0x02, 0x96, 0x20, 0x0d, 0xcb, 0x13, 0x60, 0xb5, 0x6d, 0x30, 0x42, 0xf6, 0xf6, 0x22, 0xdc,
+	0x41, 0xbb, 0xad, 0x72, 0xdb, 0xf3, 0xda, 0x90, 0xea, 0x07, 0xf0, 0x38, 0xe6, 0x02, 0x16, 0x20,
-	0x43, 0xcd, 0x57, 0x58, 0x55, 0x68, 0x36, 0x2b, 0x8f, 0x25, 0x44, 0xc1, 0x93, 0xbc, 0x86, 0xb0,
+	0x0d, 0xcb, 0x62, 0x60, 0x95, 0xba, 0x37, 0x40, 0xf6, 0x66, 0x9e, 0x73, 0x84, 0x9a, 0xaf, 0xb0,
-	0x59, 0x3d, 0x5c, 0x3f, 0x7d, 0xad, 0x1d, 0xeb, 0x7b, 0xed, 0x58, 0x3f, 0x6b, 0xc7, 0xfa, 0xf8,
+	0x2c, 0x79, 0x6d, 0x56, 0x1c, 0x0b, 0xa4, 0x9c, 0xc7, 0x59, 0x85, 0x64, 0xb3, 0xaa, 0xb8, 0x7a,
-	0x75, 0x0e, 0x9e, 0xe9, 0x22, 0x36, 0x2f, 0x79, 0x44, 0x85, 0x5a, 0xfa, 0x52, 0xa7, 0x42, 0x0c,
+	0xfa, 0x5a, 0x79, 0xd6, 0xf7, 0xca, 0xb3, 0x7e, 0x56, 0x9e, 0xf5, 0xfe, 0xeb, 0xed, 0x3c, 0xe3,
-	0x67, 0x50, 0xf8, 0x12, 0xd4, 0x5c, 0x0f, 0x79, 0x1a, 0x0f, 0x17, 0xca, 0xdf, 0xfd, 0x9d, 0xcf,
+	0x79, 0x64, 0x5e, 0xb2, 0x10, 0x0b, 0xb5, 0x20, 0x52, 0x27, 0x42, 0xf4, 0xa7, 0x90, 0x13, 0x09,
-	0x46, 0xff, 0x1e, 0xd4, 0xdd, 0x23, 0x0d, 0x27, 0xe3, 0x7f, 0xa4, 0xe8, 0xa8, 0x7a, 0xf4, 0xd1,
+	0x6a, 0xa6, 0xfb, 0x3c, 0x89, 0xfa, 0x73, 0x45, 0xea, 0xc9, 0x7d, 0x36, 0xba, 0xf7, 0xa0, 0x6e,
-	0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x16, 0x73, 0x26, 0x7e, 0xca, 0x01, 0x00, 0x00,
+	0x1f, 0xf1, 0x70, 0x3c, 0xda, 0x92, 0x85, 0x7b, 0x65, 0x12, 0x83, 0xbf, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0xde, 0x82, 0x60, 0x33, 0xe6, 0x01, 0x00, 0x00,
 }
 
 func (m *Container) Marshal() (dAtA []byte, err error) {
@@ -450,7 +451,7 @@ func (m *Container) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.OwnerId == nil {
-				m.OwnerId = &v2.OwnerID{}
+				m.OwnerId = &refs.OwnerID{}
 			}
 			if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -573,7 +574,7 @@ func (m *Container) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.Rules == nil {
-				m.Rules = &v21.PlacementRule{}
+				m.Rules = &netmap.PlacementRule{}
 			}
 			if err := m.Rules.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err

v2/container/types.proto

@@ -1,12 +1,12 @@
 syntax = "proto3";
 
-package container.v2;
+package neo.fs.v2.container;
 
-option go_package = "github.com/nspcc-dev/neofs-api-go/container/v2";
+option go_package = "github.com/nspcc-dev/neofs-api-go/v2/container";
 option csharp_namespace = "NeoFS.API.Container";
 
-import "netmap/v2/types.proto";
+import "v2/netmap/types.proto";
-import "refs/v2/types.proto";
+import "v2/refs/types.proto";
 
 // Container is a structure that defines object placement behaviour. Objects
 // can be stored only within containers. They define placement rule, attributes
@@ -14,7 +14,7 @@ import "refs/v2/types.proto";
 // SHA256 hash of stable-marshalled container message.
 message Container {
   // OwnerID carries identifier of the container owner.
-  refs.v2.OwnerID owner_id = 1;
+  neo.fs.v2.refs.OwnerID owner_id = 1;
 
   // Nonce is a 16 byte UUID, used to avoid collisions of container id.
   bytes nonce = 2;
@@ -32,9 +32,9 @@ message Container {
     string value = 2;
   }
 
-  // Attributes define any immutable characteristics of container.v2.
+  // Attributes define any immutable characteristics of container.
   repeated Attribute attributes = 4;
 
-  // Rules define storage policy for the object inside the container.v2.
+  // Rules define storage policy for the object inside the container.
-  netmap.v2.PlacementRule rules = 5;
+  neo.fs.v2.netmap.PlacementRule rules = 5;
 }

v2/netmap/marshal.go

@@ -1,4 +1,4 @@
-package v2
+package netmap
 
 import (
 	"encoding/binary"

v2/netmap/types.go

@@ -1,4 +1,4 @@
-package v2
+package netmap
 
 // SetOp sets operation of the simple filter.
 func (m *PlacementRule_SFGroup_Filter_SimpleFilter) SetOp(v PlacementRule_SFGroup_Filter_SimpleFilter_Operation) {

v2/netmap/types.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: netmap/v2/types.proto
+// source: v2/netmap/types.proto
 
-package v2
+package netmap
 
 import (
 	fmt "fmt"
@@ -65,7 +65,7 @@ func (x PlacementRule_SFGroup_Filter_SimpleFilter_Operation) String() string {
 }
 
 func (PlacementRule_SFGroup_Filter_SimpleFilter_Operation) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_059adda2b6daaf64, []int{0, 0, 0, 1, 0}
+	return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 0, 1, 0}
 }
 
 // Represents the enumeration of various states of the NeoFS node.
@@ -97,7 +97,7 @@ func (x NodeInfo_State) String() string {
 }
 
 func (NodeInfo_State) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_059adda2b6daaf64, []int{1, 0}
+	return fileDescriptor_1207dc80bd67ddec, []int{1, 0}
 }
 
 type PlacementRule struct {
@@ -112,7 +112,7 @@ func (m *PlacementRule) Reset()         { *m = PlacementRule{} }
 func (m *PlacementRule) String() string { return proto.CompactTextString(m) }
 func (*PlacementRule) ProtoMessage()    {}
 func (*PlacementRule) Descriptor() ([]byte, []int) {
-	return fileDescriptor_059adda2b6daaf64, []int{0}
+	return fileDescriptor_1207dc80bd67ddec, []int{0}
 }
 func (m *PlacementRule) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -168,7 +168,7 @@ func (m *PlacementRule_SFGroup) Reset()         { *m = PlacementRule_SFGroup{} }
 func (m *PlacementRule_SFGroup) String() string { return proto.CompactTextString(m) }
 func (*PlacementRule_SFGroup) ProtoMessage()    {}
 func (*PlacementRule_SFGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_059adda2b6daaf64, []int{0, 0}
+	return fileDescriptor_1207dc80bd67ddec, []int{0, 0}
 }
 func (m *PlacementRule_SFGroup) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -230,7 +230,7 @@ func (m *PlacementRule_SFGroup_Filter) Reset()         { *m = PlacementRule_SFGr
 func (m *PlacementRule_SFGroup_Filter) String() string { return proto.CompactTextString(m) }
 func (*PlacementRule_SFGroup_Filter) ProtoMessage()    {}
 func (*PlacementRule_SFGroup_Filter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_059adda2b6daaf64, []int{0, 0, 0}
+	return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 0}
 }
 func (m *PlacementRule_SFGroup_Filter) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -288,7 +288,7 @@ func (m *PlacementRule_SFGroup_Filter_SimpleFilters) String() string {
 }
 func (*PlacementRule_SFGroup_Filter_SimpleFilters) ProtoMessage() {}
 func (*PlacementRule_SFGroup_Filter_SimpleFilters) Descriptor() ([]byte, []int) {
-	return fileDescriptor_059adda2b6daaf64, []int{0, 0, 0, 0}
+	return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 0, 0}
 }
 func (m *PlacementRule_SFGroup_Filter_SimpleFilters) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -325,7 +325,7 @@ func (m *PlacementRule_SFGroup_Filter_SimpleFilters) GetFilters() []*PlacementRu
 }
 
 type PlacementRule_SFGroup_Filter_SimpleFilter struct {
-	Op PlacementRule_SFGroup_Filter_SimpleFilter_Operation `protobuf:"varint,1,opt,name=op,proto3,enum=netmap.v2.PlacementRule_SFGroup_Filter_SimpleFilter_Operation" json:"op,omitempty"`
+	Op PlacementRule_SFGroup_Filter_SimpleFilter_Operation `protobuf:"varint,1,opt,name=op,proto3,enum=neo.fs.v2.netmap.PlacementRule_SFGroup_Filter_SimpleFilter_Operation" json:"op,omitempty"`
 	// Types that are valid to be assigned to Args:
 	//	*PlacementRule_SFGroup_Filter_SimpleFilter_Value
 	//	*PlacementRule_SFGroup_Filter_SimpleFilter_FArgs
@@ -343,7 +343,7 @@ func (m *PlacementRule_SFGroup_Filter_SimpleFilter) String() string {
 }
 func (*PlacementRule_SFGroup_Filter_SimpleFilter) ProtoMessage() {}
 func (*PlacementRule_SFGroup_Filter_SimpleFilter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_059adda2b6daaf64, []int{0, 0, 0, 1}
+	return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 0, 1}
 }
 func (m *PlacementRule_SFGroup_Filter_SimpleFilter) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -438,7 +438,7 @@ func (m *PlacementRule_SFGroup_Selector) Reset()         { *m = PlacementRule_SF
 func (m *PlacementRule_SFGroup_Selector) String() string { return proto.CompactTextString(m) }
 func (*PlacementRule_SFGroup_Selector) ProtoMessage()    {}
 func (*PlacementRule_SFGroup_Selector) Descriptor() ([]byte, []int) {
-	return fileDescriptor_059adda2b6daaf64, []int{0, 0, 1}
+	return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 1}
 }
 func (m *PlacementRule_SFGroup_Selector) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -490,7 +490,7 @@ type NodeInfo struct {
 	// Carries list of the NeoFS node attributes in a string key-value format.
 	Attributes []*NodeInfo_Attribute `protobuf:"bytes,3,rep,name=attributes,proto3" json:"attributes,omitempty"`
 	// Carries state of the NeoFS node.
-	State                NodeInfo_State `protobuf:"varint,4,opt,name=state,proto3,enum=netmap.v2.NodeInfo_State" json:"state,omitempty"`
+	State                NodeInfo_State `protobuf:"varint,4,opt,name=state,proto3,enum=neo.fs.v2.netmap.NodeInfo_State" json:"state,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
 	XXX_unrecognized     []byte         `json:"-"`
 	XXX_sizecache        int32          `json:"-"`
@@ -500,7 +500,7 @@ func (m *NodeInfo) Reset()         { *m = NodeInfo{} }
 func (m *NodeInfo) String() string { return proto.CompactTextString(m) }
 func (*NodeInfo) ProtoMessage()    {}
 func (*NodeInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_059adda2b6daaf64, []int{1}
+	return fileDescriptor_1207dc80bd67ddec, []int{1}
 }
 func (m *NodeInfo) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -572,7 +572,7 @@ func (m *NodeInfo_Attribute) Reset()         { *m = NodeInfo_Attribute{} }
 func (m *NodeInfo_Attribute) String() string { return proto.CompactTextString(m) }
 func (*NodeInfo_Attribute) ProtoMessage()    {}
 func (*NodeInfo_Attribute) Descriptor() ([]byte, []int) {
-	return fileDescriptor_059adda2b6daaf64, []int{1, 0}
+	return fileDescriptor_1207dc80bd67ddec, []int{1, 0}
 }
 func (m *NodeInfo_Attribute) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -616,62 +616,63 @@ func (m *NodeInfo_Attribute) GetValue() string {
 }
 
 func init() {
-	proto.RegisterEnum("netmap.v2.PlacementRule_SFGroup_Filter_SimpleFilter_Operation", PlacementRule_SFGroup_Filter_SimpleFilter_Operation_name, PlacementRule_SFGroup_Filter_SimpleFilter_Operation_value)
+	proto.RegisterEnum("neo.fs.v2.netmap.PlacementRule_SFGroup_Filter_SimpleFilter_Operation", PlacementRule_SFGroup_Filter_SimpleFilter_Operation_name, PlacementRule_SFGroup_Filter_SimpleFilter_Operation_value)
-	proto.RegisterEnum("netmap.v2.NodeInfo_State", NodeInfo_State_name, NodeInfo_State_value)
+	proto.RegisterEnum("neo.fs.v2.netmap.NodeInfo_State", NodeInfo_State_name, NodeInfo_State_value)
-	proto.RegisterType((*PlacementRule)(nil), "netmap.v2.PlacementRule")
+	proto.RegisterType((*PlacementRule)(nil), "neo.fs.v2.netmap.PlacementRule")
-	proto.RegisterType((*PlacementRule_SFGroup)(nil), "netmap.v2.PlacementRule.SFGroup")
+	proto.RegisterType((*PlacementRule_SFGroup)(nil), "neo.fs.v2.netmap.PlacementRule.SFGroup")
-	proto.RegisterType((*PlacementRule_SFGroup_Filter)(nil), "netmap.v2.PlacementRule.SFGroup.Filter")
+	proto.RegisterType((*PlacementRule_SFGroup_Filter)(nil), "neo.fs.v2.netmap.PlacementRule.SFGroup.Filter")
-	proto.RegisterType((*PlacementRule_SFGroup_Filter_SimpleFilters)(nil), "netmap.v2.PlacementRule.SFGroup.Filter.SimpleFilters")
+	proto.RegisterType((*PlacementRule_SFGroup_Filter_SimpleFilters)(nil), "neo.fs.v2.netmap.PlacementRule.SFGroup.Filter.SimpleFilters")
-	proto.RegisterType((*PlacementRule_SFGroup_Filter_SimpleFilter)(nil), "netmap.v2.PlacementRule.SFGroup.Filter.SimpleFilter")
+	proto.RegisterType((*PlacementRule_SFGroup_Filter_SimpleFilter)(nil), "neo.fs.v2.netmap.PlacementRule.SFGroup.Filter.SimpleFilter")
-	proto.RegisterType((*PlacementRule_SFGroup_Selector)(nil), "netmap.v2.PlacementRule.SFGroup.Selector")
+	proto.RegisterType((*PlacementRule_SFGroup_Selector)(nil), "neo.fs.v2.netmap.PlacementRule.SFGroup.Selector")
-	proto.RegisterType((*NodeInfo)(nil), "netmap.v2.NodeInfo")
+	proto.RegisterType((*NodeInfo)(nil), "neo.fs.v2.netmap.NodeInfo")
-	proto.RegisterType((*NodeInfo_Attribute)(nil), "netmap.v2.NodeInfo.Attribute")
+	proto.RegisterType((*NodeInfo_Attribute)(nil), "neo.fs.v2.netmap.NodeInfo.Attribute")
 }
 
-func init() { proto.RegisterFile("netmap/v2/types.proto", fileDescriptor_059adda2b6daaf64) }
+func init() { proto.RegisterFile("v2/netmap/types.proto", fileDescriptor_1207dc80bd67ddec) }
 
-var fileDescriptor_059adda2b6daaf64 = []byte{
+var fileDescriptor_1207dc80bd67ddec = []byte{
-	// 633 bytes of a gzipped FileDescriptorProto
+	// 641 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x41, 0x6b, 0xdb, 0x4a,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xc1, 0x6e, 0xd3, 0x4c,
-	0x10, 0xb6, 0xa4, 0x58, 0xb6, 0xc6, 0xf1, 0x43, 0x2c, 0x79, 0x0f, 0x3d, 0x43, 0xfc, 0x8c, 0x2f,
+	0x10, 0x8e, 0xed, 0xc4, 0x89, 0x27, 0xcd, 0xaf, 0xd5, 0xaa, 0x3f, 0xb2, 0x22, 0x11, 0xa2, 0x08,
-	0xcf, 0xa5, 0x58, 0x06, 0xa5, 0x3d, 0xa6, 0xe0, 0x50, 0x3b, 0x0d, 0x09, 0x6b, 0x77, 0x9d, 0x52,
+	0x89, 0x48, 0x28, 0x1b, 0xe4, 0x4a, 0x5c, 0xe0, 0x92, 0xaa, 0x49, 0x1b, 0xb5, 0x72, 0x82, 0xd3,
-	0xe8, 0xc5, 0xc8, 0xf2, 0xca, 0x15, 0x95, 0xb5, 0x42, 0xbb, 0x32, 0xcd, 0x2f, 0x69, 0x7f, 0x40,
+	0x08, 0x89, 0x4b, 0xe4, 0x38, 0xeb, 0x60, 0xe1, 0x78, 0x2d, 0xef, 0x3a, 0xa2, 0x57, 0x9e, 0x82,
-	0x4f, 0xfd, 0x11, 0x3d, 0xf7, 0xd0, 0x43, 0x7f, 0x42, 0x49, 0xa1, 0xbf, 0xa3, 0xec, 0xda, 0x72,
+	0x17, 0xe0, 0xc2, 0x91, 0xa7, 0xe0, 0xc8, 0x23, 0xa0, 0xf2, 0x00, 0xdc, 0x38, 0x23, 0x6f, 0xe2,
-	0x9d, 0x12, 0x48, 0xc9, 0x69, 0x34, 0xdf, 0xce, 0xf7, 0xcd, 0xec, 0xcc, 0x68, 0xe1, 0xef, 0x84,
+	0xd0, 0x16, 0x84, 0x8a, 0x7a, 0x1a, 0xcf, 0xb7, 0x33, 0xdf, 0xb7, 0x3b, 0xfb, 0x79, 0xe1, 0xff,
-	0x8a, 0xa5, 0x9f, 0xf6, 0x56, 0x5e, 0x4f, 0x5c, 0xa5, 0x94, 0xbb, 0x69, 0xc6, 0x04, 0x43, 0xd6,
+	0xb5, 0xd5, 0x8d, 0xa8, 0x58, 0xb9, 0x71, 0x57, 0x5c, 0xc4, 0x94, 0x93, 0x38, 0x61, 0x82, 0x61,
-	0x1a, 0x76, 0x57, 0x5e, 0xfb, 0x93, 0x09, 0xf5, 0x71, 0xec, 0x07, 0x74, 0x49, 0x13, 0x41, 0xf2,
+	0x14, 0x51, 0x46, 0x7c, 0x4e, 0xd6, 0x16, 0xd9, 0xac, 0xb6, 0xbe, 0xeb, 0x50, 0x1b, 0x87, 0xae,
-	0x98, 0xa2, 0xff, 0xa0, 0x96, 0xd1, 0x34, 0x9e, 0x86, 0x7e, 0x20, 0x58, 0xe6, 0x68, 0x2d, 0xad,
+	0x47, 0x57, 0x34, 0x12, 0x4e, 0x1a, 0x52, 0xfc, 0x00, 0xaa, 0x09, 0x8d, 0xc3, 0x99, 0xef, 0x7a,
-	0x53, 0x27, 0x20, 0xa1, 0xa1, 0x42, 0xd0, 0x31, 0x58, 0x3c, 0x9c, 0x2e, 0x32, 0x96, 0xa7, 0xdc,
+	0x82, 0x25, 0xa6, 0xd2, 0x54, 0xda, 0x35, 0x07, 0x32, 0x68, 0x20, 0x11, 0x7c, 0x04, 0x06, 0xf7,
-	0xd1, 0x5b, 0x46, 0xa7, 0xe6, 0xb5, 0xdc, 0xad, 0xa2, 0x7b, 0x43, 0xcd, 0x9d, 0x0c, 0x4f, 0x65,
+	0x67, 0xcb, 0x84, 0xa5, 0x31, 0x37, 0xd5, 0xa6, 0xd6, 0xae, 0x5a, 0x8f, 0xc8, 0x4d, 0x62, 0x72,
-	0x20, 0xa9, 0xf2, 0x50, 0x7d, 0xf0, 0xc6, 0x97, 0x32, 0x54, 0x36, 0x28, 0xea, 0x43, 0x25, 0x8c,
+	0x8d, 0x94, 0x4c, 0x06, 0xc7, 0x59, 0xbd, 0x53, 0xe1, 0xbe, 0xfc, 0xe0, 0xf5, 0x1f, 0x25, 0x28,
-	0x62, 0x41, 0x33, 0xee, 0x68, 0x4a, 0xe8, 0xff, 0xbb, 0x84, 0xdc, 0xa1, 0x8a, 0x27, 0x05, 0x0f,
+	0x6f, 0x51, 0x7c, 0x02, 0x65, 0x3f, 0x08, 0x05, 0x4d, 0xb8, 0xa9, 0x48, 0x3e, 0x72, 0x4b, 0x3e,
-	0x9d, 0x82, 0xc5, 0x69, 0x4c, 0x65, 0x65, 0x45, 0x35, 0x0f, 0xee, 0x14, 0x99, 0x6c, 0x18, 0xe4,
+	0x32, 0x90, 0x6d, 0x4e, 0xde, 0x8e, 0x6d, 0x30, 0x38, 0x0d, 0x69, 0xb6, 0xcf, 0x7c, 0x6f, 0x4f,
-	0x17, 0x17, 0x39, 0x50, 0xa1, 0x6f, 0x83, 0x38, 0x9f, 0x53, 0xc7, 0x68, 0x19, 0x9d, 0x3a, 0x29,
+	0x6e, 0xcb, 0x35, 0xd9, 0x36, 0x3a, 0xbf, 0x28, 0xb0, 0x09, 0x65, 0xfa, 0xd6, 0x0b, 0xd3, 0x05,
-	0xdc, 0xc6, 0x0f, 0x03, 0xcc, 0x75, 0x5a, 0x64, 0x83, 0xf1, 0x86, 0x5e, 0xa9, 0xa6, 0x58, 0x44,
+	0x35, 0xb5, 0xa6, 0xd6, 0xae, 0x39, 0x79, 0x5a, 0x7f, 0x57, 0x04, 0x7d, 0xa3, 0x8e, 0x11, 0x68,
-	0x7e, 0xa2, 0x13, 0xd0, 0x42, 0x47, 0x6f, 0x69, 0x9d, 0x9a, 0xf7, 0xe8, 0x0f, 0x8b, 0x77, 0x27,
+	0x6f, 0xe8, 0x85, 0x9c, 0x94, 0xe1, 0x64, 0x9f, 0x78, 0x08, 0x8a, 0x6f, 0xaa, 0x4d, 0xa5, 0x5d,
-	0xd1, 0x32, 0x8d, 0xe9, 0xe6, 0x26, 0x5a, 0xd8, 0x98, 0x42, 0x7d, 0x17, 0xe2, 0x08, 0xff, 0xde,
+	0xb5, 0x9e, 0xfd, 0xdb, 0x51, 0xc8, 0x24, 0x58, 0xc5, 0x21, 0xdd, 0x9e, 0x4b, 0xf1, 0xeb, 0x3e,
-	0x97, 0xfb, 0x49, 0x17, 0x22, 0x8d, 0x0f, 0x3a, 0xec, 0xef, 0x9e, 0x20, 0x0c, 0x3a, 0x4b, 0xd5,
+	0xd4, 0xae, 0x42, 0x1c, 0x4f, 0x6f, 0x0e, 0xeb, 0x4e, 0x0a, 0x39, 0x57, 0xfd, 0x93, 0x0a, 0x7b,
-	0x35, 0xfe, 0xf2, 0x9e, 0xdc, 0x47, 0xdb, 0x1d, 0xa5, 0x34, 0xf3, 0x45, 0xc4, 0x12, 0xa2, 0xb3,
+	0x57, 0x57, 0xf0, 0x14, 0x54, 0x16, 0xcb, 0x43, 0xfd, 0x67, 0xf5, 0xef, 0x20, 0x41, 0x46, 0x31,
-	0x14, 0xfd, 0x03, 0xe5, 0x95, 0x1f, 0xe7, 0x54, 0x75, 0xc2, 0x7a, 0x56, 0x22, 0x6b, 0x17, 0x61,
+	0x4d, 0x5c, 0x11, 0xb0, 0xc8, 0x51, 0x59, 0x8c, 0xef, 0x41, 0x69, 0xed, 0x86, 0x29, 0x95, 0xe3,
-	0x30, 0xc3, 0xa9, 0x9f, 0x2d, 0xb8, 0x63, 0xa8, 0x16, 0x3d, 0xbe, 0x4f, 0x2e, 0x2e, 0xf5, 0xc2,
+	0x31, 0x4e, 0x0a, 0xce, 0x26, 0xc5, 0x53, 0xd0, 0xfd, 0x99, 0x9b, 0x2c, 0xb9, 0xa9, 0xc9, 0xb9,
-	0x7e, 0xb6, 0xe0, 0xed, 0x4b, 0xb0, 0xb6, 0x89, 0x91, 0x09, 0x3a, 0x1e, 0xdb, 0x25, 0x69, 0x07,
+	0x3d, 0xbf, 0x83, 0x24, 0xcf, 0x68, 0xfd, 0x5e, 0xb2, 0xe4, 0xad, 0x73, 0x30, 0x76, 0xfa, 0x58,
-	0xcf, 0x6d, 0x4d, 0xf9, 0x03, 0x5b, 0x97, 0xf6, 0xf4, 0xd2, 0x36, 0x94, 0x1d, 0xd8, 0x7b, 0xd2,
+	0x07, 0xd5, 0x1e, 0xa3, 0x42, 0x16, 0xfb, 0x2f, 0x90, 0x22, 0xf3, 0x3e, 0x52, 0xb3, 0x78, 0x7c,
-	0x5e, 0x5c, 0xda, 0x65, 0x65, 0x07, 0xb6, 0x29, 0xed, 0x88, 0xd8, 0x15, 0x54, 0x01, 0xa3, 0x8f,
+	0x8e, 0x34, 0x19, 0xfb, 0xa8, 0x98, 0xc5, 0xb3, 0x73, 0x54, 0x92, 0xb1, 0x8f, 0xf4, 0x2c, 0x8e,
-	0x9f, 0xda, 0xd5, 0x13, 0x13, 0xf6, 0x64, 0x8d, 0x0d, 0x0f, 0xaa, 0xc5, 0x66, 0xa0, 0x03, 0x28,
+	0x1c, 0x54, 0xc6, 0x65, 0xd0, 0x7a, 0xf6, 0x11, 0xaa, 0x1c, 0xea, 0x50, 0xcc, 0xb6, 0x5a, 0xb7,
-	0x07, 0x2c, 0x4f, 0xc4, 0xe6, 0x07, 0x58, 0x3b, 0xc5, 0xfc, 0xf5, 0xed, 0xfc, 0xdb, 0xef, 0x74,
+	0xa0, 0x92, 0xbb, 0x06, 0xef, 0x43, 0xc9, 0x63, 0x69, 0x24, 0xb6, 0x7f, 0xcc, 0x26, 0xc9, 0xbd,
-	0xa8, 0x62, 0x36, 0xa7, 0x67, 0x49, 0xc8, 0xe4, 0x0e, 0xf9, 0xf3, 0x79, 0x46, 0x39, 0xdf, 0xac,
+	0xa1, 0xee, 0xbc, 0xd1, 0xfa, 0xa0, 0x42, 0xc5, 0x66, 0x0b, 0x3a, 0x8c, 0x7c, 0x96, 0xf9, 0xcb,
-	0x48, 0xe1, 0xa2, 0x43, 0x80, 0x34, 0x9f, 0xc5, 0x51, 0x30, 0x2d, 0xf8, 0xfb, 0xc4, 0x5a, 0x23,
+	0x5d, 0x2c, 0x12, 0xca, 0xf9, 0xd6, 0x3e, 0x79, 0x8a, 0xef, 0x03, 0xc4, 0xe9, 0x3c, 0x0c, 0xbc,
-	0xe7, 0xf4, 0x0a, 0x1d, 0x03, 0xf8, 0x42, 0x64, 0xd1, 0x2c, 0x17, 0x94, 0xab, 0xfd, 0xab, 0x79,
+	0x59, 0xde, 0xbf, 0xe7, 0x18, 0x1b, 0xe4, 0x94, 0x5e, 0xe0, 0x23, 0x00, 0x57, 0x88, 0x24, 0x98,
-	0x87, 0x3b, 0xbd, 0x2a, 0x32, 0xb8, 0xfd, 0x22, 0x8a, 0xec, 0x10, 0x50, 0x0f, 0xca, 0x5c, 0xf8,
+	0xa7, 0x82, 0x72, 0xe9, 0xcd, 0xaa, 0xf5, 0xf0, 0xf7, 0x91, 0xe5, 0x42, 0xa4, 0x97, 0x17, 0x3b,
-	0x82, 0x3a, 0x7b, 0x6a, 0xa2, 0xff, 0xde, 0xc6, 0x9c, 0xc8, 0x00, 0xb2, 0x8e, 0x6b, 0x1c, 0x81,
+	0x57, 0xfa, 0xf0, 0x53, 0x28, 0x71, 0xe1, 0x0a, 0x6a, 0x16, 0xe5, 0x35, 0x37, 0xff, 0x42, 0x30,
-	0xb5, 0x55, 0xba, 0x65, 0xa9, 0x0f, 0x6e, 0x8c, 0x73, 0x33, 0xcc, 0x76, 0x17, 0xca, 0x4a, 0x04,
+	0xc9, 0xea, 0x9c, 0x4d, 0x79, 0xfd, 0x00, 0x8c, 0x1d, 0xe1, 0x1f, 0xec, 0xbf, 0x7f, 0xed, 0x8e,
-	0xd5, 0xa0, 0xf2, 0x02, 0x9f, 0xe3, 0xd1, 0x4b, 0x6c, 0x97, 0x10, 0x80, 0x39, 0xc2, 0x17, 0x67,
+	0xb7, 0x37, 0xdc, 0xea, 0x40, 0x49, 0x92, 0xe0, 0x2a, 0x94, 0xa7, 0xf6, 0xa9, 0x3d, 0x7a, 0x69,
-	0x78, 0x60, 0x6b, 0xf2, 0x60, 0x34, 0x1c, 0x2a, 0x47, 0x3f, 0x19, 0x7f, 0xbe, 0x6e, 0x6a, 0x5f,
+	0xa3, 0x02, 0x06, 0xd0, 0x47, 0xf6, 0xd9, 0xd0, 0xee, 0x23, 0x25, 0x5b, 0x18, 0x0d, 0x06, 0x32,
-	0xaf, 0x9b, 0xda, 0xb7, 0xeb, 0xa6, 0xf6, 0xfe, 0x7b, 0xb3, 0xf4, 0xea, 0xe1, 0x22, 0x12, 0xaf,
+	0x51, 0x0f, 0xc7, 0x9f, 0x2f, 0x1b, 0xca, 0x97, 0xcb, 0x86, 0xf2, 0xf5, 0xb2, 0xa1, 0xbc, 0xff,
-	0xf3, 0x99, 0x1b, 0xb0, 0x65, 0x2f, 0xe1, 0x69, 0x10, 0x74, 0xe7, 0x74, 0xd5, 0x4b, 0x28, 0x0b,
+	0xd6, 0x28, 0xbc, 0x7a, 0xbc, 0x0c, 0xc4, 0xeb, 0x74, 0x4e, 0x3c, 0xb6, 0xea, 0x46, 0x3c, 0xf6,
-	0x79, 0xd7, 0x4f, 0xa3, 0xee, 0x82, 0xf5, 0xb6, 0x0f, 0xd6, 0x47, 0xdd, 0xc6, 0x94, 0x0d, 0x27,
+	0xbc, 0xce, 0x82, 0xae, 0xbb, 0x11, 0x65, 0x3e, 0xef, 0xb8, 0x71, 0xd0, 0x59, 0xb2, 0xee, 0xee,
-	0x6e, 0x7f, 0x7c, 0xe6, 0x62, 0x85, 0xce, 0x4c, 0xf5, 0x7c, 0x1d, 0xfd, 0x0c, 0x00, 0x00, 0xff,
+	0xd9, 0xfb, 0xa8, 0x22, 0x9b, 0xb2, 0xc1, 0x84, 0xf4, 0xc6, 0x43, 0x62, 0x4b, 0x68, 0xae, 0xcb,
-	0xff, 0xb9, 0x8b, 0x54, 0xcf, 0xd7, 0x04, 0x00, 0x00,
+	0x47, 0xf0, 0xe0, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x8c, 0xb2, 0x91, 0x1d, 0x05, 0x00,
+	0x00,
 }
 
 func (m *PlacementRule) Marshal() (dAtA []byte, err error) {

v2/netmap/types.proto

@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-package netmap.v2;
+package neo.fs.v2.netmap;
 
-option go_package = "github.com/nspcc-dev/neofs-api-go/netmap/v2";
+option go_package = "github.com/nspcc-dev/neofs-api-go/v2/netmap";
 option csharp_namespace = "NeoFS.API.Netmap";
 
 message PlacementRule {

v2/object/service.go

@@ -1,8 +1,8 @@
-package v2
+package object
 
 import (
-	refs "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/refs"
-	service "github.com/nspcc-dev/neofs-api-go/service/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/service"
 )
 
 // SetAddress sets address of the requested object.

v2/object/service.proto

@@ -1,25 +1,25 @@
 syntax = "proto3";
 
-package object.v2;
+package neo.fs.v2.object;
 
-option go_package = "github.com/nspcc-dev/neofs-api-go/object/v2";
+option go_package = "github.com/nspcc-dev/neofs-api-go/v2/object";
 option csharp_namespace = "NeoFS.API.Object";
 
-import "object/v2/types.proto";
+import "v2/object/types.proto";
-import "refs/v2/types.proto";
+import "v2/refs/types.proto";
-import "service/v2/meta.proto";
+import "v2/service/meta.proto";
-import "service/v2/verify.proto";
+import "v2/service/verify.proto";
 
-// Object service provides API for manipulating with the object.v2.
+// Object service provides API for manipulating with the object.
 service Service {
-  // Get the object from container.v2. Response uses gRPC stream. First response
+  // Get the object from container. Response uses gRPC stream. First response
   // message carry object of requested address. Chunk messages are parts of
   // the object's payload if it is needed. All messages except first carry
   // chunks. Requested object can be restored by concatenation of object
   // message payload and all chunks keeping receiving order.
   rpc Get(GetRequest) returns (stream GetResponse);
 
-  // Put the object into container.v2. Request uses gRPC stream. First message
+  // Put the object into container. Request uses gRPC stream. First message
   // SHOULD BE type of PutHeader. Container id and Owner id of object SHOULD
   // BE set. Session token SHOULD BE obtained before put operation (see
   // session package). Chunk messages considered by server as part of object
@@ -35,7 +35,7 @@ service Service {
   // headers are also present.
   rpc Head(HeadRequest) returns (HeadResponse);
 
-  // Search objects in container.v2. Version of query language format SHOULD BE
+  // Search objects in container. Version of query language format SHOULD BE
   // set to 1. Search query represented in serialized format (see query
   // package).
   rpc Search(SearchRequest) returns (stream SearchResponse);
@@ -54,8 +54,8 @@ service Service {
 
 message GetRequest {
   message Body {
-    // Address of the requested object.v2.
+    // Address of the requested object.
-    refs.v2.Address address = 1;
+    neo.fs.v2.refs.Address address = 1;
 
     // Carries the raw option flag of the request.
     // Raw request is sent to receive only the objects
@@ -67,11 +67,11 @@ message GetRequest {
 
   // Carries request meta information. Header data is used only to regulate message
   // transport and does not affect request execution.
-  service.v2.RequestMetaHeader meta_header = 2;
+  neo.fs.v2.service.RequestMetaHeader meta_header = 2;
 
   // Carries request verification information. This header is used to authenticate
   // the nodes of the message route and check the correctness of transmission.
-  service.v2.RequestVerificationHeader verify_header = 3;
+  neo.fs.v2.service.RequestVerificationHeader verify_header = 3;
 }
 
 message GetResponse {
@@ -79,9 +79,9 @@ message GetResponse {
     // Initialization parameters of the object got from NeoFS.
     message Init {
       // Object ID
-      refs.v2.ObjectID object_id = 1;
+      neo.fs.v2.refs.ObjectID object_id = 1;
       // Object signature
-      service.v2.Signature signature =2;
+      neo.fs.v2.service.Signature signature =2;
       // Object header.
       Header header = 3;
     }
@@ -98,12 +98,12 @@ message GetResponse {
 
   // Carries response meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.ResponseMetaHeader meta_header = 2;
+  neo.fs.v2.service.ResponseMetaHeader meta_header = 2;
 
   // Carries response verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.ResponseVerificationHeader verify_header = 3;
+  neo.fs.v2.service.ResponseVerificationHeader verify_header = 3;
 }
 
 message PutRequest {
@@ -111,9 +111,9 @@ message PutRequest {
     // Groups initialization parameters of object placement in NeoFS.
     message Init {
       // Object ID, where available
-      refs.v2.ObjectID object_id = 1;
+      neo.fs.v2.refs.ObjectID object_id = 1;
       // Object signature, were available
-      service.v2.Signature signature =2;
+      neo.fs.v2.service.Signature signature =2;
       // Header of the object to save in the system.
       Header header = 3;
       // Number of the object copies to store within the RPC call.
@@ -135,49 +135,49 @@ message PutRequest {
 
   // Carries request meta information. Header data is used only to regulate message
   // transport and does not affect request execution.
-  service.v2.RequestMetaHeader meta_header = 2;
+  neo.fs.v2.service.RequestMetaHeader meta_header = 2;
 
   // Carries request verification information. This header is used to authenticate
   // the nodes of the message route and check the correctness of transmission.
-  service.v2.RequestVerificationHeader verify_header = 3;
+  neo.fs.v2.service.RequestVerificationHeader verify_header = 3;
 }
 
 message PutResponse {
   message Body {
-    // Carries identifier of the saved object.v2.
+    // Carries identifier of the saved object.
-    // It is used to access an object in the container.v2.
+    // It is used to access an object in the container.
-    refs.v2.ObjectID object_id = 1;
+    neo.fs.v2.refs.ObjectID object_id = 1;
   }
   // Body of put object response message.
   Body body = 1;
 
   // Carries response meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.ResponseMetaHeader meta_header = 2;
+  neo.fs.v2.service.ResponseMetaHeader meta_header = 2;
 
   // Carries response verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.ResponseVerificationHeader verify_header = 3;
+  neo.fs.v2.service.ResponseVerificationHeader verify_header = 3;
 }
 
 message DeleteRequest {
   message Body {
     // Carries the address of the object to be deleted.
-    refs.v2.Address address = 1;
+    neo.fs.v2.refs.Address address = 1;
     // Carries identifier the object owner.
-    refs.v2.OwnerID owner_id = 2;
+    neo.fs.v2.refs.OwnerID owner_id = 2;
   }
   // Body of delete object request message.
   Body body = 1;
 
   // Carries request meta information. Header data is used only to regulate message
   // transport and does not affect request execution.
-  service.v2.RequestMetaHeader meta_header = 2;
+  neo.fs.v2.service.RequestMetaHeader meta_header = 2;
 
   // Carries request verification information. This header is used to authenticate
   // the nodes of the message route and check the correctness of transmission.
-  service.v2.RequestVerificationHeader verify_header = 3;
+  neo.fs.v2.service.RequestVerificationHeader verify_header = 3;
 }
 
 // DeleteResponse is empty because we cannot guarantee permanent object removal
@@ -190,18 +190,18 @@ message DeleteResponse {
 
   // Carries response meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.ResponseMetaHeader meta_header = 2;
+  neo.fs.v2.service.ResponseMetaHeader meta_header = 2;
 
   // Carries response verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.ResponseVerificationHeader verify_header = 3;
+  neo.fs.v2.service.ResponseVerificationHeader verify_header = 3;
 }
 
 message HeadRequest {
   message Body {
     // Address of the object with the requested header.
-    refs.v2.Address address = 1;
+    neo.fs.v2.refs.Address address = 1;
     // Return only minimal header subset
     bool main_only = 2;
     // Carries the raw option flag of the request.
@@ -214,22 +214,22 @@ message HeadRequest {
 
   // Carries request meta information. Header data is used only to regulate message
   // transport and does not affect request execution.
-  service.v2.RequestMetaHeader meta_header = 2;
+  neo.fs.v2.service.RequestMetaHeader meta_header = 2;
 
   // Carries request verification information. This header is used to authenticate
   // the nodes of the message route and check the correctness of transmission.
-  service.v2.RequestVerificationHeader verify_header = 3;
+  neo.fs.v2.service.RequestVerificationHeader verify_header = 3;
 }
 
 message HeadResponse {
   message Body {
     message ShortHeader {
       // Object format version.
-      service.v2.Version version = 1;
+      neo.fs.v2.service.Version version = 1;
       // Epoch when the object was created
       uint64 creation_epoch = 2;
       // Object's owner
-      refs.v2.OwnerID owner_id = 3;
+      neo.fs.v2.refs.OwnerID owner_id = 3;
       // Type of the object payload content
       ObjectType object_type = 4;
       // Size of payload in bytes.
@@ -247,18 +247,18 @@ message HeadResponse {
 
   // Carries response meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.ResponseMetaHeader meta_header = 2;
+  neo.fs.v2.service.ResponseMetaHeader meta_header = 2;
 
   // Carries response verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.ResponseVerificationHeader verify_header = 3;
+  neo.fs.v2.service.ResponseVerificationHeader verify_header = 3;
 }
 
 message SearchRequest {
   message Body {
     // Carries search container identifier.
-    refs.v2.ContainerID container_id = 1;
+    neo.fs.v2.refs.ContainerID container_id = 1;
 
     message Query {
       uint32 version = 1;
@@ -287,17 +287,17 @@ message SearchRequest {
 
   // Carries request meta information. Header data is used only to regulate message
   // transport and does not affect request execution.
-  service.v2.RequestMetaHeader meta_header = 2;
+  neo.fs.v2.service.RequestMetaHeader meta_header = 2;
 
   // Carries request verification information. This header is used to authenticate
   // the nodes of the message route and check the correctness of transmission.
-  service.v2.RequestVerificationHeader verify_header = 3;
+  neo.fs.v2.service.RequestVerificationHeader verify_header = 3;
 }
 
 message SearchResponse {
   message Body {
     // Carries list of object identifiers that match the search query.
-    repeated refs.v2.ObjectID id_list = 1;
+    repeated neo.fs.v2.refs.ObjectID id_list = 1;
   }
 
   // Body of search object response message.
@@ -305,12 +305,12 @@ message SearchResponse {
 
   // Carries response meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.ResponseMetaHeader meta_header = 2;
+  neo.fs.v2.service.ResponseMetaHeader meta_header = 2;
 
   // Carries response verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.ResponseVerificationHeader verify_header = 3;
+  neo.fs.v2.service.ResponseVerificationHeader verify_header = 3;
 }
 
 // Range groups the parameters of object payload range.
@@ -325,7 +325,7 @@ message Range {
 message GetRangeRequest {
   message Body {
     // Address carries address of the object that contains the requested payload range.
-    refs.v2.Address address = 1;
+    neo.fs.v2.refs.Address address = 1;
 
     // Range carries the parameters of the requested payload range.
     Range range = 2;
@@ -336,11 +336,11 @@ message GetRangeRequest {
 
   // Carries request meta information. Header data is used only to regulate message
   // transport and does not affect request execution.
-  service.v2.RequestMetaHeader meta_header = 2;
+  neo.fs.v2.service.RequestMetaHeader meta_header = 2;
 
   // Carries request verification information. This header is used to authenticate
   // the nodes of the message route and check the correctness of transmission.
-  service.v2.RequestVerificationHeader verify_header = 3;
+  neo.fs.v2.service.RequestVerificationHeader verify_header = 3;
 }
 
 message GetRangeResponse {
@@ -354,18 +354,18 @@ message GetRangeResponse {
 
   // Carries response meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.ResponseMetaHeader meta_header = 2;
+  neo.fs.v2.service.ResponseMetaHeader meta_header = 2;
 
   // Carries response verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.ResponseVerificationHeader verify_header = 3;
+  neo.fs.v2.service.ResponseVerificationHeader verify_header = 3;
 }
 
 message GetRangeHashRequest {
   message Body {
     // Carries address of the object that contains the requested payload range.
-    refs.v2.Address address = 1;
+    neo.fs.v2.refs.Address address = 1;
 
     // Carries the list of object payload range to calculate homomorphic hash.
     repeated Range ranges = 2;
@@ -379,11 +379,11 @@ message GetRangeHashRequest {
 
   // Carries request meta information. Header data is used only to regulate message
   // transport and does not affect request execution.
-  service.v2.RequestMetaHeader meta_header = 2;
+  neo.fs.v2.service.RequestMetaHeader meta_header = 2;
 
   // Carries request verification information. This header is used to authenticate
   // the nodes of the message route and check the correctness of transmission.
-  service.v2.RequestVerificationHeader verify_header = 3;
+  neo.fs.v2.service.RequestVerificationHeader verify_header = 3;
 }
 
 message GetRangeHashResponse {
@@ -397,11 +397,11 @@ message GetRangeHashResponse {
 
   // Carries response meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.ResponseMetaHeader meta_header = 2;
+  neo.fs.v2.service.ResponseMetaHeader meta_header = 2;
 
   // Carries response verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.ResponseVerificationHeader verify_header = 3;
+  neo.fs.v2.service.ResponseVerificationHeader verify_header = 3;
 }
 

v2/object/types.go

@@ -1,8 +1,8 @@
-package v2
+package object
 
 import (
-	refs "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/refs"
-	service "github.com/nspcc-dev/neofs-api-go/service/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/service"
 )
 
 // SetKey sets key to the object attribute.

v2/object/types.pb.go

@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: object/v2/types.proto
+// source: v2/object/types.proto
 
-package v2
+package object
 
 import (
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	v2 "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	refs "github.com/nspcc-dev/neofs-api-go/v2/refs"
-	v21 "github.com/nspcc-dev/neofs-api-go/service/v2"
+	service "github.com/nspcc-dev/neofs-api-go/v2/service"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -53,31 +53,31 @@ func (x ObjectType) String() string {
 }
 
 func (ObjectType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_666bf7c1dc0e676f, []int{0}
+	return fileDescriptor_fcb9e8df342f43c6, []int{0}
 }
 
 type Header struct {
 	// Object's container
-	ContainerId *v2.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"`
+	ContainerId *refs.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"`
 	// Object's owner
-	OwnerId *v2.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
+	OwnerId *refs.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
 	// Epoch when the object was created
 	CreationEpoch uint64 `protobuf:"varint,3,opt,name=creation_epoch,json=creationEpoch,proto3" json:"creation_epoch,omitempty"`
 	// Object format version.
 	// Effectively the version of API library used to create particular object
-	Version *v21.Version `protobuf:"bytes,4,opt,name=version,proto3" json:"version,omitempty"`
+	Version *service.Version `protobuf:"bytes,4,opt,name=version,proto3" json:"version,omitempty"`
 	// Size of payload in bytes.
 	// 0xFFFFFFFFFFFFFFFF means `payload_length` is unknown
 	PayloadLength uint64 `protobuf:"varint,5,opt,name=payload_length,json=payloadLength,proto3" json:"payload_length,omitempty"`
 	// Hash of payload bytes
 	PayloadHash []byte     `protobuf:"bytes,6,opt,name=payload_hash,json=payloadHash,proto3" json:"payload_hash,omitempty"`
-	ObjectType  ObjectType `protobuf:"varint,7,opt,name=object_type,json=objectType,proto3,enum=object.v2.ObjectType" json:"object_type,omitempty"`
+	ObjectType  ObjectType `protobuf:"varint,7,opt,name=object_type,json=objectType,proto3,enum=neo.fs.v2.object.ObjectType" json:"object_type,omitempty"`
 	// Homomorphic hash of the object payload.
 	HomomorphicHash []byte `protobuf:"bytes,8,opt,name=homomorphic_hash,json=homomorphicHash,proto3" json:"homomorphic_hash,omitempty"`
 	// Session token, if it was used during Object creation.
 	// Need it to verify integrity and authenticity out of Request scope.
-	SessionToken *v21.SessionToken   `protobuf:"bytes,9,opt,name=session_token,json=sessionToken,proto3" json:"session_token,omitempty"`
+	SessionToken *service.SessionToken `protobuf:"bytes,9,opt,name=session_token,json=sessionToken,proto3" json:"session_token,omitempty"`
-	Attributes   []*Header_Attribute `protobuf:"bytes,10,rep,name=attributes,proto3" json:"attributes,omitempty"`
+	Attributes   []*Header_Attribute   `protobuf:"bytes,10,rep,name=attributes,proto3" json:"attributes,omitempty"`
 	// Position of the object in the split hierarchy.
 	Split                *Header_Split `protobuf:"bytes,11,opt,name=split,proto3" json:"split,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
@@ -89,7 +89,7 @@ func (m *Header) Reset()         { *m = Header{} }
 func (m *Header) String() string { return proto.CompactTextString(m) }
 func (*Header) ProtoMessage()    {}
 func (*Header) Descriptor() ([]byte, []int) {
-	return fileDescriptor_666bf7c1dc0e676f, []int{0}
+	return fileDescriptor_fcb9e8df342f43c6, []int{0}
 }
 func (m *Header) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -118,14 +118,14 @@ func (m *Header) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_Header proto.InternalMessageInfo
 
-func (m *Header) GetContainerId() *v2.ContainerID {
+func (m *Header) GetContainerId() *refs.ContainerID {
 	if m != nil {
 		return m.ContainerId
 	}
 	return nil
 }
 
-func (m *Header) GetOwnerId() *v2.OwnerID {
+func (m *Header) GetOwnerId() *refs.OwnerID {
 	if m != nil {
 		return m.OwnerId
 	}
@@ -139,7 +139,7 @@ func (m *Header) GetCreationEpoch() uint64 {
 	return 0
 }
 
-func (m *Header) GetVersion() *v21.Version {
+func (m *Header) GetVersion() *service.Version {
 	if m != nil {
 		return m.Version
 	}
@@ -174,7 +174,7 @@ func (m *Header) GetHomomorphicHash() []byte {
 	return nil
 }
 
-func (m *Header) GetSessionToken() *v21.SessionToken {
+func (m *Header) GetSessionToken() *service.SessionToken {
 	if m != nil {
 		return m.SessionToken
 	}
@@ -210,7 +210,7 @@ func (m *Header_Attribute) Reset()         { *m = Header_Attribute{} }
 func (m *Header_Attribute) String() string { return proto.CompactTextString(m) }
 func (*Header_Attribute) ProtoMessage()    {}
 func (*Header_Attribute) Descriptor() ([]byte, []int) {
-	return fileDescriptor_666bf7c1dc0e676f, []int{0, 0}
+	return fileDescriptor_fcb9e8df342f43c6, []int{0, 0}
 }
 func (m *Header_Attribute) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -255,28 +255,28 @@ func (m *Header_Attribute) GetValue() string {
 
 // Information about spawning the objects through a payload splitting.
 type Header_Split struct {
-	// Identifier of the origin object.v2.
+	// Identifier of the origin object.
-	// Parent and children objects must be within the same container.v2.
+	// Parent and children objects must be within the same container.
 	// Parent object_id is known only to the minor child.
-	Parent *v2.ObjectID `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
+	Parent *refs.ObjectID `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
 	// Previous carries identifier of the left split neighbor.
-	Previous *v2.ObjectID `protobuf:"bytes,2,opt,name=previous,proto3" json:"previous,omitempty"`
+	Previous *refs.ObjectID `protobuf:"bytes,2,opt,name=previous,proto3" json:"previous,omitempty"`
-	// `signature` field of the parent object.v2. Used to reconstruct parent.
+	// `signature` field of the parent object. Used to reconstruct parent.
-	ParentSignature *v21.Signature `protobuf:"bytes,3,opt,name=parent_signature,json=parentSignature,proto3" json:"parent_signature,omitempty"`
+	ParentSignature *service.Signature `protobuf:"bytes,3,opt,name=parent_signature,json=parentSignature,proto3" json:"parent_signature,omitempty"`
-	// `header` field of the parent object.v2. Used to reconstruct parent.
+	// `header` field of the parent object. Used to reconstruct parent.
 	ParentHeader *Header `protobuf:"bytes,4,opt,name=parent_header,json=parentHeader,proto3" json:"parent_header,omitempty"`
 	// Children carries list of identifiers of the objects generated by splitting the current.
-	Children             []*v2.ObjectID `protobuf:"bytes,5,rep,name=children,proto3" json:"children,omitempty"`
+	Children             []*refs.ObjectID `protobuf:"bytes,5,rep,name=children,proto3" json:"children,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
-	XXX_unrecognized     []byte         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
-	XXX_sizecache        int32          `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
 }
 
 func (m *Header_Split) Reset()         { *m = Header_Split{} }
 func (m *Header_Split) String() string { return proto.CompactTextString(m) }
 func (*Header_Split) ProtoMessage()    {}
 func (*Header_Split) Descriptor() ([]byte, []int) {
-	return fileDescriptor_666bf7c1dc0e676f, []int{0, 1}
+	return fileDescriptor_fcb9e8df342f43c6, []int{0, 1}
 }
 func (m *Header_Split) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -305,21 +305,21 @@ func (m *Header_Split) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_Header_Split proto.InternalMessageInfo
 
-func (m *Header_Split) GetParent() *v2.ObjectID {
+func (m *Header_Split) GetParent() *refs.ObjectID {
 	if m != nil {
 		return m.Parent
 	}
 	return nil
 }
 
-func (m *Header_Split) GetPrevious() *v2.ObjectID {
+func (m *Header_Split) GetPrevious() *refs.ObjectID {
 	if m != nil {
 		return m.Previous
 	}
 	return nil
 }
 
-func (m *Header_Split) GetParentSignature() *v21.Signature {
+func (m *Header_Split) GetParentSignature() *service.Signature {
 	if m != nil {
 		return m.ParentSignature
 	}
@@ -333,7 +333,7 @@ func (m *Header_Split) GetParentHeader() *Header {
 	return nil
 }
 
-func (m *Header_Split) GetChildren() []*v2.ObjectID {
+func (m *Header_Split) GetChildren() []*refs.ObjectID {
 	if m != nil {
 		return m.Children
 	}
@@ -346,9 +346,9 @@ type Object struct {
 	// Object is content-addressed. It means id will change if header or payload
 	// changes. It's calculated as a hash of header field, which contains hash of
 	// object's payload
-	ObjectId *v2.ObjectID `protobuf:"bytes,1,opt,name=object_id,json=objectId,proto3" json:"object_id,omitempty"`
+	ObjectId *refs.ObjectID `protobuf:"bytes,1,opt,name=object_id,json=objectId,proto3" json:"object_id,omitempty"`
 	// Signed object_id
-	Signature *v21.Signature `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`
+	Signature *service.Signature `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`
 	// Object metadata headers
 	Header *Header `protobuf:"bytes,3,opt,name=header,proto3" json:"header,omitempty"`
 	// Payload bytes.
@@ -362,7 +362,7 @@ func (m *Object) Reset()         { *m = Object{} }
 func (m *Object) String() string { return proto.CompactTextString(m) }
 func (*Object) ProtoMessage()    {}
 func (*Object) Descriptor() ([]byte, []int) {
-	return fileDescriptor_666bf7c1dc0e676f, []int{1}
+	return fileDescriptor_fcb9e8df342f43c6, []int{1}
 }
 func (m *Object) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -391,14 +391,14 @@ func (m *Object) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_Object proto.InternalMessageInfo
 
-func (m *Object) GetObjectId() *v2.ObjectID {
+func (m *Object) GetObjectId() *refs.ObjectID {
 	if m != nil {
 		return m.ObjectId
 	}
 	return nil
 }
 
-func (m *Object) GetSignature() *v21.Signature {
+func (m *Object) GetSignature() *service.Signature {
 	if m != nil {
 		return m.Signature
 	}
@@ -420,61 +420,62 @@ func (m *Object) GetPayload() []byte {
 }
 
 func init() {
-	proto.RegisterEnum("object.v2.ObjectType", ObjectType_name, ObjectType_value)
+	proto.RegisterEnum("neo.fs.v2.object.ObjectType", ObjectType_name, ObjectType_value)
-	proto.RegisterType((*Header)(nil), "object.v2.Header")
+	proto.RegisterType((*Header)(nil), "neo.fs.v2.object.Header")
-	proto.RegisterType((*Header_Attribute)(nil), "object.v2.Header.Attribute")
+	proto.RegisterType((*Header_Attribute)(nil), "neo.fs.v2.object.Header.Attribute")
-	proto.RegisterType((*Header_Split)(nil), "object.v2.Header.Split")
+	proto.RegisterType((*Header_Split)(nil), "neo.fs.v2.object.Header.Split")
-	proto.RegisterType((*Object)(nil), "object.v2.Object")
+	proto.RegisterType((*Object)(nil), "neo.fs.v2.object.Object")
 }
 
-func init() { proto.RegisterFile("object/v2/types.proto", fileDescriptor_666bf7c1dc0e676f) }
+func init() { proto.RegisterFile("v2/object/types.proto", fileDescriptor_fcb9e8df342f43c6) }
 
-var fileDescriptor_666bf7c1dc0e676f = []byte{
+var fileDescriptor_fcb9e8df342f43c6 = []byte{
-	// 704 bytes of a gzipped FileDescriptorProto
+	// 718 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0x5f, 0x4e, 0xdb, 0x4a,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xdf, 0x6e, 0xda, 0x48,
-	0x14, 0xc6, 0x71, 0x42, 0xfe, 0x1d, 0x27, 0x60, 0x06, 0x22, 0xac, 0x5c, 0x29, 0xca, 0x45, 0xba,
+	0x14, 0xc6, 0x63, 0x08, 0xff, 0x8e, 0x21, 0xf1, 0xce, 0xee, 0x2a, 0x16, 0xbb, 0x62, 0xd9, 0x48,
-	0x52, 0xb8, 0x28, 0x8e, 0x14, 0x24, 0xee, 0x03, 0xba, 0x52, 0x43, 0x49, 0x21, 0x12, 0x25, 0x68,
+	0x2b, 0xb1, 0xbb, 0x8a, 0x59, 0x11, 0xf6, 0xa6, 0x55, 0x2a, 0x91, 0x86, 0x12, 0xa4, 0x34, 0x44,
-	0x12, 0xfa, 0xd0, 0x97, 0xc8, 0xb1, 0x87, 0xd8, 0x25, 0xf1, 0x58, 0xf6, 0xc4, 0x28, 0x5b, 0xe8,
+	0x03, 0xe9, 0x45, 0x6f, 0x90, 0xb1, 0x07, 0xec, 0x06, 0x3c, 0x96, 0xc7, 0x38, 0xe2, 0x4d, 0xfa,
-	0x0a, 0xba, 0x86, 0x3e, 0x76, 0x15, 0x7d, 0xec, 0x0a, 0xaa, 0x8a, 0x6e, 0xa4, 0xf2, 0xcc, 0xd8,
+	0x0c, 0x95, 0x7a, 0xd3, 0x97, 0x68, 0x2f, 0xfb, 0x08, 0x55, 0xfa, 0x22, 0x95, 0x67, 0xc6, 0x86,
-	0x49, 0x0b, 0xed, 0xdb, 0xcc, 0x77, 0x7e, 0xe7, 0xcc, 0x7c, 0xc7, 0x67, 0x0c, 0x55, 0x3a, 0x79,
+	0x26, 0x4d, 0xda, 0x2b, 0x7b, 0x3e, 0xff, 0xbe, 0x73, 0xe6, 0x9c, 0x39, 0x63, 0xf8, 0x35, 0x6a,
-	0x47, 0x2c, 0xd6, 0x8e, 0x3a, 0x6d, 0xb6, 0xf4, 0x49, 0x68, 0xf8, 0x01, 0x65, 0x14, 0x95, 0x84,
+	0x35, 0xe9, 0xe4, 0x15, 0xb1, 0xc2, 0x66, 0xb8, 0xf2, 0x09, 0x33, 0xfc, 0x80, 0x86, 0x14, 0x69,
-	0x6c, 0x44, 0x9d, 0xda, 0x6e, 0x40, 0xee, 0xc2, 0x5f, 0xe2, 0xb5, 0x6a, 0x48, 0x82, 0xc8, 0xb5,
+	0x1e, 0xa1, 0xc6, 0x94, 0x19, 0x51, 0xcb, 0x10, 0x5f, 0xab, 0x3f, 0x47, 0xad, 0x66, 0x40, 0xa6,
-	0x48, 0xac, 0xcf, 0x09, 0x33, 0xa5, 0xbc, 0xbf, 0x26, 0x47, 0x24, 0x70, 0xef, 0x96, 0x22, 0x70,
+	0x6c, 0x13, 0xab, 0xc6, 0x6e, 0x46, 0x82, 0xc8, 0xb5, 0x48, 0x73, 0x41, 0x42, 0x53, 0xca, 0x7b,
-	0xf0, 0x35, 0x0f, 0xf9, 0x4b, 0x62, 0xda, 0x24, 0x40, 0xff, 0x41, 0xd9, 0xa2, 0x1e, 0x33, 0x5d,
+	0x1b, 0x72, 0x44, 0x02, 0x77, 0xba, 0x12, 0x1f, 0xf6, 0xdf, 0x15, 0x20, 0x7f, 0x4a, 0x4c, 0x9b,
-	0x8f, 0x04, 0x63, 0xd7, 0xd6, 0x95, 0x86, 0xd2, 0x54, 0x3b, 0x7b, 0x46, 0x7c, 0x8c, 0x11, 0x75,
+	0x04, 0xe8, 0x09, 0x94, 0x2d, 0xea, 0x85, 0xa6, 0xeb, 0x91, 0x60, 0xec, 0xda, 0xba, 0x52, 0x57,
-	0x8c, 0x97, 0x49, 0xb0, 0x7f, 0x8e, 0xd5, 0x94, 0xec, 0xdb, 0xe8, 0x08, 0x8a, 0xf4, 0x41, 0x26,
+	0x1a, 0x6a, 0xeb, 0x37, 0x63, 0x9d, 0x38, 0xce, 0x66, 0x3c, 0x4d, 0x98, 0xfe, 0x09, 0x56, 0x53,
-	0x65, 0x78, 0x92, 0x96, 0x26, 0x0d, 0x1e, 0x44, 0x42, 0x81, 0x13, 0x7d, 0x1b, 0xfd, 0x03, 0x5b,
+	0x43, 0xdf, 0x46, 0x2d, 0x28, 0xd2, 0x6b, 0xe9, 0xcd, 0x70, 0xef, 0xde, 0x6d, 0xef, 0xe0, 0x5a,
-	0x56, 0x40, 0x4c, 0xe6, 0x52, 0x6f, 0x4c, 0x7c, 0x6a, 0x39, 0x7a, 0xb6, 0xa1, 0x34, 0x37, 0x71,
+	0xf8, 0x0a, 0x1c, 0xec, 0xdb, 0xe8, 0x2f, 0xd8, 0xb1, 0x02, 0x62, 0x86, 0x2e, 0xf5, 0xc6, 0xc4,
-	0x25, 0x51, 0x7b, 0xb1, 0x88, 0x5a, 0x50, 0x88, 0x48, 0x10, 0xba, 0xd4, 0xd3, 0x37, 0x79, 0xc9,
+	0xa7, 0x96, 0xa3, 0x67, 0xeb, 0x4a, 0x63, 0x1b, 0x57, 0x12, 0xb5, 0x1b, 0x8b, 0xa8, 0x0d, 0x85,
-	0x5d, 0x43, 0x5a, 0x88, 0xab, 0xbe, 0x11, 0x21, 0x9c, 0x30, 0x71, 0x55, 0xdf, 0x5c, 0xce, 0xa8,
+	0x88, 0x04, 0xcc, 0xa5, 0x9e, 0xbe, 0xcd, 0x23, 0x57, 0x37, 0x22, 0xcb, 0xba, 0x8c, 0x17, 0x82,
-	0x69, 0x8f, 0x67, 0xc4, 0x9b, 0x32, 0x47, 0xcf, 0x89, 0xaa, 0x52, 0xbd, 0xe2, 0x22, 0xfa, 0x1b,
+	0xc0, 0x09, 0x1a, 0x07, 0xf7, 0xcd, 0xd5, 0x9c, 0x9a, 0xf6, 0x78, 0x4e, 0xbc, 0x59, 0xe8, 0xe8,
-	0xca, 0x09, 0xe6, 0x98, 0xa1, 0xa3, 0xe7, 0x1b, 0x4a, 0xb3, 0x8c, 0x55, 0xa9, 0x5d, 0x9a, 0xa1,
+	0x39, 0x11, 0x5c, 0xaa, 0x67, 0x5c, 0x44, 0x7f, 0x42, 0x39, 0xc1, 0x1c, 0x93, 0x39, 0x7a, 0xbe,
-	0x83, 0x4e, 0x40, 0x15, 0x2d, 0x1e, 0xc7, 0x6d, 0xd5, 0x0b, 0x0d, 0xa5, 0xb9, 0xd5, 0xa9, 0x1a,
+	0xae, 0x34, 0xca, 0x58, 0x95, 0xda, 0xa9, 0xc9, 0x1c, 0x74, 0x04, 0xaa, 0x68, 0xfa, 0x38, 0xee,
-	0x69, 0xdb, 0x8d, 0x01, 0x5f, 0x8d, 0x96, 0x3e, 0xc1, 0x40, 0xd3, 0x35, 0x3a, 0x04, 0xcd, 0xa1,
+	0xb5, 0x5e, 0xa8, 0x2b, 0x8d, 0x9d, 0xd6, 0xef, 0xc6, 0xed, 0x23, 0x31, 0x06, 0xfc, 0x31, 0x5a,
-	0x73, 0x3a, 0xa7, 0x81, 0xef, 0xb8, 0x96, 0x28, 0x5f, 0xe4, 0xe5, 0xb7, 0xd7, 0x74, 0x7e, 0xc4,
+	0xf9, 0x04, 0x03, 0x4d, 0xdf, 0xd1, 0xdf, 0xa0, 0x39, 0x74, 0x41, 0x17, 0x34, 0xf0, 0x1d, 0xd7,
-	0xff, 0x50, 0x09, 0x49, 0x18, 0xdf, 0x7b, 0xcc, 0xe8, 0x3d, 0xf1, 0xf4, 0x12, 0x77, 0xa8, 0xaf,
+	0x12, 0x59, 0x8a, 0x3c, 0xcb, 0xee, 0x86, 0xce, 0x33, 0x9d, 0x40, 0x85, 0x11, 0x16, 0x6f, 0x7f,
-	0x3b, 0x1c, 0x0a, 0x60, 0x14, 0xc7, 0x71, 0x39, 0x5c, 0xdb, 0xa1, 0x53, 0x00, 0x93, 0xb1, 0xc0,
+	0x1c, 0xd2, 0x2b, 0xe2, 0xe9, 0x25, 0x5e, 0xef, 0x1f, 0xdf, 0xa8, 0x77, 0x28, 0xb8, 0x51, 0x8c,
-	0x9d, 0x2c, 0x18, 0x09, 0x75, 0x68, 0x64, 0x9b, 0x6a, 0xe7, 0xaf, 0xb5, 0x0b, 0x8a, 0xcf, 0x69,
+	0xe1, 0x32, 0xdb, 0x58, 0xa1, 0x63, 0x00, 0x33, 0x0c, 0x03, 0x77, 0xb2, 0x0c, 0x09, 0xd3, 0xa1,
-	0x74, 0x13, 0x06, 0xaf, 0xe1, 0xa8, 0x05, 0xb9, 0xd0, 0x9f, 0xb9, 0x4c, 0x57, 0xf9, 0x99, 0xfb,
+	0x9e, 0x6d, 0xa8, 0xad, 0xfd, 0xbb, 0xdb, 0x15, 0x07, 0x6f, 0x74, 0x12, 0x14, 0x6f, 0xb8, 0x50,
-	0x4f, 0xf3, 0x86, 0x71, 0x18, 0x0b, 0xaa, 0x76, 0x0c, 0xa5, 0xb4, 0x0e, 0xd2, 0x20, 0x7b, 0x4f,
+	0x1b, 0x72, 0xcc, 0x9f, 0xbb, 0xa1, 0xae, 0xf2, 0x1d, 0xd4, 0xee, 0xb5, 0x0f, 0x63, 0x0a, 0x0b,
-	0x96, 0x7c, 0x2e, 0x4a, 0x38, 0x5e, 0xa2, 0x3d, 0xc8, 0x45, 0xe6, 0x6c, 0x41, 0xf8, 0x67, 0x2f,
+	0xb8, 0x7a, 0x08, 0xa5, 0x34, 0x1c, 0xd2, 0x20, 0x7b, 0x45, 0x56, 0x7c, 0x90, 0x4a, 0x38, 0x7e,
-	0x61, 0xb1, 0xa9, 0xbd, 0xcf, 0x40, 0x8e, 0x57, 0x41, 0x87, 0x90, 0xf7, 0xcd, 0x80, 0x78, 0x4c,
+	0x45, 0xbf, 0x40, 0x2e, 0x32, 0xe7, 0x4b, 0xc2, 0x07, 0xa4, 0x84, 0xc5, 0xa2, 0xfa, 0x36, 0x03,
-	0x0e, 0xd3, 0xce, 0x6a, 0x2e, 0xf8, 0xb1, 0xfd, 0x73, 0x2c, 0x01, 0xd4, 0x82, 0xa2, 0x1f, 0x90,
+	0x39, 0x1e, 0x05, 0xfd, 0x07, 0x79, 0xdf, 0x0c, 0x88, 0x17, 0xca, 0xe9, 0xd3, 0xef, 0x4c, 0x10,
-	0xc8, 0xa5, 0x8b, 0x50, 0x0e, 0xd1, 0x33, 0x70, 0x8a, 0xa0, 0x17, 0xa0, 0x89, 0xc4, 0x71, 0xe8,
+	0x4f, 0xdd, 0x3f, 0xc1, 0x92, 0x43, 0x6d, 0x28, 0xfa, 0x01, 0x89, 0x5c, 0xba, 0x64, 0x72, 0xea,
-	0x4e, 0x3d, 0x93, 0x2d, 0x02, 0xc2, 0x07, 0x49, 0xed, 0x54, 0x7f, 0x6a, 0x63, 0x12, 0xc4, 0xdb,
+	0xee, 0xf7, 0xa4, 0x24, 0xea, 0x81, 0x26, 0xfc, 0x63, 0xe6, 0xce, 0x3c, 0x33, 0x5c, 0x06, 0x84,
-	0x02, 0x4f, 0x05, 0x74, 0x02, 0x15, 0x59, 0xc1, 0xe1, 0xc6, 0xe5, 0x9c, 0xed, 0x3c, 0xe9, 0x08,
+	0x4f, 0x9e, 0xfa, 0xd5, 0xa9, 0xa6, 0x9d, 0x4e, 0x18, 0xbc, 0x2b, 0x5c, 0xa9, 0x80, 0x8e, 0xa0,
-	0x2e, 0x0b, 0x4e, 0x3e, 0x93, 0x16, 0x14, 0x2d, 0xc7, 0x9d, 0xd9, 0x01, 0xf1, 0xf4, 0x1c, 0x6f,
+	0x22, 0x03, 0x39, 0xbc, 0x1b, 0x72, 0x3e, 0xf5, 0xfb, 0xba, 0x85, 0xcb, 0x02, 0x97, 0x77, 0xae,
-	0xfe, 0x73, 0x17, 0x4d, 0x90, 0x83, 0x4f, 0x0a, 0xe4, 0x85, 0x8c, 0x0c, 0x90, 0xaf, 0x77, 0xf5,
+	0x0d, 0x45, 0xcb, 0x71, 0xe7, 0x76, 0x40, 0x3c, 0x3d, 0xc7, 0x8f, 0xe9, 0x81, 0xdd, 0x27, 0xe4,
-	0xba, 0x9e, 0x4b, 0x15, 0x4c, 0xdf, 0x46, 0xc7, 0x50, 0x5a, 0x99, 0xcb, 0xfc, 0xc9, 0xdc, 0x8a,
+	0xfe, 0x7b, 0x05, 0xf2, 0x42, 0x46, 0xff, 0x43, 0x49, 0x4e, 0x66, 0x7a, 0x63, 0x1f, 0x88, 0x20,
-	0x8b, 0x5b, 0x2e, 0xfd, 0x64, 0x7f, 0xe7, 0x47, 0x02, 0x48, 0x87, 0x82, 0x9c, 0x7c, 0xee, 0xbd,
+	0xd0, 0xbe, 0x8d, 0x1e, 0x41, 0x69, 0x5d, 0x78, 0xe6, 0x07, 0x0a, 0x5f, 0xe3, 0xf1, 0x19, 0xc9,
-	0x8c, 0x93, 0xed, 0xbf, 0xa7, 0x00, 0xab, 0x31, 0x47, 0x2a, 0x14, 0x70, 0xef, 0xe2, 0xf6, 0xaa,
+	0x5a, 0xb3, 0xdf, 0xa9, 0x55, 0x72, 0x48, 0x87, 0x82, 0xbc, 0x4d, 0xbc, 0x3d, 0x65, 0x9c, 0x2c,
-	0x8b, 0xb5, 0x0d, 0x54, 0x81, 0xd2, 0x68, 0xf0, 0xfa, 0x6c, 0x38, 0x1a, 0x5c, 0xf7, 0x34, 0x05,
+	0xff, 0x79, 0x0c, 0xb0, 0xbe, 0x33, 0x48, 0x85, 0x02, 0xee, 0xf6, 0x2e, 0xcf, 0x3a, 0x58, 0xdb,
-	0xed, 0x40, 0x65, 0x38, 0x1a, 0xe0, 0xee, 0x45, 0x6f, 0x7c, 0x81, 0x07, 0xb7, 0x37, 0x5a, 0xe6,
+	0x42, 0x15, 0x28, 0x8d, 0x06, 0xcf, 0x8f, 0x87, 0xa3, 0xc1, 0x79, 0x57, 0x53, 0xd0, 0x4f, 0x50,
-	0xec, 0xe6, 0xf3, 0x63, 0x5d, 0xf9, 0xf2, 0x58, 0x57, 0xbe, 0x3d, 0xd6, 0x95, 0x0f, 0xdf, 0xeb,
+	0x19, 0x8e, 0x06, 0xb8, 0xd3, 0xeb, 0x8e, 0x7b, 0x78, 0x70, 0x79, 0xa1, 0x65, 0x8e, 0x2f, 0x3e,
-	0x1b, 0x6f, 0x8f, 0xa6, 0x2e, 0x73, 0x16, 0x13, 0xc3, 0xa2, 0xf3, 0xb6, 0x17, 0xfa, 0x96, 0xd5,
+	0xdc, 0xd4, 0x94, 0x8f, 0x37, 0x35, 0xe5, 0xd3, 0x4d, 0x4d, 0x79, 0xfd, 0xb9, 0xb6, 0xf5, 0xf2,
-	0xb2, 0x49, 0xd4, 0xf6, 0x08, 0xbd, 0x0b, 0x5b, 0xa6, 0xef, 0xb6, 0xa6, 0xb4, 0x9d, 0xfe, 0xed,
+	0xdf, 0x99, 0x1b, 0x3a, 0xcb, 0x89, 0x61, 0xd1, 0x45, 0xd3, 0x63, 0xbe, 0x65, 0x1d, 0xd8, 0x24,
-	0x3e, 0x66, 0xb4, 0x6b, 0x42, 0x5f, 0x0d, 0x8d, 0xee, 0x4d, 0x5f, 0x36, 0x65, 0x92, 0xe7, 0xff,
+	0x6a, 0x7a, 0x84, 0x4e, 0xd9, 0x81, 0xe9, 0xbb, 0x07, 0x33, 0xda, 0x4c, 0xff, 0xae, 0x6f, 0x32,
-	0xaa, 0xe3, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xeb, 0x34, 0x17, 0x81, 0x14, 0x05, 0x00, 0x00,
+	0xda, 0x39, 0xa1, 0xcf, 0x86, 0x46, 0xe7, 0xa2, 0x2f, 0x5b, 0x34, 0xc9, 0xf3, 0x9f, 0xe2, 0xe1,
+	0x97, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0xd0, 0xe4, 0x6c, 0x84, 0x05, 0x00, 0x00,
 }
 
 func (m *Header) Marshal() (dAtA []byte, err error) {
@@ -1020,7 +1021,7 @@ func (m *Header) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.ContainerId == nil {
-				m.ContainerId = &v2.ContainerID{}
+				m.ContainerId = &refs.ContainerID{}
 			}
 			if err := m.ContainerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1056,7 +1057,7 @@ func (m *Header) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.OwnerId == nil {
-				m.OwnerId = &v2.OwnerID{}
+				m.OwnerId = &refs.OwnerID{}
 			}
 			if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1111,7 +1112,7 @@ func (m *Header) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.Version == nil {
-				m.Version = &v21.Version{}
+				m.Version = &service.Version{}
 			}
 			if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1253,7 +1254,7 @@ func (m *Header) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.SessionToken == nil {
-				m.SessionToken = &v21.SessionToken{}
+				m.SessionToken = &service.SessionToken{}
 			}
 			if err := m.SessionToken.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1531,7 +1532,7 @@ func (m *Header_Split) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.Parent == nil {
-				m.Parent = &v2.ObjectID{}
+				m.Parent = &refs.ObjectID{}
 			}
 			if err := m.Parent.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1567,7 +1568,7 @@ func (m *Header_Split) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.Previous == nil {
-				m.Previous = &v2.ObjectID{}
+				m.Previous = &refs.ObjectID{}
 			}
 			if err := m.Previous.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1603,7 +1604,7 @@ func (m *Header_Split) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.ParentSignature == nil {
-				m.ParentSignature = &v21.Signature{}
+				m.ParentSignature = &service.Signature{}
 			}
 			if err := m.ParentSignature.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1674,7 +1675,7 @@ func (m *Header_Split) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Children = append(m.Children, &v2.ObjectID{})
+			m.Children = append(m.Children, &refs.ObjectID{})
 			if err := m.Children[len(m.Children)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
@@ -1763,7 +1764,7 @@ func (m *Object) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.ObjectId == nil {
-				m.ObjectId = &v2.ObjectID{}
+				m.ObjectId = &refs.ObjectID{}
 			}
 			if err := m.ObjectId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1799,7 +1800,7 @@ func (m *Object) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.Signature == nil {
-				m.Signature = &v21.Signature{}
+				m.Signature = &service.Signature{}
 			}
 			if err := m.Signature.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err

v2/object/types.proto

@@ -1,13 +1,13 @@
 syntax = "proto3";
 
-package object.v2;
+package neo.fs.v2.object;
 
-option go_package = "github.com/nspcc-dev/neofs-api-go/object/v2";
+option go_package = "github.com/nspcc-dev/neofs-api-go/v2/object";
 option csharp_namespace = "NeoFS.API.Object";
 
-import "refs/v2/types.proto";
+import "v2/refs/types.proto";
-import "service/v2/meta.proto";
+import "v2/service/meta.proto";
-import "service/v2/verify.proto";
+import "v2/service/verify.proto";
 
 // Type of the object payload content
 enum ObjectType {
@@ -21,14 +21,14 @@ enum ObjectType {
 
 message Header {
   // Object's container
-  refs.v2.ContainerID container_id = 1;
+  neo.fs.v2.refs.ContainerID container_id = 1;
   // Object's owner
-  refs.v2.OwnerID owner_id = 2;
+  neo.fs.v2.refs.OwnerID owner_id = 2;
   // Epoch when the object was created
   uint64 creation_epoch = 3;
   // Object format version.
   // Effectively the version of API library used to create particular object
-  service.v2.Version version = 4;
+  neo.fs.v2.service.Version version = 4;
   // Size of payload in bytes.
   // 0xFFFFFFFFFFFFFFFF means `payload_length` is unknown
   uint64 payload_length = 5;
@@ -39,7 +39,7 @@ message Header {
   bytes homomorphic_hash = 8;
   // Session token, if it was used during Object creation.
   // Need it to verify integrity and authenticity out of Request scope.
-  service.v2.SessionToken session_token = 9;
+  neo.fs.v2.service.SessionToken session_token = 9;
 
   // Attribute groups the user-defined Key-Value pairs attached to the object
   message Attribute {
@@ -52,18 +52,18 @@ message Header {
 
   // Information about spawning the objects through a payload splitting.
   message Split {
-    // Identifier of the origin object.v2.
+    // Identifier of the origin object.
-    // Parent and children objects must be within the same container.v2.
+    // Parent and children objects must be within the same container.
     // Parent object_id is known only to the minor child.
-    refs.v2.ObjectID parent = 1;
+    neo.fs.v2.refs.ObjectID parent = 1;
     // Previous carries identifier of the left split neighbor.
-    refs.v2.ObjectID previous = 2;
+    neo.fs.v2.refs.ObjectID previous = 2;
-    // `signature` field of the parent object.v2. Used to reconstruct parent.
+    // `signature` field of the parent object. Used to reconstruct parent.
-    service.v2.Signature parent_signature = 3;
+    neo.fs.v2.service.Signature parent_signature = 3;
-    // `header` field of the parent object.v2. Used to reconstruct parent.
+    // `header` field of the parent object. Used to reconstruct parent.
     Header parent_header = 4;
     // Children carries list of identifiers of the objects generated by splitting the current.
-    repeated refs.v2.ObjectID children = 5;
+    repeated neo.fs.v2.refs.ObjectID children = 5;
   }
   // Position of the object in the split hierarchy.
   Split split = 11;
@@ -75,9 +75,9 @@ message Object {
   // Object is content-addressed. It means id will change if header or payload
   // changes. It's calculated as a hash of header field, which contains hash of
   // object's payload
-  refs.v2.ObjectID object_id = 1;
+  neo.fs.v2.refs.ObjectID object_id = 1;
   // Signed object_id
-  service.v2.Signature signature = 2;
+  neo.fs.v2.service.Signature signature = 2;
   // Object metadata headers
   Header header = 3;
   // Payload bytes.

v2/refs/marshal.go

@@ -1,4 +1,4 @@
-package v2
+package refs
 
 import (
 	"encoding/binary"

v2/refs/marshal_test.go

@@ -1,4 +1,4 @@
-package v2
+package refs
 
 import (
 	"crypto/rand"

v2/refs/types.go

@@ -1,4 +1,4 @@
-package v2
+package refs
 
 // SetValue sets container identifier in a binary format.
 func (m *ContainerID) SetValue(v []byte) {

v2/refs/types.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: refs/v2/types.proto
+// source: v2/refs/types.proto
 
-package v2
+package refs
 
 import (
 	fmt "fmt"
@@ -37,7 +37,7 @@ func (m *Address) Reset()         { *m = Address{} }
 func (m *Address) String() string { return proto.CompactTextString(m) }
 func (*Address) ProtoMessage()    {}
 func (*Address) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9faa6bee2355acc, []int{0}
+	return fileDescriptor_8ea16029b13f1cfa, []int{0}
 }
 func (m *Address) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -93,7 +93,7 @@ func (m *ObjectID) Reset()         { *m = ObjectID{} }
 func (m *ObjectID) String() string { return proto.CompactTextString(m) }
 func (*ObjectID) ProtoMessage()    {}
 func (*ObjectID) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9faa6bee2355acc, []int{1}
+	return fileDescriptor_8ea16029b13f1cfa, []int{1}
 }
 func (m *ObjectID) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -142,7 +142,7 @@ func (m *ContainerID) Reset()         { *m = ContainerID{} }
 func (m *ContainerID) String() string { return proto.CompactTextString(m) }
 func (*ContainerID) ProtoMessage()    {}
 func (*ContainerID) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9faa6bee2355acc, []int{2}
+	return fileDescriptor_8ea16029b13f1cfa, []int{2}
 }
 func (m *ContainerID) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -178,7 +178,7 @@ func (m *ContainerID) GetValue() []byte {
 	return nil
 }
 
-// OwnerID group information about the owner of the NeoFS container.v2.
+// OwnerID group information about the owner of the NeoFS container.
 type OwnerID struct {
 	// value carries the identifier of the container owner in a binary format.
 	Value                []byte   `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
@@ -191,7 +191,7 @@ func (m *OwnerID) Reset()         { *m = OwnerID{} }
 func (m *OwnerID) String() string { return proto.CompactTextString(m) }
 func (*OwnerID) ProtoMessage()    {}
 func (*OwnerID) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e9faa6bee2355acc, []int{3}
+	return fileDescriptor_8ea16029b13f1cfa, []int{3}
 }
 func (m *OwnerID) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -228,32 +228,32 @@ func (m *OwnerID) GetValue() []byte {
 }
 
 func init() {
-	proto.RegisterType((*Address)(nil), "refs.v2.Address")
+	proto.RegisterType((*Address)(nil), "neo.fs.v2.refs.Address")
-	proto.RegisterType((*ObjectID)(nil), "refs.v2.ObjectID")
+	proto.RegisterType((*ObjectID)(nil), "neo.fs.v2.refs.ObjectID")
-	proto.RegisterType((*ContainerID)(nil), "refs.v2.ContainerID")
+	proto.RegisterType((*ContainerID)(nil), "neo.fs.v2.refs.ContainerID")
-	proto.RegisterType((*OwnerID)(nil), "refs.v2.OwnerID")
+	proto.RegisterType((*OwnerID)(nil), "neo.fs.v2.refs.OwnerID")
 }
 
-func init() { proto.RegisterFile("refs/v2/types.proto", fileDescriptor_e9faa6bee2355acc) }
+func init() { proto.RegisterFile("v2/refs/types.proto", fileDescriptor_8ea16029b13f1cfa) }
 
-var fileDescriptor_e9faa6bee2355acc = []byte{
+var fileDescriptor_8ea16029b13f1cfa = []byte{
-	// 247 bytes of a gzipped FileDescriptorProto
+	// 256 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2e, 0x4a, 0x4d, 0x2b,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2e, 0x33, 0xd2, 0x2f,
-	0xd6, 0x2f, 0x33, 0xd2, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17,
+	0x4a, 0x4d, 0x2b, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17,
-	0x62, 0x07, 0x09, 0xea, 0x95, 0x19, 0x29, 0x15, 0x71, 0xb1, 0x3b, 0xa6, 0xa4, 0x14, 0xa5, 0x16,
+	0xe2, 0xcb, 0x4b, 0xcd, 0xd7, 0x4b, 0x2b, 0xd6, 0x2b, 0x33, 0xd2, 0x03, 0xc9, 0x29, 0x35, 0x30,
-	0x17, 0x0b, 0x99, 0x73, 0xf1, 0x24, 0xe7, 0xe7, 0x95, 0x24, 0x66, 0xe6, 0xa5, 0x16, 0xc5, 0x67,
+	0x72, 0xb1, 0x3b, 0xa6, 0xa4, 0x14, 0xa5, 0x16, 0x17, 0x0b, 0xd9, 0x71, 0xf1, 0x24, 0xe7, 0xe7,
-	0xa6, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x1b, 0x89, 0xe8, 0x41, 0x95, 0xea, 0x39, 0xc3, 0x24,
+	0x95, 0x24, 0x66, 0xe6, 0xa5, 0x16, 0xc5, 0x67, 0xa6, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x1b,
-	0x3d, 0x5d, 0x82, 0xb8, 0xe1, 0x2a, 0x3d, 0x53, 0x84, 0xf4, 0xb8, 0x38, 0xf3, 0x93, 0xb2, 0x52,
+	0x49, 0xeb, 0xa1, 0x6a, 0xd1, 0x73, 0x86, 0xa9, 0xf1, 0x74, 0x09, 0xe2, 0x86, 0x6b, 0xf0, 0x4c,
-	0x93, 0x4b, 0x40, 0xba, 0x98, 0xc0, 0xba, 0x04, 0xe1, 0xba, 0xfc, 0xc1, 0x32, 0x9e, 0x2e, 0x41,
+	0x11, 0x32, 0xe5, 0xe2, 0xcc, 0x4f, 0xca, 0x4a, 0x4d, 0x2e, 0x01, 0x69, 0x66, 0x02, 0x6b, 0x96,
-	0x1c, 0x10, 0x35, 0x9e, 0x29, 0x4a, 0x0a, 0x5c, 0x1c, 0x30, 0x51, 0x21, 0x11, 0x2e, 0xd6, 0xb2,
+	0x40, 0xd7, 0xec, 0x0f, 0x56, 0xe0, 0xe9, 0x12, 0xc4, 0x01, 0x51, 0xea, 0x99, 0xa2, 0xa4, 0xc0,
-	0xc4, 0x9c, 0xd2, 0x54, 0xb0, 0x6d, 0x3c, 0x41, 0x10, 0x8e, 0x92, 0x32, 0x17, 0x37, 0x92, 0x6d,
+	0xc5, 0x01, 0x13, 0x15, 0x12, 0xe1, 0x62, 0x2d, 0x4b, 0xcc, 0x29, 0x4d, 0x05, 0xdb, 0xcd, 0x13,
-	0x38, 0x14, 0xc9, 0x73, 0xb1, 0xfb, 0x97, 0xe3, 0x51, 0xe0, 0xe4, 0x73, 0xe2, 0x91, 0x1c, 0xe3,
+	0x04, 0xe1, 0x28, 0x29, 0x73, 0x71, 0x23, 0x59, 0x8a, 0x43, 0x91, 0x3c, 0x17, 0xbb, 0x7f, 0x39,
-	0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0xce, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x99, 0x9e,
+	0x1e, 0x05, 0x4e, 0x3e, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c,
-	0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x9f, 0x57, 0x5c, 0x90, 0x9c, 0xac, 0x9b,
+	0xe3, 0x8c, 0xc7, 0x72, 0x0c, 0x51, 0x9a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9,
-	0x92, 0x5a, 0xa6, 0x9f, 0x97, 0x9a, 0x9f, 0x56, 0xac, 0x9b, 0x58, 0x90, 0xa9, 0x9b, 0x9e, 0xaf,
+	0xb9, 0xfa, 0x79, 0xc5, 0x05, 0xc9, 0xc9, 0xba, 0x29, 0xa9, 0x65, 0xfa, 0x79, 0xa9, 0xf9, 0x69,
-	0x0f, 0x0d, 0xad, 0x55, 0x4c, 0x7c, 0x7e, 0xa9, 0xf9, 0x6e, 0xc1, 0x7a, 0x8e, 0x01, 0x9e, 0x7a,
+	0xc5, 0xba, 0x89, 0x05, 0x99, 0xba, 0xe9, 0xf9, 0xfa, 0xd0, 0x30, 0x5c, 0xc5, 0xc4, 0xe7, 0x97,
-	0x41, 0xa9, 0x69, 0xc5, 0x49, 0x6c, 0xe0, 0x90, 0x33, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xd2,
+	0x9a, 0xef, 0x16, 0xac, 0xe7, 0x18, 0xe0, 0xa9, 0x17, 0x94, 0x9a, 0x56, 0x9c, 0xc4, 0x06, 0x0e,
-	0xd4, 0x5b, 0x91, 0x50, 0x01, 0x00, 0x00,
+	0x4f, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x4f, 0x72, 0xf0, 0x66, 0x01, 0x00, 0x00,
 }
 
 func (m *Address) Marshal() (dAtA []byte, err error) {

v2/refs/types.proto

@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-package refs.v2;
+package neo.fs.v2.refs;
 
-option go_package = "github.com/nspcc-dev/neofs-api-go/refs/v2";
+option go_package = "github.com/nspcc-dev/neofs-api-go/v2/refs";
 option csharp_namespace = "NeoFS.API.Refs";
 
 // Address of object (container id + object id)
@@ -25,7 +25,7 @@ message ContainerID {
   bytes value = 1;
 }
 
-// OwnerID group information about the owner of the NeoFS container.v2.
+// OwnerID group information about the owner of the NeoFS container.
 message OwnerID {
   // value carries the identifier of the container owner in a binary format.
   bytes value = 1;

v2/service/meta.go

@@ -1,8 +1,8 @@
-package v2
+package service
 
 import (
-	acl "github.com/nspcc-dev/neofs-api-go/acl/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/acl"
-	refs "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/refs"
 )
 
 // SetKey sets key to the X-Header.

v2/service/meta.pb.go

@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: service/v2/meta.proto
+// source: v2/service/meta.proto
 
-package v2
+package service
 
 import (
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	v21 "github.com/nspcc-dev/neofs-api-go/acl/v2"
+	acl "github.com/nspcc-dev/neofs-api-go/v2/acl"
-	v2 "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	refs "github.com/nspcc-dev/neofs-api-go/v2/refs"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -69,7 +69,7 @@ func (x SessionToken_Body_Verb) String() string {
 }
 
 func (SessionToken_Body_Verb) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_44cb230373b42f12, []int{3, 0, 0}
+	return fileDescriptor_932e020d69aee3f0, []int{3, 0, 0}
 }
 
 type XHeader struct {
@@ -86,7 +86,7 @@ func (m *XHeader) Reset()         { *m = XHeader{} }
 func (m *XHeader) String() string { return proto.CompactTextString(m) }
 func (*XHeader) ProtoMessage()    {}
 func (*XHeader) Descriptor() ([]byte, []int) {
-	return fileDescriptor_44cb230373b42f12, []int{0}
+	return fileDescriptor_932e020d69aee3f0, []int{0}
 }
 func (m *XHeader) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -144,7 +144,7 @@ func (m *Version) Reset()         { *m = Version{} }
 func (m *Version) String() string { return proto.CompactTextString(m) }
 func (*Version) ProtoMessage()    {}
 func (*Version) Descriptor() ([]byte, []int) {
-	return fileDescriptor_44cb230373b42f12, []int{1}
+	return fileDescriptor_932e020d69aee3f0, []int{1}
 }
 func (m *Version) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -204,7 +204,7 @@ func (m *TokenLifetime) Reset()         { *m = TokenLifetime{} }
 func (m *TokenLifetime) String() string { return proto.CompactTextString(m) }
 func (*TokenLifetime) ProtoMessage()    {}
 func (*TokenLifetime) Descriptor() ([]byte, []int) {
-	return fileDescriptor_44cb230373b42f12, []int{2}
+	return fileDescriptor_932e020d69aee3f0, []int{2}
 }
 func (m *TokenLifetime) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -269,7 +269,7 @@ func (m *SessionToken) Reset()         { *m = SessionToken{} }
 func (m *SessionToken) String() string { return proto.CompactTextString(m) }
 func (*SessionToken) ProtoMessage()    {}
 func (*SessionToken) Descriptor() ([]byte, []int) {
-	return fileDescriptor_44cb230373b42f12, []int{3}
+	return fileDescriptor_932e020d69aee3f0, []int{3}
 }
 func (m *SessionToken) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -316,9 +316,9 @@ type SessionToken_Body struct {
 	// ID is a token identifier. valid UUIDv4 represented in bytes
 	Id []byte `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	// OwnerID carries identifier of the session initiator.
-	OwnerId *v2.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
+	OwnerId *refs.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
 	// Verb is a type of request for which the token is issued
-	Verb SessionToken_Body_Verb `protobuf:"varint,3,opt,name=verb,proto3,enum=service.v2.SessionToken_Body_Verb" json:"verb,omitempty"`
+	Verb SessionToken_Body_Verb `protobuf:"varint,3,opt,name=verb,proto3,enum=neo.fs.v2.service.SessionToken_Body_Verb" json:"verb,omitempty"`
 	// Lifetime is a lifetime of the session
 	Lifetime *TokenLifetime `protobuf:"bytes,4,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
 	// SessionKey is a public key of session key
@@ -337,7 +337,7 @@ func (m *SessionToken_Body) Reset()         { *m = SessionToken_Body{} }
 func (m *SessionToken_Body) String() string { return proto.CompactTextString(m) }
 func (*SessionToken_Body) ProtoMessage()    {}
 func (*SessionToken_Body) Descriptor() ([]byte, []int) {
-	return fileDescriptor_44cb230373b42f12, []int{3, 0}
+	return fileDescriptor_932e020d69aee3f0, []int{3, 0}
 }
 func (m *SessionToken_Body) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -373,7 +373,7 @@ type isSessionToken_Body_Context interface {
 }
 
 type SessionToken_Body_ObjectAddress struct {
-	ObjectAddress *v2.Address `protobuf:"bytes,6,opt,name=object_address,json=objectAddress,proto3,oneof" json:"object_address,omitempty"`
+	ObjectAddress *refs.Address `protobuf:"bytes,6,opt,name=object_address,json=objectAddress,proto3,oneof" json:"object_address,omitempty"`
 }
 
 func (*SessionToken_Body_ObjectAddress) isSessionToken_Body_Context() {}
@@ -392,7 +392,7 @@ func (m *SessionToken_Body) GetId() []byte {
 	return nil
 }
 
-func (m *SessionToken_Body) GetOwnerId() *v2.OwnerID {
+func (m *SessionToken_Body) GetOwnerId() *refs.OwnerID {
 	if m != nil {
 		return m.OwnerId
 	}
@@ -420,7 +420,7 @@ func (m *SessionToken_Body) GetSessionKey() []byte {
 	return nil
 }
 
-func (m *SessionToken_Body) GetObjectAddress() *v2.Address {
+func (m *SessionToken_Body) GetObjectAddress() *refs.Address {
 	if x, ok := m.GetContext().(*SessionToken_Body_ObjectAddress); ok {
 		return x.ObjectAddress
 	}
@@ -449,7 +449,7 @@ func (m *BearerToken) Reset()         { *m = BearerToken{} }
 func (m *BearerToken) String() string { return proto.CompactTextString(m) }
 func (*BearerToken) ProtoMessage()    {}
 func (*BearerToken) Descriptor() ([]byte, []int) {
-	return fileDescriptor_44cb230373b42f12, []int{4}
+	return fileDescriptor_932e020d69aee3f0, []int{4}
 }
 func (m *BearerToken) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -494,9 +494,9 @@ func (m *BearerToken) GetSignature() *Signature {
 
 type BearerToken_Body struct {
 	// EACLTable carries table of extended ACL rules
-	EaclTable *v21.EACLTable `protobuf:"bytes,1,opt,name=eacl_table,json=eaclTable,proto3" json:"eacl_table,omitempty"`
+	EaclTable *acl.EACLTable `protobuf:"bytes,1,opt,name=eacl_table,json=eaclTable,proto3" json:"eacl_table,omitempty"`
 	// OwnerID carries identifier of the token owner
-	OwnerId *v2.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
+	OwnerId *refs.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
 	// Token expiration and valid time period parameters
 	Lifetime             *TokenLifetime `protobuf:"bytes,3,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
@@ -508,7 +508,7 @@ func (m *BearerToken_Body) Reset()         { *m = BearerToken_Body{} }
 func (m *BearerToken_Body) String() string { return proto.CompactTextString(m) }
 func (*BearerToken_Body) ProtoMessage()    {}
 func (*BearerToken_Body) Descriptor() ([]byte, []int) {
-	return fileDescriptor_44cb230373b42f12, []int{4, 0}
+	return fileDescriptor_932e020d69aee3f0, []int{4, 0}
 }
 func (m *BearerToken_Body) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -537,14 +537,14 @@ func (m *BearerToken_Body) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_BearerToken_Body proto.InternalMessageInfo
 
-func (m *BearerToken_Body) GetEaclTable() *v21.EACLTable {
+func (m *BearerToken_Body) GetEaclTable() *acl.EACLTable {
 	if m != nil {
 		return m.EaclTable
 	}
 	return nil
 }
 
-func (m *BearerToken_Body) GetOwnerId() *v2.OwnerID {
+func (m *BearerToken_Body) GetOwnerId() *refs.OwnerID {
 	if m != nil {
 		return m.OwnerId
 	}
@@ -583,7 +583,7 @@ func (m *RequestMetaHeader) Reset()         { *m = RequestMetaHeader{} }
 func (m *RequestMetaHeader) String() string { return proto.CompactTextString(m) }
 func (*RequestMetaHeader) ProtoMessage()    {}
 func (*RequestMetaHeader) Descriptor() ([]byte, []int) {
-	return fileDescriptor_44cb230373b42f12, []int{5}
+	return fileDescriptor_932e020d69aee3f0, []int{5}
 }
 func (m *RequestMetaHeader) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -682,7 +682,7 @@ func (m *ResponseMetaHeader) Reset()         { *m = ResponseMetaHeader{} }
 func (m *ResponseMetaHeader) String() string { return proto.CompactTextString(m) }
 func (*ResponseMetaHeader) ProtoMessage()    {}
 func (*ResponseMetaHeader) Descriptor() ([]byte, []int) {
-	return fileDescriptor_44cb230373b42f12, []int{6}
+	return fileDescriptor_932e020d69aee3f0, []int{6}
 }
 func (m *ResponseMetaHeader) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -747,71 +747,73 @@ func (m *ResponseMetaHeader) GetOrigin() *ResponseMetaHeader {
 }
 
 func init() {
-	proto.RegisterEnum("service.v2.SessionToken_Body_Verb", SessionToken_Body_Verb_name, SessionToken_Body_Verb_value)
+	proto.RegisterEnum("neo.fs.v2.service.SessionToken_Body_Verb", SessionToken_Body_Verb_name, SessionToken_Body_Verb_value)
-	proto.RegisterType((*XHeader)(nil), "service.v2.XHeader")
+	proto.RegisterType((*XHeader)(nil), "neo.fs.v2.service.XHeader")
-	proto.RegisterType((*Version)(nil), "service.v2.Version")
+	proto.RegisterType((*Version)(nil), "neo.fs.v2.service.Version")
-	proto.RegisterType((*TokenLifetime)(nil), "service.v2.TokenLifetime")
+	proto.RegisterType((*TokenLifetime)(nil), "neo.fs.v2.service.TokenLifetime")
-	proto.RegisterType((*SessionToken)(nil), "service.v2.SessionToken")
+	proto.RegisterType((*SessionToken)(nil), "neo.fs.v2.service.SessionToken")
-	proto.RegisterType((*SessionToken_Body)(nil), "service.v2.SessionToken.Body")
+	proto.RegisterType((*SessionToken_Body)(nil), "neo.fs.v2.service.SessionToken.Body")
-	proto.RegisterType((*BearerToken)(nil), "service.v2.BearerToken")
+	proto.RegisterType((*BearerToken)(nil), "neo.fs.v2.service.BearerToken")
-	proto.RegisterType((*BearerToken_Body)(nil), "service.v2.BearerToken.Body")
+	proto.RegisterType((*BearerToken_Body)(nil), "neo.fs.v2.service.BearerToken.Body")
-	proto.RegisterType((*RequestMetaHeader)(nil), "service.v2.RequestMetaHeader")
+	proto.RegisterType((*RequestMetaHeader)(nil), "neo.fs.v2.service.RequestMetaHeader")
-	proto.RegisterType((*ResponseMetaHeader)(nil), "service.v2.ResponseMetaHeader")
+	proto.RegisterType((*ResponseMetaHeader)(nil), "neo.fs.v2.service.ResponseMetaHeader")
 }
 
-func init() { proto.RegisterFile("service/v2/meta.proto", fileDescriptor_44cb230373b42f12) }
+func init() { proto.RegisterFile("v2/service/meta.proto", fileDescriptor_932e020d69aee3f0) }
 
-var fileDescriptor_44cb230373b42f12 = []byte{
+var fileDescriptor_932e020d69aee3f0 = []byte{
-	// 778 bytes of a gzipped FileDescriptorProto
+	// 801 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0x4f, 0x6f, 0x1b, 0x45,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0xcd, 0x8e, 0x1b, 0x45,
-	0x14, 0xcf, 0xda, 0x6b, 0x3b, 0x7e, 0x8e, 0xc3, 0x66, 0xda, 0xaa, 0x26, 0x02, 0x53, 0xed, 0x09,
+	0x10, 0xde, 0xb1, 0xc7, 0xf6, 0xba, 0xbc, 0x5e, 0x66, 0x9b, 0xa0, 0x58, 0x2b, 0xe4, 0xac, 0x0c,
-	0x09, 0xb2, 0x2e, 0x8e, 0x52, 0x89, 0xa3, 0x9d, 0x2c, 0x75, 0x20, 0xb4, 0xd5, 0xd8, 0x54, 0x88,
+	0x48, 0x20, 0xb1, 0x63, 0x61, 0x08, 0x11, 0x51, 0x22, 0x61, 0xef, 0x0e, 0xf1, 0xc2, 0x92, 0x44,
-	0x8b, 0xb5, 0xde, 0x7d, 0x4e, 0xa6, 0x75, 0x76, 0xcc, 0xcc, 0x64, 0x89, 0x3f, 0x00, 0x1f, 0x01,
+	0x6d, 0x13, 0x21, 0x2e, 0xd6, 0xfc, 0x94, 0x77, 0x27, 0xf1, 0x4e, 0x9b, 0xee, 0xde, 0xc1, 0x7e,
-	0x89, 0x43, 0x2f, 0x5c, 0x39, 0xf3, 0x21, 0x38, 0x72, 0xe1, 0x8e, 0xc2, 0x17, 0x41, 0xf3, 0xc7,
+	0x00, 0xde, 0x81, 0x67, 0xe0, 0xc6, 0x8d, 0x0b, 0x57, 0xc4, 0x91, 0x1b, 0x57, 0xb4, 0xdc, 0x78,
-	0xcd, 0x26, 0x55, 0x11, 0x88, 0x0b, 0xb7, 0x37, 0xbf, 0xf7, 0x7b, 0xff, 0xdf, 0xdb, 0x85, 0x7b,
+	0x0a, 0xd4, 0x3f, 0x4e, 0x66, 0x89, 0x97, 0x3f, 0x71, 0xc8, 0xad, 0xea, 0xeb, 0xaa, 0xaf, 0xab,
-	0x12, 0x45, 0xc1, 0x52, 0xec, 0x15, 0xfd, 0xde, 0x39, 0xaa, 0x24, 0x5a, 0x0a, 0xae, 0x38, 0x01,
+	0xaa, 0xbf, 0xa9, 0x81, 0x57, 0xf2, 0x5e, 0x57, 0x20, 0xcf, 0xd3, 0x18, 0xbb, 0x67, 0x28, 0x43,
-	0x07, 0x47, 0x45, 0x7f, 0x97, 0x24, 0xe9, 0x42, 0xab, 0xd5, 0x6a, 0x89, 0xd2, 0xea, 0x77, 0xef,
+	0x7f, 0xce, 0x99, 0x64, 0x64, 0x27, 0x43, 0xe6, 0x4f, 0x85, 0x9f, 0xf7, 0x7c, 0x7b, 0xba, 0x4b,
-	0x08, 0x9c, 0xcb, 0xdb, 0xe0, 0xfd, 0x92, 0xaf, 0x02, 0x05, 0x9b, 0xaf, 0xac, 0x22, 0xfc, 0x04,
+	0xf2, 0x5e, 0x37, 0x8c, 0x67, 0x5d, 0xb9, 0x9c, 0xa3, 0x30, 0x61, 0xbb, 0x2f, 0xe7, 0xbd, 0x2e,
-	0x1a, 0x5f, 0x8f, 0x30, 0xc9, 0x50, 0x90, 0x00, 0xaa, 0x2f, 0x71, 0xd5, 0xf1, 0x1e, 0x78, 0x1f,
+	0xc7, 0xa9, 0xb8, 0x04, 0x5e, 0x2f, 0x50, 0xe6, 0xc8, 0xd3, 0xe9, 0xd2, 0x1c, 0x74, 0xde, 0x81,
-	0x36, 0xa9, 0x16, 0xc9, 0x5d, 0xa8, 0x15, 0xc9, 0xe2, 0x02, 0x3b, 0x15, 0x83, 0xd9, 0x47, 0x78,
+	0xda, 0xe7, 0x43, 0x0c, 0x13, 0xe4, 0xc4, 0x83, 0xf2, 0x13, 0x5c, 0xb6, 0x9c, 0x3d, 0xe7, 0xcd,
-	0x00, 0x8d, 0xe7, 0x28, 0x24, 0xe3, 0xb9, 0x26, 0x9c, 0x27, 0x2f, 0xb8, 0x30, 0x46, 0x6d, 0x6a,
+	0x3a, 0x55, 0x26, 0xb9, 0x06, 0x95, 0x3c, 0x9c, 0x9d, 0x63, 0xab, 0xa4, 0x31, 0xe3, 0x74, 0x6e,
-	0x1f, 0x06, 0x65, 0x39, 0x17, 0xc6, 0x4c, 0xa3, 0xfa, 0x11, 0xc6, 0xd0, 0x9e, 0xf0, 0x97, 0x98,
+	0x42, 0xed, 0x11, 0x72, 0x91, 0xb2, 0x4c, 0x05, 0x9c, 0x85, 0x8f, 0x19, 0xd7, 0x49, 0x4d, 0x6a,
-	0x9f, 0xb0, 0x39, 0x2a, 0x76, 0x8e, 0x3a, 0x1e, 0x5e, 0x2e, 0x8d, 0xa9, 0x4f, 0xb5, 0xa8, 0x91,
+	0x1c, 0x8d, 0xa6, 0x19, 0xe3, 0x3a, 0x4d, 0xa1, 0xca, 0xe9, 0x04, 0xd0, 0x1c, 0xb3, 0x27, 0x98,
-	0x7c, 0x36, 0x37, 0x66, 0x3e, 0xd5, 0xa2, 0x46, 0x58, 0xa2, 0x3a, 0x55, 0x8b, 0xb0, 0x44, 0x85,
+	0x1d, 0xa7, 0x53, 0x94, 0xe9, 0x19, 0xaa, 0xfb, 0x70, 0x31, 0xd7, 0xa9, 0x2e, 0x55, 0xa6, 0x42,
-	0xaf, 0x7c, 0xd8, 0x1a, 0xa3, 0xd4, 0xe1, 0x8d, 0x3b, 0xb2, 0x0f, 0x35, 0xa5, 0x05, 0xe3, 0xa8,
+	0xb2, 0x68, 0xaa, 0xd3, 0x5c, 0xaa, 0x4c, 0x85, 0xa4, 0xa1, 0x6c, 0x95, 0x0d, 0x92, 0x86, 0xb2,
-	0xd5, 0x7f, 0x3f, 0xba, 0xee, 0x4f, 0x54, 0x26, 0x46, 0x43, 0x9e, 0xad, 0xa8, 0xe5, 0x92, 0x7d,
+	0xf3, 0xa3, 0x0b, 0x5b, 0x23, 0x14, 0xea, 0x7a, 0x4d, 0x47, 0x6e, 0x43, 0x45, 0x2a, 0x43, 0x13,
-	0x68, 0x4a, 0x76, 0x9a, 0x27, 0xea, 0x42, 0xd8, 0xea, 0x5a, 0xfd, 0x7b, 0x37, 0x0c, 0xd7, 0x4a,
+	0x35, 0x7a, 0xaf, 0xfb, 0xcf, 0x8d, 0xc9, 0x2f, 0xc6, 0xfb, 0x03, 0x96, 0x2c, 0xa9, 0x49, 0x21,
-	0x7a, 0xcd, 0xdb, 0xfd, 0xa9, 0x0a, 0xbe, 0x76, 0x42, 0xb6, 0xa1, 0xc2, 0x32, 0x13, 0x6f, 0x8b,
+	0xb7, 0xa1, 0x2e, 0xd2, 0x93, 0x2c, 0x94, 0xe7, 0xdc, 0x34, 0xd9, 0xe8, 0xbd, 0xba, 0x2e, 0x7f,
-	0x56, 0x58, 0x46, 0x3e, 0x82, 0x4d, 0xfe, 0x5d, 0x8e, 0x62, 0xca, 0x32, 0xe7, 0x2c, 0x88, 0xf4,
+	0x15, 0x43, 0x9f, 0x85, 0xef, 0xfe, 0x50, 0x06, 0x57, 0x71, 0x91, 0x6d, 0x28, 0xa5, 0x89, 0xbe,
-	0x14, 0xb4, 0xa7, 0xa7, 0x5a, 0x71, 0x7c, 0x44, 0x1b, 0x86, 0x71, 0x9c, 0x91, 0x47, 0xe0, 0x17,
+	0x7d, 0x8b, 0x96, 0xd2, 0x84, 0xf4, 0x60, 0x93, 0x7d, 0x95, 0x21, 0x9f, 0xa4, 0x89, 0xe5, 0xbc,
-	0x28, 0x66, 0xa6, 0xa6, 0xed, 0x7e, 0xf8, 0xb7, 0xe9, 0x46, 0xcf, 0x51, 0xcc, 0xa8, 0xe1, 0x93,
+	0x5e, 0xe0, 0x54, 0x4f, 0xe3, 0x3f, 0x50, 0xe7, 0x47, 0x87, 0xb4, 0xa6, 0x03, 0x8f, 0x12, 0x72,
-	0x03, 0xd8, 0x5c, 0xb8, 0xd6, 0x75, 0x7c, 0x13, 0xe4, 0xdd, 0xb2, 0xed, 0x8d, 0xde, 0xd2, 0xd7,
+	0x17, 0xdc, 0x1c, 0x79, 0xa4, 0x1b, 0xdd, 0xee, 0xbd, 0xf5, 0x4f, 0x7a, 0xf0, 0x1f, 0x21, 0x8f,
-	0x54, 0xf2, 0x01, 0xb4, 0xa4, 0x75, 0x3b, 0xd5, 0xd3, 0xad, 0x99, 0xa4, 0xc1, 0x41, 0x5f, 0xe0,
+	0xa8, 0x4e, 0x23, 0x77, 0x60, 0x73, 0x66, 0xc7, 0xda, 0x72, 0xf5, 0x95, 0x7b, 0x6b, 0x28, 0x2e,
-	0x8a, 0x7c, 0x0a, 0xdb, 0x7c, 0xf6, 0x02, 0x53, 0x35, 0x4d, 0xb2, 0x4c, 0xa0, 0x94, 0x9d, 0xfa,
+	0x8d, 0x9f, 0x3e, 0xcd, 0x20, 0x37, 0xa0, 0x21, 0x0c, 0xfb, 0x44, 0x09, 0xa0, 0xa2, 0x3b, 0x01,
-	0xad, 0x12, 0x06, 0x16, 0x1f, 0x6d, 0xd0, 0xb6, 0x65, 0x3a, 0x20, 0xfc, 0xde, 0x03, 0x5f, 0x67,
+	0x0b, 0x7d, 0x82, 0x4b, 0xf2, 0x21, 0x6c, 0xb3, 0xe8, 0x31, 0xc6, 0x72, 0x12, 0x26, 0x09, 0x47,
-	0x48, 0xb6, 0x01, 0x9e, 0x0e, 0x3f, 0x8f, 0x0f, 0x27, 0xd3, 0x67, 0x5f, 0x4d, 0x82, 0x8d, 0xd2,
+	0x21, 0x5a, 0xd5, 0xf5, 0x7d, 0xf5, 0xcd, 0xf1, 0x70, 0x83, 0x36, 0x4d, 0x82, 0x05, 0x3a, 0x5f,
-	0xfb, 0x71, 0x3c, 0x09, 0x3c, 0xf2, 0x0e, 0xb4, 0xdc, 0x7b, 0x14, 0x0f, 0x8e, 0x82, 0x0a, 0xd9,
+	0x3b, 0xe0, 0xaa, 0x7a, 0xc9, 0x36, 0xc0, 0x83, 0xc1, 0xc7, 0xc1, 0xc1, 0x78, 0xf2, 0xf0, 0xb3,
-	0x81, 0xb6, 0x03, 0xc6, 0xf1, 0x80, 0x1e, 0x8e, 0x82, 0x6a, 0x09, 0x3a, 0x8a, 0x4f, 0xe2, 0x49,
+	0xb1, 0xb7, 0x51, 0xf0, 0xef, 0x05, 0x63, 0xcf, 0x21, 0x2f, 0x41, 0xc3, 0xfa, 0xc3, 0xa0, 0x7f,
-	0x1c, 0xf8, 0x24, 0x80, 0x2d, 0x07, 0xd1, 0xc1, 0x93, 0xc7, 0x71, 0x50, 0x23, 0x77, 0x21, 0x28,
+	0xe8, 0x95, 0xc8, 0x0e, 0x34, 0x2d, 0x30, 0x0a, 0xfa, 0xf4, 0x60, 0xe8, 0x95, 0x0b, 0xd0, 0x61,
-	0x23, 0xa3, 0xc1, 0x78, 0x14, 0xd4, 0x87, 0x4d, 0x68, 0xa4, 0x3c, 0x57, 0x78, 0xa9, 0xc2, 0x1f,
+	0x70, 0x1c, 0x8c, 0x03, 0xcf, 0x25, 0x1e, 0x6c, 0x59, 0x88, 0xf6, 0xef, 0xdf, 0x0b, 0xbc, 0x0a,
-	0x2a, 0xd0, 0x1a, 0x62, 0x22, 0x50, 0xd8, 0xed, 0xe8, 0xdf, 0xdc, 0x8e, 0xf7, 0xca, 0x2d, 0x2b,
+	0xb9, 0x06, 0x5e, 0x11, 0x19, 0xf6, 0x47, 0x43, 0xaf, 0x3a, 0xa8, 0x43, 0x2d, 0x66, 0x99, 0xc4,
-	0xf1, 0xfe, 0xfb, 0x72, 0xbc, 0xf2, 0xdc, 0x72, 0x3c, 0x04, 0xc0, 0x24, 0x5d, 0x4c, 0x55, 0x32,
+	0x85, 0xec, 0x7c, 0x5f, 0x82, 0xc6, 0x00, 0x43, 0x8e, 0xdc, 0xe8, 0xe8, 0x83, 0xcb, 0x3a, 0x7a,
-	0x5b, 0xa0, 0x0b, 0xbb, 0x13, 0x25, 0xe9, 0x42, 0x9b, 0xc6, 0x83, 0xc3, 0x93, 0x89, 0x56, 0xd0,
+	0x6d, 0xcd, 0x00, 0x0b, 0xe1, 0xff, 0x9b, 0x8c, 0xbe, 0x73, 0xac, 0x8c, 0x6e, 0x01, 0x60, 0x18,
-	0xa6, 0x26, 0x19, 0xf1, 0xdf, 0xad, 0x4f, 0x79, 0x0d, 0xaa, 0xff, 0x78, 0x0d, 0xc2, 0x5f, 0x2a,
+	0xcf, 0x26, 0x32, 0x8c, 0x66, 0x68, 0x8b, 0x68, 0x15, 0x58, 0xc2, 0x78, 0xe6, 0x07, 0xfd, 0x83,
-	0xb0, 0x43, 0xf1, 0xdb, 0x0b, 0x94, 0xea, 0x4b, 0x54, 0x89, 0x3b, 0xf9, 0x3d, 0x68, 0x14, 0xf6,
+	0xe3, 0xb1, 0x3a, 0xa7, 0x75, 0x15, 0xab, 0xcd, 0xff, 0xa4, 0xb7, 0xa2, 0x60, 0xca, 0xff, 0x56,
-	0x94, 0x5d, 0xa2, 0x77, 0xca, 0xbe, 0xdc, 0x95, 0xd3, 0x35, 0x47, 0x1f, 0x36, 0x2e, 0x79, 0x7a,
+	0x30, 0x9d, 0x5f, 0x4a, 0xb0, 0x43, 0xf1, 0xcb, 0x73, 0x14, 0xf2, 0x53, 0x94, 0xa1, 0xdd, 0x1f,
-	0xe6, 0x2e, 0xd4, 0x3e, 0xf4, 0x8d, 0x2a, 0xb5, 0x30, 0xc9, 0xb4, 0xa9, 0x16, 0xc9, 0x43, 0x68,
+	0xef, 0x41, 0x2d, 0x37, 0x7b, 0xc1, 0x56, 0xbf, 0xbb, 0x86, 0xd2, 0x6e, 0x0e, 0xba, 0x0a, 0x55,
-	0x5e, 0x4e, 0xcf, 0x4c, 0x08, 0xd9, 0xf1, 0x1f, 0x54, 0x6f, 0x3b, 0x76, 0x5f, 0x1c, 0xba, 0x79,
+	0xcb, 0x02, 0xe7, 0x2c, 0x3e, 0xb5, 0x5f, 0xbd, 0x71, 0xd4, 0x77, 0x2f, 0xe5, 0x4c, 0x97, 0xd6,
-	0x69, 0x05, 0x49, 0xa2, 0xf5, 0x98, 0x6a, 0x26, 0x8d, 0xce, 0xdb, 0xae, 0x62, 0x3d, 0xa2, 0x1e,
+	0xa4, 0xca, 0x24, 0xb7, 0xa0, 0xbe, 0x98, 0x9c, 0xea, 0x9b, 0x44, 0xcb, 0xdd, 0x2b, 0x5f, 0xc1,
-	0xd4, 0x67, 0x66, 0x7a, 0x6e, 0x59, 0xef, 0xbf, 0x65, 0xae, 0xd4, 0xd1, 0xc8, 0x01, 0xd4, 0xb9,
+	0x6f, 0x97, 0x19, 0xdd, 0x5c, 0x18, 0x43, 0x90, 0x9b, 0xab, 0x77, 0xad, 0xe8, 0xa2, 0x6e, 0xfc,
-	0x60, 0xa7, 0x2c, 0xef, 0x34, 0xde, 0xfc, 0x4c, 0xbc, 0xd1, 0x18, 0xea, 0xc8, 0xe1, 0xef, 0x1e,
+	0xcd, 0xb7, 0xb5, 0x7a, 0xd3, 0xf7, 0xa1, 0x1a, 0xe9, 0xe7, 0xb6, 0x5a, 0x6f, 0xff, 0xb5, 0x1e,
-	0x10, 0x8a, 0x72, 0xc9, 0x73, 0x89, 0xff, 0xc7, 0xbe, 0x3d, 0x7a, 0x5d, 0x96, 0x6d, 0x5c, 0xf7,
+	0xa8, 0x8d, 0x26, 0x77, 0xa0, 0xca, 0x78, 0x7a, 0x92, 0x66, 0xad, 0xda, 0x95, 0xfb, 0xe8, 0xb9,
-	0x66, 0x59, 0xb7, 0x13, 0x5f, 0xd7, 0x35, 0xa4, 0xbf, 0x5e, 0x75, 0xbd, 0xdf, 0xae, 0xba, 0xde,
+	0xd9, 0x51, 0x9b, 0xd3, 0xf9, 0xdd, 0x01, 0x42, 0x51, 0xcc, 0x59, 0x26, 0xf0, 0xc5, 0x1f, 0xed,
-	0x1f, 0x57, 0x5d, 0xef, 0xc7, 0x3f, 0xbb, 0x1b, 0xdf, 0x7c, 0x7c, 0xca, 0xd4, 0xd9, 0xc5, 0x2c,
+	0xdd, 0xa7, 0xbd, 0x9a, 0xd9, 0xbe, 0xb1, 0xb6, 0xd7, 0x3f, 0x77, 0xb3, 0x6a, 0x76, 0x40, 0x7f,
-	0x4a, 0xf9, 0x79, 0x2f, 0x97, 0xcb, 0x34, 0xdd, 0xcb, 0xb0, 0xe8, 0xe5, 0xc8, 0xe7, 0x72, 0x2f,
+	0xba, 0x68, 0x3b, 0x3f, 0x5f, 0xb4, 0x9d, 0x5f, 0x2f, 0xda, 0xce, 0x37, 0xbf, 0xb5, 0x37, 0xbe,
-	0x59, 0xb2, 0xbd, 0x53, 0xde, 0xbb, 0xfe, 0x87, 0xfc, 0x5c, 0xd9, 0x79, 0x82, 0xfc, 0xb3, 0x71,
+	0x78, 0xfb, 0x24, 0x95, 0xa7, 0xe7, 0x91, 0x1f, 0xb3, 0xb3, 0x6e, 0x26, 0xe6, 0x71, 0xbc, 0x9f,
-	0x34, 0x78, 0x76, 0x1c, 0x8d, 0x2d, 0x3c, 0xab, 0x9b, 0x3f, 0xca, 0xfe, 0x5f, 0x01, 0x00, 0x00,
+	0x60, 0xde, 0xcd, 0x90, 0x4d, 0xc5, 0x7e, 0x38, 0x4f, 0xf7, 0x4f, 0x58, 0xf7, 0xd9, 0x8f, 0xec,
-	0xff, 0xff, 0x35, 0x2b, 0x57, 0xef, 0xb8, 0x06, 0x00, 0x00,
+	0xdb, 0xd2, 0xce, 0x7d, 0x64, 0x1f, 0x8d, 0xfc, 0xfe, 0xc3, 0x23, 0x7f, 0x64, 0xb0, 0xa8, 0xaa,
+	0x7f, 0x6b, 0xef, 0xfe, 0x11, 0x00, 0x00, 0xff, 0xff, 0x1a, 0xf8, 0x0e, 0x53, 0x44, 0x07, 0x00,
+	0x00,
 }
 
 func (m *XHeader) Marshal() (dAtA []byte, err error) {
@@ -2171,7 +2173,7 @@ func (m *SessionToken_Body) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.OwnerId == nil {
-				m.OwnerId = &v2.OwnerID{}
+				m.OwnerId = &refs.OwnerID{}
 			}
 			if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -2295,7 +2297,7 @@ func (m *SessionToken_Body) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			v := &v2.Address{}
+			v := &refs.Address{}
 			if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
@@ -2511,7 +2513,7 @@ func (m *BearerToken_Body) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.EaclTable == nil {
-				m.EaclTable = &v21.EACLTable{}
+				m.EaclTable = &acl.EACLTable{}
 			}
 			if err := m.EaclTable.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -2547,7 +2549,7 @@ func (m *BearerToken_Body) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.OwnerId == nil {
-				m.OwnerId = &v2.OwnerID{}
+				m.OwnerId = &refs.OwnerID{}
 			}
 			if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err

v2/service/meta.proto

@@ -1,13 +1,13 @@
 syntax = "proto3";
 
-package service.v2;
+package neo.fs.v2.service;
 
-option go_package = "github.com/nspcc-dev/neofs-api-go/service/v2";
+option go_package = "github.com/nspcc-dev/neofs-api-go/v2/service";
 option csharp_namespace = "NeoFS.API.Service";
 
-import "acl/v2/types.proto";
+import "v2/acl/types.proto";
-import "refs/v2/types.proto";
+import "v2/refs/types.proto";
-import "service/v2/verify.proto";
+import "v2/service/verify.proto";
 
 message XHeader {
   // Key of the X-Header.
@@ -40,7 +40,7 @@ message SessionToken {
     // ID is a token identifier. valid UUIDv4 represented in bytes
     bytes id = 1;
     // OwnerID carries identifier of the session initiator.
-    refs.v2.OwnerID owner_id = 2;
+    neo.fs.v2.refs.OwnerID owner_id = 2;
     // Verb is an enumeration of session request types
     enum Verb {
       // Refers to object.Put RPC call
@@ -67,7 +67,7 @@ message SessionToken {
     // Carries context of the session.
     oneof context {
       // object_address represents the object session context.
-      refs.v2.Address object_address = 6;
+      neo.fs.v2.refs.Address object_address = 6;
     }
   }
   // Session Token body
@@ -81,9 +81,9 @@ message SessionToken {
 message BearerToken {
   message Body {
     // EACLTable carries table of extended ACL rules
-    acl.v2.EACLTable eacl_table = 1;
+    neo.fs.v2.acl.EACLTable eacl_table = 1;
     // OwnerID carries identifier of the token owner
-    refs.v2.OwnerID owner_id = 2;
+    neo.fs.v2.refs.OwnerID owner_id = 2;
     // Token expiration and valid time period parameters
     TokenLifetime lifetime = 3;
   }

v2/service/verify.go

@@ -1,4 +1,4 @@
-package v2
+package service
 
 // SetKey sets public key in a binary format.
 func (m *Signature) SetKey(v []byte) {

v2/service/verify.pb.go

@@ -1,13 +1,11 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: service/v2/verify.proto
+// source: v2/service/verify.proto
 
-package v2
+package service
 
 import (
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	_ "github.com/nspcc-dev/neofs-api-go/acl/v2"
-	_ "github.com/nspcc-dev/neofs-api-go/refs/v2"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -39,7 +37,7 @@ func (m *Signature) Reset()         { *m = Signature{} }
 func (m *Signature) String() string { return proto.CompactTextString(m) }
 func (*Signature) ProtoMessage()    {}
 func (*Signature) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7ea2d606af3f2456, []int{0}
+	return fileDescriptor_848d62e0ecc8b6b6, []int{0}
 }
 func (m *Signature) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -101,7 +99,7 @@ func (m *RequestVerificationHeader) Reset()         { *m = RequestVerificationHe
 func (m *RequestVerificationHeader) String() string { return proto.CompactTextString(m) }
 func (*RequestVerificationHeader) ProtoMessage()    {}
 func (*RequestVerificationHeader) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7ea2d606af3f2456, []int{1}
+	return fileDescriptor_848d62e0ecc8b6b6, []int{1}
 }
 func (m *RequestVerificationHeader) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -177,7 +175,7 @@ func (m *ResponseVerificationHeader) Reset()         { *m = ResponseVerification
 func (m *ResponseVerificationHeader) String() string { return proto.CompactTextString(m) }
 func (*ResponseVerificationHeader) ProtoMessage()    {}
 func (*ResponseVerificationHeader) Descriptor() ([]byte, []int) {
-	return fileDescriptor_7ea2d606af3f2456, []int{2}
+	return fileDescriptor_848d62e0ecc8b6b6, []int{2}
 }
 func (m *ResponseVerificationHeader) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -235,37 +233,36 @@ func (m *ResponseVerificationHeader) GetOrigin() *ResponseVerificationHeader {
 }
 
 func init() {
-	proto.RegisterType((*Signature)(nil), "service.v2.Signature")
+	proto.RegisterType((*Signature)(nil), "neo.fs.v2.service.Signature")
-	proto.RegisterType((*RequestVerificationHeader)(nil), "service.v2.RequestVerificationHeader")
+	proto.RegisterType((*RequestVerificationHeader)(nil), "neo.fs.v2.service.RequestVerificationHeader")
-	proto.RegisterType((*ResponseVerificationHeader)(nil), "service.v2.ResponseVerificationHeader")
+	proto.RegisterType((*ResponseVerificationHeader)(nil), "neo.fs.v2.service.ResponseVerificationHeader")
 }
 
-func init() { proto.RegisterFile("service/v2/verify.proto", fileDescriptor_7ea2d606af3f2456) }
+func init() { proto.RegisterFile("v2/service/verify.proto", fileDescriptor_848d62e0ecc8b6b6) }
 
-var fileDescriptor_7ea2d606af3f2456 = []byte{
+var fileDescriptor_848d62e0ecc8b6b6 = []byte{
-	// 339 bytes of a gzipped FileDescriptorProto
+	// 325 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2f, 0x4e, 0x2d, 0x2a,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2f, 0x33, 0xd2, 0x2f,
-	0xcb, 0x4c, 0x4e, 0xd5, 0x2f, 0x33, 0xd2, 0x2f, 0x4b, 0x2d, 0xca, 0x4c, 0xab, 0xd4, 0x2b, 0x28,
+	0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2f, 0x4b, 0x2d, 0xca, 0x4c, 0xab, 0xd4, 0x2b, 0x28,
-	0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x82, 0x4a, 0xe8, 0x95, 0x19, 0x49, 0x09, 0x25, 0x26, 0xe7, 0x80,
+	0xca, 0x2f, 0xc9, 0x17, 0x12, 0xcc, 0x4b, 0xcd, 0xd7, 0x4b, 0x2b, 0xd6, 0x2b, 0x33, 0xd2, 0x83,
-	0x14, 0x94, 0x54, 0x16, 0xa4, 0x16, 0x43, 0xe4, 0xa5, 0x84, 0x8b, 0x52, 0xd3, 0x8a, 0xd1, 0x04,
+	0xca, 0x2b, 0x19, 0x72, 0x71, 0x06, 0x67, 0xa6, 0xe7, 0x25, 0x96, 0x94, 0x16, 0xa5, 0x0a, 0x09,
-	0x95, 0x0c, 0xb9, 0x38, 0x83, 0x33, 0xd3, 0xf3, 0x12, 0x4b, 0x4a, 0x8b, 0x52, 0x85, 0x04, 0xb8,
+	0x70, 0x31, 0x67, 0xa7, 0x56, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0xf0, 0x04, 0x81, 0x98, 0x42, 0x42,
-	0x98, 0xb3, 0x53, 0x2b, 0x25, 0x18, 0x15, 0x18, 0x35, 0x78, 0x82, 0x40, 0x4c, 0x21, 0x21, 0x2e,
+	0x5c, 0x2c, 0xc5, 0x99, 0xe9, 0x79, 0x12, 0x4c, 0x60, 0x21, 0x30, 0x5b, 0x69, 0x0b, 0x13, 0x97,
-	0x96, 0xe2, 0xcc, 0xf4, 0x3c, 0x09, 0x26, 0xb0, 0x10, 0x98, 0xad, 0x34, 0x83, 0x89, 0x4b, 0x32,
+	0x64, 0x50, 0x6a, 0x61, 0x69, 0x6a, 0x71, 0x49, 0x18, 0xc8, 0xf4, 0xcc, 0xe4, 0xc4, 0x92, 0xcc,
-	0x28, 0xb5, 0xb0, 0x34, 0xb5, 0xb8, 0x24, 0x0c, 0x64, 0x7f, 0x66, 0x72, 0x62, 0x49, 0x66, 0x7e,
+	0xfc, 0x3c, 0x8f, 0xd4, 0xc4, 0x94, 0xd4, 0x22, 0x21, 0x67, 0x2e, 0xbe, 0xa4, 0xfc, 0x94, 0xca,
-	0x9e, 0x47, 0x6a, 0x62, 0x4a, 0x6a, 0x91, 0x90, 0x0d, 0x17, 0x5f, 0x52, 0x7e, 0x4a, 0x65, 0x7c,
+	0xf8, 0x62, 0x98, 0xa9, 0x60, 0xe3, 0xb8, 0x8d, 0x64, 0xf4, 0x30, 0x2c, 0xd7, 0x83, 0xdb, 0x1c,
-	0x31, 0xcc, 0x54, 0xb0, 0x71, 0xdc, 0x46, 0xa2, 0x7a, 0x08, 0xe7, 0xe9, 0xc1, 0xad, 0x0c, 0xe2,
+	0xc4, 0x0b, 0xd2, 0x83, 0x70, 0x88, 0x33, 0x17, 0x5f, 0x6e, 0x6a, 0x49, 0x22, 0x92, 0x21, 0x4c,
-	0x05, 0x29, 0x46, 0xb8, 0xc0, 0x86, 0x8b, 0x2f, 0x37, 0xb5, 0x24, 0x11, 0x49, 0x37, 0x13, 0x5e,
+	0xc4, 0x18, 0x02, 0xd2, 0x83, 0x30, 0xc4, 0x9d, 0x4b, 0x20, 0xbf, 0x28, 0x33, 0x3d, 0x33, 0x0f,
-	0xdd, 0x20, 0xc5, 0x08, 0xdd, 0x0e, 0x5c, 0x02, 0xf9, 0x45, 0x99, 0xe9, 0x99, 0x79, 0x48, 0xfa,
+	0xc9, 0x18, 0x66, 0x22, 0x8c, 0xe1, 0x87, 0xe8, 0x42, 0x18, 0xe4, 0xc2, 0xc5, 0x06, 0x11, 0x92,
-	0x99, 0xf1, 0xe9, 0xe7, 0x87, 0x28, 0x47, 0x98, 0x60, 0xcb, 0xc5, 0x06, 0x11, 0x92, 0x60, 0x01,
+	0x60, 0x01, 0x6b, 0xd7, 0xc1, 0xa2, 0x1d, 0x67, 0x80, 0x04, 0x41, 0xf5, 0x2a, 0x6d, 0x63, 0xe2,
-	0xeb, 0x53, 0x45, 0xd6, 0x87, 0xd3, 0xd3, 0x41, 0x50, 0x4d, 0x4a, 0xb3, 0x98, 0xb8, 0xa4, 0x82,
+	0x92, 0x0a, 0x4a, 0x2d, 0x2e, 0xc8, 0xcf, 0x2b, 0x4e, 0x1d, 0x19, 0xe1, 0xe6, 0x8a, 0x16, 0x6e,
-	0x52, 0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x87, 0x5d, 0xd8, 0xd8, 0xa1, 0x85, 0x8d, 0x1a, 0x6a,
+	0xba, 0x58, 0xc3, 0x0d, 0x57, 0x88, 0xc0, 0x02, 0xce, 0x29, 0xe8, 0xc4, 0x23, 0x39, 0xc6, 0x0b,
-	0xd8, 0xe0, 0xf2, 0x35, 0x2c, 0x70, 0x9c, 0x82, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e,
+	0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x27, 0x3d, 0xb3,
-	0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x19, 0x8f, 0xe5, 0x18, 0xa2, 0x74, 0xd2, 0x33, 0x4b, 0x32, 0x4a,
+	0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0xaf, 0xb8, 0x20, 0x39, 0x59, 0x37, 0x25,
-	0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xf3, 0x8a, 0x0b, 0x92, 0x93, 0x75, 0x53, 0x52, 0xcb, 0xf4,
+	0xb5, 0x4c, 0x3f, 0x2f, 0x35, 0x3f, 0xad, 0x58, 0x37, 0xb1, 0x20, 0x53, 0x37, 0x3d, 0x5f, 0x1f,
-	0xf3, 0x52, 0xf3, 0xd3, 0x8a, 0x75, 0x13, 0x0b, 0x32, 0x75, 0xd3, 0xf3, 0xf5, 0x11, 0x89, 0x7d,
+	0x91, 0x05, 0x56, 0x31, 0x09, 0xfa, 0xa5, 0xe6, 0xbb, 0x05, 0xeb, 0x39, 0x06, 0x78, 0xea, 0x05,
-	0x15, 0x93, 0xa0, 0x5f, 0x6a, 0xbe, 0x5b, 0xb0, 0x9e, 0x63, 0x80, 0xa7, 0x5e, 0x30, 0x44, 0x38,
+	0x43, 0xc4, 0x92, 0xd8, 0xc0, 0x19, 0xc2, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x93, 0x01, 0xa7,
-	0x89, 0x0d, 0x9c, 0x8a, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0e, 0xde, 0xf9, 0x4c, 0x15,
+	0xcb, 0x2b, 0x03, 0x00, 0x00,
-	0x03, 0x00, 0x00,
 }
 
 func (m *Signature) Marshal() (dAtA []byte, err error) {

v2/service/verify.proto

@@ -1,13 +1,10 @@
 syntax = "proto3";
 
-package service.v2;
+package neo.fs.v2.service;
 
-option go_package = "github.com/nspcc-dev/neofs-api-go/service/v2";
+option go_package = "github.com/nspcc-dev/neofs-api-go/v2/service";
 option csharp_namespace = "NeoFS.API.Service";
 
-import "acl/v2/types.proto";
-import "refs/v2/types.proto";
-
 // Signature of something in NeoFS
 message Signature {
   // Public key used for signing.

v2/session/service.go

@@ -1,8 +1,8 @@
-package v2
+package session
 
 import (
-	refs "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/refs"
-	service "github.com/nspcc-dev/neofs-api-go/service/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/service"
 )
 
 // SetOwnerId sets identifier of the session initiator.

v2/session/service.pb.go

@@ -1,14 +1,14 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: session/v2/service.proto
+// source: v2/session/service.proto
 
-package v2
+package session
 
 import (
 	context "context"
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	v21 "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	refs "github.com/nspcc-dev/neofs-api-go/v2/refs"
-	v2 "github.com/nspcc-dev/neofs-api-go/service/v2"
+	service "github.com/nspcc-dev/neofs-api-go/v2/service"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -28,26 +28,26 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
-// CreateRequest carries an information necessary for opening a session.v2.
+// CreateRequest carries an information necessary for opening a session.
 type CreateRequest struct {
 	// Body of create session token request message.
 	Body *CreateRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"`
 	// Carries request meta information. Header data is used only to regulate message
 	// transport and does not affect request execution.
-	MetaHeader *v2.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"`
+	MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"`
 	// Carries request verification information. This header is used to authenticate
 	// the nodes of the message route and check the correctness of transmission.
-	VerifyHeader         *v2.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"`
+	VerifyHeader         *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_NoUnkeyedLiteral struct{}                           `json:"-"`
-	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_unrecognized     []byte                             `json:"-"`
-	XXX_sizecache        int32                         `json:"-"`
+	XXX_sizecache        int32                              `json:"-"`
 }
 
 func (m *CreateRequest) Reset()         { *m = CreateRequest{} }
 func (m *CreateRequest) String() string { return proto.CompactTextString(m) }
 func (*CreateRequest) ProtoMessage()    {}
 func (*CreateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dc9d885cd3f2324e, []int{0}
+	return fileDescriptor_ab0074a16885b32c, []int{0}
 }
 func (m *CreateRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -83,14 +83,14 @@ func (m *CreateRequest) GetBody() *CreateRequest_Body {
 	return nil
 }
 
-func (m *CreateRequest) GetMetaHeader() *v2.RequestMetaHeader {
+func (m *CreateRequest) GetMetaHeader() *service.RequestMetaHeader {
 	if m != nil {
 		return m.MetaHeader
 	}
 	return nil
 }
 
-func (m *CreateRequest) GetVerifyHeader() *v2.RequestVerificationHeader {
+func (m *CreateRequest) GetVerifyHeader() *service.RequestVerificationHeader {
 	if m != nil {
 		return m.VerifyHeader
 	}
@@ -99,19 +99,19 @@ func (m *CreateRequest) GetVerifyHeader() *v2.RequestVerificationHeader {
 
 type CreateRequest_Body struct {
 	// Carries an identifier of a session initiator.
-	OwnerId *v21.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
+	OwnerId *refs.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"`
-	// Carries a lifetime of the session.v2.
+	// Carries a lifetime of the session.
-	Lifetime             *v2.TokenLifetime `protobuf:"bytes,2,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
+	Lifetime             *service.TokenLifetime `protobuf:"bytes,2,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
-	XXX_unrecognized     []byte            `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
-	XXX_sizecache        int32             `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
 }
 
 func (m *CreateRequest_Body) Reset()         { *m = CreateRequest_Body{} }
 func (m *CreateRequest_Body) String() string { return proto.CompactTextString(m) }
 func (*CreateRequest_Body) ProtoMessage()    {}
 func (*CreateRequest_Body) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dc9d885cd3f2324e, []int{0, 0}
+	return fileDescriptor_ab0074a16885b32c, []int{0, 0}
 }
 func (m *CreateRequest_Body) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -140,41 +140,41 @@ func (m *CreateRequest_Body) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_CreateRequest_Body proto.InternalMessageInfo
 
-func (m *CreateRequest_Body) GetOwnerId() *v21.OwnerID {
+func (m *CreateRequest_Body) GetOwnerId() *refs.OwnerID {
 	if m != nil {
 		return m.OwnerId
 	}
 	return nil
 }
 
-func (m *CreateRequest_Body) GetLifetime() *v2.TokenLifetime {
+func (m *CreateRequest_Body) GetLifetime() *service.TokenLifetime {
 	if m != nil {
 		return m.Lifetime
 	}
 	return nil
 }
 
-// CreateResponse carries an information about the opened session.v2.
+// CreateResponse carries an information about the opened session.
 type CreateResponse struct {
 	// Body of create session token response message.
 	Body *CreateResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"`
 	// Carries response meta information. Header data is used only to regulate
 	// message transport and does not affect request execution.
-	MetaHeader *v2.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"`
+	MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"`
 	// Carries response verification information. This header is used to
 	// authenticate the nodes of the message route and check the correctness
 	// of transmission.
-	VerifyHeader         *v2.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"`
+	VerifyHeader         *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                       `json:"-"`
+	XXX_NoUnkeyedLiteral struct{}                            `json:"-"`
-	XXX_unrecognized     []byte                         `json:"-"`
+	XXX_unrecognized     []byte                              `json:"-"`
-	XXX_sizecache        int32                          `json:"-"`
+	XXX_sizecache        int32                               `json:"-"`
 }
 
 func (m *CreateResponse) Reset()         { *m = CreateResponse{} }
 func (m *CreateResponse) String() string { return proto.CompactTextString(m) }
 func (*CreateResponse) ProtoMessage()    {}
 func (*CreateResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dc9d885cd3f2324e, []int{1}
+	return fileDescriptor_ab0074a16885b32c, []int{1}
 }
 func (m *CreateResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -210,14 +210,14 @@ func (m *CreateResponse) GetBody() *CreateResponse_Body {
 	return nil
 }
 
-func (m *CreateResponse) GetMetaHeader() *v2.ResponseMetaHeader {
+func (m *CreateResponse) GetMetaHeader() *service.ResponseMetaHeader {
 	if m != nil {
 		return m.MetaHeader
 	}
 	return nil
 }
 
-func (m *CreateResponse) GetVerifyHeader() *v2.ResponseVerificationHeader {
+func (m *CreateResponse) GetVerifyHeader() *service.ResponseVerificationHeader {
 	if m != nil {
 		return m.VerifyHeader
 	}
@@ -238,7 +238,7 @@ func (m *CreateResponse_Body) Reset()         { *m = CreateResponse_Body{} }
 func (m *CreateResponse_Body) String() string { return proto.CompactTextString(m) }
 func (*CreateResponse_Body) ProtoMessage()    {}
 func (*CreateResponse_Body) Descriptor() ([]byte, []int) {
-	return fileDescriptor_dc9d885cd3f2324e, []int{1, 0}
+	return fileDescriptor_ab0074a16885b32c, []int{1, 0}
 }
 func (m *CreateResponse_Body) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -282,44 +282,45 @@ func (m *CreateResponse_Body) GetSessionKey() []byte {
 }
 
 func init() {
-	proto.RegisterType((*CreateRequest)(nil), "session.v2.CreateRequest")
+	proto.RegisterType((*CreateRequest)(nil), "neo.fs.v2.session.CreateRequest")
-	proto.RegisterType((*CreateRequest_Body)(nil), "session.v2.CreateRequest.Body")
+	proto.RegisterType((*CreateRequest_Body)(nil), "neo.fs.v2.session.CreateRequest.Body")
-	proto.RegisterType((*CreateResponse)(nil), "session.v2.CreateResponse")
+	proto.RegisterType((*CreateResponse)(nil), "neo.fs.v2.session.CreateResponse")
-	proto.RegisterType((*CreateResponse_Body)(nil), "session.v2.CreateResponse.Body")
+	proto.RegisterType((*CreateResponse_Body)(nil), "neo.fs.v2.session.CreateResponse.Body")
 }
 
-func init() { proto.RegisterFile("session/v2/service.proto", fileDescriptor_dc9d885cd3f2324e) }
+func init() { proto.RegisterFile("v2/session/service.proto", fileDescriptor_ab0074a16885b32c) }
 
-var fileDescriptor_dc9d885cd3f2324e = []byte{
+var fileDescriptor_ab0074a16885b32c = []byte{
-	// 448 bytes of a gzipped FileDescriptorProto
+	// 454 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xdf, 0x8a, 0xd3, 0x40,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0x4f, 0x6f, 0xd3, 0x30,
-	0x14, 0xc6, 0x4d, 0x5c, 0x76, 0x97, 0x69, 0x77, 0xd1, 0x11, 0xb1, 0x1b, 0x30, 0x2b, 0x0b, 0x8a,
+	0x18, 0xc6, 0x49, 0x98, 0xb6, 0xc9, 0xed, 0x26, 0xcd, 0x08, 0xad, 0xca, 0x21, 0x94, 0x89, 0x21,
-	0xa0, 0x9d, 0x40, 0x16, 0xf1, 0xce, 0x62, 0x15, 0xb1, 0xad, 0xff, 0x98, 0x8a, 0x17, 0xde, 0x94,
+	0x0e, 0x8b, 0x2d, 0x85, 0x03, 0x02, 0x71, 0x61, 0xc0, 0x44, 0x05, 0xe3, 0x8f, 0x87, 0x10, 0xe2,
-	0x34, 0x39, 0x69, 0xc7, 0x9a, 0x4c, 0xcc, 0x4c, 0x23, 0x79, 0x07, 0x1f, 0xc0, 0x67, 0xf0, 0x15,
+	0x52, 0xa5, 0xc9, 0x9b, 0xcd, 0x1a, 0xb1, 0x43, 0xec, 0x05, 0xf2, 0x4d, 0xb8, 0x72, 0xe5, 0x93,
-	0x7c, 0x01, 0x2f, 0x7d, 0x04, 0xa9, 0x2f, 0x22, 0x93, 0x99, 0xf4, 0x0f, 0xa4, 0x78, 0x97, 0x99,
+	0x70, 0xe4, 0x13, 0x20, 0x54, 0xbe, 0x08, 0x8a, 0xed, 0x8d, 0x56, 0x64, 0xed, 0x2d, 0xb6, 0x9f,
-	0xf9, 0xce, 0x77, 0xbe, 0xf3, 0xe3, 0x04, 0x75, 0x04, 0x08, 0xc1, 0x78, 0xea, 0x15, 0xbe, 0x27,
+	0xe7, 0xf1, 0xfb, 0xfc, 0x14, 0xa3, 0x41, 0x1d, 0x53, 0x05, 0x4a, 0x71, 0x29, 0xa8, 0x82, 0xaa,
-	0x20, 0x2f, 0x58, 0x08, 0x24, 0xcb, 0xb9, 0xe4, 0x18, 0x99, 0x17, 0x52, 0xf8, 0xce, 0x8d, 0x1c,
+	0xe6, 0x29, 0x90, 0xb2, 0x92, 0x5a, 0xe2, 0x2d, 0x01, 0x92, 0xe4, 0x8a, 0xd4, 0x31, 0x71, 0x82,
-	0x62, 0xa1, 0x24, 0xb2, 0xcc, 0x40, 0x68, 0x81, 0x73, 0xd3, 0xe8, 0xd5, 0x7d, 0x02, 0x32, 0x30,
+	0xe0, 0x5a, 0x1d, 0xd3, 0x0a, 0x72, 0x45, 0x75, 0x53, 0x82, 0xb2, 0xba, 0xe0, 0xba, 0x49, 0x30,
-	0xd7, 0xb7, 0xb6, 0xae, 0x0b, 0xc8, 0x59, 0x5c, 0xea, 0x87, 0x8b, 0x9f, 0x36, 0x3a, 0x79, 0x96,
+	0x4e, 0x5a, 0x80, 0x4e, 0xdc, 0xf6, 0xf6, 0xcc, 0x76, 0x0d, 0x15, 0xcf, 0x1b, 0x7b, 0xb0, 0xf3,
-	0x43, 0x20, 0x81, 0xc2, 0x97, 0x25, 0x08, 0x89, 0x7d, 0x74, 0x30, 0xe5, 0x51, 0xd9, 0xb1, 0xee,
+	0xcb, 0x47, 0x1b, 0x8f, 0x2b, 0x48, 0x34, 0x30, 0xf8, 0x74, 0x06, 0x4a, 0xe3, 0xfb, 0x68, 0x65,
-	0x58, 0xf7, 0x5b, 0xbe, 0x4b, 0x36, 0x1d, 0xc9, 0x8e, 0x90, 0xf4, 0x79, 0x54, 0xd2, 0x4a, 0x8b,
+	0x22, 0xb3, 0x66, 0xe0, 0x0d, 0xbd, 0x3b, 0xbd, 0x78, 0x97, 0xfc, 0x77, 0x31, 0x99, 0xd3, 0x93,
-	0x9f, 0xa0, 0x96, 0x6a, 0x36, 0x99, 0x43, 0x10, 0x41, 0xde, 0xb1, 0xab, 0xd2, 0xdb, 0xa4, 0xce,
+	0x7d, 0x99, 0x35, 0xcc, 0x58, 0xf0, 0x53, 0xd4, 0x6b, 0xef, 0x1c, 0x9f, 0x40, 0x92, 0x41, 0x35,
-	0x5e, 0xf8, 0xc4, 0x14, 0xbd, 0x06, 0x19, 0xbc, 0xac, 0x44, 0x14, 0x25, 0xeb, 0x6f, 0x3c, 0x44,
+	0xf0, 0x4d, 0xc2, 0xad, 0xb9, 0x04, 0xdb, 0xc9, 0x79, 0x0f, 0x41, 0x27, 0xcf, 0x8c, 0x96, 0xa1,
-	0x27, 0x3a, 0x55, 0xed, 0x70, 0xb5, 0x72, 0xb8, 0xdb, 0xe0, 0xf0, 0x41, 0xe9, 0x58, 0x18, 0x48,
+	0xe2, 0xe2, 0x1b, 0xbf, 0x41, 0x1b, 0x76, 0xc6, 0xf3, 0xa0, 0xab, 0x26, 0x68, 0xef, 0xf2, 0xa0,
-	0xc6, 0x53, 0xe3, 0xd4, 0xd6, 0xb5, 0xfa, 0xe4, 0x7c, 0x42, 0x07, 0x2a, 0x19, 0x7e, 0x80, 0x8e,
+	0x77, 0xad, 0x9c, 0xa7, 0x89, 0xe6, 0x52, 0xb8, 0xc0, 0xbe, 0x8d, 0xb0, 0xab, 0xe0, 0x0b, 0x5a,
-	0xf9, 0xd7, 0x14, 0xf2, 0x09, 0x8b, 0xcc, 0x2c, 0xd7, 0x88, 0x22, 0xa6, 0xbc, 0xde, 0xaa, 0x87,
+	0x69, 0xe7, 0xc4, 0x31, 0x5a, 0x97, 0x9f, 0x05, 0x54, 0x63, 0x9e, 0xb9, 0x82, 0xdb, 0x33, 0xa9,
-	0xc1, 0x73, 0x7a, 0x54, 0x29, 0x06, 0x11, 0x7e, 0x84, 0x8e, 0x3f, 0xb3, 0x18, 0x24, 0x4b, 0xc0,
+	0x2d, 0x4d, 0xf2, 0xaa, 0x3d, 0x1f, 0x3d, 0x61, 0x6b, 0x46, 0x38, 0xca, 0xf0, 0x43, 0xb4, 0xfe,
-	0xa4, 0x3f, 0xdb, 0xee, 0xfd, 0x9e, 0x2f, 0x20, 0x7d, 0x65, 0x04, 0x74, 0x2d, 0xbd, 0xf8, 0x66,
+	0x91, 0xe7, 0xa0, 0x79, 0x01, 0xae, 0xd2, 0xb0, 0x63, 0x92, 0xb7, 0xf2, 0x14, 0xc4, 0x0b, 0xa7,
-	0xa3, 0xd3, 0x1a, 0x8a, 0xc8, 0x78, 0x2a, 0x00, 0x5f, 0xee, 0xe0, 0x3b, 0x6f, 0xc2, 0xa7, 0x95,
+	0x63, 0x17, 0x8e, 0x9d, 0x6f, 0x3e, 0xda, 0x3c, 0x07, 0xa6, 0x4a, 0x29, 0x14, 0xe0, 0x07, 0x73,
-	0xdb, 0xfc, 0x7a, 0x4d, 0xfc, 0xdc, 0xdd, 0xe9, 0x75, 0xd5, 0x1e, 0x80, 0xa3, 0x66, 0x80, 0xf7,
+	0x84, 0x6f, 0x2f, 0x20, 0x6c, 0x0d, 0xb3, 0x88, 0x0f, 0xba, 0x10, 0xef, 0x76, 0x92, 0xb1, 0xe6,
-	0x9a, 0x2c, 0xfe, 0x4b, 0xf0, 0xb1, 0x21, 0x78, 0x8a, 0x6c, 0xc3, 0xae, 0x4d, 0x6d, 0x16, 0xe1,
+	0x4b, 0x18, 0xb3, 0x6e, 0xc6, 0xd1, 0x82, 0xa4, 0xa5, 0x90, 0xef, 0x39, 0xc8, 0x9b, 0xc8, 0x77,
-	0x73, 0xd4, 0x32, 0xd3, 0x4c, 0x16, 0x50, 0x56, 0x29, 0xdb, 0xb4, 0xde, 0xc8, 0x11, 0x94, 0xfe,
+	0x78, 0xfb, 0xcc, 0xe7, 0x19, 0xbe, 0x81, 0x7a, 0xae, 0xd8, 0xf8, 0x14, 0x1a, 0x33, 0x73, 0x9f,
-	0x10, 0x1d, 0x8d, 0xf5, 0x09, 0xf7, 0xd0, 0xa1, 0x1e, 0x17, 0x9f, 0xed, 0xdd, 0x20, 0xc7, 0xd9,
+	0x21, 0xb7, 0xf5, 0x1c, 0x9a, 0xf8, 0x3d, 0x5a, 0x3b, 0xb2, 0x2b, 0x7c, 0x88, 0x56, 0x6d, 0x79,
-	0x4f, 0xa7, 0x4f, 0x7f, 0xad, 0x5c, 0xeb, 0xf7, 0xca, 0xb5, 0xfe, 0xac, 0x5c, 0xeb, 0xfb, 0x5f,
+	0x3c, 0x5c, 0xf6, 0xe7, 0x05, 0x37, 0x97, 0x92, 0xdb, 0x67, 0x3f, 0xa6, 0xa1, 0xf7, 0x73, 0x1a,
-	0xf7, 0xca, 0xc7, 0x87, 0x33, 0x26, 0xe7, 0xcb, 0x29, 0x09, 0x79, 0xe2, 0xa5, 0x22, 0x0b, 0xc3,
+	0x7a, 0xbf, 0xa7, 0xa1, 0xf7, 0xf5, 0x4f, 0x78, 0xe5, 0xc3, 0xde, 0x31, 0xd7, 0x27, 0x67, 0x13,
-	0x6e, 0x04, 0x85, 0x97, 0x02, 0x8f, 0x45, 0x37, 0xc8, 0x58, 0x77, 0xc6, 0xbd, 0xcd, 0x7f, 0xf3,
+	0x92, 0xca, 0x82, 0x0a, 0x55, 0xa6, 0x69, 0x94, 0x41, 0x4d, 0x05, 0xc8, 0x5c, 0x45, 0x49, 0xc9,
-	0xc3, 0xbe, 0xfe, 0x06, 0xf8, 0x8b, 0x31, 0x79, 0xfa, 0x6e, 0x40, 0x4c, 0xa8, 0xe9, 0x61, 0xb5,
+	0xa3, 0x63, 0x49, 0xff, 0x3d, 0xc2, 0xef, 0xfe, 0xd6, 0x4b, 0x90, 0x07, 0x47, 0xe4, 0xd1, 0xeb,
-	0xf3, 0x97, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x41, 0x43, 0x09, 0xb3, 0x60, 0x03, 0x00, 0x00,
+	0x11, 0x71, 0x23, 0x4e, 0x56, 0xcd, 0xcb, 0xb9, 0xfb, 0x37, 0x00, 0x00, 0xff, 0xff, 0xf2, 0xbe,
+	0x3b, 0xbe, 0xad, 0x03, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -348,7 +349,7 @@ func NewSessionClient(cc *grpc.ClientConn) SessionClient {
 
 func (c *sessionClient) Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) {
 	out := new(CreateResponse)
-	err := c.cc.Invoke(ctx, "/session.v2.Session/Create", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/neo.fs.v2.session.Session/Create", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -383,7 +384,7 @@ func _Session_Create_Handler(srv interface{}, ctx context.Context, dec func(inte
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/session.v2.Session/Create",
+		FullMethod: "/neo.fs.v2.session.Session/Create",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(SessionServer).Create(ctx, req.(*CreateRequest))
@@ -392,7 +393,7 @@ func _Session_Create_Handler(srv interface{}, ctx context.Context, dec func(inte
 }
 
 var _Session_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "session.v2.Session",
+	ServiceName: "neo.fs.v2.session.Session",
 	HandlerType: (*SessionServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
@@ -401,7 +402,7 @@ var _Session_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "session/v2/service.proto",
+	Metadata: "v2/session/service.proto",
 }
 
 func (m *CreateRequest) Marshal() (dAtA []byte, err error) {
@@ -822,7 +823,7 @@ func (m *CreateRequest) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.MetaHeader == nil {
-				m.MetaHeader = &v2.RequestMetaHeader{}
+				m.MetaHeader = &service.RequestMetaHeader{}
 			}
 			if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -858,7 +859,7 @@ func (m *CreateRequest) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.VerifyHeader == nil {
-				m.VerifyHeader = &v2.RequestVerificationHeader{}
+				m.VerifyHeader = &service.RequestVerificationHeader{}
 			}
 			if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -948,7 +949,7 @@ func (m *CreateRequest_Body) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.OwnerId == nil {
-				m.OwnerId = &v21.OwnerID{}
+				m.OwnerId = &refs.OwnerID{}
 			}
 			if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -984,7 +985,7 @@ func (m *CreateRequest_Body) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.Lifetime == nil {
-				m.Lifetime = &v2.TokenLifetime{}
+				m.Lifetime = &service.TokenLifetime{}
 			}
 			if err := m.Lifetime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1110,7 +1111,7 @@ func (m *CreateResponse) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.MetaHeader == nil {
-				m.MetaHeader = &v2.ResponseMetaHeader{}
+				m.MetaHeader = &service.ResponseMetaHeader{}
 			}
 			if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -1146,7 +1147,7 @@ func (m *CreateResponse) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.VerifyHeader == nil {
-				m.VerifyHeader = &v2.ResponseVerificationHeader{}
+				m.VerifyHeader = &service.ResponseVerificationHeader{}
 			}
 			if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err

v2/session/service.proto

@@ -1,27 +1,26 @@
 syntax = "proto3";
 
-package session.v2;
+package neo.fs.v2.session;
-
+option go_package = "github.com/nspcc-dev/neofs-api-go/v2/session";
-option go_package = "github.com/nspcc-dev/neofs-api-go/session/v2";
 option csharp_namespace = "NeoFS.API.Session";
 
-import "refs/v2/types.proto";
+import "v2/refs/types.proto";
-import "service/v2/meta.proto";
+import "v2/service/meta.proto";
-import "service/v2/verify.proto";
+import "v2/service/verify.proto";
 
 service Session {
   // Create opens new session between the client and the server.
   rpc Create (CreateRequest) returns (CreateResponse);
 }
 
-// CreateRequest carries an information necessary for opening a session.v2.
+// CreateRequest carries an information necessary for opening a session.
 message CreateRequest {
   message Body {
     // Carries an identifier of a session initiator.
-    refs.v2.OwnerID owner_id = 1;
+    neo.fs.v2.refs.OwnerID owner_id = 1;
 
-    // Carries a lifetime of the session.v2.
+    // Carries a lifetime of the session.
-    service.v2.TokenLifetime lifetime = 2;
+    neo.fs.v2.service.TokenLifetime lifetime = 2;
   }
 
   // Body of create session token request message.
@@ -29,14 +28,14 @@ message CreateRequest {
 
   // Carries request meta information. Header data is used only to regulate message
   // transport and does not affect request execution.
-  service.v2.RequestMetaHeader meta_header = 2;
+  neo.fs.v2.service.RequestMetaHeader meta_header = 2;
 
   // Carries request verification information. This header is used to authenticate
   // the nodes of the message route and check the correctness of transmission.
-  service.v2.RequestVerificationHeader verify_header = 3;
+  neo.fs.v2.service.RequestVerificationHeader verify_header = 3;
 }
 
-// CreateResponse carries an information about the opened session.v2.
+// CreateResponse carries an information about the opened session.
 message CreateResponse {
   message Body {
     // id carries an identifier of session token.
@@ -51,10 +50,10 @@ message CreateResponse {
 
   // Carries response meta information. Header data is used only to regulate
   // message transport and does not affect request execution.
-  service.v2.ResponseMetaHeader meta_header = 2;
+  neo.fs.v2.service.ResponseMetaHeader meta_header = 2;
 
   // Carries response verification information. This header is used to
   // authenticate the nodes of the message route and check the correctness
   // of transmission.
-  service.v2.ResponseVerificationHeader verify_header = 3;
+  neo.fs.v2.service.ResponseVerificationHeader verify_header = 3;
 }

v2/storagegroup/types.go

@@ -1,7 +1,7 @@
-package v2
+package storagegroup
 
 import (
-	refs "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	"github.com/nspcc-dev/neofs-api-go/v2/refs"
 )
 
 // SetValidationDataSize sets the total size of the payloads of the storage group.

v2/storagegroup/types.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: storagegroup/v2/types.proto
+// source: v2/storagegroup/types.proto
 
-package v2
+package storagegroup
 
 import (
 	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	v2 "github.com/nspcc-dev/neofs-api-go/refs/v2"
+	refs "github.com/nspcc-dev/neofs-api-go/v2/refs"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -39,17 +39,17 @@ type StorageGroup struct {
 	ExpirationEpoch uint64 `protobuf:"varint,3,opt,name=expiration_epoch,json=expirationEpoch,proto3" json:"expiration_epoch,omitempty"`
 	// Members carries the list of identifiers of the object storage group members.
 	// The list is strictly ordered.
-	Members              []*v2.ObjectID `protobuf:"bytes,4,rep,name=members,proto3" json:"members,omitempty"`
+	Members              []*refs.ObjectID `protobuf:"bytes,4,rep,name=members,proto3" json:"members,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
-	XXX_unrecognized     []byte         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
-	XXX_sizecache        int32          `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
 }
 
 func (m *StorageGroup) Reset()         { *m = StorageGroup{} }
 func (m *StorageGroup) String() string { return proto.CompactTextString(m) }
 func (*StorageGroup) ProtoMessage()    {}
 func (*StorageGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_e6cea1f26229f4f1, []int{0}
+	return fileDescriptor_593772eae6c18cdf, []int{0}
 }
 func (m *StorageGroup) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -99,7 +99,7 @@ func (m *StorageGroup) GetExpirationEpoch() uint64 {
 	return 0
 }
 
-func (m *StorageGroup) GetMembers() []*v2.ObjectID {
+func (m *StorageGroup) GetMembers() []*refs.ObjectID {
 	if m != nil {
 		return m.Members
 	}
@@ -107,31 +107,32 @@ func (m *StorageGroup) GetMembers() []*v2.ObjectID {
 }
 
 func init() {
-	proto.RegisterType((*StorageGroup)(nil), "storagegroup.v2.StorageGroup")
+	proto.RegisterType((*StorageGroup)(nil), "neo.fs.v2.storagegroup.StorageGroup")
 }
 
-func init() { proto.RegisterFile("storagegroup/v2/types.proto", fileDescriptor_e6cea1f26229f4f1) }
+func init() { proto.RegisterFile("v2/storagegroup/types.proto", fileDescriptor_593772eae6c18cdf) }
 
-var fileDescriptor_e6cea1f26229f4f1 = []byte{
+var fileDescriptor_593772eae6c18cdf = []byte{
-	// 287 bytes of a gzipped FileDescriptorProto
+	// 293 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2e, 0x2e, 0xc9, 0x2f,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0xd0, 0xdf, 0x4a, 0xf3, 0x30,
-	0x4a, 0x4c, 0x4f, 0x4d, 0x2f, 0xca, 0x2f, 0x2d, 0xd0, 0x2f, 0x33, 0xd2, 0x2f, 0xa9, 0x2c, 0x48,
+	0x18, 0x06, 0xf0, 0x2f, 0xdb, 0xf8, 0x84, 0x38, 0x9c, 0x44, 0x19, 0x45, 0xa1, 0x0c, 0x4f, 0x9c,
-	0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x47, 0x96, 0xd4, 0x2b, 0x33, 0x92, 0x12,
+	0x07, 0x4b, 0xb4, 0x5e, 0x81, 0x32, 0xff, 0xec, 0x44, 0xa5, 0x3d, 0x13, 0x61, 0xa4, 0xed, 0xdb,
-	0x2e, 0x4a, 0x4d, 0x2b, 0x46, 0x53, 0xa5, 0x74, 0x90, 0x91, 0x8b, 0x27, 0x18, 0xa2, 0xd0, 0x1d,
+	0x36, 0x62, 0x9b, 0x90, 0x64, 0x45, 0x77, 0x25, 0x5e, 0x83, 0x57, 0xb2, 0x43, 0x2f, 0x41, 0xea,
-	0xa4, 0x50, 0xc8, 0x80, 0x4b, 0xa4, 0x2c, 0x31, 0x27, 0x33, 0x25, 0xb1, 0x24, 0x33, 0x3f, 0x2f,
+	0x8d, 0x48, 0x37, 0xa4, 0xc5, 0xd3, 0x27, 0xbf, 0xbc, 0xf0, 0x3c, 0xf8, 0xb0, 0xf4, 0x98, 0xb1,
-	0x3e, 0x25, 0xb1, 0x24, 0x31, 0xbe, 0x38, 0xb3, 0x2a, 0x55, 0x82, 0x51, 0x81, 0x51, 0x83, 0x25,
+	0x52, 0xf3, 0x14, 0x52, 0x2d, 0x17, 0x8a, 0xd9, 0x37, 0x05, 0x86, 0x2a, 0x2d, 0xad, 0x24, 0xc3,
-	0x48, 0x08, 0x21, 0xe7, 0x92, 0x58, 0x92, 0x18, 0x9c, 0x59, 0x95, 0x2a, 0xa4, 0xce, 0xc5, 0x8f,
+	0x02, 0x24, 0x4d, 0x0c, 0x2d, 0x3d, 0xda, 0x36, 0x07, 0x7b, 0xa5, 0xc7, 0x34, 0x24, 0xa6, 0x8d,
-	0xa4, 0x23, 0x23, 0xb1, 0x38, 0x43, 0x82, 0x49, 0x81, 0x51, 0x83, 0x27, 0x88, 0x0f, 0x21, 0xec,
+	0x8f, 0x56, 0x08, 0xf7, 0x83, 0x8d, 0xba, 0xa9, 0x15, 0x39, 0xc5, 0xfb, 0x25, 0x7f, 0x11, 0x31,
-	0x91, 0x58, 0x9c, 0x21, 0xa4, 0xc9, 0x25, 0x90, 0x5a, 0x51, 0x90, 0x59, 0x04, 0x51, 0x98, 0x5a,
+	0xb7, 0x42, 0x16, 0xf3, 0x98, 0x5b, 0x3e, 0x37, 0x62, 0x09, 0x0e, 0x1a, 0xa1, 0x71, 0xcf, 0x27,
-	0x90, 0x9f, 0x9c, 0x21, 0xc1, 0x0c, 0x36, 0x96, 0x1f, 0x21, 0xee, 0x0a, 0x12, 0x16, 0xd2, 0xe6,
+	0xcd, 0xdb, 0x94, 0x5b, 0x1e, 0x88, 0x25, 0x90, 0x63, 0x3c, 0x68, 0xfd, 0xc8, 0xb8, 0xc9, 0x9c,
-	0x62, 0xcf, 0x4d, 0xcd, 0x4d, 0x4a, 0x2d, 0x2a, 0x96, 0x60, 0x51, 0x60, 0xd6, 0xe0, 0x36, 0x12,
+	0xce, 0x08, 0x8d, 0xfb, 0xfe, 0x4e, 0x13, 0xdf, 0x72, 0x93, 0x91, 0x13, 0xbc, 0x0b, 0xaf, 0x4a,
-	0xd4, 0x03, 0xb9, 0x5e, 0xaf, 0xcc, 0x48, 0xcf, 0x3f, 0x29, 0x2b, 0x35, 0xb9, 0xc4, 0xd3, 0x25,
+	0xe8, 0x0d, 0x04, 0x25, 0xa3, 0xcc, 0xe9, 0xae, 0xcf, 0x0e, 0x9a, 0xfc, 0xaa, 0x8e, 0x89, 0x87,
-	0x08, 0xa6, 0xc2, 0x29, 0xe6, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92,
+	0xb7, 0x72, 0xc8, 0x43, 0xd0, 0xc6, 0xe9, 0x8d, 0xba, 0xe3, 0x6d, 0xcf, 0xa1, 0x4d, 0xab, 0xba,
-	0x63, 0x9c, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x30, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39,
+	0x04, 0xbd, 0x0f, 0x9f, 0x21, 0xb2, 0xb3, 0xa9, 0xff, 0x0b, 0x2f, 0x9f, 0x56, 0x95, 0x8b, 0x3e,
-	0x3f, 0x57, 0x3f, 0xaf, 0xb8, 0x20, 0x39, 0x59, 0x37, 0x25, 0xb5, 0x4c, 0x3f, 0x2f, 0x35, 0x3f,
+	0x2b, 0x17, 0x7d, 0x55, 0x2e, 0x7a, 0xff, 0x76, 0xff, 0x3d, 0x9e, 0xa5, 0xc2, 0x66, 0x8b, 0x90,
-	0xad, 0x58, 0x37, 0xb1, 0x20, 0x53, 0x37, 0x3d, 0x5f, 0x1f, 0x2d, 0xe8, 0x56, 0x31, 0x89, 0xf9,
+	0x46, 0x32, 0x67, 0x85, 0x51, 0x51, 0x34, 0x89, 0xa1, 0x64, 0x05, 0xc8, 0xc4, 0x4c, 0xb8, 0x12,
-	0xa5, 0xe6, 0xbb, 0x05, 0xeb, 0x39, 0x06, 0x78, 0xea, 0x21, 0x07, 0x48, 0x12, 0x1b, 0x38, 0xa0,
+	0x93, 0x54, 0xb2, 0x3f, 0x43, 0x7e, 0x74, 0x86, 0x77, 0x20, 0xaf, 0x03, 0x7a, 0xf1, 0x30, 0xa3,
-	0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe8, 0xae, 0xc0, 0x6d, 0x6d, 0x01, 0x00, 0x00,
+	0xed, 0x5d, 0xc2, 0xff, 0xeb, 0xbd, 0xce, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x71, 0xf1,
+	0x6b, 0x7b, 0x01, 0x00, 0x00,
 }
 
 func (m *StorageGroup) Marshal() (dAtA []byte, err error) {
@@ -367,7 +368,7 @@ func (m *StorageGroup) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Members = append(m.Members, &v2.ObjectID{})
+			m.Members = append(m.Members, &refs.ObjectID{})
 			if err := m.Members[len(m.Members)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}

v2/storagegroup/types.proto

@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package storagegroup.v2;
+package neo.fs.v2.storagegroup;
 
-option go_package = "github.com/nspcc-dev/neofs-api-go/storagegroup/v2";
+option go_package = "github.com/nspcc-dev/neofs-api-go/v2/storagegroup";
 option csharp_namespace = "NeoFS.API.StorageGroup";
 
-import "refs/v2/types.proto";
+import "v2/refs/types.proto";
 
 // StorageGroup groups the information about the NeoFS storage group.
 // The storage group consists of objects from single container.
@@ -26,5 +26,5 @@ message StorageGroup {
 
   // Members carries the list of identifiers of the object storage group members.
   // The list is strictly ordered.
-  repeated refs.v2.ObjectID members = 4;
+  repeated neo.fs.v2.refs.ObjectID members = 4;
 }