diff --git a/accounting/grpc/service.pb.go b/accounting/grpc/service.pb.go
index 68485e4..bdd0925 100644
Binary files a/accounting/grpc/service.pb.go and b/accounting/grpc/service.pb.go differ
diff --git a/accounting/grpc/service_grpc.pb.go b/accounting/grpc/service_grpc.pb.go
index 44b24a8..7139614 100644
Binary files a/accounting/grpc/service_grpc.pb.go and b/accounting/grpc/service_grpc.pb.go differ
diff --git a/accounting/grpc/types.pb.go b/accounting/grpc/types.pb.go
index 2028639..5a65e84 100644
Binary files a/accounting/grpc/types.pb.go and b/accounting/grpc/types.pb.go differ
diff --git a/acl/grpc/types.pb.go b/acl/grpc/types.pb.go
index 8121686..4af5520 100644
Binary files a/acl/grpc/types.pb.go and b/acl/grpc/types.pb.go differ
diff --git a/audit/grpc/types.pb.go b/audit/grpc/types.pb.go
index 82cb4c9..5353dd0 100644
Binary files a/audit/grpc/types.pb.go and b/audit/grpc/types.pb.go differ
diff --git a/container/grpc/service.pb.go b/container/grpc/service.pb.go
index 031ac63..251638e 100644
Binary files a/container/grpc/service.pb.go and b/container/grpc/service.pb.go differ
diff --git a/container/grpc/service_grpc.pb.go b/container/grpc/service_grpc.pb.go
index 9f6af5b..cbac355 100644
Binary files a/container/grpc/service_grpc.pb.go and b/container/grpc/service_grpc.pb.go differ
diff --git a/container/grpc/types.pb.go b/container/grpc/types.pb.go
index 279c781..10f3019 100644
Binary files a/container/grpc/types.pb.go and b/container/grpc/types.pb.go differ
diff --git a/netmap/grpc/service.pb.go b/netmap/grpc/service.pb.go
index c39ec43..238265a 100644
Binary files a/netmap/grpc/service.pb.go and b/netmap/grpc/service.pb.go differ
diff --git a/netmap/grpc/service_grpc.pb.go b/netmap/grpc/service_grpc.pb.go
index 4500227..babf2e7 100644
Binary files a/netmap/grpc/service_grpc.pb.go and b/netmap/grpc/service_grpc.pb.go differ
diff --git a/netmap/grpc/types.pb.go b/netmap/grpc/types.pb.go
index 60aa3ac..b26eef9 100644
Binary files a/netmap/grpc/types.pb.go and b/netmap/grpc/types.pb.go differ
diff --git a/object/grpc/service.pb.go b/object/grpc/service.pb.go
index 9c61501..3e42924 100644
Binary files a/object/grpc/service.pb.go and b/object/grpc/service.pb.go differ
diff --git a/object/grpc/service_grpc.pb.go b/object/grpc/service_grpc.pb.go
index 2586c04..4a2ea28 100644
Binary files a/object/grpc/service_grpc.pb.go and b/object/grpc/service_grpc.pb.go differ
diff --git a/v2/object/grpc/status.pb.go b/object/grpc/status.pb.go
similarity index 100%
rename from v2/object/grpc/status.pb.go
rename to object/grpc/status.pb.go
diff --git a/object/grpc/types.pb.go b/object/grpc/types.pb.go
index 6efc6dc..efc92dc 100644
Binary files a/object/grpc/types.pb.go and b/object/grpc/types.pb.go differ
diff --git a/prepare.sh b/prepare.sh
index c7cd644..5899367 100755
--- a/prepare.sh
+++ b/prepare.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-prefix=v2
-
 if [ -z "$1" ]; then
     echo "usage: ./prepare.sh path/to/neofs-api"
     exit 1
@@ -9,23 +7,22 @@ fi
 
 API_GO_PATH=$(pwd)
 API_PATH=$1
-mkdir "$API_GO_PATH/$prefix" 2>/dev/null
 
 # MOVE FILES FROM API REPO
 cd "$API_PATH" || exit 1
 ARGS=$(find ./ -name '*.proto' -not -path './vendor/*')
 for file in $ARGS; do
 	dir=$(dirname "$file")
-	mkdir -p "$API_GO_PATH/$prefix/$dir/grpc"
-	cp -r "$dir"/* "$API_GO_PATH/$prefix/$dir/grpc"
+	mkdir -p "$API_GO_PATH/$dir/grpc"
+	cp -r "$dir"/* "$API_GO_PATH/$dir/grpc"
 done
 
 # MODIFY FILES
-cd "$API_GO_PATH/$prefix" || exit 1
+cd "$API_GO_PATH" || exit 1
 ARGS2=$(find ./ -name '*.proto')
 for file in $ARGS2; do
 	echo "$file"
-	sed -i "s/import\ \"\(.*\)\/\(.*\)\.proto\";/import\ \"$prefix\/\1\/grpc\/\2\.proto\";/" $file
+	sed -i "s/import\ \"\(.*\)\/\(.*\)\.proto\";/import\ \"\1\/grpc\/\2\.proto\";/" $file
 done
 
 cd "$API_GO_PATH" || exit 1
diff --git a/refs/grpc/types.pb.go b/refs/grpc/types.pb.go
index 52b1a7e..34c6186 100644
Binary files a/refs/grpc/types.pb.go and b/refs/grpc/types.pb.go differ
diff --git a/reputation/grpc/service.pb.go b/reputation/grpc/service.pb.go
index 1ef79f4..79104b5 100644
Binary files a/reputation/grpc/service.pb.go and b/reputation/grpc/service.pb.go differ
diff --git a/reputation/grpc/service_grpc.pb.go b/reputation/grpc/service_grpc.pb.go
index 8713df7..b260785 100644
Binary files a/reputation/grpc/service_grpc.pb.go and b/reputation/grpc/service_grpc.pb.go differ
diff --git a/reputation/grpc/types.pb.go b/reputation/grpc/types.pb.go
index 009df3b..be5185e 100644
Binary files a/reputation/grpc/types.pb.go and b/reputation/grpc/types.pb.go differ
diff --git a/session/grpc/service.pb.go b/session/grpc/service.pb.go
index 6851176..914f9af 100644
Binary files a/session/grpc/service.pb.go and b/session/grpc/service.pb.go differ
diff --git a/session/grpc/service_grpc.pb.go b/session/grpc/service_grpc.pb.go
index a6bc2bd..cb72826 100644
Binary files a/session/grpc/service_grpc.pb.go and b/session/grpc/service_grpc.pb.go differ
diff --git a/session/grpc/types.pb.go b/session/grpc/types.pb.go
index 3977511..eb7c25b 100644
Binary files a/session/grpc/types.pb.go and b/session/grpc/types.pb.go differ
diff --git a/v2/status/convert.go b/status/convert.go
similarity index 93%
rename from v2/status/convert.go
rename to status/convert.go
index 5c05221..8195096 100644
--- a/v2/status/convert.go
+++ b/status/convert.go
@@ -1,8 +1,8 @@
 package status
 
 import (
-	"github.com/nspcc-dev/neofs-api-go/rpc/grpc"
-	"github.com/nspcc-dev/neofs-api-go/rpc/message"
+	"github.com/nspcc-dev/neofs-api-go/v2/rpc/grpc"
+	"github.com/nspcc-dev/neofs-api-go/v2/rpc/message"
 	status "github.com/nspcc-dev/neofs-api-go/v2/status/grpc"
 )
 
diff --git a/v2/status/grpc/types.go b/status/grpc/types.go
similarity index 100%
rename from v2/status/grpc/types.go
rename to status/grpc/types.go
diff --git a/v2/status/grpc/types.pb.go b/status/grpc/types.pb.go
similarity index 100%
rename from v2/status/grpc/types.pb.go
rename to status/grpc/types.pb.go
diff --git a/v2/status/marshal.go b/status/marshal.go
similarity index 94%
rename from v2/status/marshal.go
rename to status/marshal.go
index 8170325..da6572e 100644
--- a/v2/status/marshal.go
+++ b/status/marshal.go
@@ -1,9 +1,9 @@
 package status
 
 import (
-	"github.com/nspcc-dev/neofs-api-go/rpc/message"
-	protoutil "github.com/nspcc-dev/neofs-api-go/util/proto"
+	"github.com/nspcc-dev/neofs-api-go/v2/rpc/message"
 	status "github.com/nspcc-dev/neofs-api-go/v2/status/grpc"
+	protoutil "github.com/nspcc-dev/neofs-api-go/v2/util/proto"
 )
 
 const (
diff --git a/v2/status/message_test.go b/status/message_test.go
similarity index 73%
rename from v2/status/message_test.go
rename to status/message_test.go
index c301162..b6f8d2d 100644
--- a/v2/status/message_test.go
+++ b/status/message_test.go
@@ -3,8 +3,8 @@ package status_test
 import (
 	"testing"
 
-	"github.com/nspcc-dev/neofs-api-go/rpc/message"
-	messagetest "github.com/nspcc-dev/neofs-api-go/rpc/message/test"
+	"github.com/nspcc-dev/neofs-api-go/v2/rpc/message"
+	messagetest "github.com/nspcc-dev/neofs-api-go/v2/rpc/message/test"
 	statustest "github.com/nspcc-dev/neofs-api-go/v2/status/test"
 )
 
diff --git a/v2/status/status.go b/status/status.go
similarity index 100%
rename from v2/status/status.go
rename to status/status.go
diff --git a/v2/status/test/generate.go b/status/test/generate.go
similarity index 100%
rename from v2/status/test/generate.go
rename to status/test/generate.go
diff --git a/v2/status/types.go b/status/types.go
similarity index 100%
rename from v2/status/types.go
rename to status/types.go
diff --git a/storagegroup/grpc/types.pb.go b/storagegroup/grpc/types.pb.go
index 94f1e05..fa5b98c 100644
Binary files a/storagegroup/grpc/types.pb.go and b/storagegroup/grpc/types.pb.go differ
diff --git a/tombstone/grpc/types.pb.go b/tombstone/grpc/types.pb.go
index e6fc2d0..f2f3db6 100644
Binary files a/tombstone/grpc/types.pb.go and b/tombstone/grpc/types.pb.go differ