diff --git a/contrib/fuzz/cri_fuzzer.go b/contrib/fuzz/cri_fuzzer.go
index 67a5597ba..5a6f21035 100644
--- a/contrib/fuzz/cri_fuzzer.go
+++ b/contrib/fuzz/cri_fuzzer.go
@@ -24,8 +24,8 @@ import (
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	server "github.com/containerd/containerd/pkg/cri/sbserver"
-	"github.com/containerd/containerd/pkg/cri/sbserver/images"
+	"github.com/containerd/containerd/pkg/cri/server"
+	"github.com/containerd/containerd/pkg/cri/server/images"
 	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
 )
diff --git a/contrib/fuzz/cri_sbserver_fuzzer.go b/contrib/fuzz/cri_sbserver_fuzzer.go
index ed3e88ec7..1146c1326 100644
--- a/contrib/fuzz/cri_sbserver_fuzzer.go
+++ b/contrib/fuzz/cri_sbserver_fuzzer.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/containerd/containerd"
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
-	"github.com/containerd/containerd/pkg/cri/sbserver"
+	"github.com/containerd/containerd/pkg/cri/server"
 )
 
 func FuzzCRISandboxServer(data []byte) int {
@@ -37,7 +37,7 @@ func FuzzCRISandboxServer(data []byte) int {
 	}
 	defer client.Close()
 
-	c, err := sbserver.NewCRIService(criconfig.Config{}, client, nil)
+	c, err := server.NewCRIService(criconfig.Config{}, client, nil)
 	if err != nil {
 		panic(err)
 	}
diff --git a/contrib/fuzz/cri_server_fuzzer.go b/contrib/fuzz/cri_server_fuzzer.go
index 1b5baa8fb..2b6622bf8 100644
--- a/contrib/fuzz/cri_server_fuzzer.go
+++ b/contrib/fuzz/cri_server_fuzzer.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/containerd/containerd"
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
-	server "github.com/containerd/containerd/pkg/cri/sbserver"
+	"github.com/containerd/containerd/pkg/cri/server"
 )
 
 func FuzzCRIServer(data []byte) int {
diff --git a/integration/image_pull_timeout_test.go b/integration/image_pull_timeout_test.go
index 439998f1f..683e1f8c4 100644
--- a/integration/image_pull_timeout_test.go
+++ b/integration/image_pull_timeout_test.go
@@ -38,7 +38,7 @@ import (
 	"github.com/containerd/containerd/leases"
 	"github.com/containerd/containerd/namespaces"
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
-	criserver "github.com/containerd/containerd/pkg/cri/sbserver"
+	criserver "github.com/containerd/containerd/pkg/cri/server"
 	"github.com/containerd/log"
 	"github.com/containerd/log/logtest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/integration/main_test.go b/integration/main_test.go
index 16f613c13..ffe1e29a9 100644
--- a/integration/main_test.go
+++ b/integration/main_test.go
@@ -41,7 +41,7 @@ import (
 	dialer "github.com/containerd/containerd/integration/remote/util"
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
 	"github.com/containerd/containerd/pkg/cri/constants"
-	server "github.com/containerd/containerd/pkg/cri/sbserver"
+	"github.com/containerd/containerd/pkg/cri/server"
 	"github.com/containerd/containerd/pkg/cri/util"
 	"github.com/containerd/log"
 	"github.com/opencontainers/selinux/go-selinux"
diff --git a/integration/sandbox_run_rollback_test.go b/integration/sandbox_run_rollback_test.go
index 3e15e9bc0..c9ecf5c3f 100644
--- a/integration/sandbox_run_rollback_test.go
+++ b/integration/sandbox_run_rollback_test.go
@@ -35,7 +35,7 @@ import (
 	"github.com/stretchr/testify/require"
 	criapiv1 "k8s.io/cri-api/pkg/apis/runtime/v1"
 
-	"github.com/containerd/containerd/pkg/cri/sbserver/podsandbox"
+	"github.com/containerd/containerd/pkg/cri/server/podsandbox"
 	"github.com/containerd/containerd/pkg/failpoint"
 )
 
diff --git a/pkg/cri/cri.go b/pkg/cri/cri.go
index d4351f981..b432ae3fa 100644
--- a/pkg/cri/cri.go
+++ b/pkg/cri/cri.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/pkg/cri/nri"
-	"github.com/containerd/containerd/pkg/cri/sbserver"
+	"github.com/containerd/containerd/pkg/cri/server"
 	nriservice "github.com/containerd/containerd/pkg/nri"
 	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/containerd/plugin"
@@ -84,7 +84,7 @@ func initCRIService(ic *plugin.InitContext) (interface{}, error) {
 		return nil, fmt.Errorf("failed to create containerd client: %w", err)
 	}
 
-	s, err := sbserver.NewCRIService(c, client, getNRIAPI(ic))
+	s, err := server.NewCRIService(c, client, getNRIAPI(ic))
 	if err != nil {
 		return nil, fmt.Errorf("failed to create CRI service: %w", err)
 	}
diff --git a/pkg/cri/sbserver/blockio_linux.go b/pkg/cri/server/blockio_linux.go
similarity index 98%
rename from pkg/cri/sbserver/blockio_linux.go
rename to pkg/cri/server/blockio_linux.go
index 1ccf10189..7d1e522ea 100644
--- a/pkg/cri/sbserver/blockio_linux.go
+++ b/pkg/cri/server/blockio_linux.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"fmt"
diff --git a/pkg/cri/sbserver/blockio_stub.go b/pkg/cri/server/blockio_stub.go
similarity index 97%
rename from pkg/cri/sbserver/blockio_stub.go
rename to pkg/cri/server/blockio_stub.go
index a8f8e66f2..b622b4418 100644
--- a/pkg/cri/sbserver/blockio_stub.go
+++ b/pkg/cri/server/blockio_stub.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 func (c *criService) blockIOClassFromAnnotations(containerName string, containerAnnotations, podAnnotations map[string]string) (string, error) {
 	return "", nil
diff --git a/pkg/cri/sbserver/cni_conf_syncer.go b/pkg/cri/server/cni_conf_syncer.go
similarity index 99%
rename from pkg/cri/sbserver/cni_conf_syncer.go
rename to pkg/cri/server/cni_conf_syncer.go
index c94bde502..f56e22203 100644
--- a/pkg/cri/sbserver/cni_conf_syncer.go
+++ b/pkg/cri/server/cni_conf_syncer.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"fmt"
diff --git a/pkg/cri/sbserver/container_attach.go b/pkg/cri/server/container_attach.go
similarity index 99%
rename from pkg/cri/sbserver/container_attach.go
rename to pkg/cri/server/container_attach.go
index 852707114..d7d0096d6 100644
--- a/pkg/cri/sbserver/container_attach.go
+++ b/pkg/cri/server/container_attach.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_checkpoint.go b/pkg/cri/server/container_checkpoint.go
similarity index 98%
rename from pkg/cri/sbserver/container_checkpoint.go
rename to pkg/cri/server/container_checkpoint.go
index 1c017bd9a..8a6e79941 100644
--- a/pkg/cri/sbserver/container_checkpoint.go
+++ b/pkg/cri/server/container_checkpoint.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_create.go b/pkg/cri/server/container_create.go
similarity index 99%
rename from pkg/cri/sbserver/container_create.go
rename to pkg/cri/server/container_create.go
index f97b01e7d..b1bf08960 100644
--- a/pkg/cri/sbserver/container_create.go
+++ b/pkg/cri/server/container_create.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_create_linux.go b/pkg/cri/server/container_create_linux.go
similarity index 99%
rename from pkg/cri/sbserver/container_create_linux.go
rename to pkg/cri/server/container_create_linux.go
index 71ad55476..0c39eb08b 100644
--- a/pkg/cri/sbserver/container_create_linux.go
+++ b/pkg/cri/server/container_create_linux.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"bufio"
diff --git a/pkg/cri/sbserver/container_create_linux_test.go b/pkg/cri/server/container_create_linux_test.go
similarity index 99%
rename from pkg/cri/sbserver/container_create_linux_test.go
rename to pkg/cri/server/container_create_linux_test.go
index 6be91dc00..35a37492d 100644
--- a/pkg/cri/sbserver/container_create_linux_test.go
+++ b/pkg/cri/server/container_create_linux_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_create_other.go b/pkg/cri/server/container_create_other.go
similarity index 98%
rename from pkg/cri/sbserver/container_create_other.go
rename to pkg/cri/server/container_create_other.go
index a5feb385c..9f010e6f4 100644
--- a/pkg/cri/sbserver/container_create_other.go
+++ b/pkg/cri/server/container_create_other.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	imagespec "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/pkg/cri/sbserver/container_create_other_test.go b/pkg/cri/server/container_create_other_test.go
similarity index 99%
rename from pkg/cri/sbserver/container_create_other_test.go
rename to pkg/cri/server/container_create_other_test.go
index cc639305d..604b289eb 100644
--- a/pkg/cri/sbserver/container_create_other_test.go
+++ b/pkg/cri/server/container_create_other_test.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"testing"
diff --git a/pkg/cri/sbserver/container_create_test.go b/pkg/cri/server/container_create_test.go
similarity index 99%
rename from pkg/cri/sbserver/container_create_test.go
rename to pkg/cri/server/container_create_test.go
index bbc21f209..6f3294f73 100644
--- a/pkg/cri/sbserver/container_create_test.go
+++ b/pkg/cri/server/container_create_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_create_windows.go b/pkg/cri/server/container_create_windows.go
similarity index 98%
rename from pkg/cri/sbserver/container_create_windows.go
rename to pkg/cri/server/container_create_windows.go
index 9beb2a44a..0b72173ce 100644
--- a/pkg/cri/sbserver/container_create_windows.go
+++ b/pkg/cri/server/container_create_windows.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"strconv"
diff --git a/pkg/cri/sbserver/container_create_windows_test.go b/pkg/cri/server/container_create_windows_test.go
similarity index 99%
rename from pkg/cri/sbserver/container_create_windows_test.go
rename to pkg/cri/server/container_create_windows_test.go
index cb20823a4..70f9a2afd 100644
--- a/pkg/cri/sbserver/container_create_windows_test.go
+++ b/pkg/cri/server/container_create_windows_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"testing"
diff --git a/pkg/cri/sbserver/container_events.go b/pkg/cri/server/container_events.go
similarity index 98%
rename from pkg/cri/sbserver/container_events.go
rename to pkg/cri/server/container_events.go
index 563cd26c9..83e322cd9 100644
--- a/pkg/cri/sbserver/container_events.go
+++ b/pkg/cri/server/container_events.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
diff --git a/pkg/cri/sbserver/container_exec.go b/pkg/cri/server/container_exec.go
similarity index 98%
rename from pkg/cri/sbserver/container_exec.go
rename to pkg/cri/server/container_exec.go
index 10d716b27..e33a59493 100644
--- a/pkg/cri/sbserver/container_exec.go
+++ b/pkg/cri/server/container_exec.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_execsync.go b/pkg/cri/server/container_execsync.go
similarity index 99%
rename from pkg/cri/sbserver/container_execsync.go
rename to pkg/cri/server/container_execsync.go
index 8d62888e7..ba2c3a7d1 100644
--- a/pkg/cri/sbserver/container_execsync.go
+++ b/pkg/cri/server/container_execsync.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"bytes"
diff --git a/pkg/cri/sbserver/container_execsync_test.go b/pkg/cri/server/container_execsync_test.go
similarity index 99%
rename from pkg/cri/sbserver/container_execsync_test.go
rename to pkg/cri/server/container_execsync_test.go
index 3f3ef274d..48f72abef 100644
--- a/pkg/cri/sbserver/container_execsync_test.go
+++ b/pkg/cri/server/container_execsync_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"bytes"
diff --git a/pkg/cri/sbserver/container_list.go b/pkg/cri/server/container_list.go
similarity index 99%
rename from pkg/cri/sbserver/container_list.go
rename to pkg/cri/server/container_list.go
index 51cb10268..931f1be2f 100644
--- a/pkg/cri/sbserver/container_list.go
+++ b/pkg/cri/server/container_list.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_list_test.go b/pkg/cri/server/container_list_test.go
similarity index 99%
rename from pkg/cri/sbserver/container_list_test.go
rename to pkg/cri/server/container_list_test.go
index ce4f59bd1..8af7165b2 100644
--- a/pkg/cri/sbserver/container_list_test.go
+++ b/pkg/cri/server/container_list_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_log_reopen.go b/pkg/cri/server/container_log_reopen.go
similarity index 99%
rename from pkg/cri/sbserver/container_log_reopen.go
rename to pkg/cri/server/container_log_reopen.go
index 96d726c28..1f68df133 100644
--- a/pkg/cri/sbserver/container_log_reopen.go
+++ b/pkg/cri/server/container_log_reopen.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_remove.go b/pkg/cri/server/container_remove.go
similarity index 99%
rename from pkg/cri/sbserver/container_remove.go
rename to pkg/cri/server/container_remove.go
index 83cde61a3..51b570fba 100644
--- a/pkg/cri/sbserver/container_remove.go
+++ b/pkg/cri/server/container_remove.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_remove_test.go b/pkg/cri/server/container_remove_test.go
similarity index 99%
rename from pkg/cri/sbserver/container_remove_test.go
rename to pkg/cri/server/container_remove_test.go
index e00278b82..6beda4616 100644
--- a/pkg/cri/sbserver/container_remove_test.go
+++ b/pkg/cri/server/container_remove_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"testing"
diff --git a/pkg/cri/sbserver/container_start.go b/pkg/cri/server/container_start.go
similarity index 99%
rename from pkg/cri/sbserver/container_start.go
rename to pkg/cri/server/container_start.go
index ddc6b1122..92ae32d34 100644
--- a/pkg/cri/sbserver/container_start.go
+++ b/pkg/cri/server/container_start.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_start_test.go b/pkg/cri/server/container_start_test.go
similarity index 99%
rename from pkg/cri/sbserver/container_start_test.go
rename to pkg/cri/server/container_start_test.go
index 79340e921..0c457f4f1 100644
--- a/pkg/cri/sbserver/container_start_test.go
+++ b/pkg/cri/server/container_start_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"testing"
diff --git a/pkg/cri/sbserver/container_stats.go b/pkg/cri/server/container_stats.go
similarity index 99%
rename from pkg/cri/sbserver/container_stats.go
rename to pkg/cri/server/container_stats.go
index 6b643f88f..e2ca5f1ac 100644
--- a/pkg/cri/sbserver/container_stats.go
+++ b/pkg/cri/server/container_stats.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_stats_list.go b/pkg/cri/server/container_stats_list.go
similarity index 99%
rename from pkg/cri/sbserver/container_stats_list.go
rename to pkg/cri/server/container_stats_list.go
index 72f441441..7c70a4854 100644
--- a/pkg/cri/sbserver/container_stats_list.go
+++ b/pkg/cri/server/container_stats_list.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_stats_list_test.go b/pkg/cri/server/container_stats_list_test.go
similarity index 99%
rename from pkg/cri/sbserver/container_stats_list_test.go
rename to pkg/cri/server/container_stats_list_test.go
index 0a7bf877d..723249008 100644
--- a/pkg/cri/sbserver/container_stats_list_test.go
+++ b/pkg/cri/server/container_stats_list_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_status.go b/pkg/cri/server/container_status.go
similarity index 98%
rename from pkg/cri/sbserver/container_status.go
rename to pkg/cri/server/container_status.go
index b9bcf7058..721532257 100644
--- a/pkg/cri/sbserver/container_status.go
+++ b/pkg/cri/server/container_status.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
@@ -22,7 +22,7 @@ import (
 	"fmt"
 
 	"github.com/containerd/containerd/errdefs"
-	"github.com/containerd/containerd/pkg/cri/sbserver/images"
+	"github.com/containerd/containerd/pkg/cri/server/images"
 	containerstore "github.com/containerd/containerd/pkg/cri/store/container"
 
 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"
diff --git a/pkg/cri/sbserver/container_status_test.go b/pkg/cri/server/container_status_test.go
similarity index 99%
rename from pkg/cri/sbserver/container_status_test.go
rename to pkg/cri/server/container_status_test.go
index 88e6c02b9..39e10e543 100644
--- a/pkg/cri/sbserver/container_status_test.go
+++ b/pkg/cri/server/container_status_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_stop.go b/pkg/cri/server/container_stop.go
similarity index 99%
rename from pkg/cri/sbserver/container_stop.go
rename to pkg/cri/server/container_stop.go
index 8a83f48ba..144400027 100644
--- a/pkg/cri/sbserver/container_stop.go
+++ b/pkg/cri/server/container_stop.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_stop_test.go b/pkg/cri/server/container_stop_test.go
similarity index 99%
rename from pkg/cri/sbserver/container_stop_test.go
rename to pkg/cri/server/container_stop_test.go
index 8dbee0d37..e3ab4829b 100644
--- a/pkg/cri/sbserver/container_stop_test.go
+++ b/pkg/cri/server/container_stop_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_update_resources.go b/pkg/cri/server/container_update_resources.go
similarity index 99%
rename from pkg/cri/sbserver/container_update_resources.go
rename to pkg/cri/server/container_update_resources.go
index 8e80bc29d..cbbe3492c 100644
--- a/pkg/cri/sbserver/container_update_resources.go
+++ b/pkg/cri/server/container_update_resources.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_update_resources_linux.go b/pkg/cri/server/container_update_resources_linux.go
similarity index 99%
rename from pkg/cri/sbserver/container_update_resources_linux.go
rename to pkg/cri/server/container_update_resources_linux.go
index 04186ac11..954487867 100644
--- a/pkg/cri/sbserver/container_update_resources_linux.go
+++ b/pkg/cri/server/container_update_resources_linux.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_update_resources_linux_test.go b/pkg/cri/server/container_update_resources_linux_test.go
similarity index 99%
rename from pkg/cri/sbserver/container_update_resources_linux_test.go
rename to pkg/cri/server/container_update_resources_linux_test.go
index 6cff864e8..bb89d8cae 100644
--- a/pkg/cri/sbserver/container_update_resources_linux_test.go
+++ b/pkg/cri/server/container_update_resources_linux_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_update_resources_other.go b/pkg/cri/server/container_update_resources_other.go
similarity index 98%
rename from pkg/cri/sbserver/container_update_resources_other.go
rename to pkg/cri/server/container_update_resources_other.go
index 7fa3f29df..4bf801ec2 100644
--- a/pkg/cri/sbserver/container_update_resources_other.go
+++ b/pkg/cri/server/container_update_resources_other.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/container_update_resources_windows.go b/pkg/cri/server/container_update_resources_windows.go
similarity index 98%
rename from pkg/cri/sbserver/container_update_resources_windows.go
rename to pkg/cri/server/container_update_resources_windows.go
index adbad53fd..9ce21aca8 100644
--- a/pkg/cri/sbserver/container_update_resources_windows.go
+++ b/pkg/cri/server/container_update_resources_windows.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/events.go b/pkg/cri/server/events.go
similarity index 99%
rename from pkg/cri/sbserver/events.go
rename to pkg/cri/server/events.go
index 1352e056e..cba4d2071 100644
--- a/pkg/cri/sbserver/events.go
+++ b/pkg/cri/server/events.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/events_test.go b/pkg/cri/server/events_test.go
similarity index 99%
rename from pkg/cri/sbserver/events_test.go
rename to pkg/cri/server/events_test.go
index e5d2d01eb..e15f47da8 100644
--- a/pkg/cri/sbserver/events_test.go
+++ b/pkg/cri/server/events_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"testing"
diff --git a/pkg/cri/sbserver/fuzz.go b/pkg/cri/server/fuzz.go
similarity index 98%
rename from pkg/cri/sbserver/fuzz.go
rename to pkg/cri/server/fuzz.go
index 77e5d2c82..1f3fe1f90 100644
--- a/pkg/cri/sbserver/fuzz.go
+++ b/pkg/cri/server/fuzz.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"fmt"
diff --git a/pkg/cri/sbserver/helpers.go b/pkg/cri/server/helpers.go
similarity index 99%
rename from pkg/cri/sbserver/helpers.go
rename to pkg/cri/server/helpers.go
index 71da2e711..45f8460cb 100644
--- a/pkg/cri/sbserver/helpers.go
+++ b/pkg/cri/server/helpers.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/helpers_linux.go b/pkg/cri/server/helpers_linux.go
similarity index 99%
rename from pkg/cri/sbserver/helpers_linux.go
rename to pkg/cri/server/helpers_linux.go
index 36b161fda..4580ba138 100644
--- a/pkg/cri/sbserver/helpers_linux.go
+++ b/pkg/cri/server/helpers_linux.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/helpers_other.go b/pkg/cri/server/helpers_other.go
similarity index 98%
rename from pkg/cri/sbserver/helpers_other.go
rename to pkg/cri/server/helpers_other.go
index aef880153..62b4b6c56 100644
--- a/pkg/cri/sbserver/helpers_other.go
+++ b/pkg/cri/server/helpers_other.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/helpers_test.go b/pkg/cri/server/helpers_test.go
similarity index 99%
rename from pkg/cri/sbserver/helpers_test.go
rename to pkg/cri/server/helpers_test.go
index 8088850d6..5e58ef12a 100644
--- a/pkg/cri/sbserver/helpers_test.go
+++ b/pkg/cri/server/helpers_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/helpers_windows.go b/pkg/cri/server/helpers_windows.go
similarity index 99%
rename from pkg/cri/sbserver/helpers_windows.go
rename to pkg/cri/server/helpers_windows.go
index 808a95e75..a289abc44 100644
--- a/pkg/cri/sbserver/helpers_windows.go
+++ b/pkg/cri/server/helpers_windows.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/helpers_windows_test.go b/pkg/cri/server/helpers_windows_test.go
similarity index 99%
rename from pkg/cri/sbserver/helpers_windows_test.go
rename to pkg/cri/server/helpers_windows_test.go
index 3cc844bc0..d1fcd9ad5 100644
--- a/pkg/cri/sbserver/helpers_windows_test.go
+++ b/pkg/cri/server/helpers_windows_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"testing"
diff --git a/pkg/cri/sbserver/images/image_list.go b/pkg/cri/server/images/image_list.go
similarity index 100%
rename from pkg/cri/sbserver/images/image_list.go
rename to pkg/cri/server/images/image_list.go
diff --git a/pkg/cri/sbserver/images/image_list_test.go b/pkg/cri/server/images/image_list_test.go
similarity index 100%
rename from pkg/cri/sbserver/images/image_list_test.go
rename to pkg/cri/server/images/image_list_test.go
diff --git a/pkg/cri/sbserver/images/image_pull.go b/pkg/cri/server/images/image_pull.go
similarity index 100%
rename from pkg/cri/sbserver/images/image_pull.go
rename to pkg/cri/server/images/image_pull.go
diff --git a/pkg/cri/sbserver/images/image_pull_test.go b/pkg/cri/server/images/image_pull_test.go
similarity index 100%
rename from pkg/cri/sbserver/images/image_pull_test.go
rename to pkg/cri/server/images/image_pull_test.go
diff --git a/pkg/cri/sbserver/images/image_remove.go b/pkg/cri/server/images/image_remove.go
similarity index 100%
rename from pkg/cri/sbserver/images/image_remove.go
rename to pkg/cri/server/images/image_remove.go
diff --git a/pkg/cri/sbserver/images/image_status.go b/pkg/cri/server/images/image_status.go
similarity index 100%
rename from pkg/cri/sbserver/images/image_status.go
rename to pkg/cri/server/images/image_status.go
diff --git a/pkg/cri/sbserver/images/image_status_test.go b/pkg/cri/server/images/image_status_test.go
similarity index 100%
rename from pkg/cri/sbserver/images/image_status_test.go
rename to pkg/cri/server/images/image_status_test.go
diff --git a/pkg/cri/sbserver/images/imagefs_info.go b/pkg/cri/server/images/imagefs_info.go
similarity index 100%
rename from pkg/cri/sbserver/images/imagefs_info.go
rename to pkg/cri/server/images/imagefs_info.go
diff --git a/pkg/cri/sbserver/images/imagefs_info_test.go b/pkg/cri/server/images/imagefs_info_test.go
similarity index 100%
rename from pkg/cri/sbserver/images/imagefs_info_test.go
rename to pkg/cri/server/images/imagefs_info_test.go
diff --git a/pkg/cri/sbserver/images/metrics.go b/pkg/cri/server/images/metrics.go
similarity index 100%
rename from pkg/cri/sbserver/images/metrics.go
rename to pkg/cri/server/images/metrics.go
diff --git a/pkg/cri/sbserver/images/service.go b/pkg/cri/server/images/service.go
similarity index 100%
rename from pkg/cri/sbserver/images/service.go
rename to pkg/cri/server/images/service.go
diff --git a/pkg/cri/sbserver/images/service_test.go b/pkg/cri/server/images/service_test.go
similarity index 100%
rename from pkg/cri/sbserver/images/service_test.go
rename to pkg/cri/server/images/service_test.go
diff --git a/pkg/cri/sbserver/images/snapshots.go b/pkg/cri/server/images/snapshots.go
similarity index 100%
rename from pkg/cri/sbserver/images/snapshots.go
rename to pkg/cri/server/images/snapshots.go
diff --git a/pkg/cri/sbserver/list_metric_descriptors.go b/pkg/cri/server/list_metric_descriptors.go
similarity index 98%
rename from pkg/cri/sbserver/list_metric_descriptors.go
rename to pkg/cri/server/list_metric_descriptors.go
index 3fec5450d..7adc7d669 100644
--- a/pkg/cri/sbserver/list_metric_descriptors.go
+++ b/pkg/cri/server/list_metric_descriptors.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/list_pod_sandbox_metrics.go b/pkg/cri/server/list_pod_sandbox_metrics.go
similarity index 98%
rename from pkg/cri/sbserver/list_pod_sandbox_metrics.go
rename to pkg/cri/server/list_pod_sandbox_metrics.go
index 33ce32009..d1587454e 100644
--- a/pkg/cri/sbserver/list_pod_sandbox_metrics.go
+++ b/pkg/cri/server/list_pod_sandbox_metrics.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/metrics.go b/pkg/cri/server/metrics.go
similarity index 99%
rename from pkg/cri/sbserver/metrics.go
rename to pkg/cri/server/metrics.go
index b5ed72b10..b9d198821 100644
--- a/pkg/cri/sbserver/metrics.go
+++ b/pkg/cri/server/metrics.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"github.com/docker/go-metrics"
diff --git a/pkg/cri/sbserver/nri.go b/pkg/cri/server/nri.go
similarity index 98%
rename from pkg/cri/sbserver/nri.go
rename to pkg/cri/server/nri.go
index d76b74759..78475b097 100644
--- a/pkg/cri/sbserver/nri.go
+++ b/pkg/cri/server/nri.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
diff --git a/pkg/cri/sbserver/nri_linux.go b/pkg/cri/server/nri_linux.go
similarity index 98%
rename from pkg/cri/sbserver/nri_linux.go
rename to pkg/cri/server/nri_linux.go
index 38c2f5e85..76f99de2c 100644
--- a/pkg/cri/sbserver/nri_linux.go
+++ b/pkg/cri/server/nri_linux.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/nri_other.go b/pkg/cri/server/nri_other.go
similarity index 98%
rename from pkg/cri/sbserver/nri_other.go
rename to pkg/cri/server/nri_other.go
index f88c16a3a..c4a4da3eb 100644
--- a/pkg/cri/sbserver/nri_other.go
+++ b/pkg/cri/server/nri_other.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/podsandbox/container_linux.go b/pkg/cri/server/podsandbox/container_linux.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/container_linux.go
rename to pkg/cri/server/podsandbox/container_linux.go
diff --git a/pkg/cri/sbserver/podsandbox/controller.go b/pkg/cri/server/podsandbox/controller.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/controller.go
rename to pkg/cri/server/podsandbox/controller.go
diff --git a/pkg/cri/sbserver/podsandbox/controller_test.go b/pkg/cri/server/podsandbox/controller_test.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/controller_test.go
rename to pkg/cri/server/podsandbox/controller_test.go
diff --git a/pkg/cri/sbserver/podsandbox/helpers.go b/pkg/cri/server/podsandbox/helpers.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/helpers.go
rename to pkg/cri/server/podsandbox/helpers.go
diff --git a/pkg/cri/sbserver/podsandbox/helpers_linux.go b/pkg/cri/server/podsandbox/helpers_linux.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/helpers_linux.go
rename to pkg/cri/server/podsandbox/helpers_linux.go
diff --git a/pkg/cri/sbserver/podsandbox/helpers_linux_test.go b/pkg/cri/server/podsandbox/helpers_linux_test.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/helpers_linux_test.go
rename to pkg/cri/server/podsandbox/helpers_linux_test.go
diff --git a/pkg/cri/sbserver/podsandbox/helpers_other.go b/pkg/cri/server/podsandbox/helpers_other.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/helpers_other.go
rename to pkg/cri/server/podsandbox/helpers_other.go
diff --git a/pkg/cri/sbserver/podsandbox/helpers_selinux_linux_test.go b/pkg/cri/server/podsandbox/helpers_selinux_linux_test.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/helpers_selinux_linux_test.go
rename to pkg/cri/server/podsandbox/helpers_selinux_linux_test.go
diff --git a/pkg/cri/sbserver/podsandbox/helpers_test.go b/pkg/cri/server/podsandbox/helpers_test.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/helpers_test.go
rename to pkg/cri/server/podsandbox/helpers_test.go
diff --git a/pkg/cri/sbserver/podsandbox/helpers_windows.go b/pkg/cri/server/podsandbox/helpers_windows.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/helpers_windows.go
rename to pkg/cri/server/podsandbox/helpers_windows.go
diff --git a/pkg/cri/sbserver/podsandbox/opts.go b/pkg/cri/server/podsandbox/opts.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/opts.go
rename to pkg/cri/server/podsandbox/opts.go
diff --git a/pkg/cri/sbserver/podsandbox/recover.go b/pkg/cri/server/podsandbox/recover.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/recover.go
rename to pkg/cri/server/podsandbox/recover.go
diff --git a/pkg/cri/sbserver/podsandbox/sandbox_delete.go b/pkg/cri/server/podsandbox/sandbox_delete.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/sandbox_delete.go
rename to pkg/cri/server/podsandbox/sandbox_delete.go
diff --git a/pkg/cri/sbserver/podsandbox/sandbox_run.go b/pkg/cri/server/podsandbox/sandbox_run.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/sandbox_run.go
rename to pkg/cri/server/podsandbox/sandbox_run.go
diff --git a/pkg/cri/sbserver/podsandbox/sandbox_run_linux.go b/pkg/cri/server/podsandbox/sandbox_run_linux.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/sandbox_run_linux.go
rename to pkg/cri/server/podsandbox/sandbox_run_linux.go
diff --git a/pkg/cri/sbserver/podsandbox/sandbox_run_linux_test.go b/pkg/cri/server/podsandbox/sandbox_run_linux_test.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/sandbox_run_linux_test.go
rename to pkg/cri/server/podsandbox/sandbox_run_linux_test.go
diff --git a/pkg/cri/sbserver/podsandbox/sandbox_run_other.go b/pkg/cri/server/podsandbox/sandbox_run_other.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/sandbox_run_other.go
rename to pkg/cri/server/podsandbox/sandbox_run_other.go
diff --git a/pkg/cri/sbserver/podsandbox/sandbox_run_other_test.go b/pkg/cri/server/podsandbox/sandbox_run_other_test.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/sandbox_run_other_test.go
rename to pkg/cri/server/podsandbox/sandbox_run_other_test.go
diff --git a/pkg/cri/sbserver/podsandbox/sandbox_run_test.go b/pkg/cri/server/podsandbox/sandbox_run_test.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/sandbox_run_test.go
rename to pkg/cri/server/podsandbox/sandbox_run_test.go
diff --git a/pkg/cri/sbserver/podsandbox/sandbox_run_windows.go b/pkg/cri/server/podsandbox/sandbox_run_windows.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/sandbox_run_windows.go
rename to pkg/cri/server/podsandbox/sandbox_run_windows.go
diff --git a/pkg/cri/sbserver/podsandbox/sandbox_run_windows_test.go b/pkg/cri/server/podsandbox/sandbox_run_windows_test.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/sandbox_run_windows_test.go
rename to pkg/cri/server/podsandbox/sandbox_run_windows_test.go
diff --git a/pkg/cri/sbserver/podsandbox/sandbox_stats.go b/pkg/cri/server/podsandbox/sandbox_stats.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/sandbox_stats.go
rename to pkg/cri/server/podsandbox/sandbox_stats.go
diff --git a/pkg/cri/sbserver/podsandbox/sandbox_status.go b/pkg/cri/server/podsandbox/sandbox_status.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/sandbox_status.go
rename to pkg/cri/server/podsandbox/sandbox_status.go
diff --git a/pkg/cri/sbserver/podsandbox/sandbox_stop.go b/pkg/cri/server/podsandbox/sandbox_stop.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/sandbox_stop.go
rename to pkg/cri/server/podsandbox/sandbox_stop.go
diff --git a/pkg/cri/sbserver/podsandbox/store.go b/pkg/cri/server/podsandbox/store.go
similarity index 100%
rename from pkg/cri/sbserver/podsandbox/store.go
rename to pkg/cri/server/podsandbox/store.go
diff --git a/pkg/cri/sbserver/rdt.go b/pkg/cri/server/rdt.go
similarity index 98%
rename from pkg/cri/sbserver/rdt.go
rename to pkg/cri/server/rdt.go
index c03bce55e..b45d24572 100644
--- a/pkg/cri/sbserver/rdt.go
+++ b/pkg/cri/server/rdt.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"fmt"
diff --git a/pkg/cri/sbserver/rdt_stub.go b/pkg/cri/server/rdt_stub.go
similarity index 97%
rename from pkg/cri/sbserver/rdt_stub.go
rename to pkg/cri/server/rdt_stub.go
index d362ac2ac..16d3e606e 100644
--- a/pkg/cri/sbserver/rdt_stub.go
+++ b/pkg/cri/server/rdt_stub.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 func (c *criService) rdtClassFromAnnotations(containerName string, containerAnnotations, podAnnotations map[string]string) (string, error) {
 	return "", nil
diff --git a/pkg/cri/sbserver/restart.go b/pkg/cri/server/restart.go
similarity index 99%
rename from pkg/cri/sbserver/restart.go
rename to pkg/cri/server/restart.go
index 8ed261842..8b7455c4d 100644
--- a/pkg/cri/sbserver/restart.go
+++ b/pkg/cri/server/restart.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
@@ -29,7 +29,7 @@ import (
 	"github.com/containerd/containerd/errdefs"
 	containerdimages "github.com/containerd/containerd/images"
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
-	"github.com/containerd/containerd/pkg/cri/sbserver/podsandbox"
+	"github.com/containerd/containerd/pkg/cri/server/podsandbox"
 	"github.com/containerd/containerd/pkg/netns"
 	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/log"
diff --git a/pkg/cri/sbserver/runtime_config.go b/pkg/cri/server/runtime_config.go
similarity index 98%
rename from pkg/cri/sbserver/runtime_config.go
rename to pkg/cri/server/runtime_config.go
index 37769f10d..149d433ef 100644
--- a/pkg/cri/sbserver/runtime_config.go
+++ b/pkg/cri/server/runtime_config.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/runtime_config_linux.go b/pkg/cri/server/runtime_config_linux.go
similarity index 99%
rename from pkg/cri/sbserver/runtime_config_linux.go
rename to pkg/cri/server/runtime_config_linux.go
index e5046d853..719db31eb 100644
--- a/pkg/cri/sbserver/runtime_config_linux.go
+++ b/pkg/cri/server/runtime_config_linux.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/runtime_config_linux_test.go b/pkg/cri/server/runtime_config_linux_test.go
similarity index 99%
rename from pkg/cri/sbserver/runtime_config_linux_test.go
rename to pkg/cri/server/runtime_config_linux_test.go
index de53523b9..035f88593 100644
--- a/pkg/cri/sbserver/runtime_config_linux_test.go
+++ b/pkg/cri/server/runtime_config_linux_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/runtime_config_other.go b/pkg/cri/server/runtime_config_other.go
similarity index 97%
rename from pkg/cri/sbserver/runtime_config_other.go
rename to pkg/cri/server/runtime_config_other.go
index 7559472ff..1039b2562 100644
--- a/pkg/cri/sbserver/runtime_config_other.go
+++ b/pkg/cri/server/runtime_config_other.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/sandbox_list.go b/pkg/cri/server/sandbox_list.go
similarity index 99%
rename from pkg/cri/sbserver/sandbox_list.go
rename to pkg/cri/server/sandbox_list.go
index 4cae5a6f4..08ad80b7c 100644
--- a/pkg/cri/sbserver/sandbox_list.go
+++ b/pkg/cri/server/sandbox_list.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/sandbox_list_test.go b/pkg/cri/server/sandbox_list_test.go
similarity index 99%
rename from pkg/cri/sbserver/sandbox_list_test.go
rename to pkg/cri/server/sandbox_list_test.go
index 0bed867fd..1d38c98d4 100644
--- a/pkg/cri/sbserver/sandbox_list_test.go
+++ b/pkg/cri/server/sandbox_list_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"testing"
diff --git a/pkg/cri/sbserver/sandbox_portforward.go b/pkg/cri/server/sandbox_portforward.go
similarity index 98%
rename from pkg/cri/sbserver/sandbox_portforward.go
rename to pkg/cri/server/sandbox_portforward.go
index b87ab89c9..9a1aee43f 100644
--- a/pkg/cri/sbserver/sandbox_portforward.go
+++ b/pkg/cri/server/sandbox_portforward.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/sandbox_portforward_linux.go b/pkg/cri/server/sandbox_portforward_linux.go
similarity index 99%
rename from pkg/cri/sbserver/sandbox_portforward_linux.go
rename to pkg/cri/server/sandbox_portforward_linux.go
index 1ff318a5f..15256421d 100644
--- a/pkg/cri/sbserver/sandbox_portforward_linux.go
+++ b/pkg/cri/server/sandbox_portforward_linux.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/sandbox_portforward_other.go b/pkg/cri/server/sandbox_portforward_other.go
similarity index 98%
rename from pkg/cri/sbserver/sandbox_portforward_other.go
rename to pkg/cri/server/sandbox_portforward_other.go
index cadbae0c8..9ba3fe162 100644
--- a/pkg/cri/sbserver/sandbox_portforward_other.go
+++ b/pkg/cri/server/sandbox_portforward_other.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/sandbox_portforward_windows.go b/pkg/cri/server/sandbox_portforward_windows.go
similarity index 99%
rename from pkg/cri/sbserver/sandbox_portforward_windows.go
rename to pkg/cri/server/sandbox_portforward_windows.go
index 876a36c51..44442f678 100644
--- a/pkg/cri/sbserver/sandbox_portforward_windows.go
+++ b/pkg/cri/server/sandbox_portforward_windows.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"bytes"
diff --git a/pkg/cri/sbserver/sandbox_remove.go b/pkg/cri/server/sandbox_remove.go
similarity index 99%
rename from pkg/cri/sbserver/sandbox_remove.go
rename to pkg/cri/server/sandbox_remove.go
index 678ee6e01..4cccd13dc 100644
--- a/pkg/cri/sbserver/sandbox_remove.go
+++ b/pkg/cri/server/sandbox_remove.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/sandbox_run.go b/pkg/cri/server/sandbox_run.go
similarity index 99%
rename from pkg/cri/sbserver/sandbox_run.go
rename to pkg/cri/server/sandbox_run.go
index 4503c4edd..6dbecdc38 100644
--- a/pkg/cri/sbserver/sandbox_run.go
+++ b/pkg/cri/server/sandbox_run.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
@@ -34,7 +34,7 @@ import (
 	"github.com/containerd/containerd/pkg/cri/annotations"
 	"github.com/containerd/containerd/pkg/cri/bandwidth"
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
-	"github.com/containerd/containerd/pkg/cri/sbserver/podsandbox"
+	"github.com/containerd/containerd/pkg/cri/server/podsandbox"
 	sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox"
 	"github.com/containerd/containerd/pkg/cri/util"
 	"github.com/containerd/containerd/pkg/netns"
diff --git a/pkg/cri/sbserver/sandbox_run_test.go b/pkg/cri/server/sandbox_run_test.go
similarity index 99%
rename from pkg/cri/sbserver/sandbox_run_test.go
rename to pkg/cri/server/sandbox_run_test.go
index 238ef031f..f414f2382 100644
--- a/pkg/cri/sbserver/sandbox_run_test.go
+++ b/pkg/cri/server/sandbox_run_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/sandbox_stats.go b/pkg/cri/server/sandbox_stats.go
similarity index 98%
rename from pkg/cri/sbserver/sandbox_stats.go
rename to pkg/cri/server/sandbox_stats.go
index 464435168..905e1e58f 100644
--- a/pkg/cri/sbserver/sandbox_stats.go
+++ b/pkg/cri/server/sandbox_stats.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/sandbox_stats_linux.go b/pkg/cri/server/sandbox_stats_linux.go
similarity index 99%
rename from pkg/cri/sbserver/sandbox_stats_linux.go
rename to pkg/cri/server/sandbox_stats_linux.go
index 93a4b94a8..028bf4e52 100644
--- a/pkg/cri/sbserver/sandbox_stats_linux.go
+++ b/pkg/cri/server/sandbox_stats_linux.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/sandbox_stats_list.go b/pkg/cri/server/sandbox_stats_list.go
similarity index 99%
rename from pkg/cri/sbserver/sandbox_stats_list.go
rename to pkg/cri/server/sandbox_stats_list.go
index ea03c9bc7..233202c01 100644
--- a/pkg/cri/sbserver/sandbox_stats_list.go
+++ b/pkg/cri/server/sandbox_stats_list.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/sandbox_stats_other.go b/pkg/cri/server/sandbox_stats_other.go
similarity index 98%
rename from pkg/cri/sbserver/sandbox_stats_other.go
rename to pkg/cri/server/sandbox_stats_other.go
index 8a249a485..4f1a53e46 100644
--- a/pkg/cri/sbserver/sandbox_stats_other.go
+++ b/pkg/cri/server/sandbox_stats_other.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/sandbox_stats_windows.go b/pkg/cri/server/sandbox_stats_windows.go
similarity index 99%
rename from pkg/cri/sbserver/sandbox_stats_windows.go
rename to pkg/cri/server/sandbox_stats_windows.go
index 3c9d2dead..ba4ab2ddd 100644
--- a/pkg/cri/sbserver/sandbox_stats_windows.go
+++ b/pkg/cri/server/sandbox_stats_windows.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/sandbox_stats_windows_test.go b/pkg/cri/server/sandbox_stats_windows_test.go
similarity index 99%
rename from pkg/cri/sbserver/sandbox_stats_windows_test.go
rename to pkg/cri/server/sandbox_stats_windows_test.go
index 75432256a..6b430b889 100644
--- a/pkg/cri/sbserver/sandbox_stats_windows_test.go
+++ b/pkg/cri/server/sandbox_stats_windows_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"testing"
diff --git a/pkg/cri/sbserver/sandbox_status.go b/pkg/cri/server/sandbox_status.go
similarity index 99%
rename from pkg/cri/sbserver/sandbox_status.go
rename to pkg/cri/server/sandbox_status.go
index 24b9bd846..70afaea1e 100644
--- a/pkg/cri/sbserver/sandbox_status.go
+++ b/pkg/cri/server/sandbox_status.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/sandbox_status_test.go b/pkg/cri/server/sandbox_status_test.go
similarity index 99%
rename from pkg/cri/sbserver/sandbox_status_test.go
rename to pkg/cri/server/sandbox_status_test.go
index 5f942b79b..48fde0e24 100644
--- a/pkg/cri/sbserver/sandbox_status_test.go
+++ b/pkg/cri/server/sandbox_status_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"testing"
diff --git a/pkg/cri/sbserver/sandbox_stop.go b/pkg/cri/server/sandbox_stop.go
similarity index 99%
rename from pkg/cri/sbserver/sandbox_stop.go
rename to pkg/cri/server/sandbox_stop.go
index 3346364cf..e957a84ed 100644
--- a/pkg/cri/sbserver/sandbox_stop.go
+++ b/pkg/cri/server/sandbox_stop.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/sandbox_stop_test.go b/pkg/cri/server/sandbox_stop_test.go
similarity index 99%
rename from pkg/cri/sbserver/sandbox_stop_test.go
rename to pkg/cri/server/sandbox_stop_test.go
index 09235768e..e58bc58b9 100644
--- a/pkg/cri/sbserver/sandbox_stop_test.go
+++ b/pkg/cri/server/sandbox_stop_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/service.go b/pkg/cri/server/service.go
similarity index 98%
rename from pkg/cri/sbserver/service.go
rename to pkg/cri/server/service.go
index 29dbe4e36..4ebc4e36d 100644
--- a/pkg/cri/sbserver/service.go
+++ b/pkg/cri/server/service.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
@@ -31,8 +31,8 @@ import (
 	"github.com/containerd/containerd/oci"
 	"github.com/containerd/containerd/pkg/cri/instrument"
 	"github.com/containerd/containerd/pkg/cri/nri"
-	"github.com/containerd/containerd/pkg/cri/sbserver/images"
-	"github.com/containerd/containerd/pkg/cri/sbserver/podsandbox"
+	"github.com/containerd/containerd/pkg/cri/server/images"
+	"github.com/containerd/containerd/pkg/cri/server/podsandbox"
 	imagestore "github.com/containerd/containerd/pkg/cri/store/image"
 	snapshotstore "github.com/containerd/containerd/pkg/cri/store/snapshot"
 	"github.com/containerd/containerd/pkg/cri/streaming"
diff --git a/pkg/cri/sbserver/service_linux.go b/pkg/cri/server/service_linux.go
similarity index 99%
rename from pkg/cri/sbserver/service_linux.go
rename to pkg/cri/server/service_linux.go
index 79ed66ccc..0e3c42e42 100644
--- a/pkg/cri/sbserver/service_linux.go
+++ b/pkg/cri/server/service_linux.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"fmt"
diff --git a/pkg/cri/sbserver/service_other.go b/pkg/cri/server/service_other.go
similarity index 98%
rename from pkg/cri/sbserver/service_other.go
rename to pkg/cri/server/service_other.go
index 053178600..70e050f11 100644
--- a/pkg/cri/sbserver/service_other.go
+++ b/pkg/cri/server/service_other.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"github.com/containerd/go-cni"
diff --git a/pkg/cri/sbserver/service_test.go b/pkg/cri/server/service_test.go
similarity index 99%
rename from pkg/cri/sbserver/service_test.go
rename to pkg/cri/server/service_test.go
index 915e78398..0ed4b4de0 100644
--- a/pkg/cri/sbserver/service_test.go
+++ b/pkg/cri/server/service_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"encoding/json"
diff --git a/pkg/cri/sbserver/service_windows.go b/pkg/cri/server/service_windows.go
similarity index 99%
rename from pkg/cri/sbserver/service_windows.go
rename to pkg/cri/server/service_windows.go
index 2f73d248a..47ec67ec4 100644
--- a/pkg/cri/sbserver/service_windows.go
+++ b/pkg/cri/server/service_windows.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"fmt"
diff --git a/pkg/cri/sbserver/status.go b/pkg/cri/server/status.go
similarity index 99%
rename from pkg/cri/sbserver/status.go
rename to pkg/cri/server/status.go
index e2547fdba..619ee7801 100644
--- a/pkg/cri/sbserver/status.go
+++ b/pkg/cri/server/status.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/streaming.go b/pkg/cri/server/streaming.go
similarity index 99%
rename from pkg/cri/sbserver/streaming.go
rename to pkg/cri/server/streaming.go
index e2ba8fa14..6c9cd4b3e 100644
--- a/pkg/cri/sbserver/streaming.go
+++ b/pkg/cri/server/streaming.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/streaming_test.go b/pkg/cri/server/streaming_test.go
similarity index 99%
rename from pkg/cri/sbserver/streaming_test.go
rename to pkg/cri/server/streaming_test.go
index 9796b3876..d7b7b427e 100644
--- a/pkg/cri/sbserver/streaming_test.go
+++ b/pkg/cri/server/streaming_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"testing"
diff --git a/pkg/cri/sbserver/test_config.go b/pkg/cri/server/test_config.go
similarity index 98%
rename from pkg/cri/sbserver/test_config.go
rename to pkg/cri/server/test_config.go
index 44908435b..e7a0fd130 100644
--- a/pkg/cri/sbserver/test_config.go
+++ b/pkg/cri/server/test_config.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import criconfig "github.com/containerd/containerd/pkg/cri/config"
 
diff --git a/pkg/cri/sbserver/update_runtime_config.go b/pkg/cri/server/update_runtime_config.go
similarity index 99%
rename from pkg/cri/sbserver/update_runtime_config.go
rename to pkg/cri/server/update_runtime_config.go
index b609ec493..e0a44e7b7 100644
--- a/pkg/cri/sbserver/update_runtime_config.go
+++ b/pkg/cri/server/update_runtime_config.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/update_runtime_config_test.go b/pkg/cri/server/update_runtime_config_test.go
similarity index 99%
rename from pkg/cri/sbserver/update_runtime_config_test.go
rename to pkg/cri/server/update_runtime_config_test.go
index 004b6bac0..51822272e 100644
--- a/pkg/cri/sbserver/update_runtime_config_test.go
+++ b/pkg/cri/server/update_runtime_config_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"
diff --git a/pkg/cri/sbserver/version.go b/pkg/cri/server/version.go
similarity index 98%
rename from pkg/cri/sbserver/version.go
rename to pkg/cri/server/version.go
index 7ea9778f3..1de600f58 100644
--- a/pkg/cri/sbserver/version.go
+++ b/pkg/cri/server/version.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package sbserver
+package server
 
 import (
 	"context"