diff --git a/.golangci.yml b/.golangci.yml
index 8a20f79e8..4c213b1e1 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -23,6 +23,11 @@ issues:
   max-issues-per-linter: 0
   max-same-issues: 0
 
+  # Only using / doesn't work due to https://github.com/golangci/golangci-lint/issues/1398.
+  exclude-rules:
+    - path: 'cmd[\\/]containerd[\\/]builtins[\\/]'
+      text: "blank-imports:"
+
 linters-settings:
   gosec:
     # The following issues surfaced when `gosec` linter
diff --git a/cmd/containerd/builtins_aufs_linux.go b/cmd/containerd/builtins/aufs_linux.go
similarity index 97%
rename from cmd/containerd/builtins_aufs_linux.go
rename to cmd/containerd/builtins/aufs_linux.go
index f06e01f25..f7f77057c 100644
--- a/cmd/containerd/builtins_aufs_linux.go
+++ b/cmd/containerd/builtins/aufs_linux.go
@@ -17,6 +17,6 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import _ "github.com/containerd/aufs/plugin"
diff --git a/cmd/containerd/builtins_btrfs_linux.go b/cmd/containerd/builtins/btrfs_linux.go
similarity index 97%
rename from cmd/containerd/builtins_btrfs_linux.go
rename to cmd/containerd/builtins/btrfs_linux.go
index a6b11ca2a..a66ab284b 100644
--- a/cmd/containerd/builtins_btrfs_linux.go
+++ b/cmd/containerd/builtins/btrfs_linux.go
@@ -17,6 +17,6 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import _ "github.com/containerd/containerd/snapshots/btrfs/plugin"
diff --git a/cmd/containerd/builtins.go b/cmd/containerd/builtins/builtins.go
similarity index 99%
rename from cmd/containerd/builtins.go
rename to cmd/containerd/builtins/builtins.go
index 8ad1f7fdf..3e64dcea5 100644
--- a/cmd/containerd/builtins.go
+++ b/cmd/containerd/builtins/builtins.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 // register containerd builtins here
 import (
diff --git a/cmd/containerd/builtins_freebsd.go b/cmd/containerd/builtins/builtins_freebsd.go
similarity index 97%
rename from cmd/containerd/builtins_freebsd.go
rename to cmd/containerd/builtins/builtins_freebsd.go
index 2528586ac..c7fdbe190 100644
--- a/cmd/containerd/builtins_freebsd.go
+++ b/cmd/containerd/builtins/builtins_freebsd.go
@@ -14,6 +14,6 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import _ "github.com/containerd/zfs/plugin"
diff --git a/cmd/containerd/builtins_linux.go b/cmd/containerd/builtins/builtins_linux.go
similarity index 98%
rename from cmd/containerd/builtins_linux.go
rename to cmd/containerd/builtins/builtins_linux.go
index bb0defd68..2671606f4 100644
--- a/cmd/containerd/builtins_linux.go
+++ b/cmd/containerd/builtins/builtins_linux.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import (
 	_ "github.com/containerd/containerd/metrics/cgroups"
diff --git a/cmd/containerd/builtins_unix.go b/cmd/containerd/builtins/builtins_unix.go
similarity index 97%
rename from cmd/containerd/builtins_unix.go
rename to cmd/containerd/builtins/builtins_unix.go
index 2e5c1fa26..5b9eced4b 100644
--- a/cmd/containerd/builtins_unix.go
+++ b/cmd/containerd/builtins/builtins_unix.go
@@ -17,7 +17,7 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import (
 	_ "github.com/containerd/containerd/snapshots/native/plugin"
diff --git a/cmd/containerd/builtins_windows.go b/cmd/containerd/builtins/builtins_windows.go
similarity index 97%
rename from cmd/containerd/builtins_windows.go
rename to cmd/containerd/builtins/builtins_windows.go
index 8861ca3c8..3ba975a1a 100644
--- a/cmd/containerd/builtins_windows.go
+++ b/cmd/containerd/builtins/builtins_windows.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import (
 	_ "github.com/containerd/containerd/diff/lcow"
diff --git a/cmd/containerd/builtins_devmapper_linux.go b/cmd/containerd/builtins/devmapper_linux.go
similarity index 97%
rename from cmd/containerd/builtins_devmapper_linux.go
rename to cmd/containerd/builtins/devmapper_linux.go
index 0c036242c..b1b0578f0 100644
--- a/cmd/containerd/builtins_devmapper_linux.go
+++ b/cmd/containerd/builtins/devmapper_linux.go
@@ -17,6 +17,6 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import _ "github.com/containerd/containerd/snapshots/devmapper/plugin"
diff --git a/cmd/containerd/builtins_tracing.go b/cmd/containerd/builtins/tracing.go
similarity index 97%
rename from cmd/containerd/builtins_tracing.go
rename to cmd/containerd/builtins/tracing.go
index 668e990c0..a1d068e56 100644
--- a/cmd/containerd/builtins_tracing.go
+++ b/cmd/containerd/builtins/tracing.go
@@ -17,7 +17,7 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import (
 	_ "github.com/containerd/containerd/tracing/plugin"
diff --git a/cmd/containerd/builtins_zfs_linux.go b/cmd/containerd/builtins/zfs_linux.go
similarity index 97%
rename from cmd/containerd/builtins_zfs_linux.go
rename to cmd/containerd/builtins/zfs_linux.go
index bde126a61..48e47a6fd 100644
--- a/cmd/containerd/builtins_zfs_linux.go
+++ b/cmd/containerd/builtins/zfs_linux.go
@@ -17,6 +17,6 @@
    limitations under the License.
 */
 
-package main
+package builtins
 
 import _ "github.com/containerd/zfs/plugin"
diff --git a/cmd/containerd/builtins_cri.go b/cmd/containerd/builtins_cri.go
deleted file mode 100644
index f89d4a220..000000000
--- a/cmd/containerd/builtins_cri.go
+++ /dev/null
@@ -1,22 +0,0 @@
-//go:build (linux && !no_cri) || (windows && !no_cri) || (darwin && !no_cri)
-// +build linux,!no_cri windows,!no_cri darwin,!no_cri
-
-/*
-   Copyright The containerd Authors.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-package main
-
-import _ "github.com/containerd/containerd/pkg/cri"
diff --git a/cmd/containerd/main.go b/cmd/containerd/main.go
index 10bde45bd..7eee0ddf5 100644
--- a/cmd/containerd/main.go
+++ b/cmd/containerd/main.go
@@ -22,6 +22,9 @@ import (
 
 	"github.com/containerd/containerd/cmd/containerd/command"
 	"github.com/containerd/containerd/pkg/seed"
+
+	_ "github.com/containerd/containerd/cmd/containerd/builtins"
+	_ "github.com/containerd/containerd/pkg/cri"
 )
 
 func init() {