diff --git a/cmd/ctr/command/main.go b/cmd/ctr/app/main.go
similarity index 97%
rename from cmd/ctr/command/main.go
rename to cmd/ctr/app/main.go
index 8fd1a5a51..0cc3a22c6 100644
--- a/cmd/ctr/command/main.go
+++ b/cmd/ctr/app/main.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package command
+package app
 
 import (
 	"fmt"
@@ -51,8 +51,8 @@ func init() {
 	}
 }
 
-// App returns a *cli.App instance.
-func App() *cli.App {
+// New returns a *cli.App instance.
+func New() *cli.App {
 	app := cli.NewApp()
 	app.Name = "ctr"
 	app.Version = version.Version
diff --git a/cmd/ctr/command/main_unix.go b/cmd/ctr/app/main_unix.go
similarity index 97%
rename from cmd/ctr/command/main_unix.go
rename to cmd/ctr/app/main_unix.go
index 80f2f41dc..c0eb1b6e1 100644
--- a/cmd/ctr/command/main_unix.go
+++ b/cmd/ctr/app/main_unix.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package command
+package app
 
 import "github.com/containerd/containerd/cmd/ctr/commands/shim"
 
diff --git a/cmd/ctr/main.go b/cmd/ctr/main.go
index dd9a1fc43..9cb81a8b2 100644
--- a/cmd/ctr/main.go
+++ b/cmd/ctr/main.go
@@ -20,14 +20,14 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/containerd/containerd/cmd/ctr/command"
+	"github.com/containerd/containerd/cmd/ctr/app"
 	"github.com/urfave/cli"
 )
 
 var pluginCmds = []cli.Command{}
 
 func main() {
-	app := command.App()
+	app := app.New()
 	app.Commands = append(app.Commands, pluginCmds...)
 	if err := app.Run(os.Args); err != nil {
 		fmt.Fprintf(os.Stderr, "ctr: %s\n", err)