diff --git a/pkg/logger/grpc.go b/logger/grpc.go
similarity index 100%
rename from pkg/logger/grpc.go
rename to logger/grpc.go
diff --git a/pkg/logger/option.go b/logger/option.go
similarity index 100%
rename from pkg/logger/option.go
rename to logger/option.go
diff --git a/pkg/logger/zap.go b/logger/zap.go
similarity index 100%
rename from pkg/logger/zap.go
rename to logger/zap.go
diff --git a/pkg/policy/doc.go b/policy/doc.go
similarity index 100%
rename from pkg/policy/doc.go
rename to policy/doc.go
diff --git a/pkg/policy/encode.go b/policy/encode.go
similarity index 100%
rename from pkg/policy/encode.go
rename to policy/encode.go
diff --git a/pkg/policy/encode_test.go b/policy/encode_test.go
similarity index 93%
rename from pkg/policy/encode_test.go
rename to policy/encode_test.go
index d2bb716f..813e7168 100644
--- a/pkg/policy/encode_test.go
+++ b/policy/encode_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/nspcc-dev/neofs-sdk-go/pkg/policy"
+	"github.com/nspcc-dev/neofs-sdk-go/policy"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/pkg/policy/json.go b/policy/json.go
similarity index 100%
rename from pkg/policy/json.go
rename to policy/json.go
diff --git a/pkg/policy/json_test.go b/policy/json_test.go
similarity index 100%
rename from pkg/policy/json_test.go
rename to policy/json_test.go
diff --git a/pkg/policy/parser/Query.g4 b/policy/parser/Query.g4
similarity index 100%
rename from pkg/policy/parser/Query.g4
rename to policy/parser/Query.g4
diff --git a/pkg/policy/parser/Query.interp b/policy/parser/Query.interp
similarity index 100%
rename from pkg/policy/parser/Query.interp
rename to policy/parser/Query.interp
diff --git a/pkg/policy/parser/Query.tokens b/policy/parser/Query.tokens
similarity index 100%
rename from pkg/policy/parser/Query.tokens
rename to policy/parser/Query.tokens
diff --git a/pkg/policy/parser/QueryLexer.g4 b/policy/parser/QueryLexer.g4
similarity index 100%
rename from pkg/policy/parser/QueryLexer.g4
rename to policy/parser/QueryLexer.g4
diff --git a/pkg/policy/parser/QueryLexer.interp b/policy/parser/QueryLexer.interp
similarity index 100%
rename from pkg/policy/parser/QueryLexer.interp
rename to policy/parser/QueryLexer.interp
diff --git a/pkg/policy/parser/QueryLexer.tokens b/policy/parser/QueryLexer.tokens
similarity index 100%
rename from pkg/policy/parser/QueryLexer.tokens
rename to policy/parser/QueryLexer.tokens
diff --git a/pkg/policy/parser/generate.go b/policy/parser/generate.go
similarity index 100%
rename from pkg/policy/parser/generate.go
rename to policy/parser/generate.go
diff --git a/pkg/policy/parser/query_base_listener.go b/policy/parser/query_base_listener.go
similarity index 100%
rename from pkg/policy/parser/query_base_listener.go
rename to policy/parser/query_base_listener.go
diff --git a/pkg/policy/parser/query_base_visitor.go b/policy/parser/query_base_visitor.go
similarity index 100%
rename from pkg/policy/parser/query_base_visitor.go
rename to policy/parser/query_base_visitor.go
diff --git a/pkg/policy/parser/query_lexer.go b/policy/parser/query_lexer.go
similarity index 100%
rename from pkg/policy/parser/query_lexer.go
rename to policy/parser/query_lexer.go
diff --git a/pkg/policy/parser/query_listener.go b/policy/parser/query_listener.go
similarity index 100%
rename from pkg/policy/parser/query_listener.go
rename to policy/parser/query_listener.go
diff --git a/pkg/policy/parser/query_parser.go b/policy/parser/query_parser.go
similarity index 100%
rename from pkg/policy/parser/query_parser.go
rename to policy/parser/query_parser.go
diff --git a/pkg/policy/parser/query_visitor.go b/policy/parser/query_visitor.go
similarity index 100%
rename from pkg/policy/parser/query_visitor.go
rename to policy/parser/query_visitor.go
diff --git a/pkg/policy/query.go b/policy/query.go
similarity index 99%
rename from pkg/policy/query.go
rename to policy/query.go
index 9bf08ac2..9688d13f 100644
--- a/pkg/policy/query.go
+++ b/policy/query.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 	"github.com/nspcc-dev/neofs-api-go/pkg/netmap"
-	"github.com/nspcc-dev/neofs-sdk-go/pkg/policy/parser"
+	"github.com/nspcc-dev/neofs-sdk-go/policy/parser"
 )
 
 var (
diff --git a/pkg/policy/query_test.go b/policy/query_test.go
similarity index 100%
rename from pkg/policy/query_test.go
rename to policy/query_test.go
diff --git a/pkg/pool/key.go b/pool/key.go
similarity index 100%
rename from pkg/pool/key.go
rename to pool/key.go
diff --git a/pkg/pool/mock_test.go b/pool/mock_test.go
similarity index 100%
rename from pkg/pool/mock_test.go
rename to pool/mock_test.go
diff --git a/pkg/pool/pool.go b/pool/pool.go
similarity index 99%
rename from pkg/pool/pool.go
rename to pool/pool.go
index 5518c6f1..055ffaae 100644
--- a/pkg/pool/pool.go
+++ b/pool/pool.go
@@ -169,6 +169,7 @@ func updateNodesHealth(ctx context.Context, p *pool, options *BuilderOptions, bu
 	wg := sync.WaitGroup{}
 	for i, cPack := range p.clientPacks {
 		wg.Add(1)
+
 		go func(i int, client client.Client) {
 			defer wg.Done()
 			var (
diff --git a/pkg/pool/pool_test.go b/pool/pool_test.go
similarity index 100%
rename from pkg/pool/pool_test.go
rename to pool/pool_test.go
diff --git a/pkg/pool/sampler.go b/pool/sampler.go
similarity index 100%
rename from pkg/pool/sampler.go
rename to pool/sampler.go
diff --git a/pkg/pool/sampler_test.go b/pool/sampler_test.go
similarity index 100%
rename from pkg/pool/sampler_test.go
rename to pool/sampler_test.go