diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8804d7f6b..72408d4c8 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -69,8 +69,8 @@ jobs:
 
       - name: Install utilities
         run: |
-          go install mvdan.cc/gofumpt@v0.3.1
-          go install github.com/rinchsan/gosimports/cmd/gosimports@v0.1.5
+          go install mvdan.cc/gofumpt@v0.5.0
+          go install github.com/rinchsan/gosimports/cmd/gosimports@v0.3.8
 
       - name: format all files with auto-formatter
         run: bash ./.github/scripts/format-all-go-code.sh "$PWD"
diff --git a/driver.go b/driver.go
index 69c96873a..47b68b44e 100644
--- a/driver.go
+++ b/driver.go
@@ -12,24 +12,24 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/coordination"
 	"github.com/ydb-platform/ydb-go-sdk/v3/discovery"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/coordinationImpl"
+	coordinationConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/coordinationImpl/config"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/discoveryImpl"
+	discoveryConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/discoveryImpl/config"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/ratelimiterImpl"
+	ratelimiterConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/ratelimiterImpl/config"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/schemeImpl"
+	schemeConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/schemeImpl/config"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/scriptingImpl"
+	scriptingConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/scriptingImpl/config"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/tableImpl"
+	tableConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/tableImpl/config"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl/topicclientinternal"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
-	internalCoordination "github.com/ydb-platform/ydb-go-sdk/v3/internal/coordination"
-	coordinationConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/coordination/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/credentials"
-	internalDiscovery "github.com/ydb-platform/ydb-go-sdk/v3/internal/discovery"
-	discoveryConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/discovery/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/dsn"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint"
-	internalRatelimiter "github.com/ydb-platform/ydb-go-sdk/v3/internal/ratelimiter"
-	ratelimiterConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/ratelimiter/config"
-	internalScheme "github.com/ydb-platform/ydb-go-sdk/v3/internal/scheme"
-	schemeConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/scheme/config"
-	internalScripting "github.com/ydb-platform/ydb-go-sdk/v3/internal/scripting"
-	scriptingConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/scripting/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
-	internalTable "github.com/ydb-platform/ydb-go-sdk/v3/internal/table"
-	tableConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/table/config"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicclientinternal"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsync"
@@ -58,22 +58,22 @@ type Driver struct { //nolint:maligned
 	config  *config.Config
 	options []config.Option
 
-	discovery        *internalDiscovery.Client
+	discovery        *discoveryImpl.Client
 	discoveryOptions []discoveryConfig.Option
 
-	table        *internalTable.Client
+	table        *tableImpl.Client
 	tableOptions []tableConfig.Option
 
-	scripting        *internalScripting.Client
+	scripting        *scriptingImpl.Client
 	scriptingOptions []scriptingConfig.Option
 
-	scheme        *internalScheme.Client
+	scheme        *schemeImpl.Client
 	schemeOptions []schemeConfig.Option
 
-	coordination        *internalCoordination.Client
+	coordination        *coordinationImpl.Client
 	coordinationOptions []coordinationConfig.Option
 
-	ratelimiter        *internalRatelimiter.Client
+	ratelimiter        *ratelimiterImpl.Client
 	ratelimiterOptions []ratelimiterConfig.Option
 
 	topic        *topicclientinternal.Client
@@ -355,7 +355,7 @@ func (d *Driver) connect(ctx context.Context) (err error) {
 		return xerrors.WithStackTrace(err)
 	}
 
-	d.table, err = internalTable.New(ctx,
+	d.table, err = tableImpl.New(ctx,
 		d.balancer,
 		tableConfig.New(
 			append(
@@ -371,7 +371,7 @@ func (d *Driver) connect(ctx context.Context) (err error) {
 		return xerrors.WithStackTrace(err)
 	}
 
-	d.scheme, err = internalScheme.New(ctx,
+	d.scheme, err = schemeImpl.New(ctx,
 		d.balancer,
 		schemeConfig.New(
 			append(
@@ -388,7 +388,7 @@ func (d *Driver) connect(ctx context.Context) (err error) {
 		return xerrors.WithStackTrace(err)
 	}
 
-	d.coordination, err = internalCoordination.New(ctx,
+	d.coordination, err = coordinationImpl.New(ctx,
 		d.balancer,
 		coordinationConfig.New(
 			append(
@@ -404,7 +404,7 @@ func (d *Driver) connect(ctx context.Context) (err error) {
 		return xerrors.WithStackTrace(err)
 	}
 
-	d.ratelimiter, err = internalRatelimiter.New(ctx,
+	d.ratelimiter, err = ratelimiterImpl.New(ctx,
 		d.balancer,
 		ratelimiterConfig.New(
 			append(
@@ -420,7 +420,7 @@ func (d *Driver) connect(ctx context.Context) (err error) {
 		return xerrors.WithStackTrace(err)
 	}
 
-	d.discovery, err = internalDiscovery.New(ctx,
+	d.discovery, err = discoveryImpl.New(ctx,
 		d.pool.Get(endpoint.New(d.config.Endpoint())),
 		discoveryConfig.New(
 			append(
@@ -440,7 +440,7 @@ func (d *Driver) connect(ctx context.Context) (err error) {
 		return xerrors.WithStackTrace(err)
 	}
 
-	d.scripting, err = internalScripting.New(ctx,
+	d.scripting, err = scriptingImpl.New(ctx,
 		d.balancer,
 		scriptingConfig.New(
 			append(
diff --git a/errors.go b/errors.go
index 944ae86a7..9f39781f7 100644
--- a/errors.go
+++ b/errors.go
@@ -4,7 +4,7 @@ import (
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb"
 	grpcCodes "google.golang.org/grpc/codes"
 
-	ratelimiterErrors "github.com/ydb-platform/ydb-go-sdk/v3/internal/ratelimiter/errors"
+	ratelimiterErrors "github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/ratelimiterImpl/errors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/ratelimiter"
 )
diff --git a/internal/balancer/balancer.go b/internal/balancer/balancer.go
index 5f089688f..e83c7ab8c 100644
--- a/internal/balancer/balancer.go
+++ b/internal/balancer/balancer.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/config"
 	balancerConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer/config"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/discoveryImpl"
+	discoveryConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/discoveryImpl/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/closer"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/credentials"
-	internalDiscovery "github.com/ydb-platform/ydb-go-sdk/v3/internal/discovery"
-	discoveryConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/discovery/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/repeater"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
@@ -253,7 +253,7 @@ func New(
 		pool:            pool,
 		localDCDetector: detectLocalDC,
 	}
-	d, err := internalDiscovery.New(ctx, pool.Get(
+	d, err := discoveryImpl.New(ctx, pool.Get(
 		endpoint.New(driverConfig.Endpoint()),
 	), discoveryConfig)
 	if err != nil {
diff --git a/internal/coordination/client.go b/internal/clients/coordinationImpl/client.go
similarity index 97%
rename from internal/coordination/client.go
rename to internal/clients/coordinationImpl/client.go
index f077aabfa..5bc7dd8e1 100644
--- a/internal/coordination/client.go
+++ b/internal/clients/coordinationImpl/client.go
@@ -1,4 +1,4 @@
-package coordination
+package coordinationImpl
 
 import (
 	"context"
@@ -9,18 +9,14 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/coordination"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/coordination/config"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/coordinationImpl/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/operation"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/retry"
 	"github.com/ydb-platform/ydb-go-sdk/v3/scheme"
 )
 
-//nolint:gofumpt
-//nolint:nolintlint
-var (
-	errNilClient = xerrors.Wrap(errors.New("coordination client is not initialized"))
-)
+var errNilClient = xerrors.Wrap(errors.New("coordination client is not initialized"))
 
 type Client struct {
 	config  config.Config
diff --git a/internal/coordination/config/config.go b/internal/clients/coordinationImpl/config/config.go
similarity index 100%
rename from internal/coordination/config/config.go
rename to internal/clients/coordinationImpl/config/config.go
diff --git a/internal/discovery/config/config.go b/internal/clients/discoveryImpl/config/config.go
similarity index 100%
rename from internal/discovery/config/config.go
rename to internal/clients/discoveryImpl/config/config.go
diff --git a/internal/discovery/discovery.go b/internal/clients/discoveryImpl/discovery.go
similarity index 97%
rename from internal/discovery/discovery.go
rename to internal/clients/discoveryImpl/discovery.go
index 6126c5961..dfc36207e 100644
--- a/internal/discovery/discovery.go
+++ b/internal/clients/discoveryImpl/discovery.go
@@ -1,4 +1,4 @@
-package discovery
+package discoveryImpl
 
 import (
 	"context"
@@ -12,7 +12,7 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/discovery"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/discovery/config"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/discoveryImpl/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/endpoint"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
diff --git a/internal/ratelimiter/client.go b/internal/clients/ratelimiterImpl/client.go
similarity index 97%
rename from internal/ratelimiter/client.go
rename to internal/clients/ratelimiterImpl/client.go
index 8705d7897..f63bc24e2 100644
--- a/internal/ratelimiter/client.go
+++ b/internal/clients/ratelimiterImpl/client.go
@@ -1,4 +1,4 @@
-package ratelimiter
+package ratelimiterImpl
 
 import (
 	"context"
@@ -10,10 +10,10 @@ import (
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_RateLimiter"
 	"google.golang.org/grpc"
 
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/ratelimiterImpl/config"
+	ratelimiterErrors "github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/ratelimiterImpl/errors"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/ratelimiterImpl/options"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/operation"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/ratelimiter/config"
-	ratelimiterErrors "github.com/ydb-platform/ydb-go-sdk/v3/internal/ratelimiter/errors"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/ratelimiter/options"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/ratelimiter"
 	"github.com/ydb-platform/ydb-go-sdk/v3/retry"
diff --git a/internal/ratelimiter/config/config.go b/internal/clients/ratelimiterImpl/config/config.go
similarity index 100%
rename from internal/ratelimiter/config/config.go
rename to internal/clients/ratelimiterImpl/config/config.go
diff --git a/internal/ratelimiter/errors/errors.go b/internal/clients/ratelimiterImpl/errors/errors.go
similarity index 100%
rename from internal/ratelimiter/errors/errors.go
rename to internal/clients/ratelimiterImpl/errors/errors.go
diff --git a/internal/ratelimiter/errors/errors_test.go b/internal/clients/ratelimiterImpl/errors/errors_test.go
similarity index 100%
rename from internal/ratelimiter/errors/errors_test.go
rename to internal/clients/ratelimiterImpl/errors/errors_test.go
diff --git a/internal/ratelimiter/options/acquire.go b/internal/clients/ratelimiterImpl/options/acquire.go
similarity index 100%
rename from internal/ratelimiter/options/acquire.go
rename to internal/clients/ratelimiterImpl/options/acquire.go
diff --git a/internal/scheme/client.go b/internal/clients/schemeImpl/client.go
similarity index 98%
rename from internal/scheme/client.go
rename to internal/clients/schemeImpl/client.go
index 22428fe41..b14ed29b2 100644
--- a/internal/scheme/client.go
+++ b/internal/clients/schemeImpl/client.go
@@ -1,4 +1,4 @@
-package scheme
+package schemeImpl
 
 import (
 	"context"
@@ -8,8 +8,8 @@ import (
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Scheme"
 	"google.golang.org/grpc"
 
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/schemeImpl/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/operation"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/scheme/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/retry"
diff --git a/internal/scheme/config/config.go b/internal/clients/schemeImpl/config/config.go
similarity index 100%
rename from internal/scheme/config/config.go
rename to internal/clients/schemeImpl/config/config.go
diff --git a/internal/scheme/helpers/check_exists.go b/internal/clients/schemeImpl/helpers/check_exists.go
similarity index 100%
rename from internal/scheme/helpers/check_exists.go
rename to internal/clients/schemeImpl/helpers/check_exists.go
diff --git a/internal/scheme/helpers/check_exists_test.go b/internal/clients/schemeImpl/helpers/check_exists_test.go
similarity index 100%
rename from internal/scheme/helpers/check_exists_test.go
rename to internal/clients/schemeImpl/helpers/check_exists_test.go
diff --git a/internal/scheme/options.go b/internal/clients/schemeImpl/options.go
similarity index 94%
rename from internal/scheme/options.go
rename to internal/clients/schemeImpl/options.go
index 875b66b20..d3f1603bd 100644
--- a/internal/scheme/options.go
+++ b/internal/clients/schemeImpl/options.go
@@ -1,4 +1,4 @@
-package scheme
+package schemeImpl
 
 import "github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Scheme"
 
diff --git a/internal/scheme/options_test.go b/internal/clients/schemeImpl/options_test.go
similarity index 98%
rename from internal/scheme/options_test.go
rename to internal/clients/schemeImpl/options_test.go
index 5f99dfd32..bac8d468c 100644
--- a/internal/scheme/options_test.go
+++ b/internal/clients/schemeImpl/options_test.go
@@ -1,4 +1,4 @@
-package scheme
+package schemeImpl
 
 import (
 	"testing"
diff --git a/internal/scripting/client.go b/internal/clients/scriptingImpl/client.go
similarity index 97%
rename from internal/scripting/client.go
rename to internal/clients/scriptingImpl/client.go
index b73f3c75f..0bee65af0 100644
--- a/internal/scripting/client.go
+++ b/internal/clients/scriptingImpl/client.go
@@ -1,4 +1,4 @@
-package scripting
+package scriptingImpl
 
 import (
 	"context"
@@ -11,10 +11,10 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/allocator"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/scriptingImpl/config"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/tableImpl/scanner"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/operation"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/scripting/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/scanner"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/value"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
diff --git a/internal/scripting/config/config.go b/internal/clients/scriptingImpl/config/config.go
similarity index 100%
rename from internal/scripting/config/config.go
rename to internal/clients/scriptingImpl/config/config.go
diff --git a/internal/table/client.go b/internal/clients/tableImpl/client.go
similarity index 99%
rename from internal/table/client.go
rename to internal/clients/tableImpl/client.go
index a19662a7f..a967b55c0 100644
--- a/internal/table/client.go
+++ b/internal/clients/tableImpl/client.go
@@ -1,4 +1,4 @@
-package table
+package tableImpl
 
 import (
 	"container/list"
@@ -10,9 +10,9 @@ import (
 	"github.com/jonboulle/clockwork"
 	"google.golang.org/grpc"
 
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/tableImpl/config"
 	metaHeaders "github.com/ydb-platform/ydb-go-sdk/v3/internal/meta"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsync"
diff --git a/internal/table/client_test.go b/internal/clients/tableImpl/client_test.go
similarity index 99%
rename from internal/table/client_test.go
rename to internal/clients/tableImpl/client_test.go
index 0ab4a0b61..1209f35d3 100644
--- a/internal/table/client_test.go
+++ b/internal/clients/tableImpl/client_test.go
@@ -1,4 +1,4 @@
-package table
+package tableImpl
 
 import (
 	"context"
@@ -18,7 +18,7 @@ import (
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/emptypb"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/config"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/tableImpl/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
diff --git a/internal/table/config/config.go b/internal/clients/tableImpl/config/config.go
similarity index 100%
rename from internal/table/config/config.go
rename to internal/clients/tableImpl/config/config.go
diff --git a/internal/table/data_query.go b/internal/clients/tableImpl/data_query.go
similarity index 98%
rename from internal/table/data_query.go
rename to internal/clients/tableImpl/data_query.go
index c5063a30e..faf01e019 100644
--- a/internal/table/data_query.go
+++ b/internal/clients/tableImpl/data_query.go
@@ -1,4 +1,4 @@
-package table
+package tableImpl
 
 import (
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Table"
diff --git a/internal/table/errors.go b/internal/clients/tableImpl/errors.go
similarity index 99%
rename from internal/table/errors.go
rename to internal/clients/tableImpl/errors.go
index 4ba5473f0..ae1611a3a 100644
--- a/internal/table/errors.go
+++ b/internal/clients/tableImpl/errors.go
@@ -1,4 +1,4 @@
-package table
+package tableImpl
 
 import (
 	"errors"
diff --git a/internal/table/params.go b/internal/clients/tableImpl/params.go
similarity index 98%
rename from internal/table/params.go
rename to internal/clients/tableImpl/params.go
index a4efeee38..557b27ee7 100644
--- a/internal/table/params.go
+++ b/internal/clients/tableImpl/params.go
@@ -1,4 +1,4 @@
-package table
+package tableImpl
 
 import (
 	"bytes"
diff --git a/internal/table/retry.go b/internal/clients/tableImpl/retry.go
similarity index 96%
rename from internal/table/retry.go
rename to internal/clients/tableImpl/retry.go
index ec21c1b8f..542559804 100644
--- a/internal/table/retry.go
+++ b/internal/clients/tableImpl/retry.go
@@ -1,9 +1,9 @@
-package table
+package tableImpl
 
 import (
 	"context"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/config"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/tableImpl/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/retry"
diff --git a/internal/table/retry_test.go b/internal/clients/tableImpl/retry_test.go
similarity index 99%
rename from internal/table/retry_test.go
rename to internal/clients/tableImpl/retry_test.go
index 43a1c865e..2e35b6166 100644
--- a/internal/table/retry_test.go
+++ b/internal/clients/tableImpl/retry_test.go
@@ -1,4 +1,4 @@
-package table
+package tableImpl
 
 import (
 	"context"
@@ -11,7 +11,7 @@ import (
 	grpcCodes "google.golang.org/grpc/codes"
 	grpcStatus "google.golang.org/grpc/status"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/config"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/tableImpl/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xrand"
diff --git a/internal/table/scanner/perfomance_test.go b/internal/clients/tableImpl/scanner/perfomance_test.go
similarity index 100%
rename from internal/table/scanner/perfomance_test.go
rename to internal/clients/tableImpl/scanner/perfomance_test.go
diff --git a/internal/table/scanner/result.go b/internal/clients/tableImpl/scanner/result.go
similarity index 100%
rename from internal/table/scanner/result.go
rename to internal/clients/tableImpl/scanner/result.go
diff --git a/internal/table/scanner/result_test.go b/internal/clients/tableImpl/scanner/result_test.go
similarity index 100%
rename from internal/table/scanner/result_test.go
rename to internal/clients/tableImpl/scanner/result_test.go
diff --git a/internal/table/scanner/scan_raw.go b/internal/clients/tableImpl/scanner/scan_raw.go
similarity index 100%
rename from internal/table/scanner/scan_raw.go
rename to internal/clients/tableImpl/scanner/scan_raw.go
diff --git a/internal/table/scanner/scanner.go b/internal/clients/tableImpl/scanner/scanner.go
similarity index 100%
rename from internal/table/scanner/scanner.go
rename to internal/clients/tableImpl/scanner/scanner.go
diff --git a/internal/table/scanner/scanner_data_test.go b/internal/clients/tableImpl/scanner/scanner_data_test.go
similarity index 100%
rename from internal/table/scanner/scanner_data_test.go
rename to internal/clients/tableImpl/scanner/scanner_data_test.go
diff --git a/internal/table/scanner/scanner_test.go b/internal/clients/tableImpl/scanner/scanner_test.go
similarity index 100%
rename from internal/table/scanner/scanner_test.go
rename to internal/clients/tableImpl/scanner/scanner_test.go
diff --git a/internal/table/scanner/stats.go b/internal/clients/tableImpl/scanner/stats.go
similarity index 100%
rename from internal/table/scanner/stats.go
rename to internal/clients/tableImpl/scanner/stats.go
diff --git a/internal/table/session.go b/internal/clients/tableImpl/session.go
similarity index 99%
rename from internal/table/session.go
rename to internal/clients/tableImpl/session.go
index 045ebc00d..29b806fa1 100644
--- a/internal/table/session.go
+++ b/internal/clients/tableImpl/session.go
@@ -1,4 +1,4 @@
-package table
+package tableImpl
 
 import (
 	"context"
@@ -17,13 +17,13 @@ import (
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/allocator"
 	balancerContext "github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/tableImpl/config"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/tableImpl/scanner"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/feature"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/meta"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/operation"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/config"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/scanner"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/value"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
diff --git a/internal/table/session_test.go b/internal/clients/tableImpl/session_test.go
similarity index 99%
rename from internal/table/session_test.go
rename to internal/clients/tableImpl/session_test.go
index d841c5fd4..399d0b2ad 100644
--- a/internal/table/session_test.go
+++ b/internal/clients/tableImpl/session_test.go
@@ -1,4 +1,4 @@
-package table
+package tableImpl
 
 import (
 	"context"
@@ -20,8 +20,8 @@ import (
 	"google.golang.org/protobuf/types/known/durationpb"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/allocator"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/tableImpl/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/operation"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/value"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xtest"
diff --git a/internal/table/statement.go b/internal/clients/tableImpl/statement.go
similarity index 99%
rename from internal/table/statement.go
rename to internal/clients/tableImpl/statement.go
index e59f07b5a..eae3930f2 100644
--- a/internal/table/statement.go
+++ b/internal/clients/tableImpl/statement.go
@@ -1,4 +1,4 @@
-package table
+package tableImpl
 
 import (
 	"context"
diff --git a/internal/table/transaction.go b/internal/clients/tableImpl/transaction.go
similarity index 98%
rename from internal/table/transaction.go
rename to internal/clients/tableImpl/transaction.go
index 180784c3a..2449f9c9b 100644
--- a/internal/table/transaction.go
+++ b/internal/clients/tableImpl/transaction.go
@@ -1,4 +1,4 @@
-package table
+package tableImpl
 
 import (
 	"context"
@@ -7,9 +7,9 @@ import (
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Table"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/allocator"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/tableImpl/scanner"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/operation"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/table/scanner"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"
diff --git a/internal/table/transaction_test.go b/internal/clients/tableImpl/transaction_test.go
similarity index 99%
rename from internal/table/transaction_test.go
rename to internal/clients/tableImpl/transaction_test.go
index c08d19e25..17dbe92ad 100644
--- a/internal/table/transaction_test.go
+++ b/internal/clients/tableImpl/transaction_test.go
@@ -1,4 +1,4 @@
-package table
+package tableImpl
 
 import (
 	"context"
diff --git a/internal/table/ttl.go b/internal/clients/tableImpl/ttl.go
similarity index 98%
rename from internal/table/ttl.go
rename to internal/clients/tableImpl/ttl.go
index c734847d9..b39b1e8e7 100644
--- a/internal/table/ttl.go
+++ b/internal/clients/tableImpl/ttl.go
@@ -1,4 +1,4 @@
-package table
+package tableImpl
 
 import (
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Table"
diff --git a/internal/topic/configs.go b/internal/clients/topicImpl/configs.go
similarity index 90%
rename from internal/topic/configs.go
rename to internal/clients/topicImpl/configs.go
index accc5d0dd..bc49ac31f 100644
--- a/internal/topic/configs.go
+++ b/internal/clients/topicImpl/configs.go
@@ -1,4 +1,4 @@
-package topic
+package topicImpl
 
 import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/config"
diff --git a/internal/topic/convertors.go b/internal/clients/topicImpl/convertors.go
similarity index 97%
rename from internal/topic/convertors.go
rename to internal/clients/topicImpl/convertors.go
index b9a25f747..f1cb3640f 100644
--- a/internal/topic/convertors.go
+++ b/internal/clients/topicImpl/convertors.go
@@ -1,4 +1,4 @@
-package topic
+package topicImpl
 
 import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/config"
diff --git a/internal/topic/retriable_error.go b/internal/clients/topicImpl/retriable_error.go
similarity index 99%
rename from internal/topic/retriable_error.go
rename to internal/clients/topicImpl/retriable_error.go
index c750338cb..e1821d37c 100644
--- a/internal/topic/retriable_error.go
+++ b/internal/clients/topicImpl/retriable_error.go
@@ -1,4 +1,4 @@
-package topic
+package topicImpl
 
 import (
 	"errors"
diff --git a/internal/topic/retriable_error_test.go b/internal/clients/topicImpl/retriable_error_test.go
similarity index 99%
rename from internal/topic/retriable_error_test.go
rename to internal/clients/topicImpl/retriable_error_test.go
index 79e8e7128..dd3a52523 100644
--- a/internal/topic/retriable_error_test.go
+++ b/internal/clients/topicImpl/retriable_error_test.go
@@ -1,4 +1,4 @@
-package topic
+package topicImpl
 
 import (
 	"fmt"
diff --git a/internal/topic/topicclientinternal/client.go b/internal/clients/topicImpl/topicclientinternal/client.go
similarity index 91%
rename from internal/topic/topicclientinternal/client.go
rename to internal/clients/topicImpl/topicclientinternal/client.go
index d774a30fb..58e628717 100644
--- a/internal/topic/topicclientinternal/client.go
+++ b/internal/clients/topicImpl/topicclientinternal/client.go
@@ -7,11 +7,11 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/credentials"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl/topicreaderinternal"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl/topicwriterinternal"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawydb"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreaderinternal"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicwriterinternal"
 	"github.com/ydb-platform/ydb-go-sdk/v3/retry"
 	"github.com/ydb-platform/ydb-go-sdk/v3/topic/topicoptions"
 	"github.com/ydb-platform/ydb-go-sdk/v3/topic/topicreader"
@@ -21,7 +21,7 @@ import (
 )
 
 type Client struct {
-	cfg                    topic.Config
+	cfg                    topicImpl.Config
 	cred                   credentials.Credentials
 	defaultOperationParams rawydb.OperationParams
 	rawClient              rawtopic.Client
@@ -38,7 +38,7 @@ func New(
 	cfg := newTopicConfig(opts...)
 
 	var defaultOperationParams rawydb.OperationParams
-	topic.OperationParamsFromConfig(&defaultOperationParams, &cfg.Common)
+	topicImpl.OperationParamsFromConfig(&defaultOperationParams, &cfg.Common)
 
 	return &Client{
 		cfg:                    cfg,
@@ -48,8 +48,8 @@ func New(
 	}, nil
 }
 
-func newTopicConfig(opts ...topicoptions.TopicOption) topic.Config {
-	c := topic.Config{
+func newTopicConfig(opts ...topicoptions.TopicOption) topicImpl.Config {
+	c := topicImpl.Config{
 		Trace: &trace.Topic{},
 	}
 	for _, o := range opts {
@@ -209,7 +209,7 @@ func (c *Client) StartReader(
 		topicoptions.WithCommonConfig(c.cfg.Common),
 		topicreaderinternal.WithCredentials(c.cred),
 		topicreaderinternal.WithTrace(c.cfg.Trace),
-		topicoptions.WithReaderStartTimeout(topic.DefaultStartTimeout),
+		topicoptions.WithReaderStartTimeout(topicImpl.DefaultStartTimeout),
 	}
 	opts = append(defaultOpts, opts...)
 
diff --git a/internal/topic/topicreaderinternal/batch.go b/internal/clients/topicImpl/topicreaderinternal/batch.go
similarity index 100%
rename from internal/topic/topicreaderinternal/batch.go
rename to internal/clients/topicImpl/topicreaderinternal/batch.go
diff --git a/internal/topic/topicreaderinternal/batch_test.go b/internal/clients/topicImpl/topicreaderinternal/batch_test.go
similarity index 100%
rename from internal/topic/topicreaderinternal/batch_test.go
rename to internal/clients/topicImpl/topicreaderinternal/batch_test.go
diff --git a/internal/topic/topicreaderinternal/batched_stream_reader_interface.go b/internal/clients/topicImpl/topicreaderinternal/batched_stream_reader_interface.go
similarity index 100%
rename from internal/topic/topicreaderinternal/batched_stream_reader_interface.go
rename to internal/clients/topicImpl/topicreaderinternal/batched_stream_reader_interface.go
diff --git a/internal/topic/topicreaderinternal/batched_stream_reader_mock_test.go b/internal/clients/topicImpl/topicreaderinternal/batched_stream_reader_mock_test.go
similarity index 100%
rename from internal/topic/topicreaderinternal/batched_stream_reader_mock_test.go
rename to internal/clients/topicImpl/topicreaderinternal/batched_stream_reader_mock_test.go
diff --git a/internal/topic/topicreaderinternal/batcher.go b/internal/clients/topicImpl/topicreaderinternal/batcher.go
similarity index 100%
rename from internal/topic/topicreaderinternal/batcher.go
rename to internal/clients/topicImpl/topicreaderinternal/batcher.go
diff --git a/internal/topic/topicreaderinternal/batcher_test.go b/internal/clients/topicImpl/topicreaderinternal/batcher_test.go
similarity index 100%
rename from internal/topic/topicreaderinternal/batcher_test.go
rename to internal/clients/topicImpl/topicreaderinternal/batcher_test.go
diff --git a/internal/topic/topicreaderinternal/commit_range.go b/internal/clients/topicImpl/topicreaderinternal/commit_range.go
similarity index 100%
rename from internal/topic/topicreaderinternal/commit_range.go
rename to internal/clients/topicImpl/topicreaderinternal/commit_range.go
diff --git a/internal/topic/topicreaderinternal/commit_range_test.go b/internal/clients/topicImpl/topicreaderinternal/commit_range_test.go
similarity index 100%
rename from internal/topic/topicreaderinternal/commit_range_test.go
rename to internal/clients/topicImpl/topicreaderinternal/commit_range_test.go
diff --git a/internal/topic/topicreaderinternal/committer.go b/internal/clients/topicImpl/topicreaderinternal/committer.go
similarity index 100%
rename from internal/topic/topicreaderinternal/committer.go
rename to internal/clients/topicImpl/topicreaderinternal/committer.go
diff --git a/internal/topic/topicreaderinternal/committer_test.go b/internal/clients/topicImpl/topicreaderinternal/committer_test.go
similarity index 100%
rename from internal/topic/topicreaderinternal/committer_test.go
rename to internal/clients/topicImpl/topicreaderinternal/committer_test.go
diff --git a/internal/topic/topicreaderinternal/decoders.go b/internal/clients/topicImpl/topicreaderinternal/decoders.go
similarity index 100%
rename from internal/topic/topicreaderinternal/decoders.go
rename to internal/clients/topicImpl/topicreaderinternal/decoders.go
diff --git a/internal/topic/topicreaderinternal/grpc_synced_stream.go b/internal/clients/topicImpl/topicreaderinternal/grpc_synced_stream.go
similarity index 100%
rename from internal/topic/topicreaderinternal/grpc_synced_stream.go
rename to internal/clients/topicImpl/topicreaderinternal/grpc_synced_stream.go
diff --git a/internal/topic/topicreaderinternal/message.go b/internal/clients/topicImpl/topicreaderinternal/message.go
similarity index 100%
rename from internal/topic/topicreaderinternal/message.go
rename to internal/clients/topicImpl/topicreaderinternal/message.go
diff --git a/internal/topic/topicreaderinternal/message_content_pool.go b/internal/clients/topicImpl/topicreaderinternal/message_content_pool.go
similarity index 95%
rename from internal/topic/topicreaderinternal/message_content_pool.go
rename to internal/clients/topicImpl/topicreaderinternal/message_content_pool.go
index 5554cf17b..b19d6fcfb 100644
--- a/internal/topic/topicreaderinternal/message_content_pool.go
+++ b/internal/clients/topicImpl/topicreaderinternal/message_content_pool.go
@@ -11,7 +11,7 @@ import (
 
 // Pool is interface for sync.Pool and may be extended by follow to original type
 //
-//go:generate mockgen -destination=pool_interface_mock_test.go -write_package_comment=false -package=topicreaderinternal github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreaderinternal Pool
+//go:generate mockgen -destination=pool_interface_mock_test.go -write_package_comment=false -package=topicreaderinternal github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl/topicreaderinternal Pool
 type Pool interface {
 	Get() interface{}
 	Put(x interface{})
diff --git a/internal/topic/topicreaderinternal/message_content_pool_test.go b/internal/clients/topicImpl/topicreaderinternal/message_content_pool_test.go
similarity index 100%
rename from internal/topic/topicreaderinternal/message_content_pool_test.go
rename to internal/clients/topicImpl/topicreaderinternal/message_content_pool_test.go
diff --git a/internal/topic/topicreaderinternal/one_time_reader.go b/internal/clients/topicImpl/topicreaderinternal/one_time_reader.go
similarity index 100%
rename from internal/topic/topicreaderinternal/one_time_reader.go
rename to internal/clients/topicImpl/topicreaderinternal/one_time_reader.go
diff --git a/internal/topic/topicreaderinternal/one_time_reader_test.go b/internal/clients/topicImpl/topicreaderinternal/one_time_reader_test.go
similarity index 100%
rename from internal/topic/topicreaderinternal/one_time_reader_test.go
rename to internal/clients/topicImpl/topicreaderinternal/one_time_reader_test.go
diff --git a/internal/topic/topicreaderinternal/partition_session.go b/internal/clients/topicImpl/topicreaderinternal/partition_session.go
similarity index 100%
rename from internal/topic/topicreaderinternal/partition_session.go
rename to internal/clients/topicImpl/topicreaderinternal/partition_session.go
diff --git a/internal/topic/topicreaderinternal/pool_interface_mock_test.go b/internal/clients/topicImpl/topicreaderinternal/pool_interface_mock_test.go
similarity index 92%
rename from internal/topic/topicreaderinternal/pool_interface_mock_test.go
rename to internal/clients/topicImpl/topicreaderinternal/pool_interface_mock_test.go
index a1f84aa81..53f180e51 100644
--- a/internal/topic/topicreaderinternal/pool_interface_mock_test.go
+++ b/internal/clients/topicImpl/topicreaderinternal/pool_interface_mock_test.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreaderinternal (interfaces: Pool)
+// Source: github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl/topicreaderinternal (interfaces: Pool)
 
 package topicreaderinternal
 
diff --git a/internal/topic/topicreaderinternal/public_callbacks.go b/internal/clients/topicImpl/topicreaderinternal/public_callbacks.go
similarity index 100%
rename from internal/topic/topicreaderinternal/public_callbacks.go
rename to internal/clients/topicImpl/topicreaderinternal/public_callbacks.go
diff --git a/internal/topic/topicreaderinternal/raw_topic_reader_stream_mock_test.go b/internal/clients/topicImpl/topicreaderinternal/raw_topic_reader_stream_mock_test.go
similarity index 95%
rename from internal/topic/topicreaderinternal/raw_topic_reader_stream_mock_test.go
rename to internal/clients/topicImpl/topicreaderinternal/raw_topic_reader_stream_mock_test.go
index 70bc7bb47..530a0d265 100644
--- a/internal/topic/topicreaderinternal/raw_topic_reader_stream_mock_test.go
+++ b/internal/clients/topicImpl/topicreaderinternal/raw_topic_reader_stream_mock_test.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreaderinternal (interfaces: RawTopicReaderStream)
+// Source: github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl/topicreaderinternal (interfaces: RawTopicReaderStream)
 
 package topicreaderinternal
 
diff --git a/internal/topic/topicreaderinternal/reader.go b/internal/clients/topicImpl/topicreaderinternal/reader.go
similarity index 98%
rename from internal/topic/topicreaderinternal/reader.go
rename to internal/clients/topicImpl/topicreaderinternal/reader.go
index 31144d6fc..ddf2110e6 100644
--- a/internal/topic/topicreaderinternal/reader.go
+++ b/internal/clients/topicImpl/topicreaderinternal/reader.go
@@ -9,10 +9,10 @@ import (
 	"time"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/credentials"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clone"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopicreader"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
@@ -221,7 +221,7 @@ func (r *Reader) CommitRanges(ctx context.Context, ranges []PublicCommitRange) e
 type ReaderConfig struct {
 	config.Common
 
-	RetrySettings      topic.RetrySettings
+	RetrySettings      topicImpl.RetrySettings
 	DefaultBatchConfig ReadMessageBatchOptions
 	topicStreamReaderConfig
 }
diff --git a/internal/topic/topicreaderinternal/reader_test.go b/internal/clients/topicImpl/topicreaderinternal/reader_test.go
similarity index 100%
rename from internal/topic/topicreaderinternal/reader_test.go
rename to internal/clients/topicImpl/topicreaderinternal/reader_test.go
diff --git a/internal/topic/topicreaderinternal/stream_reader_impl.go b/internal/clients/topicImpl/topicreaderinternal/stream_reader_impl.go
similarity index 100%
rename from internal/topic/topicreaderinternal/stream_reader_impl.go
rename to internal/clients/topicImpl/topicreaderinternal/stream_reader_impl.go
diff --git a/internal/topic/topicreaderinternal/stream_reader_impl_test.go b/internal/clients/topicImpl/topicreaderinternal/stream_reader_impl_test.go
similarity index 100%
rename from internal/topic/topicreaderinternal/stream_reader_impl_test.go
rename to internal/clients/topicImpl/topicreaderinternal/stream_reader_impl_test.go
diff --git a/internal/topic/topicreaderinternal/stream_reconnector.go b/internal/clients/topicImpl/topicreaderinternal/stream_reconnector.go
similarity index 96%
rename from internal/topic/topicreaderinternal/stream_reconnector.go
rename to internal/clients/topicImpl/topicreaderinternal/stream_reconnector.go
index 6bae747f0..453c46d73 100644
--- a/internal/topic/topicreaderinternal/stream_reconnector.go
+++ b/internal/clients/topicImpl/topicreaderinternal/stream_reconnector.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/background"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/backoff"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/empty"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/value"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
@@ -34,7 +34,7 @@ type readerReconnector struct {
 
 	tracer        *trace.Topic
 	baseContext   context.Context
-	retrySettings topic.RetrySettings
+	retrySettings topicImpl.RetrySettings
 
 	readerConnect readerConnectFunc
 
@@ -60,7 +60,7 @@ func newReaderReconnector(
 	readerID int64,
 	connector readerConnectFunc,
 	connectTimeout time.Duration,
-	retrySettings topic.RetrySettings,
+	retrySettings topicImpl.RetrySettings,
 	tracer *trace.Topic,
 	baseContext context.Context,
 ) *readerReconnector {
@@ -194,7 +194,7 @@ func (r *readerReconnector) reconnectionLoop(ctx context.Context) {
 	attempt := 0
 	for {
 		now := r.clock.Now()
-		if topic.CheckResetReconnectionCounters(lastTime, now, r.connectTimeout) {
+		if topicImpl.CheckResetReconnectionCounters(lastTime, now, r.connectTimeout) {
 			attempt = 0
 			retriesStarted = time.Now()
 		} else {
@@ -296,7 +296,7 @@ func (r *readerReconnector) reconnect(ctx context.Context, reason error, oldRead
 }
 
 func (r *readerReconnector) isRetriableError(err error) bool {
-	_, res := topic.CheckRetryMode(err, r.retrySettings, 0)
+	_, res := topicImpl.CheckRetryMode(err, r.retrySettings, 0)
 	return res
 }
 
@@ -304,7 +304,7 @@ func (r *readerReconnector) checkErrRetryMode(err error, retriesDuration time.Du
 	backoffType backoff.Backoff,
 	isRetriableErr bool,
 ) {
-	return topic.CheckRetryMode(err, r.retrySettings, retriesDuration)
+	return topicImpl.CheckRetryMode(err, r.retrySettings, retriesDuration)
 }
 
 func (r *readerReconnector) connectWithTimeout() (_ batchedStreamReader, err error) {
diff --git a/internal/topic/topicreaderinternal/stream_reconnector_test.go b/internal/clients/topicImpl/topicreaderinternal/stream_reconnector_test.go
similarity index 100%
rename from internal/topic/topicreaderinternal/stream_reconnector_test.go
rename to internal/clients/topicImpl/topicreaderinternal/stream_reconnector_test.go
diff --git a/internal/topic/topicwriterinternal/encoders.go b/internal/clients/topicImpl/topicwriterinternal/encoders.go
similarity index 100%
rename from internal/topic/topicwriterinternal/encoders.go
rename to internal/clients/topicImpl/topicwriterinternal/encoders.go
diff --git a/internal/topic/topicwriterinternal/encoders_test.go b/internal/clients/topicImpl/topicwriterinternal/encoders_test.go
similarity index 100%
rename from internal/topic/topicwriterinternal/encoders_test.go
rename to internal/clients/topicImpl/topicwriterinternal/encoders_test.go
diff --git a/internal/topic/topicwriterinternal/message.go b/internal/clients/topicImpl/topicwriterinternal/message.go
similarity index 100%
rename from internal/topic/topicwriterinternal/message.go
rename to internal/clients/topicImpl/topicwriterinternal/message.go
diff --git a/internal/topic/topicwriterinternal/public_callbacks.go b/internal/clients/topicImpl/topicwriterinternal/public_callbacks.go
similarity index 100%
rename from internal/topic/topicwriterinternal/public_callbacks.go
rename to internal/clients/topicImpl/topicwriterinternal/public_callbacks.go
diff --git a/internal/topic/topicwriterinternal/queue.go b/internal/clients/topicImpl/topicwriterinternal/queue.go
similarity index 100%
rename from internal/topic/topicwriterinternal/queue.go
rename to internal/clients/topicImpl/topicwriterinternal/queue.go
diff --git a/internal/topic/topicwriterinternal/queue_test.go b/internal/clients/topicImpl/topicwriterinternal/queue_test.go
similarity index 100%
rename from internal/topic/topicwriterinternal/queue_test.go
rename to internal/clients/topicImpl/topicwriterinternal/queue_test.go
diff --git a/internal/topic/topicwriterinternal/raw_topic_writer_stream_mock_test.go b/internal/clients/topicImpl/topicwriterinternal/raw_topic_writer_stream_mock_test.go
similarity index 95%
rename from internal/topic/topicwriterinternal/raw_topic_writer_stream_mock_test.go
rename to internal/clients/topicImpl/topicwriterinternal/raw_topic_writer_stream_mock_test.go
index cedc4b9c8..00eb190be 100644
--- a/internal/topic/topicwriterinternal/raw_topic_writer_stream_mock_test.go
+++ b/internal/clients/topicImpl/topicwriterinternal/raw_topic_writer_stream_mock_test.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicwriterinternal (interfaces: RawTopicWriterStream)
+// Source: github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl/topicwriterinternal (interfaces: RawTopicWriterStream)
 
 package topicwriterinternal
 
diff --git a/internal/topic/topicwriterinternal/writer.go b/internal/clients/topicImpl/topicwriterinternal/writer.go
similarity index 92%
rename from internal/topic/topicwriterinternal/writer.go
rename to internal/clients/topicImpl/topicwriterinternal/writer.go
index 9b3758666..35d26aae9 100644
--- a/internal/topic/topicwriterinternal/writer.go
+++ b/internal/clients/topicImpl/topicwriterinternal/writer.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopicwriter"
 )
 
-//go:generate mockgen -destination raw_topic_writer_stream_mock_test.go -package topicwriterinternal -write_package_comment=false github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicwriterinternal RawTopicWriterStream
+//go:generate mockgen -destination raw_topic_writer_stream_mock_test.go -package topicwriterinternal -write_package_comment=false github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl/topicwriterinternal RawTopicWriterStream
 
 type RawTopicWriterStream interface {
 	Recv() (rawtopicwriter.ServerMessage, error)
diff --git a/internal/topic/topicwriterinternal/writer_config.go b/internal/clients/topicImpl/topicwriterinternal/writer_config.go
similarity index 100%
rename from internal/topic/topicwriterinternal/writer_config.go
rename to internal/clients/topicImpl/topicwriterinternal/writer_config.go
diff --git a/internal/topic/topicwriterinternal/writer_options.go b/internal/clients/topicImpl/topicwriterinternal/writer_options.go
similarity index 100%
rename from internal/topic/topicwriterinternal/writer_options.go
rename to internal/clients/topicImpl/topicwriterinternal/writer_options.go
diff --git a/internal/topic/topicwriterinternal/writer_reconnector.go b/internal/clients/topicImpl/topicwriterinternal/writer_reconnector.go
similarity index 97%
rename from internal/topic/topicwriterinternal/writer_reconnector.go
rename to internal/clients/topicImpl/topicwriterinternal/writer_reconnector.go
index 4e34eab96..95be31c73 100644
--- a/internal/topic/topicwriterinternal/writer_reconnector.go
+++ b/internal/clients/topicImpl/topicwriterinternal/writer_reconnector.go
@@ -16,11 +16,11 @@ import (
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/credentials"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/background"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/empty"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopiccommon"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopicwriter"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/value"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
@@ -59,7 +59,7 @@ type WriterReconnectorConfig struct {
 	AutoSetSeqNo                 bool
 	AutoSetCreatedTime           bool
 	OnWriterInitResponseCallback PublicOnWriterInitResponseCallback
-	RetrySettings                topic.RetrySettings
+	RetrySettings                topicImpl.RetrySettings
 
 	connectTimeout time.Duration
 }
@@ -85,8 +85,8 @@ func newWriterReconnectorConfig(options ...PublicWriterOption) WriterReconnector
 		AutoSetCreatedTime: true,
 		MaxMessageSize:     50 * 1024 * 1024,
 		MaxQueueLen:        1000,
-		RetrySettings: topic.RetrySettings{
-			StartTimeout: topic.DefaultStartTimeout,
+		RetrySettings: topicImpl.RetrySettings{
+			StartTimeout: topicImpl.DefaultStartTimeout,
 		},
 	}
 	if cfg.compressorCount == 0 {
@@ -114,7 +114,7 @@ func newWriterReconnectorConfig(options ...PublicWriterOption) WriterReconnector
 
 type WriterReconnector struct {
 	cfg           WriterReconnectorConfig
-	retrySettings topic.RetrySettings
+	retrySettings topicImpl.RetrySettings
 
 	semaphore                      *semaphore.Weighted
 	queue                          messageQueue
@@ -369,7 +369,7 @@ func (w *WriterReconnector) connectionLoop(ctx context.Context) {
 		streamCtx, streamCtxCancel = createStreamContext()
 
 		now := time.Now()
-		if topic.CheckResetReconnectionCounters(prevAttemptTime, now, w.cfg.connectTimeout) {
+		if topicImpl.CheckResetReconnectionCounters(prevAttemptTime, now, w.cfg.connectTimeout) {
 			attempt = 0
 			startOfRetries = w.clock.Now()
 		} else {
@@ -378,7 +378,9 @@ func (w *WriterReconnector) connectionLoop(ctx context.Context) {
 		prevAttemptTime = now
 
 		if reconnectReason != nil {
-			if backoff, retry := topic.CheckRetryMode(reconnectReason, w.retrySettings, w.clock.Since(startOfRetries)); retry {
+			if backoff, retry := topicImpl.CheckRetryMode(
+				reconnectReason, w.retrySettings, w.clock.Since(startOfRetries),
+			); retry {
 				delay := backoff.Delay(attempt)
 				select {
 				case <-doneCtx:
diff --git a/internal/topic/topicwriterinternal/writer_reconnector_test.go b/internal/clients/topicImpl/topicwriterinternal/writer_reconnector_test.go
similarity index 100%
rename from internal/topic/topicwriterinternal/writer_reconnector_test.go
rename to internal/clients/topicImpl/topicwriterinternal/writer_reconnector_test.go
diff --git a/internal/topic/topicwriterinternal/writer_reconnector_unsafe_test.go b/internal/clients/topicImpl/topicwriterinternal/writer_reconnector_unsafe_test.go
similarity index 100%
rename from internal/topic/topicwriterinternal/writer_reconnector_unsafe_test.go
rename to internal/clients/topicImpl/topicwriterinternal/writer_reconnector_unsafe_test.go
diff --git a/internal/topic/topicwriterinternal/writer_single_stream.go b/internal/clients/topicImpl/topicwriterinternal/writer_single_stream.go
similarity index 100%
rename from internal/topic/topicwriterinternal/writer_single_stream.go
rename to internal/clients/topicImpl/topicwriterinternal/writer_single_stream.go
diff --git a/internal/topic/topicwriterinternal/writer_single_stream_test.go b/internal/clients/topicImpl/topicwriterinternal/writer_single_stream_test.go
similarity index 100%
rename from internal/topic/topicwriterinternal/writer_single_stream_test.go
rename to internal/clients/topicImpl/topicwriterinternal/writer_single_stream_test.go
diff --git a/internal/topic/topicwriterinternal/writer_stream_interface.go b/internal/clients/topicImpl/topicwriterinternal/writer_stream_interface.go
similarity index 100%
rename from internal/topic/topicwriterinternal/writer_stream_interface.go
rename to internal/clients/topicImpl/topicwriterinternal/writer_stream_interface.go
diff --git a/internal/topic/topicwriterinternal/writer_stream_interface_mock_test.go b/internal/clients/topicImpl/topicwriterinternal/writer_stream_interface_mock_test.go
similarity index 100%
rename from internal/topic/topicwriterinternal/writer_stream_interface_mock_test.go
rename to internal/clients/topicImpl/topicwriterinternal/writer_stream_interface_mock_test.go
diff --git a/internal/topic/topicwriterinternal/writer_test.go b/internal/clients/topicImpl/topicwriterinternal/writer_test.go
similarity index 100%
rename from internal/topic/topicwriterinternal/writer_test.go
rename to internal/clients/topicImpl/topicwriterinternal/writer_test.go
diff --git a/internal/xsql/conn.go b/internal/xsql/conn.go
index b5a52fd71..96681965d 100644
--- a/internal/xsql/conn.go
+++ b/internal/xsql/conn.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/scheme/helpers"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/schemeImpl/helpers"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/stack"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
diff --git a/options.go b/options.go
index c6e14cfa9..704610737 100644
--- a/options.go
+++ b/options.go
@@ -13,14 +13,14 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/credentials"
 	balancerConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/balancer/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/certificates"
+	coordinationConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/coordinationImpl/config"
+	discoveryConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/discoveryImpl/config"
+	ratelimiterConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/ratelimiterImpl/config"
+	schemeConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/schemeImpl/config"
+	scriptingConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/scriptingImpl/config"
+	tableConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/tableImpl/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/conn"
-	coordinationConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/coordination/config"
-	discoveryConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/discovery/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/dsn"
-	ratelimiterConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/ratelimiter/config"
-	schemeConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/scheme/config"
-	scriptingConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/scripting/config"
-	tableConfig "github.com/ydb-platform/ydb-go-sdk/v3/internal/table/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsql"
 	"github.com/ydb-platform/ydb-go-sdk/v3/log"
diff --git a/ratelimiter/ratelimiter.go b/ratelimiter/ratelimiter.go
index 2702c5683..341672a64 100644
--- a/ratelimiter/ratelimiter.go
+++ b/ratelimiter/ratelimiter.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/ratelimiter/options"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/ratelimiterImpl/options"
 )
 
 type Client interface {
diff --git a/sugar/check_exists.go b/sugar/check_exists.go
index 8aeed03c9..295481b22 100644
--- a/sugar/check_exists.go
+++ b/sugar/check_exists.go
@@ -3,7 +3,7 @@ package sugar
 import (
 	"context"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/scheme/helpers"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/schemeImpl/helpers"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/scheme"
 )
diff --git a/sugar/params.go b/sugar/params.go
index ee9ed504d..349215214 100644
--- a/sugar/params.go
+++ b/sugar/params.go
@@ -4,7 +4,7 @@
 package sugar
 
 import (
-	internal "github.com/ydb-platform/ydb-go-sdk/v3/internal/table"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/tableImpl"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"
 )
 
@@ -12,5 +12,5 @@ import (
 //
 // Deprecated: use testutil.QueryBind(ydb.WithAutoDeclare()) helper
 func GenerateDeclareSection(params *table.QueryParameters) (string, error) {
-	return internal.GenerateDeclareSection(params)
+	return tableImpl.GenerateDeclareSection(params)
 }
diff --git a/sugar/params_go1.18.go b/sugar/params_go1.18.go
index 0e0eeb1e3..42bd213bb 100644
--- a/sugar/params_go1.18.go
+++ b/sugar/params_go1.18.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/bind"
-	internal "github.com/ydb-platform/ydb-go-sdk/v3/internal/table"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/tableImpl"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"
 )
@@ -21,9 +21,9 @@ func GenerateDeclareSection[T *table.QueryParameters | []table.ParameterOption |
 ) (string, error) {
 	switch v := any(params).(type) {
 	case *table.QueryParameters:
-		return internal.GenerateDeclareSection(v)
+		return tableImpl.GenerateDeclareSection(v)
 	case []table.ParameterOption:
-		return internal.GenerateDeclareSection(table.NewQueryParameters(v...))
+		return tableImpl.GenerateDeclareSection(table.NewQueryParameters(v...))
 	case []sql.NamedArg:
 		values, err := bind.Params(func() (newArgs []interface{}) {
 			for i := range v {
@@ -34,7 +34,7 @@ func GenerateDeclareSection[T *table.QueryParameters | []table.ParameterOption |
 		if err != nil {
 			return "", xerrors.WithStackTrace(err)
 		}
-		return internal.GenerateDeclareSection(table.NewQueryParameters(values...))
+		return tableImpl.GenerateDeclareSection(table.NewQueryParameters(values...))
 	default:
 		return "", xerrors.WithStackTrace(fmt.Errorf("unsupported type: %T", v))
 	}
diff --git a/testutil/topic.go b/testutil/topic.go
index 44b3d486c..6c5d01acf 100644
--- a/testutil/topic.go
+++ b/testutil/topic.go
@@ -1,6 +1,8 @@
 package testutil
 
-import "github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreaderinternal"
+import (
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl/topicreaderinternal"
+)
 
 type TopicReaderMessageBuilder = topicreaderinternal.PublicMessageBuilder
 
diff --git a/topic/topicoptions/topicoptions.go b/topic/topicoptions/topicoptions.go
index 8004945fd..c09b210f5 100644
--- a/topic/topicoptions/topicoptions.go
+++ b/topic/topicoptions/topicoptions.go
@@ -3,22 +3,22 @@ package topicoptions
 import (
 	"time"
 
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopiccommon"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic"
 	"github.com/ydb-platform/ydb-go-sdk/v3/topic/topictypes"
 )
 
 type (
-	CheckErrorRetryFunction = topic.PublicCheckErrorRetryFunction
-	CheckErrorRetryArgs     = topic.PublicCheckErrorRetryArgs
-	CheckErrorRetryResult   = topic.PublicCheckRetryResult
+	CheckErrorRetryFunction = topicImpl.PublicCheckErrorRetryFunction
+	CheckErrorRetryArgs     = topicImpl.PublicCheckErrorRetryArgs
+	CheckErrorRetryResult   = topicImpl.PublicCheckRetryResult
 )
 
 var (
-	CheckErrorRetryDecisionDefault = topic.PublicRetryDecisionDefault // Apply default behavior for the error
-	CheckErrorRetryDecisionRetry   = topic.PublicRetryDecisionRetry   // Do once more retry
-	CheckErrorRetryDecisionStop    = topic.PublicRetryDecisionStop    // Do not retry
+	CheckErrorRetryDecisionDefault = topicImpl.PublicRetryDecisionDefault // Apply default behavior for the error
+	CheckErrorRetryDecisionRetry   = topicImpl.PublicRetryDecisionRetry   // Do once more retry
+	CheckErrorRetryDecisionStop    = topicImpl.PublicRetryDecisionStop    // Do not retry
 )
 
 type withMeteringMode topictypes.MeteringMode
diff --git a/topic/topicoptions/topicoptions_reader.go b/topic/topicoptions/topicoptions_reader.go
index 549211688..44983f931 100644
--- a/topic/topicoptions/topicoptions_reader.go
+++ b/topic/topicoptions/topicoptions_reader.go
@@ -3,9 +3,9 @@ package topicoptions
 import (
 	"time"
 
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl/topicreaderinternal"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/config"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopiccommon"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreaderinternal"
 	"github.com/ydb-platform/ydb-go-sdk/v3/topic/topictypes"
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
diff --git a/topic/topicoptions/topicoptions_topic.go b/topic/topicoptions/topicoptions_topic.go
index f79b710e2..c66812bec 100644
--- a/topic/topicoptions/topicoptions_topic.go
+++ b/topic/topicoptions/topicoptions_topic.go
@@ -3,8 +3,8 @@ package topicoptions
 import (
 	"time"
 
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/config"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic"
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
 
@@ -13,7 +13,7 @@ import (
 // # Experimental
 //
 // Notice: This API is EXPERIMENTAL and may be changed or removed in a later release.
-type TopicOption func(c *topic.Config)
+type TopicOption func(c *topicImpl.Config)
 
 // WithTrace defines trace over persqueue client calls
 //
@@ -21,7 +21,7 @@ type TopicOption func(c *topic.Config)
 //
 // Notice: This API is EXPERIMENTAL and may be changed or removed in a later release.
 func WithTrace(trace trace.Topic, opts ...trace.TopicComposeOption) TopicOption { //nolint:gocritic
-	return func(c *topic.Config) {
+	return func(c *topicImpl.Config) {
 		c.Trace = c.Trace.Compose(&trace, opts...)
 	}
 }
@@ -36,7 +36,7 @@ func WithTrace(trace trace.Topic, opts ...trace.TopicComposeOption) TopicOption
 //
 // Notice: This API is EXPERIMENTAL and may be changed or removed in a later release.
 func WithOperationTimeout(operationTimeout time.Duration) TopicOption {
-	return func(c *topic.Config) {
+	return func(c *topicImpl.Config) {
 		config.SetOperationTimeout(&c.Common, operationTimeout)
 	}
 }
@@ -51,7 +51,7 @@ func WithOperationTimeout(operationTimeout time.Duration) TopicOption {
 //
 // Notice: This API is EXPERIMENTAL and may be changed or removed in a later release.
 func WithOperationCancelAfter(operationCancelAfter time.Duration) TopicOption {
-	return func(c *topic.Config) {
+	return func(c *topicImpl.Config) {
 		config.SetOperationCancelAfter(&c.Common, operationCancelAfter)
 	}
 }
diff --git a/topic/topicoptions/topicoptions_writer.go b/topic/topicoptions/topicoptions_writer.go
index a29c501cb..767dcbd05 100644
--- a/topic/topicoptions/topicoptions_writer.go
+++ b/topic/topicoptions/topicoptions_writer.go
@@ -3,8 +3,8 @@ package topicoptions
 import (
 	"time"
 
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl/topicwriterinternal"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopiccommon"
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicwriterinternal"
 	"github.com/ydb-platform/ydb-go-sdk/v3/topic/topictypes"
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
diff --git a/topic/topicreader/batch_options.go b/topic/topicreader/batch_options.go
index b4c670c31..e277efe44 100644
--- a/topic/topicreader/batch_options.go
+++ b/topic/topicreader/batch_options.go
@@ -1,6 +1,8 @@
 package topicreader
 
-import "github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreaderinternal"
+import (
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl/topicreaderinternal"
+)
 
 // WithBatchMaxCount max messages within batch
 type WithBatchMaxCount int
diff --git a/topic/topicreader/errors.go b/topic/topicreader/errors.go
index 199a68257..f526f1491 100644
--- a/topic/topicreader/errors.go
+++ b/topic/topicreader/errors.go
@@ -3,7 +3,7 @@ package topicreader
 import (
 	"errors"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreaderinternal"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl/topicreaderinternal"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 )
 
diff --git a/topic/topicreader/reader.go b/topic/topicreader/reader.go
index cd6831f7e..e69846e37 100644
--- a/topic/topicreader/reader.go
+++ b/topic/topicreader/reader.go
@@ -3,7 +3,7 @@ package topicreader
 import (
 	"context"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicreaderinternal"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl/topicreaderinternal"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xatomic"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 )
diff --git a/topic/topicwriter/topicwriter.go b/topic/topicwriter/topicwriter.go
index d06efe588..9940f46f9 100644
--- a/topic/topicwriter/topicwriter.go
+++ b/topic/topicwriter/topicwriter.go
@@ -3,7 +3,7 @@ package topicwriter
 import (
 	"context"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic/topicwriterinternal"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/clients/topicImpl/topicwriterinternal"
 )
 
 type (