diff --git a/cmd/ctr/commands/images/images.go b/cmd/ctr/commands/images/images.go
index 074e118d3..79fe372c7 100644
--- a/cmd/ctr/commands/images/images.go
+++ b/cmd/ctr/commands/images/images.go
@@ -22,12 +22,14 @@ var Command = cli.Command{
 	Name:  "images",
 	Usage: "manage images",
 	Subcommands: cli.Commands{
-		listCommand,
 		checkCommand,
+		exportCommand,
+		importCommand,
+		listCommand,
+		pullCommand,
+		pushCommand,
 		removeCommand,
 		setLabelsCommand,
-		importCommand,
-		exportCommand,
 	},
 }
 
diff --git a/cmd/ctr/pull.go b/cmd/ctr/commands/images/pull.go
similarity index 98%
rename from cmd/ctr/pull.go
rename to cmd/ctr/commands/images/pull.go
index 7fb572312..c155413b7 100644
--- a/cmd/ctr/pull.go
+++ b/cmd/ctr/commands/images/pull.go
@@ -1,4 +1,4 @@
-package main
+package images
 
 import (
 	"fmt"
diff --git a/cmd/ctr/push.go b/cmd/ctr/commands/images/push.go
similarity index 99%
rename from cmd/ctr/push.go
rename to cmd/ctr/commands/images/push.go
index 732207f5e..d37653918 100644
--- a/cmd/ctr/push.go
+++ b/cmd/ctr/commands/images/push.go
@@ -1,4 +1,4 @@
-package main
+package images
 
 import (
 	gocontext "context"
diff --git a/cmd/ctr/main.go b/cmd/ctr/main.go
index b7270d491..76212a9cf 100644
--- a/cmd/ctr/main.go
+++ b/cmd/ctr/main.go
@@ -81,8 +81,6 @@ containerd CLI
 		images.Command,
 		namespacesCmd.Command,
 		pprofCommand,
-		pullCommand,
-		pushCommand,
 		rootfsCommand,
 		runCommand,
 		snapshot.Command,