diff --git a/pkg/kubelet/container/BUILD b/pkg/kubelet/container/BUILD
index 6ce5b4a47d..6bf45b8185 100644
--- a/pkg/kubelet/container/BUILD
+++ b/pkg/kubelet/container/BUILD
@@ -29,7 +29,7 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/api/v1/ref:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
         "//pkg/kubelet/events:go_default_library",
         "//pkg/kubelet/util/format:go_default_library",
         "//pkg/kubelet/util/ioutils:go_default_library",
diff --git a/pkg/kubelet/container/runtime.go b/pkg/kubelet/container/runtime.go
index 9a45ab75a3..2837e59bba 100644
--- a/pkg/kubelet/container/runtime.go
+++ b/pkg/kubelet/container/runtime.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/client-go/tools/remotecommand"
 	"k8s.io/client-go/util/flowcontrol"
 	"k8s.io/kubernetes/pkg/api/v1"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/volume"
 )
 
diff --git a/pkg/kubelet/dockershim/BUILD b/pkg/kubelet/dockershim/BUILD
index de1582825e..e182836e77 100644
--- a/pkg/kubelet/dockershim/BUILD
+++ b/pkg/kubelet/dockershim/BUILD
@@ -32,8 +32,8 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/api/v1/helper:go_default_library",
         "//pkg/apis/componentconfig:go_default_library",
-        "//pkg/kubelet/api:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
+        "//pkg/kubelet/apis/cri:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
         "//pkg/kubelet/cm:go_default_library",
         "//pkg/kubelet/container:go_default_library",
         "//pkg/kubelet/dockershim/cm:go_default_library",
diff --git a/pkg/kubelet/dockershim/docker_streaming.go b/pkg/kubelet/dockershim/docker_streaming.go
index cfec6ef0e8..d4af0b58cb 100644
--- a/pkg/kubelet/dockershim/docker_streaming.go
+++ b/pkg/kubelet/dockershim/docker_streaming.go
@@ -30,7 +30,7 @@ import (
 	"github.com/golang/glog"
 
 	"k8s.io/client-go/tools/remotecommand"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
 	"k8s.io/kubernetes/pkg/kubelet/server/streaming"
 	"k8s.io/kubernetes/pkg/kubelet/util/ioutils"
diff --git a/pkg/kubelet/server/streaming/BUILD b/pkg/kubelet/server/streaming/BUILD
index 6982ff1830..6fc7056b3e 100644
--- a/pkg/kubelet/server/streaming/BUILD
+++ b/pkg/kubelet/server/streaming/BUILD
@@ -17,7 +17,7 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
         "//pkg/kubelet/server/portforward:go_default_library",
         "//pkg/kubelet/server/remotecommand:go_default_library",
         "//vendor/github.com/emicklei/go-restful:go_default_library",
@@ -40,7 +40,7 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/kubelet/api/v1alpha1/runtime:go_default_library",
+        "//pkg/kubelet/apis/cri/v1alpha1:go_default_library",
         "//pkg/kubelet/server/portforward:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
         "//vendor/github.com/stretchr/testify/require:go_default_library",
diff --git a/pkg/kubelet/server/streaming/server.go b/pkg/kubelet/server/streaming/server.go
index 7291860fbe..3650fdeeba 100644
--- a/pkg/kubelet/server/streaming/server.go
+++ b/pkg/kubelet/server/streaming/server.go
@@ -33,7 +33,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand"
 	"k8s.io/client-go/tools/remotecommand"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	"k8s.io/kubernetes/pkg/kubelet/server/portforward"
 	remotecommandserver "k8s.io/kubernetes/pkg/kubelet/server/remotecommand"
 )
diff --git a/pkg/kubelet/server/streaming/server_test.go b/pkg/kubelet/server/streaming/server_test.go
index e7a89ff457..ca569137c2 100644
--- a/pkg/kubelet/server/streaming/server_test.go
+++ b/pkg/kubelet/server/streaming/server_test.go
@@ -34,7 +34,7 @@ import (
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/remotecommand"
 	"k8s.io/kubernetes/pkg/api"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 	kubeletportforward "k8s.io/kubernetes/pkg/kubelet/server/portforward"
 )
 
diff --git a/staging/src/k8s.io/client-go/pkg/api/BUILD b/staging/src/k8s.io/client-go/pkg/api/BUILD
index b0ea34c0c5..e6c086b320 100644
--- a/staging/src/k8s.io/client-go/pkg/api/BUILD
+++ b/staging/src/k8s.io/client-go/pkg/api/BUILD
@@ -26,7 +26,6 @@ go_library(
     visibility = [
         "//vendor/k8s.io/client-go/pkg/api:__subpackages__",
         "//vendor/k8s.io/client-go/pkg/apis:__subpackages__",
-        "//vendor/k8s.io/client-go/tools/remotecommand:__subpackages__",
         "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install:__subpackages__",
         "//vendor/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake:__subpackages__",
     ],
diff --git a/staging/src/k8s.io/client-go/tools/remotecommand/BUILD b/staging/src/k8s.io/client-go/tools/remotecommand/BUILD
index 8c8ce27cd6..6845abe049 100644
--- a/staging/src/k8s.io/client-go/tools/remotecommand/BUILD
+++ b/staging/src/k8s.io/client-go/tools/remotecommand/BUILD
@@ -19,7 +19,7 @@ go_test(
     deps = [
         "//vendor/k8s.io/apimachinery/pkg/util/httpstream:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/api:go_default_library",
+        "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
     ],
 )
 
@@ -43,7 +43,7 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/util/httpstream/spdy:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/remotecommand:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/api:go_default_library",
+        "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
         "//vendor/k8s.io/client-go/transport:go_default_library",
         "//vendor/k8s.io/client-go/util/exec:go_default_library",
diff --git a/staging/src/k8s.io/client-go/tools/remotecommand/v1.go b/staging/src/k8s.io/client-go/tools/remotecommand/v1.go
index 368fd46b29..1db917c0b7 100644
--- a/staging/src/k8s.io/client-go/tools/remotecommand/v1.go
+++ b/staging/src/k8s.io/client-go/tools/remotecommand/v1.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/util/httpstream"
-	"k8s.io/client-go/pkg/api"
+	"k8s.io/client-go/pkg/api/v1"
 )
 
 // streamProtocolV1 implements the first version of the streaming exec & attach
@@ -58,7 +58,7 @@ func (p *streamProtocolV1) stream(conn streamCreator) error {
 		if _, err := io.Copy(dst, src); err != nil && err != io.EOF {
 			glog.Errorf("Error copying %s: %v", s, err)
 		}
-		if s == api.StreamTypeStdout || s == api.StreamTypeStderr {
+		if s == v1.StreamTypeStdout || s == v1.StreamTypeStderr {
 			doneChan <- struct{}{}
 		}
 	}
@@ -66,7 +66,7 @@ func (p *streamProtocolV1) stream(conn streamCreator) error {
 	// set up all the streams first
 	var err error
 	headers := http.Header{}
-	headers.Set(api.StreamType, api.StreamTypeError)
+	headers.Set(v1.StreamType, v1.StreamTypeError)
 	p.errorStream, err = conn.CreateStream(headers)
 	if err != nil {
 		return err
@@ -81,7 +81,7 @@ func (p *streamProtocolV1) stream(conn streamCreator) error {
 	// gets all the streams. By creating all the streams first, we ensure that the server is ready to
 	// process data before the client starts sending any. See https://issues.k8s.io/16373 for more info.
 	if p.Stdin != nil {
-		headers.Set(api.StreamType, api.StreamTypeStdin)
+		headers.Set(v1.StreamType, v1.StreamTypeStdin)
 		p.remoteStdin, err = conn.CreateStream(headers)
 		if err != nil {
 			return err
@@ -90,7 +90,7 @@ func (p *streamProtocolV1) stream(conn streamCreator) error {
 	}
 
 	if p.Stdout != nil {
-		headers.Set(api.StreamType, api.StreamTypeStdout)
+		headers.Set(v1.StreamType, v1.StreamTypeStdout)
 		p.remoteStdout, err = conn.CreateStream(headers)
 		if err != nil {
 			return err
@@ -99,7 +99,7 @@ func (p *streamProtocolV1) stream(conn streamCreator) error {
 	}
 
 	if p.Stderr != nil && !p.Tty {
-		headers.Set(api.StreamType, api.StreamTypeStderr)
+		headers.Set(v1.StreamType, v1.StreamTypeStderr)
 		p.remoteStderr, err = conn.CreateStream(headers)
 		if err != nil {
 			return err
@@ -127,7 +127,7 @@ func (p *streamProtocolV1) stream(conn streamCreator) error {
 		// because stdin is not closed until the process exits. If we try to call
 		// stdin.Close(), it returns no error but doesn't unblock the copy. It will
 		// exit when the process exits, instead.
-		go cp(api.StreamTypeStdin, p.remoteStdin, p.Stdin)
+		go cp(v1.StreamTypeStdin, p.remoteStdin, p.Stdin)
 	}
 
 	waitCount := 0
@@ -135,12 +135,12 @@ func (p *streamProtocolV1) stream(conn streamCreator) error {
 
 	if p.Stdout != nil {
 		waitCount++
-		go cp(api.StreamTypeStdout, p.Stdout, p.remoteStdout)
+		go cp(v1.StreamTypeStdout, p.Stdout, p.remoteStdout)
 	}
 
 	if p.Stderr != nil && !p.Tty {
 		waitCount++
-		go cp(api.StreamTypeStderr, p.Stderr, p.remoteStderr)
+		go cp(v1.StreamTypeStderr, p.Stderr, p.remoteStderr)
 	}
 
 Loop:
diff --git a/staging/src/k8s.io/client-go/tools/remotecommand/v2.go b/staging/src/k8s.io/client-go/tools/remotecommand/v2.go
index 1bc4c2ebe8..95346a4399 100644
--- a/staging/src/k8s.io/client-go/tools/remotecommand/v2.go
+++ b/staging/src/k8s.io/client-go/tools/remotecommand/v2.go
@@ -24,7 +24,7 @@ import (
 	"sync"
 
 	"k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/client-go/pkg/api"
+	"k8s.io/client-go/pkg/api/v1"
 )
 
 // streamProtocolV2 implements version 2 of the streaming protocol for attach
@@ -53,7 +53,7 @@ func (p *streamProtocolV2) createStreams(conn streamCreator) error {
 	headers := http.Header{}
 
 	// set up error stream
-	headers.Set(api.StreamType, api.StreamTypeError)
+	headers.Set(v1.StreamType, v1.StreamTypeError)
 	p.errorStream, err = conn.CreateStream(headers)
 	if err != nil {
 		return err
@@ -61,7 +61,7 @@ func (p *streamProtocolV2) createStreams(conn streamCreator) error {
 
 	// set up stdin stream
 	if p.Stdin != nil {
-		headers.Set(api.StreamType, api.StreamTypeStdin)
+		headers.Set(v1.StreamType, v1.StreamTypeStdin)
 		p.remoteStdin, err = conn.CreateStream(headers)
 		if err != nil {
 			return err
@@ -70,7 +70,7 @@ func (p *streamProtocolV2) createStreams(conn streamCreator) error {
 
 	// set up stdout stream
 	if p.Stdout != nil {
-		headers.Set(api.StreamType, api.StreamTypeStdout)
+		headers.Set(v1.StreamType, v1.StreamTypeStdout)
 		p.remoteStdout, err = conn.CreateStream(headers)
 		if err != nil {
 			return err
@@ -79,7 +79,7 @@ func (p *streamProtocolV2) createStreams(conn streamCreator) error {
 
 	// set up stderr stream
 	if p.Stderr != nil && !p.Tty {
-		headers.Set(api.StreamType, api.StreamTypeStderr)
+		headers.Set(v1.StreamType, v1.StreamTypeStderr)
 		p.remoteStderr, err = conn.CreateStream(headers)
 		if err != nil {
 			return err
diff --git a/staging/src/k8s.io/client-go/tools/remotecommand/v2_test.go b/staging/src/k8s.io/client-go/tools/remotecommand/v2_test.go
index f1f80c917c..adebfaed8d 100644
--- a/staging/src/k8s.io/client-go/tools/remotecommand/v2_test.go
+++ b/staging/src/k8s.io/client-go/tools/remotecommand/v2_test.go
@@ -26,7 +26,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/httpstream"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/client-go/pkg/api"
+	"k8s.io/client-go/pkg/api/v1"
 )
 
 type fakeReader struct {
@@ -47,7 +47,7 @@ type fakeStreamCreator struct {
 var _ streamCreator = &fakeStreamCreator{}
 
 func (f *fakeStreamCreator) CreateStream(headers http.Header) (httpstream.Stream, error) {
-	streamType := headers.Get(api.StreamType)
+	streamType := headers.Get(v1.StreamType)
 	f.created[streamType] = true
 	return nil, f.errors[streamType]
 }
@@ -111,10 +111,10 @@ func TestV2CreateStreams(t *testing.T) {
 		conn := &fakeStreamCreator{
 			created: make(map[string]bool),
 			errors: map[string]error{
-				api.StreamTypeStdin:  test.stdinError,
-				api.StreamTypeStdout: test.stdoutError,
-				api.StreamTypeStderr: test.stderrError,
-				api.StreamTypeError:  test.errorError,
+				v1.StreamTypeStdin:  test.stdinError,
+				v1.StreamTypeStdout: test.stdoutError,
+				v1.StreamTypeStderr: test.stderrError,
+				v1.StreamTypeError:  test.errorError,
 			},
 		}
 
@@ -157,20 +157,20 @@ func TestV2CreateStreams(t *testing.T) {
 			continue
 		}
 
-		if test.stdin && !conn.created[api.StreamTypeStdin] {
+		if test.stdin && !conn.created[v1.StreamTypeStdin] {
 			t.Errorf("%s: expected stdin stream", test.name)
 		}
-		if test.stdout && !conn.created[api.StreamTypeStdout] {
+		if test.stdout && !conn.created[v1.StreamTypeStdout] {
 			t.Errorf("%s: expected stdout stream", test.name)
 		}
 		if test.stderr {
-			if test.tty && conn.created[api.StreamTypeStderr] {
+			if test.tty && conn.created[v1.StreamTypeStderr] {
 				t.Errorf("%s: unexpected stderr stream because tty is set", test.name)
-			} else if !test.tty && !conn.created[api.StreamTypeStderr] {
+			} else if !test.tty && !conn.created[v1.StreamTypeStderr] {
 				t.Errorf("%s: expected stderr stream", test.name)
 			}
 		}
-		if !conn.created[api.StreamTypeError] {
+		if !conn.created[v1.StreamTypeError] {
 			t.Errorf("%s: expected error stream", test.name)
 		}
 
diff --git a/staging/src/k8s.io/client-go/tools/remotecommand/v3.go b/staging/src/k8s.io/client-go/tools/remotecommand/v3.go
index 72f443799c..03b9e2a683 100644
--- a/staging/src/k8s.io/client-go/tools/remotecommand/v3.go
+++ b/staging/src/k8s.io/client-go/tools/remotecommand/v3.go
@@ -23,7 +23,7 @@ import (
 	"sync"
 
 	"k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/client-go/pkg/api"
+	"k8s.io/client-go/pkg/api/v1"
 )
 
 // streamProtocolV3 implements version 3 of the streaming protocol for attach
@@ -51,7 +51,7 @@ func (p *streamProtocolV3) createStreams(conn streamCreator) error {
 	// set up resize stream
 	if p.Tty {
 		headers := http.Header{}
-		headers.Set(api.StreamType, api.StreamTypeResize)
+		headers.Set(v1.StreamType, v1.StreamTypeResize)
 		var err error
 		p.resizeStream, err = conn.CreateStream(headers)
 		if err != nil {