diff --git a/pkg/genericapiserver/api/handlers/negotiation/BUILD b/pkg/genericapiserver/api/handlers/negotiation/BUILD
deleted file mode 100644
index 20c24be142a..00000000000
--- a/pkg/genericapiserver/api/handlers/negotiation/BUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-    "go_test",
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["negotiate_test.go"],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
-        "//vendor:k8s.io/apimachinery/pkg/runtime",
-    ],
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "doc.go",
-        "errors.go",
-        "negotiate.go",
-    ],
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:bitbucket.org/ww/goautoneg",
-        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
-        "//vendor:k8s.io/apimachinery/pkg/runtime",
-        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
-    ],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/pkg/genericapiserver/api/metrics/BUILD b/pkg/genericapiserver/api/metrics/BUILD
deleted file mode 100644
index 4b253661083..00000000000
--- a/pkg/genericapiserver/api/metrics/BUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["metrics.go"],
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:github.com/emicklei/go-restful",
-        "//vendor:github.com/prometheus/client_golang/prometheus",
-        "//vendor:k8s.io/apimachinery/pkg/util/net",
-    ],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/pkg/genericapiserver/api/request/BUILD b/pkg/genericapiserver/api/request/BUILD
deleted file mode 100644
index 0c05a6b0b08..00000000000
--- a/pkg/genericapiserver/api/request/BUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-    "go_test",
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "context.go",
-        "doc.go",
-        "requestcontext.go",
-        "requestinfo.go",
-    ],
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:github.com/golang/glog",
-        "//vendor:golang.org/x/net/context",
-        "//vendor:k8s.io/apimachinery/pkg/types",
-        "//vendor:k8s.io/apimachinery/pkg/util/sets",
-        "//vendor:k8s.io/apiserver/pkg/authentication/user",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["requestinfo_test.go"],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = ["//vendor:k8s.io/apimachinery/pkg/util/sets"],
-)
-
-go_test(
-    name = "go_default_xtest",
-    srcs = ["context_test.go"],
-    tags = ["automanaged"],
-    deps = [
-        "//pkg/api:go_default_library",
-        "//pkg/genericapiserver/api/request:go_default_library",
-        "//vendor:k8s.io/apimachinery/pkg/types",
-        "//vendor:k8s.io/apiserver/pkg/authentication/user",
-    ],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/pkg/util/wsstream/BUILD b/pkg/util/wsstream/BUILD
deleted file mode 100644
index 1416e00f609..00000000000
--- a/pkg/util/wsstream/BUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-    "go_test",
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "conn.go",
-        "doc.go",
-        "stream.go",
-    ],
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:github.com/golang/glog",
-        "//vendor:golang.org/x/net/websocket",
-        "//vendor:k8s.io/apimachinery/pkg/util/runtime",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "conn_test.go",
-        "stream_test.go",
-    ],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = ["//vendor:golang.org/x/net/websocket"],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/plugin/pkg/auth/authenticator/request/headerrequest/BUILD b/plugin/pkg/auth/authenticator/request/headerrequest/BUILD
deleted file mode 100644
index 7c3f5b63869..00000000000
--- a/plugin/pkg/auth/authenticator/request/headerrequest/BUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-    "go_test",
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["requestheader_test.go"],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = ["//vendor:k8s.io/apiserver/pkg/authentication/user"],
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["requestheader.go"],
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:k8s.io/apimachinery/pkg/util/sets",
-        "//vendor:k8s.io/apiserver/pkg/authentication/authenticator",
-        "//vendor:k8s.io/apiserver/pkg/authentication/request/x509",
-        "//vendor:k8s.io/apiserver/pkg/authentication/user",
-        "//vendor:k8s.io/client-go/pkg/util/cert",
-    ],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/plugin/pkg/webhook/BUILD b/plugin/pkg/webhook/BUILD
deleted file mode 100644
index 3b41f106175..00000000000
--- a/plugin/pkg/webhook/BUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["webhook.go"],
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:k8s.io/apimachinery/pkg/runtime",
-        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
-        "//vendor:k8s.io/apimachinery/pkg/runtime/serializer",
-        "//vendor:k8s.io/apimachinery/pkg/util/wait",
-        "//vendor:k8s.io/client-go/pkg/api",
-        "//vendor:k8s.io/client-go/pkg/api/errors",
-        "//vendor:k8s.io/client-go/pkg/apis/authorization/install",
-        "//vendor:k8s.io/client-go/rest",
-        "//vendor:k8s.io/client-go/tools/clientcmd",
-    ],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go b/staging/src/k8s.io/apiserver/pkg/authentication/request/headerrequest/requestheader.go
similarity index 100%
rename from plugin/pkg/auth/authenticator/request/headerrequest/requestheader.go
rename to staging/src/k8s.io/apiserver/pkg/authentication/request/headerrequest/requestheader.go
diff --git a/plugin/pkg/auth/authenticator/request/headerrequest/requestheader_test.go b/staging/src/k8s.io/apiserver/pkg/authentication/request/headerrequest/requestheader_test.go
similarity index 100%
rename from plugin/pkg/auth/authenticator/request/headerrequest/requestheader_test.go
rename to staging/src/k8s.io/apiserver/pkg/authentication/request/headerrequest/requestheader_test.go
diff --git a/pkg/genericapiserver/api/handlers/negotiation/doc.go b/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/doc.go
similarity index 100%
rename from pkg/genericapiserver/api/handlers/negotiation/doc.go
rename to staging/src/k8s.io/apiserver/pkg/handlers/negotiation/doc.go
diff --git a/pkg/genericapiserver/api/handlers/negotiation/errors.go b/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/errors.go
similarity index 100%
rename from pkg/genericapiserver/api/handlers/negotiation/errors.go
rename to staging/src/k8s.io/apiserver/pkg/handlers/negotiation/errors.go
diff --git a/pkg/genericapiserver/api/handlers/negotiation/negotiate.go b/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/negotiate.go
similarity index 100%
rename from pkg/genericapiserver/api/handlers/negotiation/negotiate.go
rename to staging/src/k8s.io/apiserver/pkg/handlers/negotiation/negotiate.go
diff --git a/pkg/genericapiserver/api/handlers/negotiation/negotiate_test.go b/staging/src/k8s.io/apiserver/pkg/handlers/negotiation/negotiate_test.go
similarity index 100%
rename from pkg/genericapiserver/api/handlers/negotiation/negotiate_test.go
rename to staging/src/k8s.io/apiserver/pkg/handlers/negotiation/negotiate_test.go
diff --git a/pkg/genericapiserver/api/metrics/OWNERS b/staging/src/k8s.io/apiserver/pkg/metrics/OWNERS
similarity index 100%
rename from pkg/genericapiserver/api/metrics/OWNERS
rename to staging/src/k8s.io/apiserver/pkg/metrics/OWNERS
diff --git a/pkg/genericapiserver/api/metrics/metrics.go b/staging/src/k8s.io/apiserver/pkg/metrics/metrics.go
similarity index 100%
rename from pkg/genericapiserver/api/metrics/metrics.go
rename to staging/src/k8s.io/apiserver/pkg/metrics/metrics.go
diff --git a/pkg/genericapiserver/api/request/OWNERS b/staging/src/k8s.io/apiserver/pkg/request/OWNERS
similarity index 100%
rename from pkg/genericapiserver/api/request/OWNERS
rename to staging/src/k8s.io/apiserver/pkg/request/OWNERS
diff --git a/pkg/genericapiserver/api/request/context.go b/staging/src/k8s.io/apiserver/pkg/request/context.go
similarity index 100%
rename from pkg/genericapiserver/api/request/context.go
rename to staging/src/k8s.io/apiserver/pkg/request/context.go
diff --git a/pkg/genericapiserver/api/request/context_test.go b/staging/src/k8s.io/apiserver/pkg/request/context_test.go
similarity index 100%
rename from pkg/genericapiserver/api/request/context_test.go
rename to staging/src/k8s.io/apiserver/pkg/request/context_test.go
diff --git a/pkg/genericapiserver/api/request/doc.go b/staging/src/k8s.io/apiserver/pkg/request/doc.go
similarity index 100%
rename from pkg/genericapiserver/api/request/doc.go
rename to staging/src/k8s.io/apiserver/pkg/request/doc.go
diff --git a/pkg/genericapiserver/api/request/requestcontext.go b/staging/src/k8s.io/apiserver/pkg/request/requestcontext.go
similarity index 100%
rename from pkg/genericapiserver/api/request/requestcontext.go
rename to staging/src/k8s.io/apiserver/pkg/request/requestcontext.go
diff --git a/pkg/genericapiserver/api/request/requestinfo.go b/staging/src/k8s.io/apiserver/pkg/request/requestinfo.go
similarity index 100%
rename from pkg/genericapiserver/api/request/requestinfo.go
rename to staging/src/k8s.io/apiserver/pkg/request/requestinfo.go
diff --git a/pkg/genericapiserver/api/request/requestinfo_test.go b/staging/src/k8s.io/apiserver/pkg/request/requestinfo_test.go
similarity index 100%
rename from pkg/genericapiserver/api/request/requestinfo_test.go
rename to staging/src/k8s.io/apiserver/pkg/request/requestinfo_test.go
diff --git a/pkg/util/wsstream/conn.go b/staging/src/k8s.io/apiserver/pkg/util/wsstream/conn.go
similarity index 100%
rename from pkg/util/wsstream/conn.go
rename to staging/src/k8s.io/apiserver/pkg/util/wsstream/conn.go
diff --git a/pkg/util/wsstream/conn_test.go b/staging/src/k8s.io/apiserver/pkg/util/wsstream/conn_test.go
similarity index 100%
rename from pkg/util/wsstream/conn_test.go
rename to staging/src/k8s.io/apiserver/pkg/util/wsstream/conn_test.go
diff --git a/pkg/util/wsstream/doc.go b/staging/src/k8s.io/apiserver/pkg/util/wsstream/doc.go
similarity index 100%
rename from pkg/util/wsstream/doc.go
rename to staging/src/k8s.io/apiserver/pkg/util/wsstream/doc.go
diff --git a/pkg/util/wsstream/stream.go b/staging/src/k8s.io/apiserver/pkg/util/wsstream/stream.go
similarity index 100%
rename from pkg/util/wsstream/stream.go
rename to staging/src/k8s.io/apiserver/pkg/util/wsstream/stream.go
diff --git a/pkg/util/wsstream/stream_test.go b/staging/src/k8s.io/apiserver/pkg/util/wsstream/stream_test.go
similarity index 100%
rename from pkg/util/wsstream/stream_test.go
rename to staging/src/k8s.io/apiserver/pkg/util/wsstream/stream_test.go
diff --git a/plugin/pkg/webhook/webhook.go b/staging/src/k8s.io/apiserver/pkg/webhook/webhook.go
similarity index 100%
rename from plugin/pkg/webhook/webhook.go
rename to staging/src/k8s.io/apiserver/pkg/webhook/webhook.go