Move api/client -> cli/command

Using
  gomvpkg
     -from github.com/docker/docker/api/client
     -to github.com/docker/docker/cli/command
     -vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}'

Signed-off-by: Daniel Nephin <dnephin@docker.com>

api/client/client.go

@@ -1,5 +0,0 @@
-// Package client provides a command-line interface for Docker.
-//
-// Run "docker help SUBCOMMAND" or "docker SUBCOMMAND --help" to see more information on any Docker subcommand, including the full list of options supported for the subcommand.
-// See https://docs.docker.com/installation/ for instructions on installing Docker.
-package client

api/client/cli.go → cli/command/cli.go

@@ -1,4 +1,4 @@
-package client
+package command
 
 import (
 	"errors"

api/client/command/commands.go → cli/command/commands/commands.go

@@ -1,23 +1,23 @@
-package command
+package commands
 
 import (
-	"github.com/docker/docker/api/client"
-	"github.com/docker/docker/api/client/container"
-	"github.com/docker/docker/api/client/image"
-	"github.com/docker/docker/api/client/network"
-	"github.com/docker/docker/api/client/node"
-	"github.com/docker/docker/api/client/plugin"
-	"github.com/docker/docker/api/client/registry"
-	"github.com/docker/docker/api/client/service"
-	"github.com/docker/docker/api/client/stack"
-	"github.com/docker/docker/api/client/swarm"
-	"github.com/docker/docker/api/client/system"
-	"github.com/docker/docker/api/client/volume"
+	"github.com/docker/docker/cli/command"
+	"github.com/docker/docker/cli/command/container"
+	"github.com/docker/docker/cli/command/image"
+	"github.com/docker/docker/cli/command/network"
+	"github.com/docker/docker/cli/command/node"
+	"github.com/docker/docker/cli/command/plugin"
+	"github.com/docker/docker/cli/command/registry"
+	"github.com/docker/docker/cli/command/service"
+	"github.com/docker/docker/cli/command/stack"
+	"github.com/docker/docker/cli/command/swarm"
+	"github.com/docker/docker/cli/command/system"
+	"github.com/docker/docker/cli/command/volume"
 	"github.com/spf13/cobra"
 )
 
 // AddCommands adds all the commands from api/client to the root command
-func AddCommands(cmd *cobra.Command, dockerCli *client.DockerCli) {
+func AddCommands(cmd *cobra.Command, dockerCli *command.DockerCli) {
 	cmd.AddCommand(
 		node.NewNodeCommand(dockerCli),
 		service.NewServiceCommand(dockerCli),

api/client/container/attach.go → cli/command/container/attach.go

@@ -8,9 +8,9 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/spf13/cobra"
 )
@@ -24,7 +24,7 @@ type attachOptions struct {
 }
 
 // NewAttachCommand creates a new cobra.Command for `docker attach`
-func NewAttachCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewAttachCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts attachOptions
 
 	cmd := &cobra.Command{
@@ -44,7 +44,7 @@ func NewAttachCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runAttach(dockerCli *client.DockerCli, opts *attachOptions) error {
+func runAttach(dockerCli *command.DockerCli, opts *attachOptions) error {
 	ctx := context.Background()
 	client := dockerCli.Client()
 

api/client/container/commit.go → cli/command/container/commit.go

@@ -5,9 +5,9 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	dockeropts "github.com/docker/docker/opts"
 	"github.com/spf13/cobra"
 )
@@ -23,7 +23,7 @@ type commitOptions struct {
 }
 
 // NewCommitCommand creates a new cobra.Command for `docker commit`
-func NewCommitCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewCommitCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts commitOptions
 
 	cmd := &cobra.Command{
@@ -52,7 +52,7 @@ func NewCommitCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runCommit(dockerCli *client.DockerCli, opts *commitOptions) error {
+func runCommit(dockerCli *command.DockerCli, opts *commitOptions) error {
 	ctx := context.Background()
 
 	name := opts.container

api/client/container/cp.go → cli/command/container/cp.go

@@ -9,9 +9,9 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/system"
 	"github.com/spf13/cobra"
@@ -36,7 +36,7 @@ type cpConfig struct {
 }
 
 // NewCopyCommand creates a new `docker cp` command
-func NewCopyCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewCopyCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts copyOptions
 
 	cmd := &cobra.Command{
@@ -71,7 +71,7 @@ func NewCopyCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runCopy(dockerCli *client.DockerCli, opts copyOptions) error {
+func runCopy(dockerCli *command.DockerCli, opts copyOptions) error {
 	srcContainer, srcPath := splitCpArg(opts.source)
 	dstContainer, dstPath := splitCpArg(opts.destination)
 
@@ -103,7 +103,7 @@ func runCopy(dockerCli *client.DockerCli, opts copyOptions) error {
 	}
 }
 
-func statContainerPath(ctx context.Context, dockerCli *client.DockerCli, containerName, path string) (types.ContainerPathStat, error) {
+func statContainerPath(ctx context.Context, dockerCli *command.DockerCli, containerName, path string) (types.ContainerPathStat, error) {
 	return dockerCli.Client().ContainerStatPath(ctx, containerName, path)
 }
 
@@ -115,7 +115,7 @@ func resolveLocalPath(localPath string) (absPath string, err error) {
 	return archive.PreserveTrailingDotOrSeparator(absPath, localPath), nil
 }
 
-func copyFromContainer(ctx context.Context, dockerCli *client.DockerCli, srcContainer, srcPath, dstPath string, cpParam *cpConfig) (err error) {
+func copyFromContainer(ctx context.Context, dockerCli *command.DockerCli, srcContainer, srcPath, dstPath string, cpParam *cpConfig) (err error) {
 	if dstPath != "-" {
 		// Get an absolute destination path.
 		dstPath, err = resolveLocalPath(dstPath)
@@ -176,7 +176,7 @@ func copyFromContainer(ctx context.Context, dockerCli *client.DockerCli, srcCont
 	return archive.CopyTo(preArchive, srcInfo, dstPath)
 }
 
-func copyToContainer(ctx context.Context, dockerCli *client.DockerCli, srcPath, dstContainer, dstPath string, cpParam *cpConfig) (err error) {
+func copyToContainer(ctx context.Context, dockerCli *command.DockerCli, srcPath, dstContainer, dstPath string, cpParam *cpConfig) (err error) {
 	if srcPath != "-" {
 		// Get an absolute source path.
 		srcPath, err = resolveLocalPath(srcPath)

api/client/container/create.go → cli/command/container/create.go

@@ -7,8 +7,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/jsonmessage"
 	// FIXME migrate to docker/distribution/reference
 	"github.com/docker/docker/api/types"
@@ -27,7 +27,7 @@ type createOptions struct {
 }
 
 // NewCreateCommand creates a new cobra.Command for `docker create`
-func NewCreateCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts createOptions
 	var copts *runconfigopts.ContainerOptions
 
@@ -53,12 +53,12 @@ func NewCreateCommand(dockerCli *client.DockerCli) *cobra.Command {
 	// with hostname
 	flags.Bool("help", false, "Print usage")
 
-	client.AddTrustedFlags(flags, true)
+	command.AddTrustedFlags(flags, true)
 	copts = runconfigopts.AddFlags(flags)
 	return cmd
 }
 
-func runCreate(dockerCli *client.DockerCli, flags *pflag.FlagSet, opts *createOptions, copts *runconfigopts.ContainerOptions) error {
+func runCreate(dockerCli *command.DockerCli, flags *pflag.FlagSet, opts *createOptions, copts *runconfigopts.ContainerOptions) error {
 	config, hostConfig, networkingConfig, err := runconfigopts.Parse(flags, copts)
 	if err != nil {
 		reportError(dockerCli.Err(), "create", err.Error(), true)
@@ -72,7 +72,7 @@ func runCreate(dockerCli *client.DockerCli, flags *pflag.FlagSet, opts *createOp
 	return nil
 }
 
-func pullImage(ctx context.Context, dockerCli *client.DockerCli, image string, out io.Writer) error {
+func pullImage(ctx context.Context, dockerCli *command.DockerCli, image string, out io.Writer) error {
 	ref, err := reference.ParseNamed(image)
 	if err != nil {
 		return err
@@ -85,7 +85,7 @@ func pullImage(ctx context.Context, dockerCli *client.DockerCli, image string, o
 	}
 
 	authConfig := dockerCli.ResolveAuthConfig(ctx, repoInfo.Index)
-	encodedAuth, err := client.EncodeAuthToBase64(authConfig)
+	encodedAuth, err := command.EncodeAuthToBase64(authConfig)
 	if err != nil {
 		return err
 	}
@@ -147,7 +147,7 @@ func newCIDFile(path string) (*cidFile, error) {
 	return &cidFile{path: path, file: f}, nil
 }
 
-func createContainer(ctx context.Context, dockerCli *client.DockerCli, config *container.Config, hostConfig *container.HostConfig, networkingConfig *networktypes.NetworkingConfig, cidfile, name string) (*types.ContainerCreateResponse, error) {
+func createContainer(ctx context.Context, dockerCli *command.DockerCli, config *container.Config, hostConfig *container.HostConfig, networkingConfig *networktypes.NetworkingConfig, cidfile, name string) (*types.ContainerCreateResponse, error) {
 	stderr := dockerCli.Err()
 
 	var containerIDFile *cidFile
@@ -167,7 +167,7 @@ func createContainer(ctx context.Context, dockerCli *client.DockerCli, config *c
 	if ref != nil {
 		ref = reference.WithDefaultTag(ref)
 
-		if ref, ok := ref.(reference.NamedTagged); ok && client.IsTrusted() {
+		if ref, ok := ref.(reference.NamedTagged); ok && command.IsTrusted() {
 			var err error
 			trustedRef, err = dockerCli.TrustedReference(ctx, ref)
 			if err != nil {

api/client/container/diff.go → cli/command/container/diff.go

@@ -5,8 +5,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/spf13/cobra"
 )
@@ -16,7 +16,7 @@ type diffOptions struct {
 }
 
 // NewDiffCommand creates a new cobra.Command for `docker diff`
-func NewDiffCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewDiffCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts diffOptions
 
 	return &cobra.Command{
@@ -30,7 +30,7 @@ func NewDiffCommand(dockerCli *client.DockerCli) *cobra.Command {
 	}
 }
 
-func runDiff(dockerCli *client.DockerCli, opts *diffOptions) error {
+func runDiff(dockerCli *command.DockerCli, opts *diffOptions) error {
 	if opts.container == "" {
 		return fmt.Errorf("Container name cannot be empty")
 	}

api/client/container/exec.go → cli/command/container/exec.go

@@ -7,9 +7,9 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	apiclient "github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/promise"
 	"github.com/spf13/cobra"
@@ -25,7 +25,7 @@ type execOptions struct {
 }
 
 // NewExecCommand creats a new cobra.Command for `docker exec`
-func NewExecCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewExecCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts execOptions
 
 	cmd := &cobra.Command{
@@ -52,7 +52,7 @@ func NewExecCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runExec(dockerCli *client.DockerCli, opts *execOptions, container string, execCmd []string) error {
+func runExec(dockerCli *command.DockerCli, opts *execOptions, container string, execCmd []string) error {
 	execConfig, err := parseExec(opts, container, execCmd)
 	// just in case the ParseExec does not exit
 	if container == "" || err != nil {

api/client/container/export.go → cli/command/container/export.go

@@ -6,8 +6,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
@@ -17,7 +17,7 @@ type exportOptions struct {
 }
 
 // NewExportCommand creates a new `docker export` command
-func NewExportCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewExportCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts exportOptions
 
 	cmd := &cobra.Command{
@@ -37,7 +37,7 @@ func NewExportCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runExport(dockerCli *client.DockerCli, opts exportOptions) error {
+func runExport(dockerCli *command.DockerCli, opts exportOptions) error {
 	if opts.output == "" && dockerCli.Out().IsTerminal() {
 		return errors.New("Cowardly refusing to save to a terminal. Use the -o flag or redirect.")
 	}
@@ -55,5 +55,5 @@ func runExport(dockerCli *client.DockerCli, opts exportOptions) error {
 		return err
 	}
 
-	return client.CopyToFile(opts.output, responseBody)
+	return command.CopyToFile(opts.output, responseBody)
 }

api/client/container/hijack.go → cli/command/container/hijack.go

@@ -6,15 +6,15 @@ import (
 	"sync"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/client"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/pkg/stdcopy"
 	"golang.org/x/net/context"
 )
 
 type streams interface {
-	In() *client.InStream
-	Out() *client.OutStream
+	In() *command.InStream
+	Out() *command.OutStream
 }
 
 // holdHijackedConnection handles copying input to and output from streams to the

api/client/container/kill.go → cli/command/container/kill.go

@@ -6,8 +6,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
@@ -18,7 +18,7 @@ type killOptions struct {
 }
 
 // NewKillCommand creates a new cobra.Command for `docker kill`
-func NewKillCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewKillCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts killOptions
 
 	cmd := &cobra.Command{
@@ -36,7 +36,7 @@ func NewKillCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runKill(dockerCli *client.DockerCli, opts *killOptions) error {
+func runKill(dockerCli *command.DockerCli, opts *killOptions) error {
 	var errs []string
 	ctx := context.Background()
 	for _, name := range opts.containers {

api/client/container/logs.go → cli/command/container/logs.go

@@ -6,9 +6,9 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/spf13/cobra"
 )
@@ -29,7 +29,7 @@ type logsOptions struct {
 }
 
 // NewLogsCommand creates a new cobra.Command for `docker logs`
-func NewLogsCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewLogsCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts logsOptions
 
 	cmd := &cobra.Command{
@@ -51,7 +51,7 @@ func NewLogsCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runLogs(dockerCli *client.DockerCli, opts *logsOptions) error {
+func runLogs(dockerCli *command.DockerCli, opts *logsOptions) error {
 	ctx := context.Background()
 
 	c, err := dockerCli.Client().ContainerInspect(ctx, opts.container)

api/client/container/pause.go → cli/command/container/pause.go

@@ -6,8 +6,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
@@ -16,7 +16,7 @@ type pauseOptions struct {
 }
 
 // NewPauseCommand creates a new cobra.Command for `docker pause`
-func NewPauseCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewPauseCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts pauseOptions
 
 	return &cobra.Command{
@@ -30,7 +30,7 @@ func NewPauseCommand(dockerCli *client.DockerCli) *cobra.Command {
 	}
 }
 
-func runPause(dockerCli *client.DockerCli, opts *pauseOptions) error {
+func runPause(dockerCli *command.DockerCli, opts *pauseOptions) error {
 	ctx := context.Background()
 
 	var errs []string

api/client/container/port.go → cli/command/container/port.go

@@ -6,8 +6,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/go-connections/nat"
 	"github.com/spf13/cobra"
 )
@@ -19,7 +19,7 @@ type portOptions struct {
 }
 
 // NewPortCommand creates a new cobra.Command for `docker port`
-func NewPortCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewPortCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts portOptions
 
 	cmd := &cobra.Command{
@@ -37,7 +37,7 @@ func NewPortCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runPort(dockerCli *client.DockerCli, opts *portOptions) error {
+func runPort(dockerCli *command.DockerCli, opts *portOptions) error {
 	ctx := context.Background()
 
 	c, err := dockerCli.Client().ContainerInspect(ctx, opts.container)

api/client/container/ps.go → cli/command/container/ps.go

@@ -3,11 +3,11 @@ package container
 import (
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
-	"github.com/docker/docker/api/client/formatter"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
+	"github.com/docker/docker/cli/command/formatter"
 
 	"io/ioutil"
 
@@ -27,7 +27,7 @@ type psOptions struct {
 }
 
 // NewPsCommand creates a new cobra.Command for `docker ps`
-func NewPsCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewPsCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts psOptions
 
 	cmd := &cobra.Command{
@@ -103,7 +103,7 @@ func buildContainerListOptions(opts *psOptions) (*types.ContainerListOptions, er
 	return options, nil
 }
 
-func runPs(dockerCli *client.DockerCli, opts *psOptions) error {
+func runPs(dockerCli *command.DockerCli, opts *psOptions) error {
 	ctx := context.Background()
 
 	listOptions, err := buildContainerListOptions(opts)

api/client/container/rename.go → cli/command/container/rename.go

@@ -6,8 +6,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
@@ -17,7 +17,7 @@ type renameOptions struct {
 }
 
 // NewRenameCommand creates a new cobra.Command for `docker rename`
-func NewRenameCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewRenameCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts renameOptions
 
 	cmd := &cobra.Command{
@@ -33,7 +33,7 @@ func NewRenameCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runRename(dockerCli *client.DockerCli, opts *renameOptions) error {
+func runRename(dockerCli *command.DockerCli, opts *renameOptions) error {
 	ctx := context.Background()
 
 	oldName := strings.TrimSpace(opts.oldName)

api/client/container/restart.go → cli/command/container/restart.go

@@ -7,8 +7,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
@@ -19,7 +19,7 @@ type restartOptions struct {
 }
 
 // NewRestartCommand creates a new cobra.Command for `docker restart`
-func NewRestartCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewRestartCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts restartOptions
 
 	cmd := &cobra.Command{
@@ -37,7 +37,7 @@ func NewRestartCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runRestart(dockerCli *client.DockerCli, opts *restartOptions) error {
+func runRestart(dockerCli *command.DockerCli, opts *restartOptions) error {
 	ctx := context.Background()
 	var errs []string
 	for _, name := range opts.containers {

api/client/container/rm.go → cli/command/container/rm.go

@@ -6,9 +6,9 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
@@ -21,7 +21,7 @@ type rmOptions struct {
 }
 
 // NewRmCommand creates a new cobra.Command for `docker rm`
-func NewRmCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewRmCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts rmOptions
 
 	cmd := &cobra.Command{
@@ -41,7 +41,7 @@ func NewRmCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runRm(dockerCli *client.DockerCli, opts *rmOptions) error {
+func runRm(dockerCli *command.DockerCli, opts *rmOptions) error {
 	ctx := context.Background()
 
 	var errs []string
@@ -63,7 +63,7 @@ func runRm(dockerCli *client.DockerCli, opts *rmOptions) error {
 	return nil
 }
 
-func removeContainer(dockerCli *client.DockerCli, ctx context.Context, container string, removeVolumes, removeLinks, force bool) error {
+func removeContainer(dockerCli *command.DockerCli, ctx context.Context, container string, removeVolumes, removeLinks, force bool) error {
 	options := types.ContainerRemoveOptions{
 		RemoveVolumes: removeVolumes,
 		RemoveLinks:   removeLinks,

api/client/container/run.go → cli/command/container/run.go

@@ -12,9 +12,9 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	opttypes "github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/promise"
 	"github.com/docker/docker/pkg/signal"
@@ -32,7 +32,7 @@ type runOptions struct {
 }
 
 // NewRunCommand create a new `docker run` command
-func NewRunCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewRunCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts runOptions
 	var copts *runconfigopts.ContainerOptions
 
@@ -62,12 +62,12 @@ func NewRunCommand(dockerCli *client.DockerCli) *cobra.Command {
 	// with hostname
 	flags.Bool("help", false, "Print usage")
 
-	client.AddTrustedFlags(flags, true)
+	command.AddTrustedFlags(flags, true)
 	copts = runconfigopts.AddFlags(flags)
 	return cmd
 }
 
-func runRun(dockerCli *client.DockerCli, flags *pflag.FlagSet, opts *runOptions, copts *runconfigopts.ContainerOptions) error {
+func runRun(dockerCli *command.DockerCli, flags *pflag.FlagSet, opts *runOptions, copts *runconfigopts.ContainerOptions) error {
 	stdout, stderr, stdin := dockerCli.Out(), dockerCli.Err(), dockerCli.In()
 	client := dockerCli.Client()
 	// TODO: pass this as an argument

api/client/container/start.go → cli/command/container/start.go

@@ -8,9 +8,9 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/promise"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/spf13/cobra"
@@ -25,7 +25,7 @@ type startOptions struct {
 }
 
 // NewStartCommand creates a new cobra.Command for `docker start`
-func NewStartCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewStartCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts startOptions
 
 	cmd := &cobra.Command{
@@ -45,7 +45,7 @@ func NewStartCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runStart(dockerCli *client.DockerCli, opts *startOptions) error {
+func runStart(dockerCli *command.DockerCli, opts *startOptions) error {
 	ctx, cancelFun := context.WithCancel(context.Background())
 
 	if opts.attach || opts.openStdin {
@@ -143,7 +143,7 @@ func runStart(dockerCli *client.DockerCli, opts *startOptions) error {
 	return nil
 }
 
-func startContainersWithoutAttachments(dockerCli *client.DockerCli, ctx context.Context, containers []string) error {
+func startContainersWithoutAttachments(dockerCli *command.DockerCli, ctx context.Context, containers []string) error {
 	var failedContainers []string
 	for _, container := range containers {
 		if err := dockerCli.Client().ContainerStart(ctx, container, types.ContainerStartOptions{}); err != nil {

api/client/container/stats.go → cli/command/container/stats.go

@@ -11,12 +11,12 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/client"
-	"github.com/docker/docker/api/client/system"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
+	"github.com/docker/docker/cli/command/system"
 	"github.com/spf13/cobra"
 )
 
@@ -28,7 +28,7 @@ type statsOptions struct {
 }
 
 // NewStatsCommand creates a new cobra.Command for `docker stats`
-func NewStatsCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewStatsCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts statsOptions
 
 	cmd := &cobra.Command{
@@ -49,7 +49,7 @@ func NewStatsCommand(dockerCli *client.DockerCli) *cobra.Command {
 
 // runStats displays a live stream of resource usage statistics for one or more containers.
 // This shows real-time information on CPU usage, memory usage, and network I/O.
-func runStats(dockerCli *client.DockerCli, opts *statsOptions) error {
+func runStats(dockerCli *command.DockerCli, opts *statsOptions) error {
 	showAll := len(opts.containers) == 0
 	closeChan := make(chan error)
 

api/client/container/stop.go → cli/command/container/stop.go

@@ -7,8 +7,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
@@ -19,7 +19,7 @@ type stopOptions struct {
 }
 
 // NewStopCommand creates a new cobra.Command for `docker stop`
-func NewStopCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewStopCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts stopOptions
 
 	cmd := &cobra.Command{
@@ -37,7 +37,7 @@ func NewStopCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runStop(dockerCli *client.DockerCli, opts *stopOptions) error {
+func runStop(dockerCli *command.DockerCli, opts *stopOptions) error {
 	ctx := context.Background()
 
 	var errs []string

api/client/container/top.go → cli/command/container/top.go

@@ -7,8 +7,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
@@ -19,7 +19,7 @@ type topOptions struct {
 }
 
 // NewTopCommand creates a new cobra.Command for `docker top`
-func NewTopCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewTopCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts topOptions
 
 	cmd := &cobra.Command{
@@ -39,7 +39,7 @@ func NewTopCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runTop(dockerCli *client.DockerCli, opts *topOptions) error {
+func runTop(dockerCli *command.DockerCli, opts *topOptions) error {
 	ctx := context.Background()
 
 	procList, err := dockerCli.Client().ContainerTop(ctx, opts.container, opts.args)

api/client/container/tty.go → cli/command/container/tty.go

@@ -8,15 +8,15 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/client"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/api/types"
-	apiclient "github.com/docker/docker/client"
+	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/signal"
 	"golang.org/x/net/context"
 )
 
 // resizeTtyTo resizes tty to specific height and width
-func resizeTtyTo(ctx context.Context, client apiclient.ContainerAPIClient, id string, height, width int, isExec bool) {
+func resizeTtyTo(ctx context.Context, client client.ContainerAPIClient, id string, height, width int, isExec bool) {
 	if height == 0 && width == 0 {
 		return
 	}
@@ -39,7 +39,7 @@ func resizeTtyTo(ctx context.Context, client apiclient.ContainerAPIClient, id st
 }
 
 // MonitorTtySize updates the container tty size when the terminal tty changes size
-func MonitorTtySize(ctx context.Context, cli *client.DockerCli, id string, isExec bool) error {
+func MonitorTtySize(ctx context.Context, cli *command.DockerCli, id string, isExec bool) error {
 	resizeTty := func() {
 		height, width := cli.Out().GetTtySize()
 		resizeTtyTo(ctx, cli.Client(), id, height, width, isExec)
@@ -74,7 +74,7 @@ func MonitorTtySize(ctx context.Context, cli *client.DockerCli, id string, isExe
 }
 
 // ForwardAllSignals forwards signals to the container
-func ForwardAllSignals(ctx context.Context, cli *client.DockerCli, cid string) chan os.Signal {
+func ForwardAllSignals(ctx context.Context, cli *command.DockerCli, cid string) chan os.Signal {
 	sigc := make(chan os.Signal, 128)
 	signal.CatchAll(sigc)
 	go func() {

api/client/container/unpause.go → cli/command/container/unpause.go

@@ -6,8 +6,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
@@ -16,7 +16,7 @@ type unpauseOptions struct {
 }
 
 // NewUnpauseCommand creates a new cobra.Command for `docker unpause`
-func NewUnpauseCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewUnpauseCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts unpauseOptions
 
 	cmd := &cobra.Command{
@@ -31,7 +31,7 @@ func NewUnpauseCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runUnpause(dockerCli *client.DockerCli, opts *unpauseOptions) error {
+func runUnpause(dockerCli *command.DockerCli, opts *unpauseOptions) error {
 	ctx := context.Background()
 
 	var errs []string

api/client/container/update.go → cli/command/container/update.go

@@ -6,9 +6,9 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	runconfigopts "github.com/docker/docker/runconfig/opts"
 	"github.com/docker/go-units"
 	"github.com/spf13/cobra"
@@ -33,7 +33,7 @@ type updateOptions struct {
 }
 
 // NewUpdateCommand creates a new cobra.Command for `docker update`
-func NewUpdateCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewUpdateCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts updateOptions
 
 	cmd := &cobra.Command{
@@ -63,7 +63,7 @@ func NewUpdateCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runUpdate(dockerCli *client.DockerCli, opts *updateOptions) error {
+func runUpdate(dockerCli *command.DockerCli, opts *updateOptions) error {
 	var err error
 
 	if opts.nFlag == 0 {

api/client/container/utils.go → cli/command/container/utils.go

@@ -7,15 +7,15 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/client"
-	"github.com/docker/docker/api/client/system"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/cli/command"
+	"github.com/docker/docker/cli/command/system"
 	clientapi "github.com/docker/docker/client"
 )
 
-func waitExitOrRemoved(dockerCli *client.DockerCli, ctx context.Context, containerID string, waitRemove bool) (chan int, error) {
+func waitExitOrRemoved(dockerCli *command.DockerCli, ctx context.Context, containerID string, waitRemove bool) (chan int, error) {
 	if len(containerID) == 0 {
 		// containerID can never be empty
 		panic("Internal Error: waitExitOrRemoved needs a containerID as parameter")
@@ -79,7 +79,7 @@ func waitExitOrRemoved(dockerCli *client.DockerCli, ctx context.Context, contain
 
 // getExitCode performs an inspect on the container. It returns
 // the running state and the exit code.
-func getExitCode(dockerCli *client.DockerCli, ctx context.Context, containerID string) (bool, int, error) {
+func getExitCode(dockerCli *command.DockerCli, ctx context.Context, containerID string) (bool, int, error) {
 	c, err := dockerCli.Client().ContainerInspect(ctx, containerID)
 	if err != nil {
 		// If we can't connect, then the daemon probably died.

api/client/container/wait.go → cli/command/container/wait.go

@@ -6,8 +6,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
@@ -16,7 +16,7 @@ type waitOptions struct {
 }
 
 // NewWaitCommand creates a new cobra.Command for `docker wait`
-func NewWaitCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewWaitCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts waitOptions
 
 	cmd := &cobra.Command{
@@ -31,7 +31,7 @@ func NewWaitCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runWait(dockerCli *client.DockerCli, opts *waitOptions) error {
+func runWait(dockerCli *command.DockerCli, opts *waitOptions) error {
 	ctx := context.Background()
 
 	var errs []string

api/client/credentials.go → cli/command/credentials.go

@@ -1,4 +1,4 @@
-package client
+package command
 
 import (
 	"github.com/docker/docker/api/types"

api/client/formatter/container_test.go → cli/command/formatter/container_test.go

@@ -232,19 +232,19 @@ containerID2        ubuntu              ""                  24 hours ago
 image: ubuntu
 command: ""
 created_at: %s
-status: 
+status:
 names: foobar_baz
-labels: 
-ports: 
+labels:
+ports:
 
 container_id: containerID2
 image: ubuntu
 command: ""
 created_at: %s
-status: 
+status:
 names: foobar_bar
-labels: 
-ports: 
+labels:
+ports:
 
 `, expectedTime, expectedTime),
 		},
@@ -259,20 +259,20 @@ ports:
 image: ubuntu
 command: ""
 created_at: %s
-status: 
+status:
 names: foobar_baz
-labels: 
-ports: 
+labels:
+ports:
 size: 0 B
 
 container_id: containerID2
 image: ubuntu
 command: ""
 created_at: %s
-status: 
+status:
 names: foobar_bar
-labels: 
-ports: 
+labels:
+ports:
 size: 0 B
 
 `, expectedTime, expectedTime),

api/client/image/build.go → cli/command/image/build.go

@@ -14,12 +14,12 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/builder"
 	"github.com/docker/docker/builder/dockerignore"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/fileutils"
@@ -58,7 +58,7 @@ type buildOptions struct {
 }
 
 // NewBuildCommand creates a new `docker build` command
-func NewBuildCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewBuildCommand(dockerCli *command.DockerCli) *cobra.Command {
 	ulimits := make(map[string]*units.Ulimit)
 	options := buildOptions{
 		tags:      opts.NewListOpts(validateTag),
@@ -99,7 +99,7 @@ func NewBuildCommand(dockerCli *client.DockerCli) *cobra.Command {
 	flags.BoolVarP(&options.quiet, "quiet", "q", false, "Suppress the build output and print image ID on success")
 	flags.BoolVar(&options.pull, "pull", false, "Always attempt to pull a newer version of the image")
 
-	client.AddTrustedFlags(flags, true)
+	command.AddTrustedFlags(flags, true)
 
 	return cmd
 }
@@ -120,7 +120,7 @@ func (out *lastProgressOutput) WriteProgress(prog progress.Progress) error {
 	return out.output.WriteProgress(prog)
 }
 
-func runBuild(dockerCli *client.DockerCli, options buildOptions) error {
+func runBuild(dockerCli *command.DockerCli, options buildOptions) error {
 
 	var (
 		buildCtx io.ReadCloser
@@ -219,7 +219,7 @@ func runBuild(dockerCli *client.DockerCli, options buildOptions) error {
 	ctx := context.Background()
 
 	var resolvedTags []*resolvedTag
-	if client.IsTrusted() {
+	if command.IsTrusted() {
 		// Wrap the tar archive to replace the Dockerfile entry with the rewritten
 		// Dockerfile which uses trusted pulls.
 		buildCtx = replaceDockerfileTarWrapper(ctx, buildCtx, relDockerfile, dockerCli.TrustedReference, &resolvedTags)
@@ -319,7 +319,7 @@ func runBuild(dockerCli *client.DockerCli, options buildOptions) error {
 		fmt.Fprintf(dockerCli.Out(), "%s", buildBuff)
 	}
 
-	if client.IsTrusted() {
+	if command.IsTrusted() {
 		// Since the build was successful, now we must tag any of the resolved
 		// images from the above Dockerfile rewrite.
 		for _, resolved := range resolvedTags {
@@ -373,7 +373,7 @@ func rewriteDockerfileFrom(ctx context.Context, dockerfile io.Reader, translator
 				return nil, nil, err
 			}
 			ref = reference.WithDefaultTag(ref)
-			if ref, ok := ref.(reference.NamedTagged); ok && client.IsTrusted() {
+			if ref, ok := ref.(reference.NamedTagged); ok && command.IsTrusted() {
 				trustedRef, err := translator(ctx, ref)
 				if err != nil {
 					return nil, nil, err

api/client/image/history.go → cli/command/image/history.go

@@ -9,8 +9,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/pkg/stringutils"
 	"github.com/docker/go-units"
@@ -26,7 +26,7 @@ type historyOptions struct {
 }
 
 // NewHistoryCommand creates a new `docker history` command
-func NewHistoryCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewHistoryCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts historyOptions
 
 	cmd := &cobra.Command{
@@ -48,7 +48,7 @@ func NewHistoryCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runHistory(dockerCli *client.DockerCli, opts historyOptions) error {
+func runHistory(dockerCli *command.DockerCli, opts historyOptions) error {
 	ctx := context.Background()
 
 	history, err := dockerCli.Client().ImageHistory(ctx, opts.image)

api/client/image/images.go → cli/command/image/images.go

@@ -3,11 +3,11 @@ package image
 import (
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
-	"github.com/docker/docker/api/client/formatter"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
+	"github.com/docker/docker/cli/command/formatter"
 	"github.com/spf13/cobra"
 )
 
@@ -23,7 +23,7 @@ type imagesOptions struct {
 }
 
 // NewImagesCommand creates a new `docker images` command
-func NewImagesCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewImagesCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts imagesOptions
 
 	cmd := &cobra.Command{
@@ -50,7 +50,7 @@ func NewImagesCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runImages(dockerCli *client.DockerCli, opts imagesOptions) error {
+func runImages(dockerCli *command.DockerCli, opts imagesOptions) error {
 	ctx := context.Background()
 
 	// Consolidate all filter flags, and sanity check them early.

api/client/image/import.go → cli/command/image/import.go

@@ -6,9 +6,9 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	dockeropts "github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/pkg/urlutil"
@@ -23,7 +23,7 @@ type importOptions struct {
 }
 
 // NewImportCommand creates a new `docker import` command
-func NewImportCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewImportCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts importOptions
 
 	cmd := &cobra.Command{
@@ -48,7 +48,7 @@ func NewImportCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runImport(dockerCli *client.DockerCli, opts importOptions) error {
+func runImport(dockerCli *command.DockerCli, opts importOptions) error {
 	var (
 		in      io.Reader
 		srcName = opts.source

api/client/image/load.go → cli/command/image/load.go

@@ -6,8 +6,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/spf13/cobra"
 )
@@ -18,7 +18,7 @@ type loadOptions struct {
 }
 
 // NewLoadCommand creates a new `docker load` command
-func NewLoadCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewLoadCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts loadOptions
 
 	cmd := &cobra.Command{
@@ -38,7 +38,7 @@ func NewLoadCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runLoad(dockerCli *client.DockerCli, opts loadOptions) error {
+func runLoad(dockerCli *command.DockerCli, opts loadOptions) error {
 
 	var input io.Reader = dockerCli.In()
 	if opts.input != "" {

api/client/image/pull.go → cli/command/image/pull.go

@@ -7,8 +7,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
 	"github.com/spf13/cobra"
@@ -20,7 +20,7 @@ type pullOptions struct {
 }
 
 // NewPullCommand creates a new `docker pull` command
-func NewPullCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewPullCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts pullOptions
 
 	cmd := &cobra.Command{
@@ -36,12 +36,12 @@ func NewPullCommand(dockerCli *client.DockerCli) *cobra.Command {
 	flags := cmd.Flags()
 
 	flags.BoolVarP(&opts.all, "all-tags", "a", false, "Download all tagged images in the repository")
-	client.AddTrustedFlags(flags, true)
+	command.AddTrustedFlags(flags, true)
 
 	return cmd
 }
 
-func runPull(dockerCli *client.DockerCli, opts pullOptions) error {
+func runPull(dockerCli *command.DockerCli, opts pullOptions) error {
 	distributionRef, err := reference.ParseNamed(opts.remote)
 	if err != nil {
 		return err
@@ -76,7 +76,7 @@ func runPull(dockerCli *client.DockerCli, opts pullOptions) error {
 	authConfig := dockerCli.ResolveAuthConfig(ctx, repoInfo.Index)
 	requestPrivilege := dockerCli.RegistryAuthenticationPrivilegedFunc(repoInfo.Index, "pull")
 
-	if client.IsTrusted() && !registryRef.HasDigest() {
+	if command.IsTrusted() && !registryRef.HasDigest() {
 		// Check if tag is digest
 		err = dockerCli.TrustedPull(ctx, repoInfo, registryRef, authConfig, requestPrivilege)
 	} else {

api/client/image/push.go → cli/command/image/push.go

@@ -3,8 +3,8 @@ package image
 import (
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/reference"
 	"github.com/docker/docker/registry"
@@ -12,7 +12,7 @@ import (
 )
 
 // NewPushCommand creates a new `docker push` command
-func NewPushCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewPushCommand(dockerCli *command.DockerCli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "push [OPTIONS] NAME[:TAG]",
 		Short: "Push an image or a repository to a registry",
@@ -24,12 +24,12 @@ func NewPushCommand(dockerCli *client.DockerCli) *cobra.Command {
 
 	flags := cmd.Flags()
 
-	client.AddTrustedFlags(flags, true)
+	command.AddTrustedFlags(flags, true)
 
 	return cmd
 }
 
-func runPush(dockerCli *client.DockerCli, remote string) error {
+func runPush(dockerCli *command.DockerCli, remote string) error {
 	ref, err := reference.ParseNamed(remote)
 	if err != nil {
 		return err
@@ -47,7 +47,7 @@ func runPush(dockerCli *client.DockerCli, remote string) error {
 	authConfig := dockerCli.ResolveAuthConfig(ctx, repoInfo.Index)
 	requestPrivilege := dockerCli.RegistryAuthenticationPrivilegedFunc(repoInfo.Index, "push")
 
-	if client.IsTrusted() {
+	if command.IsTrusted() {
 		return dockerCli.TrustedPush(ctx, repoInfo, ref, authConfig, requestPrivilege)
 	}
 

api/client/image/remove.go → cli/command/image/remove.go

@@ -6,9 +6,9 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
@@ -18,7 +18,7 @@ type removeOptions struct {
 }
 
 // NewRemoveCommand creates a new `docker remove` command
-func NewRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts removeOptions
 
 	cmd := &cobra.Command{
@@ -38,7 +38,7 @@ func NewRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runRemove(dockerCli *client.DockerCli, opts removeOptions, images []string) error {
+func runRemove(dockerCli *command.DockerCli, opts removeOptions, images []string) error {
 	client := dockerCli.Client()
 	ctx := context.Background()
 

api/client/image/save.go → cli/command/image/save.go

@@ -6,8 +6,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
@@ -17,7 +17,7 @@ type saveOptions struct {
 }
 
 // NewSaveCommand creates a new `docker save` command
-func NewSaveCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewSaveCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts saveOptions
 
 	cmd := &cobra.Command{
@@ -37,7 +37,7 @@ func NewSaveCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runSave(dockerCli *client.DockerCli, opts saveOptions) error {
+func runSave(dockerCli *command.DockerCli, opts saveOptions) error {
 	if opts.output == "" && dockerCli.Out().IsTerminal() {
 		return errors.New("Cowardly refusing to save to a terminal. Use the -o flag or redirect.")
 	}
@@ -53,5 +53,5 @@ func runSave(dockerCli *client.DockerCli, opts saveOptions) error {
 		return err
 	}
 
-	return client.CopyToFile(opts.output, responseBody)
+	return command.CopyToFile(opts.output, responseBody)
 }

api/client/image/search.go → cli/command/image/search.go

@@ -8,11 +8,11 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/pkg/stringutils"
 	"github.com/docker/docker/registry"
 	"github.com/spf13/cobra"
@@ -30,7 +30,7 @@ type searchOptions struct {
 }
 
 // NewSearchCommand creates a new `docker search` command
-func NewSearchCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewSearchCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts searchOptions
 
 	cmd := &cobra.Command{
@@ -58,7 +58,7 @@ func NewSearchCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runSearch(dockerCli *client.DockerCli, opts searchOptions) error {
+func runSearch(dockerCli *command.DockerCli, opts searchOptions) error {
 	indexInfo, err := registry.ParseSearchIndexInfo(opts.term)
 	if err != nil {
 		return err
@@ -69,7 +69,7 @@ func runSearch(dockerCli *client.DockerCli, opts searchOptions) error {
 	authConfig := dockerCli.ResolveAuthConfig(ctx, indexInfo)
 	requestPrivilege := dockerCli.RegistryAuthenticationPrivilegedFunc(indexInfo, "search")
 
-	encodedAuth, err := client.EncodeAuthToBase64(authConfig)
+	encodedAuth, err := command.EncodeAuthToBase64(authConfig)
 	if err != nil {
 		return err
 	}

api/client/image/tag.go → cli/command/image/tag.go

@@ -3,8 +3,8 @@ package image
 import (
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
@@ -14,7 +14,7 @@ type tagOptions struct {
 }
 
 // NewTagCommand creates a new `docker tag` command
-func NewTagCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewTagCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts tagOptions
 
 	cmd := &cobra.Command{
@@ -34,7 +34,7 @@ func NewTagCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runTag(dockerCli *client.DockerCli, opts tagOptions) error {
+func runTag(dockerCli *command.DockerCli, opts tagOptions) error {
 	ctx := context.Background()
 
 	return dockerCli.Client().ImageTag(ctx, opts.image, opts.name)

api/client/in.go → cli/command/in.go

@@ -1,4 +1,4 @@
-package client
+package command
 
 import (
 	"errors"

api/client/network/cmd.go → cli/command/network/cmd.go

@@ -5,12 +5,12 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 )
 
 // NewNetworkCommand returns a cobra command for `network` subcommands
-func NewNetworkCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewNetworkCommand(dockerCli *command.DockerCli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "network",
 		Short: "Manage Docker networks",

api/client/network/connect.go → cli/command/network/connect.go

@@ -3,9 +3,9 @@ package network
 import (
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/opts"
 	runconfigopts "github.com/docker/docker/runconfig/opts"
 	"github.com/spf13/cobra"
@@ -21,7 +21,7 @@ type connectOptions struct {
 	linklocalips []string
 }
 
-func newConnectCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newConnectCommand(dockerCli *command.DockerCli) *cobra.Command {
 	opts := connectOptions{
 		links: opts.NewListOpts(runconfigopts.ValidateLink),
 	}
@@ -47,7 +47,7 @@ func newConnectCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runConnect(dockerCli *client.DockerCli, opts connectOptions) error {
+func runConnect(dockerCli *command.DockerCli, opts connectOptions) error {
 	client := dockerCli.Client()
 
 	epConfig := &network.EndpointSettings{

api/client/network/create.go → cli/command/network/create.go

@@ -7,10 +7,10 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/opts"
 	runconfigopts "github.com/docker/docker/runconfig/opts"
 	"github.com/spf13/cobra"
@@ -33,7 +33,7 @@ type createOptions struct {
 	ipamOpt     opts.MapOpts
 }
 
-func newCreateCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
 	opts := createOptions{
 		driverOpts: *opts.NewMapOpts(nil, nil),
 		ipamAux:    *opts.NewMapOpts(nil, nil),
@@ -69,7 +69,7 @@ func newCreateCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runCreate(dockerCli *client.DockerCli, opts createOptions) error {
+func runCreate(dockerCli *command.DockerCli, opts createOptions) error {
 	client := dockerCli.Client()
 
 	ipamCfg, err := consolidateIpam(opts.ipamSubnet, opts.ipamIPRange, opts.ipamGateway, opts.ipamAux.GetAll())

api/client/network/disconnect.go → cli/command/network/disconnect.go

@@ -3,8 +3,8 @@ package network
 import (
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
@@ -14,7 +14,7 @@ type disconnectOptions struct {
 	force     bool
 }
 
-func newDisconnectCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newDisconnectCommand(dockerCli *command.DockerCli) *cobra.Command {
 	opts := disconnectOptions{}
 
 	cmd := &cobra.Command{
@@ -34,7 +34,7 @@ func newDisconnectCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runDisconnect(dockerCli *client.DockerCli, opts disconnectOptions) error {
+func runDisconnect(dockerCli *command.DockerCli, opts disconnectOptions) error {
 	client := dockerCli.Client()
 
 	return client.NetworkDisconnect(context.Background(), opts.network, opts.container, opts.force)

api/client/network/inspect.go → cli/command/network/inspect.go

@@ -3,9 +3,9 @@ package network
 import (
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
-	"github.com/docker/docker/api/client/inspect"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
+	"github.com/docker/docker/cli/command/inspect"
 	"github.com/spf13/cobra"
 )
 
@@ -14,7 +14,7 @@ type inspectOptions struct {
 	names  []string
 }
 
-func newInspectCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts inspectOptions
 
 	cmd := &cobra.Command{
@@ -32,7 +32,7 @@ func newInspectCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runInspect(dockerCli *client.DockerCli, opts inspectOptions) error {
+func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error {
 	client := dockerCli.Client()
 
 	ctx := context.Background()

api/client/network/list.go → cli/command/network/list.go

@@ -5,11 +5,11 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
-	"github.com/docker/docker/api/client/formatter"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
+	"github.com/docker/docker/cli/command/formatter"
 	"github.com/spf13/cobra"
 )
 
@@ -26,7 +26,7 @@ type listOptions struct {
 	filter  []string
 }
 
-func newListCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newListCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts listOptions
 
 	cmd := &cobra.Command{
@@ -48,7 +48,7 @@ func newListCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runList(dockerCli *client.DockerCli, opts listOptions) error {
+func runList(dockerCli *command.DockerCli, opts listOptions) error {
 	client := dockerCli.Client()
 
 	netFilterArgs := filters.NewArgs()

api/client/network/remove.go → cli/command/network/remove.go

@@ -5,12 +5,12 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
-func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
 	return &cobra.Command{
 		Use:     "rm NETWORK [NETWORK...]",
 		Aliases: []string{"remove"},
@@ -22,7 +22,7 @@ func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
 	}
 }
 
-func runRemove(dockerCli *client.DockerCli, networks []string) error {
+func runRemove(dockerCli *command.DockerCli, networks []string) error {
 	client := dockerCli.Client()
 	ctx := context.Background()
 	status := 0

api/client/node/cmd.go → cli/command/node/cmd.go

@@ -3,15 +3,15 @@ package node
 import (
 	"fmt"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	apiclient "github.com/docker/docker/client"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 )
 
 // NewNodeCommand returns a cobra command for `node` subcommands
-func NewNodeCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewNodeCommand(dockerCli *command.DockerCli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "node",
 		Short: "Manage Docker Swarm nodes",

api/client/node/demote.go → cli/command/node/demote.go

@@ -3,13 +3,13 @@ package node
 import (
 	"fmt"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
-func newDemoteCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newDemoteCommand(dockerCli *command.DockerCli) *cobra.Command {
 	return &cobra.Command{
 		Use:   "demote NODE [NODE...]",
 		Short: "Demote one or more nodes from manager in the swarm",
@@ -20,7 +20,7 @@ func newDemoteCommand(dockerCli *client.DockerCli) *cobra.Command {
 	}
 }
 
-func runDemote(dockerCli *client.DockerCli, nodes []string) error {
+func runDemote(dockerCli *command.DockerCli, nodes []string) error {
 	demote := func(node *swarm.Node) error {
 		if node.Spec.Role == swarm.NodeRoleWorker {
 			fmt.Fprintf(dockerCli.Out(), "Node %s is already a worker.\n", node.ID)

api/client/node/inspect.go → cli/command/node/inspect.go

@@ -6,10 +6,10 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/docker/docker/api/client"
-	"github.com/docker/docker/api/client/inspect"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
+	"github.com/docker/docker/cli/command/inspect"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/go-units"
 	"github.com/spf13/cobra"
@@ -22,7 +22,7 @@ type inspectOptions struct {
 	pretty  bool
 }
 
-func newInspectCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts inspectOptions
 
 	cmd := &cobra.Command{
@@ -41,7 +41,7 @@ func newInspectCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runInspect(dockerCli *client.DockerCli, opts inspectOptions) error {
+func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error {
 	client := dockerCli.Client()
 	ctx := context.Background()
 	getRef := func(ref string) (interface{}, []byte, error) {
@@ -90,16 +90,16 @@ func printNode(out io.Writer, node swarm.Node) {
 	}
 
 	ioutils.FprintfIfNotEmpty(out, "Hostname:\t\t%s\n", node.Description.Hostname)
-	fmt.Fprintf(out, "Joined at:\t\t%s\n", client.PrettyPrint(node.CreatedAt))
+	fmt.Fprintf(out, "Joined at:\t\t%s\n", command.PrettyPrint(node.CreatedAt))
 	fmt.Fprintln(out, "Status:")
-	fmt.Fprintf(out, " State:\t\t\t%s\n", client.PrettyPrint(node.Status.State))
-	ioutils.FprintfIfNotEmpty(out, " Message:\t\t%s\n", client.PrettyPrint(node.Status.Message))
-	fmt.Fprintf(out, " Availability:\t\t%s\n", client.PrettyPrint(node.Spec.Availability))
+	fmt.Fprintf(out, " State:\t\t\t%s\n", command.PrettyPrint(node.Status.State))
+	ioutils.FprintfIfNotEmpty(out, " Message:\t\t%s\n", command.PrettyPrint(node.Status.Message))
+	fmt.Fprintf(out, " Availability:\t\t%s\n", command.PrettyPrint(node.Spec.Availability))
 
 	if node.ManagerStatus != nil {
 		fmt.Fprintln(out, "Manager Status:")
 		fmt.Fprintf(out, " Address:\t\t%s\n", node.ManagerStatus.Addr)
-		fmt.Fprintf(out, " Raft Status:\t\t%s\n", client.PrettyPrint(node.ManagerStatus.Reachability))
+		fmt.Fprintf(out, " Raft Status:\t\t%s\n", command.PrettyPrint(node.ManagerStatus.Reachability))
 		leader := "No"
 		if node.ManagerStatus.Leader {
 			leader = "Yes"

api/client/node/list.go → cli/command/node/list.go

@@ -7,10 +7,10 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/opts"
 	"github.com/spf13/cobra"
 )
@@ -24,7 +24,7 @@ type listOptions struct {
 	filter opts.FilterOpt
 }
 
-func newListCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newListCommand(dockerCli *command.DockerCli) *cobra.Command {
 	opts := listOptions{filter: opts.NewFilterOpt()}
 
 	cmd := &cobra.Command{
@@ -43,7 +43,7 @@ func newListCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runList(dockerCli *client.DockerCli, opts listOptions) error {
+func runList(dockerCli *command.DockerCli, opts listOptions) error {
 	client := dockerCli.Client()
 	ctx := context.Background()
 
@@ -98,9 +98,9 @@ func printTable(out io.Writer, nodes []swarm.Node, info types.Info) {
 			listItemFmt,
 			ID,
 			name,
-			client.PrettyPrint(string(node.Status.State)),
-			client.PrettyPrint(availability),
-			client.PrettyPrint(reachability))
+			command.PrettyPrint(string(node.Status.State)),
+			command.PrettyPrint(availability),
+			command.PrettyPrint(reachability))
 	}
 }
 

api/client/node/promote.go → cli/command/node/promote.go

@@ -3,13 +3,13 @@ package node
 import (
 	"fmt"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
-func newPromoteCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newPromoteCommand(dockerCli *command.DockerCli) *cobra.Command {
 	return &cobra.Command{
 		Use:   "promote NODE [NODE...]",
 		Short: "Promote one or more nodes to manager in the swarm",
@@ -20,7 +20,7 @@ func newPromoteCommand(dockerCli *client.DockerCli) *cobra.Command {
 	}
 }
 
-func runPromote(dockerCli *client.DockerCli, nodes []string) error {
+func runPromote(dockerCli *command.DockerCli, nodes []string) error {
 	promote := func(node *swarm.Node) error {
 		if node.Spec.Role == swarm.NodeRoleManager {
 			fmt.Fprintf(dockerCli.Out(), "Node %s is already a manager.\n", node.ID)

api/client/node/ps.go → cli/command/node/ps.go

@@ -1,11 +1,11 @@
 package node
 
 import (
-	"github.com/docker/docker/api/client"
-	"github.com/docker/docker/api/client/idresolver"
-	"github.com/docker/docker/api/client/task"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
+	"github.com/docker/docker/cli/command/idresolver"
+	"github.com/docker/docker/cli/command/task"
 	"github.com/docker/docker/opts"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
@@ -18,7 +18,7 @@ type psOptions struct {
 	filter    opts.FilterOpt
 }
 
-func newPsCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newPsCommand(dockerCli *command.DockerCli) *cobra.Command {
 	opts := psOptions{filter: opts.NewFilterOpt()}
 
 	cmd := &cobra.Command{
@@ -43,7 +43,7 @@ func newPsCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runPs(dockerCli *client.DockerCli, opts psOptions) error {
+func runPs(dockerCli *command.DockerCli, opts psOptions) error {
 	client := dockerCli.Client()
 	ctx := context.Background()
 

api/client/node/remove.go → cli/command/node/remove.go

@@ -5,9 +5,9 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
@@ -15,7 +15,7 @@ type removeOptions struct {
 	force bool
 }
 
-func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
 	opts := removeOptions{}
 
 	cmd := &cobra.Command{
@@ -32,7 +32,7 @@ func newRemoveCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runRemove(dockerCli *client.DockerCli, args []string, opts removeOptions) error {
+func runRemove(dockerCli *command.DockerCli, args []string, opts removeOptions) error {
 	client := dockerCli.Client()
 	ctx := context.Background()
 	for _, nodeID := range args {

api/client/node/update.go → cli/command/node/update.go

@@ -4,9 +4,9 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/opts"
 	runconfigopts "github.com/docker/docker/runconfig/opts"
 	"github.com/spf13/cobra"
@@ -18,7 +18,7 @@ var (
 	errNoRoleChange = errors.New("role was already set to the requested value")
 )
 
-func newUpdateCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newUpdateCommand(dockerCli *command.DockerCli) *cobra.Command {
 	nodeOpts := newNodeOptions()
 
 	cmd := &cobra.Command{
@@ -39,14 +39,14 @@ func newUpdateCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runUpdate(dockerCli *client.DockerCli, flags *pflag.FlagSet, nodeID string) error {
+func runUpdate(dockerCli *command.DockerCli, flags *pflag.FlagSet, nodeID string) error {
 	success := func(_ string) {
 		fmt.Fprintln(dockerCli.Out(), nodeID)
 	}
 	return updateNodes(dockerCli, []string{nodeID}, mergeNodeUpdate(flags), success)
 }
 
-func updateNodes(dockerCli *client.DockerCli, nodes []string, mergeNode func(node *swarm.Node) error, success func(nodeID string)) error {
+func updateNodes(dockerCli *command.DockerCli, nodes []string, mergeNode func(node *swarm.Node) error, success func(nodeID string)) error {
 	client := dockerCli.Client()
 	ctx := context.Background()
 

api/client/out.go → cli/command/out.go

@@ -1,4 +1,4 @@
-package client
+package command
 
 import (
 	"io"

api/client/plugin/cmd.go → cli/command/plugin/cmd.go

@@ -3,10 +3,10 @@
 package plugin
 
 import (
-	"github.com/docker/docker/api/client"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
 // NewPluginCommand returns a cobra command for `plugin` subcommands
-func NewPluginCommand(cmd *cobra.Command, dockerCli *client.DockerCli) {
+func NewPluginCommand(cmd *cobra.Command, dockerCli *command.DockerCli) {
 }

api/client/registry.go → cli/command/registry.go

@@ -1,4 +1,4 @@
-package client
+package command
 
 import (
 	"bufio"

api/client/registry/login.go → cli/command/registry/login.go

@@ -5,8 +5,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 )
 
@@ -18,7 +18,7 @@ type loginOptions struct {
 }
 
 // NewLoginCommand creates a new `docker login` command
-func NewLoginCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewLoginCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts loginOptions
 
 	cmd := &cobra.Command{
@@ -46,7 +46,7 @@ func NewLoginCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runLogin(dockerCli *client.DockerCli, opts loginOptions) error {
+func runLogin(dockerCli *command.DockerCli, opts loginOptions) error {
 	ctx := context.Background()
 	clnt := dockerCli.Client()
 
@@ -74,7 +74,7 @@ func runLogin(dockerCli *client.DockerCli, opts loginOptions) error {
 		authConfig.Password = ""
 		authConfig.IdentityToken = response.IdentityToken
 	}
-	if err := client.StoreCredentials(dockerCli.ConfigFile(), authConfig); err != nil {
+	if err := command.StoreCredentials(dockerCli.ConfigFile(), authConfig); err != nil {
 		return fmt.Errorf("Error saving credentials: %v", err)
 	}
 

api/client/registry/logout.go → cli/command/registry/logout.go

@@ -5,14 +5,14 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/registry"
 	"github.com/spf13/cobra"
 )
 
 // NewLogoutCommand creates a new `docker login` command
-func NewLogoutCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewLogoutCommand(dockerCli *command.DockerCli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "logout [SERVER]",
 		Short: "Log out from a Docker registry.",
@@ -30,7 +30,7 @@ func NewLogoutCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runLogout(dockerCli *client.DockerCli, serverAddress string) error {
+func runLogout(dockerCli *command.DockerCli, serverAddress string) error {
 	ctx := context.Background()
 	var isDefaultRegistry bool
 
@@ -68,7 +68,7 @@ func runLogout(dockerCli *client.DockerCli, serverAddress string) error {
 
 	fmt.Fprintf(dockerCli.Out(), "Removing login credentials for %s\n", hostnameAddress)
 	for _, r := range regsToLogout {
-		if err := client.EraseCredentials(dockerCli.ConfigFile(), r); err != nil {
+		if err := command.EraseCredentials(dockerCli.ConfigFile(), r); err != nil {
 			fmt.Fprintf(dockerCli.Err(), "WARNING: could not erase credentials: %v\n", err)
 		}
 	}

api/client/service/cmd.go → cli/command/service/cmd.go

@@ -5,12 +5,12 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 )
 
 // NewServiceCommand returns a cobra command for `service` subcommands
-func NewServiceCommand(dockerCli *client.DockerCli) *cobra.Command {
+func NewServiceCommand(dockerCli *command.DockerCli) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "service",
 		Short: "Manage Docker services",

api/client/service/create.go → cli/command/service/create.go

@@ -3,14 +3,14 @@ package service
 import (
 	"fmt"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 )
 
-func newCreateCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
 	opts := newServiceOptions()
 
 	cmd := &cobra.Command{
@@ -41,7 +41,7 @@ func newCreateCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runCreate(dockerCli *client.DockerCli, opts *serviceOptions) error {
+func runCreate(dockerCli *command.DockerCli, opts *serviceOptions) error {
 	apiClient := dockerCli.Client()
 	createOpts := types.ServiceCreateOptions{}
 

api/client/service/inspect.go → cli/command/service/inspect.go

@@ -8,10 +8,10 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/docker/docker/api/client"
-	"github.com/docker/docker/api/client/inspect"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
+	"github.com/docker/docker/cli/command/inspect"
 	apiclient "github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/go-units"
@@ -24,7 +24,7 @@ type inspectOptions struct {
 	pretty bool
 }
 
-func newInspectCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
 	var opts inspectOptions
 
 	cmd := &cobra.Command{
@@ -47,7 +47,7 @@ func newInspectCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runInspect(dockerCli *client.DockerCli, opts inspectOptions) error {
+func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error {
 	client := dockerCli.Client()
 	ctx := context.Background()
 

api/client/service/list.go → cli/command/service/list.go

@@ -6,11 +6,11 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/docker/docker/api/client"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/spf13/cobra"
@@ -26,7 +26,7 @@ type listOptions struct {
 	filter opts.FilterOpt
 }
 
-func newListCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newListCommand(dockerCli *command.DockerCli) *cobra.Command {
 	opts := listOptions{filter: opts.NewFilterOpt()}
 
 	cmd := &cobra.Command{
@@ -46,7 +46,7 @@ func newListCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runList(dockerCli *client.DockerCli, opts listOptions) error {
+func runList(dockerCli *command.DockerCli, opts listOptions) error {
 	ctx := context.Background()
 	client := dockerCli.Client()
 

api/client/service/ps.go → cli/command/service/ps.go

@@ -1,12 +1,12 @@
 package service
 
 import (
-	"github.com/docker/docker/api/client"
-	"github.com/docker/docker/api/client/idresolver"
-	"github.com/docker/docker/api/client/node"
-	"github.com/docker/docker/api/client/task"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/cli"
+	"github.com/docker/docker/cli/command"
+	"github.com/docker/docker/cli/command/idresolver"
+	"github.com/docker/docker/cli/command/node"
+	"github.com/docker/docker/cli/command/task"
 	"github.com/docker/docker/opts"
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
@@ -19,7 +19,7 @@ type psOptions struct {
 	filter    opts.FilterOpt
 }
 
-func newPsCommand(dockerCli *client.DockerCli) *cobra.Command {
+func newPsCommand(dockerCli *command.DockerCli) *cobra.Command {
 	opts := psOptions{filter: opts.NewFilterOpt()}
 
 	cmd := &cobra.Command{
@@ -39,7 +39,7 @@ func newPsCommand(dockerCli *client.DockerCli) *cobra.Command {
 	return cmd
 }
 
-func runPS(dockerCli *client.DockerCli, opts psOptions) error {
+func runPS(dockerCli *command.DockerCli, opts psOptions) error {
 	client := dockerCli.Client()
 	ctx := context.Background()