diff --git a/cmd/clicheck/check_cli_conventions.go b/cmd/clicheck/check_cli_conventions.go
index 7747c8a1192..e24d6930a12 100644
--- a/cmd/clicheck/check_cli_conventions.go
+++ b/cmd/clicheck/check_cli_conventions.go
@@ -21,8 +21,8 @@ import (
 	"io/ioutil"
 	"os"
 
+	"k8s.io/kubectl/pkg/cmd"
 	cmdsanity "k8s.io/kubectl/pkg/cmd/util/sanity"
-	"k8s.io/kubernetes/pkg/kubectl/cmd"
 )
 
 func main() {
diff --git a/cmd/gendocs/gen_kubectl_docs.go b/cmd/gendocs/gen_kubectl_docs.go
index dc03a0e8260..fe0bcff123b 100644
--- a/cmd/gendocs/gen_kubectl_docs.go
+++ b/cmd/gendocs/gen_kubectl_docs.go
@@ -22,8 +22,8 @@ import (
 	"os"
 
 	"github.com/spf13/cobra/doc"
+	"k8s.io/kubectl/pkg/cmd"
 	"k8s.io/kubernetes/cmd/genutils"
-	"k8s.io/kubernetes/pkg/kubectl/cmd"
 )
 
 func main() {
diff --git a/cmd/genman/gen_kube_man.go b/cmd/genman/gen_kube_man.go
index b15da4d26de..9a95e76217a 100644
--- a/cmd/genman/gen_kube_man.go
+++ b/cmd/genman/gen_kube_man.go
@@ -26,6 +26,7 @@ import (
 	mangen "github.com/cpuguy83/go-md2man/v2/md2man"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+	kubectlcmd "k8s.io/kubectl/pkg/cmd"
 	"k8s.io/kubernetes/cmd/genutils"
 	apiservapp "k8s.io/kubernetes/cmd/kube-apiserver/app"
 	cmapp "k8s.io/kubernetes/cmd/kube-controller-manager/app"
@@ -33,7 +34,6 @@ import (
 	schapp "k8s.io/kubernetes/cmd/kube-scheduler/app"
 	kubeadmapp "k8s.io/kubernetes/cmd/kubeadm/app/cmd"
 	kubeletapp "k8s.io/kubernetes/cmd/kubelet/app"
-	kubectlcmd "k8s.io/kubernetes/pkg/kubectl/cmd"
 )
 
 func main() {
diff --git a/cmd/genyaml/gen_kubectl_yaml.go b/cmd/genyaml/gen_kubectl_yaml.go
index d317f5abeea..4f3c2159cb1 100644
--- a/cmd/genyaml/gen_kubectl_yaml.go
+++ b/cmd/genyaml/gen_kubectl_yaml.go
@@ -26,8 +26,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"gopkg.in/yaml.v2"
+	"k8s.io/kubectl/pkg/cmd"
 	"k8s.io/kubernetes/cmd/genutils"
-	"k8s.io/kubernetes/pkg/kubectl/cmd"
 )
 
 type cmdOption struct {
diff --git a/cmd/kubectl/kubectl.go b/cmd/kubectl/kubectl.go
index 53934ac2b00..a5e24493a41 100644
--- a/cmd/kubectl/kubectl.go
+++ b/cmd/kubectl/kubectl.go
@@ -25,8 +25,8 @@ import (
 	"github.com/spf13/pflag"
 
 	cliflag "k8s.io/component-base/cli/flag"
+	"k8s.io/kubectl/pkg/cmd"
 	"k8s.io/kubectl/pkg/util/logs"
-	"k8s.io/kubernetes/pkg/kubectl/cmd"
 
 	// Import to initialize client auth plugins.
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
diff --git a/pkg/kubectl/cmd/plugin/testdata/kubectl-foo b/pkg/kubectl/cmd/plugin/testdata/kubectl-foo
deleted file mode 100755
index 651b7662dda..00000000000
--- a/pkg/kubectl/cmd/plugin/testdata/kubectl-foo
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-echo "I am plugin foo"
diff --git a/pkg/kubectl/cmd/plugin/testdata/kubectl-version b/pkg/kubectl/cmd/plugin/testdata/kubectl-version
deleted file mode 100755
index 3718966b689..00000000000
--- a/pkg/kubectl/cmd/plugin/testdata/kubectl-version
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# This plugin is a no-op and is used to test plugins
-# that overshadow existing kubectl commands
diff --git a/pkg/kubectl/cmd/cmd.go b/staging/src/k8s.io/kubectl/pkg/cmd/cmd.go
similarity index 99%
rename from pkg/kubectl/cmd/cmd.go
rename to staging/src/k8s.io/kubectl/pkg/cmd/cmd.go
index 234c5c6bab5..999e0e4cb3d 100644
--- a/pkg/kubectl/cmd/cmd.go
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/cmd.go
@@ -31,7 +31,6 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	cliflag "k8s.io/component-base/cli/flag"
-	cmdpkg "k8s.io/kubectl/pkg/cmd"
 	"k8s.io/kubectl/pkg/cmd/annotate"
 	"k8s.io/kubectl/pkg/cmd/apiresources"
 	"k8s.io/kubectl/pkg/cmd/apply"
@@ -74,7 +73,6 @@ import (
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
 	"k8s.io/kubectl/pkg/util/term"
-	"k8s.io/kubernetes/pkg/kubectl/cmd/convert"
 
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/kubectl/pkg/cmd/kustomize"
@@ -567,7 +565,6 @@ func NewKubectlCommand(in io.Reader, out, err io.Writer) *cobra.Command {
 				patch.NewCmdPatch(f, ioStreams),
 				replace.NewCmdReplace(f, ioStreams),
 				wait.NewCmdWait(f, ioStreams),
-				convert.NewCmdConvert(f, ioStreams),
 				kustomize.NewCmdKustomize(ioStreams),
 			},
 		},
@@ -585,7 +582,7 @@ func NewKubectlCommand(in io.Reader, out, err io.Writer) *cobra.Command {
 	filters := []string{"options"}
 
 	// Hide the "alpha" subcommand if there are no alpha commands in this build.
-	alpha := cmdpkg.NewCmdAlpha(f, ioStreams)
+	alpha := NewCmdAlpha(f, ioStreams)
 	if !alpha.HasSubCommands() {
 		filters = append(filters, alpha.Name())
 	}
diff --git a/pkg/kubectl/cmd/cmd_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/cmd_test.go
similarity index 100%
rename from pkg/kubectl/cmd/cmd_test.go
rename to staging/src/k8s.io/kubectl/pkg/cmd/cmd_test.go
diff --git a/pkg/kubectl/cmd/profiling.go b/staging/src/k8s.io/kubectl/pkg/cmd/profiling.go
similarity index 100%
rename from pkg/kubectl/cmd/profiling.go
rename to staging/src/k8s.io/kubectl/pkg/cmd/profiling.go