diff --git a/pkg/endpoints/apiserver_test.go b/pkg/endpoints/apiserver_test.go
index 1eefa294f..f627fac05 100644
--- a/pkg/endpoints/apiserver_test.go
+++ b/pkg/endpoints/apiserver_test.go
@@ -55,10 +55,10 @@ import (
 	examplefuzzer "k8s.io/apiserver/pkg/apis/example/fuzzer"
 	examplev1 "k8s.io/apiserver/pkg/apis/example/v1"
 	"k8s.io/apiserver/pkg/endpoints/request"
-	genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
-	genericapitesting "k8s.io/kubernetes/pkg/genericapiserver/endpoints/testing"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	genericapifilters "k8s.io/apiserver/pkg/endpoints/filters"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
+	genericapitesting "k8s.io/apiserver/pkg/endpoints/testing"
+	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/kubernetes/plugin/pkg/admission/admit"
 	"k8s.io/kubernetes/plugin/pkg/admission/deny"
 )
diff --git a/pkg/endpoints/discovery.go b/pkg/endpoints/discovery.go
index 65c16b868..3121d5fd8 100644
--- a/pkg/endpoints/discovery.go
+++ b/pkg/endpoints/discovery.go
@@ -28,8 +28,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/endpoints/handlers"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 )
 
 // AddApiWebService adds a service to return the supported api versions at the legacy /api.
diff --git a/pkg/endpoints/doc.go b/pkg/endpoints/doc.go
index d7010712b..ef99114b6 100644
--- a/pkg/endpoints/doc.go
+++ b/pkg/endpoints/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package endpoints contains the generic code that provides a RESTful Kubernetes-style API service.
-package endpoints // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints"
+package endpoints // import "k8s.io/apiserver/pkg/endpoints"
diff --git a/pkg/endpoints/filters/audit.go b/pkg/endpoints/filters/audit.go
index 0e2e9455b..354842983 100644
--- a/pkg/endpoints/filters/audit.go
+++ b/pkg/endpoints/filters/audit.go
@@ -32,7 +32,7 @@ import (
 	utilnet "k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/apiserver/pkg/endpoints/request"
 	authenticationapi "k8s.io/client-go/pkg/apis/authentication"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 )
 
 var _ http.ResponseWriter = &auditResponseWriter{}
diff --git a/pkg/endpoints/filters/authorization.go b/pkg/endpoints/filters/authorization.go
index 59e286557..0d9292cc6 100644
--- a/pkg/endpoints/filters/authorization.go
+++ b/pkg/endpoints/filters/authorization.go
@@ -24,7 +24,7 @@ import (
 
 	"k8s.io/apiserver/pkg/authorization/authorizer"
 	"k8s.io/apiserver/pkg/endpoints/request"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 )
 
 // WithAuthorizationCheck passes all authorized requests on to handler, and returns a forbidden error otherwise.
diff --git a/pkg/endpoints/filters/authorization_test.go b/pkg/endpoints/filters/authorization_test.go
index 8449fc1c6..b60ba76a0 100644
--- a/pkg/endpoints/filters/authorization_test.go
+++ b/pkg/endpoints/filters/authorization_test.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/apiserver/pkg/authorization/authorizer"
 	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/kubernetes/pkg/apis/batch"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 )
 
 func TestGetAuthorizerAttributes(t *testing.T) {
diff --git a/pkg/endpoints/filters/doc.go b/pkg/endpoints/filters/doc.go
index 5563d5e4b..a13125a25 100644
--- a/pkg/endpoints/filters/doc.go
+++ b/pkg/endpoints/filters/doc.go
@@ -18,4 +18,4 @@ limitations under the License.
 // _are_ api related, i.e. which are prerequisite for the API services
 // to work (in contrast to the filters in the server package which are
 // not part of the API contract).
-package filters // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters"
+package filters // import "k8s.io/apiserver/pkg/endpoints/filters"
diff --git a/pkg/endpoints/filters/impersonation.go b/pkg/endpoints/filters/impersonation.go
index ccd0704c0..6c6164e0b 100644
--- a/pkg/endpoints/filters/impersonation.go
+++ b/pkg/endpoints/filters/impersonation.go
@@ -31,7 +31,7 @@ import (
 	"k8s.io/apiserver/pkg/server/httplog"
 	"k8s.io/client-go/pkg/api"
 	authenticationapi "k8s.io/client-go/pkg/apis/authentication"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 )
 
 // WithImpersonation is a filter that will inspect and check requests that attempt to change the user.Info for their requests
diff --git a/pkg/endpoints/filters/requestinfo.go b/pkg/endpoints/filters/requestinfo.go
index 75344abf6..887fc9534 100644
--- a/pkg/endpoints/filters/requestinfo.go
+++ b/pkg/endpoints/filters/requestinfo.go
@@ -22,7 +22,7 @@ import (
 	"net/http"
 
 	"k8s.io/apiserver/pkg/endpoints/request"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 )
 
 // WithRequestInfo attaches a RequestInfo to the context.
diff --git a/pkg/endpoints/groupversion.go b/pkg/endpoints/groupversion.go
index 81d24cd53..ca102660f 100644
--- a/pkg/endpoints/groupversion.go
+++ b/pkg/endpoints/groupversion.go
@@ -31,8 +31,8 @@ import (
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apiserver/pkg/admission"
 	"k8s.io/apiserver/pkg/endpoints/request"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	"k8s.io/apiserver/pkg/endpoints/handlers"
+	"k8s.io/apiserver/pkg/registry/rest"
 )
 
 // APIGroupVersion is a helper for exposing rest.Storage objects as http.Handlers via go-restful
diff --git a/pkg/endpoints/handlers/discovery.go b/pkg/endpoints/handlers/discovery.go
index d1ae7fd1c..68087e0eb 100644
--- a/pkg/endpoints/handlers/discovery.go
+++ b/pkg/endpoints/handlers/discovery.go
@@ -22,7 +22,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 
 	"github.com/emicklei/go-restful"
 )
diff --git a/pkg/endpoints/handlers/doc.go b/pkg/endpoints/handlers/doc.go
index a3658757f..d39833814 100644
--- a/pkg/endpoints/handlers/doc.go
+++ b/pkg/endpoints/handlers/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package handlers contains HTTP handlers to implement the apiserver APIs.
-package handlers // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers"
+package handlers // import "k8s.io/apiserver/pkg/endpoints/handlers"
diff --git a/pkg/endpoints/handlers/proxy.go b/pkg/endpoints/handlers/proxy.go
index 44bcb28b1..32f8a13f5 100644
--- a/pkg/endpoints/handlers/proxy.go
+++ b/pkg/endpoints/handlers/proxy.go
@@ -36,8 +36,8 @@ import (
 	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/server/httplog"
 	proxyutil "k8s.io/apiserver/pkg/util/proxy"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/registry/rest"
 
 	"github.com/golang/glog"
 )
diff --git a/pkg/endpoints/handlers/responsewriters/doc.go b/pkg/endpoints/handlers/responsewriters/doc.go
index 59bbafc2c..b76758b79 100644
--- a/pkg/endpoints/handlers/responsewriters/doc.go
+++ b/pkg/endpoints/handlers/responsewriters/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package responsewriters containers helpers to write responses in HTTP handlers.
-package responsewriters // import "k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
+package responsewriters // import "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
diff --git a/pkg/endpoints/handlers/responsewriters/writers.go b/pkg/endpoints/handlers/responsewriters/writers.go
index e475c0ee1..5ec764b02 100644
--- a/pkg/endpoints/handlers/responsewriters/writers.go
+++ b/pkg/endpoints/handlers/responsewriters/writers.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
 	"k8s.io/apiserver/pkg/util/flushwriter"
 	"k8s.io/apiserver/pkg/util/wsstream"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	"k8s.io/apiserver/pkg/registry/rest"
 )
 
 // WriteObject renders a returned runtime.Object to the response as a stream or an encoded object. If the object
diff --git a/pkg/endpoints/handlers/rest.go b/pkg/endpoints/handlers/rest.go
index 53139dc05..a1f36ed7f 100644
--- a/pkg/endpoints/handlers/rest.go
+++ b/pkg/endpoints/handlers/rest.go
@@ -44,8 +44,8 @@ import (
 	"k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
 	"k8s.io/apiserver/pkg/endpoints/request"
 	utiltrace "k8s.io/apiserver/pkg/util/trace"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/registry/rest"
 )
 
 // ContextFunc returns a Context given a request - a context must be returned
diff --git a/pkg/endpoints/handlers/rest_test.go b/pkg/endpoints/handlers/rest_test.go
index 7d6c7f91b..619b8bb2f 100644
--- a/pkg/endpoints/handlers/rest_test.go
+++ b/pkg/endpoints/handlers/rest_test.go
@@ -38,7 +38,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	"k8s.io/apiserver/pkg/registry/rest"
 )
 
 type testPatchType struct {
diff --git a/pkg/endpoints/installer.go b/pkg/endpoints/installer.go
index 181ee6560..40fd51e5c 100644
--- a/pkg/endpoints/installer.go
+++ b/pkg/endpoints/installer.go
@@ -38,8 +38,8 @@ import (
 	"k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
 	"k8s.io/apiserver/pkg/endpoints/metrics"
 	"k8s.io/apiserver/pkg/endpoints/request"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	"k8s.io/apiserver/pkg/endpoints/handlers"
+	"k8s.io/apiserver/pkg/registry/rest"
 
 	"github.com/emicklei/go-restful"
 )
diff --git a/pkg/endpoints/openapi/openapi_test.go b/pkg/endpoints/openapi/openapi_test.go
index 9541eeb5b..517a280de 100644
--- a/pkg/endpoints/openapi/openapi_test.go
+++ b/pkg/endpoints/openapi/openapi_test.go
@@ -60,13 +60,13 @@ func assertEqual(t *testing.T, expected, actual interface{}) {
 
 func TestGetDefinitionName(t *testing.T) {
 	testType := TestType{}
-	typePkgName := "k8s.io/kubernetes/pkg/genericapiserver/endpoints/openapi.TestType"
-	typeFriendlyName := "io.k8s.kubernetes.pkg.genericapiserver.endpoints.openapi.TestType"
+	typePkgName := "k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/endpoints/openapi.TestType"
+	typeFriendlyName := "io.k8s.kubernetes.vendor.k8s.io.apiserver.pkg.endpoints.openapi.TestType"
 	if strings.HasSuffix(reflect.TypeOf(testType).PkgPath(), "go_default_test") {
 		// the test is running inside bazel where the package name is changed and
 		// "go_default_test" will add to package path.
-		typePkgName = "k8s.io/kubernetes/pkg/genericapiserver/endpoints/openapi/go_default_test.TestType"
-		typeFriendlyName = "io.k8s.kubernetes.pkg.genericapiserver.endpoints.openapi.go_default_test.TestType"
+		typePkgName = "k8s.io/apiserver/pkg/endpoints/openapi/go_default_test.TestType"
+		typeFriendlyName = "io.k8s.apiserver.pkg.endpoints.openapi.go_default_test.TestType"
 	}
 	s := runtime.NewScheme()
 	s.AddKnownTypeWithName(testType.GroupVersionKind(), &testType)
diff --git a/pkg/endpoints/proxy_test.go b/pkg/endpoints/proxy_test.go
index 829d3115f..0f126cf9d 100644
--- a/pkg/endpoints/proxy_test.go
+++ b/pkg/endpoints/proxy_test.go
@@ -36,7 +36,7 @@ import (
 
 	"golang.org/x/net/websocket"
 	utilnet "k8s.io/apimachinery/pkg/util/net"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	"k8s.io/apiserver/pkg/registry/rest"
 )
 
 func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) {
diff --git a/pkg/endpoints/watch_test.go b/pkg/endpoints/watch_test.go
index bc6053230..7e2419819 100644
--- a/pkg/endpoints/watch_test.go
+++ b/pkg/endpoints/watch_test.go
@@ -40,9 +40,9 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apimachinery/pkg/watch"
 	example "k8s.io/apiserver/pkg/apis/example"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers"
-	apitesting "k8s.io/kubernetes/pkg/genericapiserver/endpoints/testing"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	"k8s.io/apiserver/pkg/endpoints/handlers"
+	apitesting "k8s.io/apiserver/pkg/endpoints/testing"
+	"k8s.io/apiserver/pkg/registry/rest"
 )
 
 // watchJSON defines the expected JSON wire equivalent of watch.Event
diff --git a/pkg/registry/doc.go b/pkg/registry/doc.go
index 1714984bc..f41dc0a2d 100644
--- a/pkg/registry/doc.go
+++ b/pkg/registry/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package registry contains the generic implementation of the storage and system logic.
-package registry // import "k8s.io/kubernetes/pkg/genericapiserver/registry"
+package registry // import "k8s.io/apiserver/pkg/registry"
diff --git a/pkg/registry/generic/doc.go b/pkg/registry/generic/doc.go
index f743ae133..ea79d130a 100644
--- a/pkg/registry/generic/doc.go
+++ b/pkg/registry/generic/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package generic provides a generic object store interface and a
 // generic label/field matching type.
-package generic // import "k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
+package generic // import "k8s.io/apiserver/pkg/registry/generic"
diff --git a/pkg/registry/generic/registry/doc.go b/pkg/registry/generic/registry/doc.go
index 95cdb9cc3..bd315ae47 100644
--- a/pkg/registry/generic/registry/doc.go
+++ b/pkg/registry/generic/registry/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package etcd has a generic implementation of a registry that
 // stores things in etcd.
-package registry // import "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry"
+package registry // import "k8s.io/apiserver/pkg/registry/generic/registry"
diff --git a/pkg/registry/generic/registry/storage_factory.go b/pkg/registry/generic/registry/storage_factory.go
index 8703bc323..2e741e123 100644
--- a/pkg/registry/generic/registry/storage_factory.go
+++ b/pkg/registry/generic/registry/storage_factory.go
@@ -22,7 +22,7 @@ import (
 	etcdstorage "k8s.io/apiserver/pkg/storage/etcd"
 	"k8s.io/apiserver/pkg/storage/storagebackend"
 	"k8s.io/apiserver/pkg/storage/storagebackend/factory"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
+	"k8s.io/apiserver/pkg/registry/generic"
 )
 
 var _ generic.StorageDecorator = StorageWithCacher
diff --git a/pkg/registry/generic/registry/store.go b/pkg/registry/generic/registry/store.go
index 5f95681ae..ee6aa2992 100644
--- a/pkg/registry/generic/registry/store.go
+++ b/pkg/registry/generic/registry/store.go
@@ -37,9 +37,9 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/storage"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
-	storeerr "k8s.io/kubernetes/pkg/storage/errors"
+	storeerr "k8s.io/apiserver/pkg/storage/errors"
+	"k8s.io/apiserver/pkg/registry/generic"
+	"k8s.io/apiserver/pkg/registry/rest"
 
 	"github.com/golang/glog"
 )
diff --git a/pkg/registry/generic/registry/store_test.go b/pkg/registry/generic/registry/store_test.go
index 8fe569a6c..16a799ec9 100644
--- a/pkg/registry/generic/registry/store_test.go
+++ b/pkg/registry/generic/registry/store_test.go
@@ -48,8 +48,8 @@ import (
 	"k8s.io/apiserver/pkg/storage/names"
 	"k8s.io/apiserver/pkg/storage/storagebackend/factory"
 	storagetesting "k8s.io/apiserver/pkg/storage/testing"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	"k8s.io/apiserver/pkg/registry/generic"
+	"k8s.io/apiserver/pkg/registry/rest"
 )
 
 var scheme = runtime.NewScheme()
diff --git a/pkg/registry/generic/rest/doc.go b/pkg/registry/generic/rest/doc.go
index abe523eb9..3b77b5593 100644
--- a/pkg/registry/generic/rest/doc.go
+++ b/pkg/registry/generic/rest/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package rest has generic implementations of resources used for
 // REST responses
-package rest // import "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/rest"
+package rest // import "k8s.io/apiserver/pkg/registry/generic/rest"
diff --git a/pkg/registry/generic/rest/streamer.go b/pkg/registry/generic/rest/streamer.go
index 24fe7f986..25477bd91 100644
--- a/pkg/registry/generic/rest/streamer.go
+++ b/pkg/registry/generic/rest/streamer.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	"k8s.io/apiserver/pkg/registry/rest"
 )
 
 // LocationStreamer is a resource that streams the contents of a particular
diff --git a/pkg/registry/rest/doc.go b/pkg/registry/rest/doc.go
index 6f9855077..20524d21f 100644
--- a/pkg/registry/rest/doc.go
+++ b/pkg/registry/rest/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package rest defines common logic around changes to Kubernetes-style resources.
-package rest // import "k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+package rest // import "k8s.io/apiserver/pkg/registry/rest"
diff --git a/pkg/registry/rest/resttest/resttest.go b/pkg/registry/rest/resttest/resttest.go
index fc5d75e76..8fdb59886 100644
--- a/pkg/registry/rest/resttest/resttest.go
+++ b/pkg/registry/rest/resttest/resttest.go
@@ -35,7 +35,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
 	genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	"k8s.io/apiserver/pkg/registry/rest"
 )
 
 type Tester struct {
diff --git a/pkg/server/config.go b/pkg/server/config.go
index 741288507..1fccb4bdc 100644
--- a/pkg/server/config.go
+++ b/pkg/server/config.go
@@ -56,10 +56,10 @@ import (
 	"k8s.io/apiserver/pkg/server/options"
 	restclient "k8s.io/client-go/rest"
 	certutil "k8s.io/client-go/util/cert"
-	genericapifilters "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters"
-	apiopenapi "k8s.io/kubernetes/pkg/genericapiserver/endpoints/openapi"
-	"k8s.io/kubernetes/pkg/genericapiserver/server/mux"
-	"k8s.io/kubernetes/pkg/genericapiserver/server/routes"
+	genericapifilters "k8s.io/apiserver/pkg/endpoints/filters"
+	apiopenapi "k8s.io/apiserver/pkg/endpoints/openapi"
+	"k8s.io/apiserver/pkg/server/mux"
+	"k8s.io/apiserver/pkg/server/routes"
 )
 
 const (
diff --git a/pkg/server/filters/maxinflight_test.go b/pkg/server/filters/maxinflight_test.go
index 872fe074c..8793143f9 100644
--- a/pkg/server/filters/maxinflight_test.go
+++ b/pkg/server/filters/maxinflight_test.go
@@ -27,7 +27,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 	apirequest "k8s.io/apiserver/pkg/endpoints/request"
-	apifilters "k8s.io/kubernetes/pkg/genericapiserver/endpoints/filters"
+	apifilters "k8s.io/apiserver/pkg/endpoints/filters"
 )
 
 func createMaxInflightServer(callsWg, blockWg *sync.WaitGroup, disableCallsWg *bool, disableCallsWgMutex *sync.Mutex, nonMutating, mutating int) *httptest.Server {
diff --git a/pkg/server/genericapiserver.go b/pkg/server/genericapiserver.go
index b2458e2d9..e6f01fab7 100644
--- a/pkg/server/genericapiserver.go
+++ b/pkg/server/genericapiserver.go
@@ -43,10 +43,10 @@ import (
 	apirequest "k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/server/healthz"
 	restclient "k8s.io/client-go/rest"
-	genericapi "k8s.io/kubernetes/pkg/genericapiserver/endpoints"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
-	genericmux "k8s.io/kubernetes/pkg/genericapiserver/server/mux"
-	"k8s.io/kubernetes/pkg/genericapiserver/server/routes"
+	genericapi "k8s.io/apiserver/pkg/endpoints"
+	"k8s.io/apiserver/pkg/registry/rest"
+	genericmux "k8s.io/apiserver/pkg/server/mux"
+	"k8s.io/apiserver/pkg/server/routes"
 )
 
 // Info about an API group.
diff --git a/pkg/server/genericapiserver_test.go b/pkg/server/genericapiserver_test.go
index 1560c11d9..44fdede40 100644
--- a/pkg/server/genericapiserver_test.go
+++ b/pkg/server/genericapiserver_test.go
@@ -49,7 +49,7 @@ import (
 	etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
 	"k8s.io/client-go/pkg/api"
 	openapigen "k8s.io/kubernetes/pkg/generated/openapi"
-	"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
+	"k8s.io/apiserver/pkg/registry/rest"
 )
 
 const (
diff --git a/pkg/server/mux/container.go b/pkg/server/mux/container.go
index dc6b61b9d..8c0f4d154 100644
--- a/pkg/server/mux/container.go
+++ b/pkg/server/mux/container.go
@@ -28,7 +28,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 )
 
 // APIContainer is a restful container which in addition support registering
diff --git a/pkg/server/openapi/openapi.go b/pkg/server/openapi/openapi.go
index 7ad095bbd..d1c487a26 100644
--- a/pkg/server/openapi/openapi.go
+++ b/pkg/server/openapi/openapi.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/apimachinery/pkg/openapi"
 	"k8s.io/apimachinery/pkg/util/json"
 	"k8s.io/apiserver/pkg/util/trie"
-	genericmux "k8s.io/kubernetes/pkg/genericapiserver/server/mux"
+	genericmux "k8s.io/apiserver/pkg/server/mux"
 )
 
 const (
diff --git a/pkg/server/openapi/openapi_test.go b/pkg/server/openapi/openapi_test.go
index dedf7c4b8..f0a922a2d 100644
--- a/pkg/server/openapi/openapi_test.go
+++ b/pkg/server/openapi/openapi_test.go
@@ -189,12 +189,12 @@ func getConfig(fullMethods bool) (*openapi.Config, *restful.Container) {
 		},
 		GetDefinitions: func(_ openapi.ReferenceCallback) map[string]openapi.OpenAPIDefinition {
 			return map[string]openapi.OpenAPIDefinition{
-				"k8s.io/kubernetes/pkg/genericapiserver/server/openapi.TestInput":  *TestInput{}.OpenAPIDefinition(),
-				"k8s.io/kubernetes/pkg/genericapiserver/server/openapi.TestOutput": *TestOutput{}.OpenAPIDefinition(),
+				"k8s.io/apiserver/pkg/server/openapi.TestInput":  *TestInput{}.OpenAPIDefinition(),
+				"k8s.io/apiserver/pkg/server/openapi.TestOutput": *TestOutput{}.OpenAPIDefinition(),
 				// Bazel changes the package name, this is ok for testing, but we need to fix it if it happened
 				// in the main code.
-				"k8s.io/kubernetes/pkg/genericapiserver/server/openapi/go_default_test.TestInput":  *TestInput{}.OpenAPIDefinition(),
-				"k8s.io/kubernetes/pkg/genericapiserver/server/openapi/go_default_test.TestOutput": *TestOutput{}.OpenAPIDefinition(),
+				"k8s.io/apiserver/pkg/server/openapi/go_default_test.TestInput":  *TestInput{}.OpenAPIDefinition(),
+				"k8s.io/apiserver/pkg/server/openapi/go_default_test.TestOutput": *TestOutput{}.OpenAPIDefinition(),
 			}
 		},
 		GetDefinitionName: func(_ string, name string) (string, spec.Extensions) {
diff --git a/pkg/server/routes/index.go b/pkg/server/routes/index.go
index cb4f813e3..d2da396ec 100644
--- a/pkg/server/routes/index.go
+++ b/pkg/server/routes/index.go
@@ -21,8 +21,8 @@ import (
 	"sort"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
-	"k8s.io/kubernetes/pkg/genericapiserver/server/mux"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/server/mux"
 )
 
 // Index provides a webservice for the http root / listing all known paths.
diff --git a/pkg/server/routes/metrics.go b/pkg/server/routes/metrics.go
index 13bba925b..39aff0232 100644
--- a/pkg/server/routes/metrics.go
+++ b/pkg/server/routes/metrics.go
@@ -22,7 +22,7 @@ import (
 
 	apimetrics "k8s.io/apiserver/pkg/endpoints/metrics"
 	etcdmetrics "k8s.io/apiserver/pkg/storage/etcd/metrics"
-	"k8s.io/kubernetes/pkg/genericapiserver/server/mux"
+	"k8s.io/apiserver/pkg/server/mux"
 
 	"github.com/prometheus/client_golang/prometheus"
 )
diff --git a/pkg/server/routes/openapi.go b/pkg/server/routes/openapi.go
index 2561b3094..073866fde 100644
--- a/pkg/server/routes/openapi.go
+++ b/pkg/server/routes/openapi.go
@@ -18,8 +18,8 @@ package routes
 
 import (
 	"k8s.io/apimachinery/pkg/openapi"
-	"k8s.io/kubernetes/pkg/genericapiserver/server/mux"
-	apiserveropenapi "k8s.io/kubernetes/pkg/genericapiserver/server/openapi"
+	"k8s.io/apiserver/pkg/server/mux"
+	apiserveropenapi "k8s.io/apiserver/pkg/server/openapi"
 
 	"github.com/golang/glog"
 )
diff --git a/pkg/server/routes/profiling.go b/pkg/server/routes/profiling.go
index 4d8384a08..759eba473 100644
--- a/pkg/server/routes/profiling.go
+++ b/pkg/server/routes/profiling.go
@@ -19,7 +19,7 @@ package routes
 import (
 	"net/http/pprof"
 
-	"k8s.io/kubernetes/pkg/genericapiserver/server/mux"
+	"k8s.io/apiserver/pkg/server/mux"
 )
 
 // Profiling adds handlers for pprof under /debug/pprof.
diff --git a/pkg/server/routes/swagger.go b/pkg/server/routes/swagger.go
index 352c4f5e9..fb62c65b0 100644
--- a/pkg/server/routes/swagger.go
+++ b/pkg/server/routes/swagger.go
@@ -17,7 +17,7 @@ limitations under the License.
 package routes
 
 import (
-	"k8s.io/kubernetes/pkg/genericapiserver/server/mux"
+	"k8s.io/apiserver/pkg/server/mux"
 
 	"github.com/emicklei/go-restful/swagger"
 )
diff --git a/pkg/server/routes/swaggerui.go b/pkg/server/routes/swaggerui.go
index 8acbc6243..13f3a6166 100644
--- a/pkg/server/routes/swaggerui.go
+++ b/pkg/server/routes/swaggerui.go
@@ -22,7 +22,7 @@ import (
 	assetfs "github.com/elazarl/go-bindata-assetfs"
 
 	"k8s.io/apiserver/pkg/server/routes/data/swagger"
-	"k8s.io/kubernetes/pkg/genericapiserver/server/mux"
+	"k8s.io/apiserver/pkg/server/mux"
 )
 
 // SwaggerUI exposes files in third_party/swagger-ui/ under /swagger-ui.
diff --git a/pkg/server/routes/version.go b/pkg/server/routes/version.go
index fdb1a7343..a1c3c6ad7 100644
--- a/pkg/server/routes/version.go
+++ b/pkg/server/routes/version.go
@@ -22,8 +22,8 @@ import (
 	"github.com/emicklei/go-restful"
 
 	"k8s.io/apimachinery/pkg/version"
-	"k8s.io/kubernetes/pkg/genericapiserver/endpoints/handlers/responsewriters"
-	"k8s.io/kubernetes/pkg/genericapiserver/server/mux"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/server/mux"
 )
 
 // Version provides a webservice with version information.