diff --git a/cmd/dist/images.go b/cmd/dist/images.go
index 984ae820d..595768602 100644
--- a/cmd/dist/images.go
+++ b/cmd/dist/images.go
@@ -13,8 +13,9 @@ import (
 	"github.com/urfave/cli"
 )
 
-var imagesCommand = cli.Command{
-	Name:        "images",
+var imagesListCommand = cli.Command{
+	Name:        "list",
+	Aliases:     []string{"images"},
 	Usage:       "list images known to containerd",
 	ArgsUsage:   "[flags] <ref>",
 	Description: `List images registered with containerd.`,
diff --git a/cmd/dist/main.go b/cmd/dist/main.go
index 9e5255bcd..f9acfc859 100644
--- a/cmd/dist/main.go
+++ b/cmd/dist/main.go
@@ -61,16 +61,11 @@ distribution tool
 		},
 	}
 	app.Commands = []cli.Command{
-		imagesCommand,
-		rmiCommand,
+		imageCommand,
+		contentCommand,
 		pullCommand,
 		fetchCommand,
 		fetchObjectCommand,
-		ingestCommand,
-		activeCommand,
-		getCommand,
-		deleteCommand,
-		listCommand,
 		applyCommand,
 		rootfsCommand,
 	}
@@ -93,3 +88,24 @@ distribution tool
 		os.Exit(1)
 	}
 }
+
+var imageCommand = cli.Command{
+	Name:  "image",
+	Usage: "image management",
+	Subcommands: cli.Commands{
+		imagesListCommand,
+		rmiCommand,
+	},
+}
+
+var contentCommand = cli.Command{
+	Name:  "content",
+	Usage: "content management",
+	Subcommands: cli.Commands{
+		listCommand,
+		ingestCommand,
+		activeCommand,
+		getCommand,
+		deleteCommand,
+	},
+}