diff --git a/pkg/dynamicaccess/accesslogic.go b/pkg/dynamicaccess/accesslogic.go
index 671537486e9..e87720e4812 100644
--- a/pkg/dynamicaccess/accesslogic.go
+++ b/pkg/dynamicaccess/accesslogic.go
@@ -9,8 +9,8 @@ import (
 	"crypto/ecdsa"
 	"fmt"
 
+	"github.com/ethersphere/bee/v2/pkg/dynamicaccess/kvs"
 	"github.com/ethersphere/bee/v2/pkg/encryption"
-	"github.com/ethersphere/bee/v2/pkg/kvs"
 	"github.com/ethersphere/bee/v2/pkg/swarm"
 	"golang.org/x/crypto/sha3"
 )
diff --git a/pkg/dynamicaccess/accesslogic_test.go b/pkg/dynamicaccess/accesslogic_test.go
index b8cab2f8fbf..ee7ccbb2997 100644
--- a/pkg/dynamicaccess/accesslogic_test.go
+++ b/pkg/dynamicaccess/accesslogic_test.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/ethersphere/bee/v2/pkg/crypto"
 	"github.com/ethersphere/bee/v2/pkg/dynamicaccess"
-	kvsmock "github.com/ethersphere/bee/v2/pkg/kvs/mock"
+	kvsmock "github.com/ethersphere/bee/v2/pkg/dynamicaccess/kvs/mock"
 	"github.com/ethersphere/bee/v2/pkg/swarm"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/pkg/dynamicaccess/controller.go b/pkg/dynamicaccess/controller.go
index 48e771cddc5..dce6986cf57 100644
--- a/pkg/dynamicaccess/controller.go
+++ b/pkg/dynamicaccess/controller.go
@@ -10,9 +10,9 @@ import (
 	"io"
 	"time"
 
+	"github.com/ethersphere/bee/v2/pkg/dynamicaccess/kvs"
 	"github.com/ethersphere/bee/v2/pkg/encryption"
 	"github.com/ethersphere/bee/v2/pkg/file"
-	"github.com/ethersphere/bee/v2/pkg/kvs"
 	"github.com/ethersphere/bee/v2/pkg/swarm"
 )
 
diff --git a/pkg/dynamicaccess/controller_test.go b/pkg/dynamicaccess/controller_test.go
index 7118368afa8..389f2b187a3 100644
--- a/pkg/dynamicaccess/controller_test.go
+++ b/pkg/dynamicaccess/controller_test.go
@@ -12,11 +12,11 @@ import (
 	"time"
 
 	"github.com/ethersphere/bee/v2/pkg/dynamicaccess"
+	"github.com/ethersphere/bee/v2/pkg/dynamicaccess/kvs"
 	encryption "github.com/ethersphere/bee/v2/pkg/encryption"
 	"github.com/ethersphere/bee/v2/pkg/file"
 	"github.com/ethersphere/bee/v2/pkg/file/loadsave"
 	"github.com/ethersphere/bee/v2/pkg/file/redundancy"
-	"github.com/ethersphere/bee/v2/pkg/kvs"
 	"github.com/ethersphere/bee/v2/pkg/swarm"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/crypto/sha3"
diff --git a/pkg/kvs/kvs.go b/pkg/dynamicaccess/kvs/kvs.go
similarity index 100%
rename from pkg/kvs/kvs.go
rename to pkg/dynamicaccess/kvs/kvs.go
diff --git a/pkg/kvs/kvs_test.go b/pkg/dynamicaccess/kvs/kvs_test.go
similarity index 98%
rename from pkg/kvs/kvs_test.go
rename to pkg/dynamicaccess/kvs/kvs_test.go
index 2f9af999a95..6b55afdc3de 100644
--- a/pkg/kvs/kvs_test.go
+++ b/pkg/dynamicaccess/kvs/kvs_test.go
@@ -8,12 +8,12 @@ import (
 	"context"
 	"testing"
 
+	"github.com/ethersphere/bee/v2/pkg/dynamicaccess/kvs"
 	"github.com/ethersphere/bee/v2/pkg/file"
 	"github.com/ethersphere/bee/v2/pkg/file/loadsave"
 	"github.com/ethersphere/bee/v2/pkg/file/pipeline"
 	"github.com/ethersphere/bee/v2/pkg/file/pipeline/builder"
 	"github.com/ethersphere/bee/v2/pkg/file/redundancy"
-	"github.com/ethersphere/bee/v2/pkg/kvs"
 	"github.com/ethersphere/bee/v2/pkg/storage"
 	mockstorer "github.com/ethersphere/bee/v2/pkg/storer/mock"
 	"github.com/ethersphere/bee/v2/pkg/swarm"
diff --git a/pkg/kvs/mock/kvs.go b/pkg/dynamicaccess/kvs/mock/kvs.go
similarity index 96%
rename from pkg/kvs/mock/kvs.go
rename to pkg/dynamicaccess/kvs/mock/kvs.go
index f5818972004..3f444bb58a8 100644
--- a/pkg/kvs/mock/kvs.go
+++ b/pkg/dynamicaccess/kvs/mock/kvs.go
@@ -9,7 +9,7 @@ import (
 	"encoding/hex"
 	"sync"
 
-	"github.com/ethersphere/bee/v2/pkg/kvs"
+	"github.com/ethersphere/bee/v2/pkg/dynamicaccess/kvs"
 	"github.com/ethersphere/bee/v2/pkg/swarm"
 )