diff --git a/hack/.golint_failures b/hack/.golint_failures
index ae65a025940..a1c2183d53e 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -8,6 +8,7 @@ pkg/apis/abac/v1beta1
 pkg/apis/admission
 pkg/apis/admissionregistration/v1
 pkg/apis/admissionregistration/v1beta1
+pkg/apis/apiserverinternal
 pkg/apis/apps/v1
 pkg/apis/apps/v1beta1
 pkg/apis/apps/v1beta2
@@ -204,6 +205,7 @@ staging/src/k8s.io/api/admission/v1
 staging/src/k8s.io/api/admission/v1beta1
 staging/src/k8s.io/api/admissionregistration/v1
 staging/src/k8s.io/api/admissionregistration/v1beta1
+staging/src/k8s.io/api/apiserverinternal/v1alpha1
 staging/src/k8s.io/api/apps/v1
 staging/src/k8s.io/api/apps/v1beta1
 staging/src/k8s.io/api/apps/v1beta2
@@ -302,8 +304,6 @@ staging/src/k8s.io/apiserver/pkg/apis/apiserver
 staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1
 staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1
 staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1beta1
-staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal
-staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/v1alpha1
 staging/src/k8s.io/apiserver/pkg/apis/audit
 staging/src/k8s.io/apiserver/pkg/apis/audit/v1
 staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1
diff --git a/pkg/apis/apiserverinternal/install/install.go b/pkg/apis/apiserverinternal/install/install.go
index 0ecd186949f..cf82ccfe730 100644
--- a/pkg/apis/apiserverinternal/install/install.go
+++ b/pkg/apis/apiserverinternal/install/install.go
@@ -21,8 +21,8 @@ package install
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/apiserver/pkg/apis/apiserverinternal"
-	"k8s.io/apiserver/pkg/apis/apiserverinternal/v1alpha1"
+	"k8s.io/kubernetes/pkg/apis/apiserverinternal"
+	"k8s.io/kubernetes/pkg/apis/apiserverinternal/v1alpha1"
 )
 
 // Install registers the API group and adds types to a scheme
diff --git a/pkg/apis/apiserverinternal/install/roundtrip_test.go b/pkg/apis/apiserverinternal/install/roundtrip_test.go
index 3f48ab06310..eb4215fa1e6 100644
--- a/pkg/apis/apiserverinternal/install/roundtrip_test.go
+++ b/pkg/apis/apiserverinternal/install/roundtrip_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/api/apitesting/roundtrip"
-	"k8s.io/apiserver/pkg/apis/apiserverinternal/fuzzer"
+	"k8s.io/kubernetes/pkg/apis/apiserverinternal/fuzzer"
 )
 
 func TestRoundTrip(t *testing.T) {
diff --git a/pkg/apis/apiserverinternal/validation/validation.go b/pkg/apis/apiserverinternal/validation/validation.go
index d1886af99b4..b045d24ba70 100644
--- a/pkg/apis/apiserverinternal/validation/validation.go
+++ b/pkg/apis/apiserverinternal/validation/validation.go
@@ -24,7 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation"
 	utilvalidation "k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	"k8s.io/apiserver/pkg/apis/apiserverinternal"
+	"k8s.io/kubernetes/pkg/apis/apiserverinternal"
 )
 
 // ValidateStorageVersion validate the storage version object.
diff --git a/pkg/apis/apiserverinternal/validation/validation_test.go b/pkg/apis/apiserverinternal/validation/validation_test.go
index d0d70611f22..c349d1828cf 100644
--- a/pkg/apis/apiserverinternal/validation/validation_test.go
+++ b/pkg/apis/apiserverinternal/validation/validation_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	"k8s.io/apiserver/pkg/apis/apiserverinternal"
+	"k8s.io/kubernetes/pkg/apis/apiserverinternal"
 )
 
 func TestValidateServerStorageVersion(t *testing.T) {
diff --git a/staging/src/k8s.io/api/roundtrip_test.go b/staging/src/k8s.io/api/roundtrip_test.go
index beafa9d1a25..0bc318a5da4 100644
--- a/staging/src/k8s.io/api/roundtrip_test.go
+++ b/staging/src/k8s.io/api/roundtrip_test.go
@@ -24,6 +24,7 @@ import (
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 	admissionregv1 "k8s.io/api/admissionregistration/v1"
 	admissionregv1beta1 "k8s.io/api/admissionregistration/v1beta1"
+	apiserverinternalv1alpha1 "k8s.io/api/apiserverinternal/v1alpha1"
 	appsv1 "k8s.io/api/apps/v1"
 	appsv1beta1 "k8s.io/api/apps/v1beta1"
 	appsv1beta2 "k8s.io/api/apps/v1beta2"
@@ -75,6 +76,7 @@ var groups = []runtime.SchemeBuilder{
 	admissionv1.SchemeBuilder,
 	admissionregv1beta1.SchemeBuilder,
 	admissionregv1.SchemeBuilder,
+	apiserverinternalv1alpha1.SchemeBuilder,
 	appsv1beta1.SchemeBuilder,
 	appsv1beta2.SchemeBuilder,
 	appsv1.SchemeBuilder,