diff --git a/cmd/kubernetes-discovery/pkg/apiserver/BUILD b/cmd/kubernetes-discovery/pkg/apiserver/BUILD
index ab1f47c32e3..707329dde1c 100644
--- a/cmd/kubernetes-discovery/pkg/apiserver/BUILD
+++ b/cmd/kubernetes-discovery/pkg/apiserver/BUILD
@@ -30,8 +30,8 @@ go_library(
         "//pkg/api/errors:go_default_library",
         "//pkg/api/rest:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
-        "//pkg/apiserver:go_default_library",
         "//pkg/apiserver/filters:go_default_library",
+        "//pkg/apiserver/handlers/responsewriters:go_default_library",
         "//pkg/auth/handlers:go_default_library",
         "//pkg/client/cache:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
diff --git a/hack/.linted_packages b/hack/.linted_packages
index 6740498cb50..1aacf5502db 100644
--- a/hack/.linted_packages
+++ b/hack/.linted_packages
@@ -95,6 +95,7 @@ pkg/apis/rbac/install
 pkg/apis/storage/install
 pkg/apis/storage/validation
 pkg/apiserver/audit
+pkg/apiserver/handlers/responsewriters
 pkg/apiserver/openapi
 pkg/auth/authenticator
 pkg/auth/authorizer/union
diff --git a/pkg/apiserver/BUILD b/pkg/apiserver/BUILD
index a0987a4c948..f9552172466 100644
--- a/pkg/apiserver/BUILD
+++ b/pkg/apiserver/BUILD
@@ -11,15 +11,11 @@ load(
 go_library(
     name = "go_default_library",
     srcs = [
-        "api_installer.go",
         "apiserver.go",
+        "discovery.go",
         "doc.go",
-        "errors.go",
-        "negotiate.go",
-        "proxy.go",
-        "resthandler.go",
-        "serviceerror.go",
-        "watch.go",
+        "groupversion.go",
+        "installer.go",
     ],
     tags = ["automanaged"],
     deps = [
@@ -30,46 +26,25 @@ go_library(
         "//pkg/api/rest:go_default_library",
         "//pkg/apis/extensions:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
+        "//pkg/apiserver/handlers:go_default_library",
+        "//pkg/apiserver/handlers/negotiation:go_default_library",
+        "//pkg/apiserver/handlers/responsewriters:go_default_library",
         "//pkg/apiserver/metrics:go_default_library",
-        "//pkg/apiserver/request:go_default_library",
         "//pkg/conversion:go_default_library",
-        "//pkg/fields:go_default_library",
-        "//pkg/httplog:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
-        "//pkg/runtime/serializer/streaming:go_default_library",
-        "//pkg/storage:go_default_library",
-        "//pkg/util:go_default_library",
         "//pkg/util/errors:go_default_library",
-        "//pkg/util/flushwriter:go_default_library",
-        "//pkg/util/httpstream:go_default_library",
-        "//pkg/util/net:go_default_library",
-        "//pkg/util/proxy:go_default_library",
-        "//pkg/util/runtime:go_default_library",
-        "//pkg/util/sets:go_default_library",
-        "//pkg/util/strategicpatch:go_default_library",
         "//pkg/util/strings:go_default_library",
-        "//pkg/util/version:go_default_library",
-        "//pkg/util/wsstream:go_default_library",
-        "//pkg/watch:go_default_library",
-        "//pkg/watch/versioned:go_default_library",
-        "//vendor:bitbucket.org/ww/goautoneg",
         "//vendor:github.com/emicklei/go-restful",
-        "//vendor:github.com/evanphx/json-patch",
-        "//vendor:github.com/golang/glog",
-        "//vendor:golang.org/x/net/websocket",
     ],
 )
 
 go_test(
     name = "go_default_test",
     srcs = [
-        "api_installer_test.go",
         "apiserver_test.go",
-        "errors_test.go",
-        "negotiate_test.go",
+        "installer_test.go",
         "proxy_test.go",
-        "resthandler_test.go",
         "watch_test.go",
     ],
     library = "go_default_library",
@@ -80,11 +55,12 @@ go_test(
         "//pkg/api/errors:go_default_library",
         "//pkg/api/meta:go_default_library",
         "//pkg/api/rest:go_default_library",
-        "//pkg/api/testapi:go_default_library",
         "//pkg/api/testing:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
         "//pkg/apiserver/filters:go_default_library",
+        "//pkg/apiserver/handlers:go_default_library",
+        "//pkg/apiserver/handlers/responsewriters:go_default_library",
         "//pkg/apiserver/request:go_default_library",
         "//pkg/apiserver/testing:go_default_library",
         "//pkg/fields:go_default_library",
@@ -92,18 +68,15 @@ go_test(
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
         "//pkg/runtime/serializer/streaming:go_default_library",
-        "//pkg/types:go_default_library",
         "//pkg/util/diff:go_default_library",
         "//pkg/util/net:go_default_library",
         "//pkg/util/sets:go_default_library",
-        "//pkg/util/strategicpatch:go_default_library",
         "//pkg/util/wait:go_default_library",
         "//pkg/watch:go_default_library",
         "//pkg/watch/versioned:go_default_library",
         "//plugin/pkg/admission/admit:go_default_library",
         "//plugin/pkg/admission/deny:go_default_library",
         "//vendor:github.com/emicklei/go-restful",
-        "//vendor:github.com/evanphx/json-patch",
         "//vendor:golang.org/x/net/websocket",
     ],
 )
diff --git a/pkg/apiserver/handlers/BUILD b/pkg/apiserver/handlers/BUILD
new file mode 100644
index 00000000000..8d7f1473ba5
--- /dev/null
+++ b/pkg/apiserver/handlers/BUILD
@@ -0,0 +1,75 @@
+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 = ["resthandler_test.go"],
+    library = "go_default_library",
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/api:go_default_library",
+        "//pkg/api/errors:go_default_library",
+        "//pkg/api/rest:go_default_library",
+        "//pkg/api/testapi:go_default_library",
+        "//pkg/api/v1:go_default_library",
+        "//pkg/apis/meta/v1:go_default_library",
+        "//pkg/runtime:go_default_library",
+        "//pkg/runtime/schema:go_default_library",
+        "//pkg/types:go_default_library",
+        "//pkg/util/diff:go_default_library",
+        "//pkg/util/strategicpatch:go_default_library",
+        "//vendor:github.com/emicklei/go-restful",
+        "//vendor:github.com/evanphx/json-patch",
+    ],
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "discovery.go",
+        "doc.go",
+        "proxy.go",
+        "resthandler.go",
+        "watch.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/admission:go_default_library",
+        "//pkg/api:go_default_library",
+        "//pkg/api/errors:go_default_library",
+        "//pkg/api/meta:go_default_library",
+        "//pkg/api/rest:go_default_library",
+        "//pkg/apis/meta/v1:go_default_library",
+        "//pkg/apiserver/handlers/negotiation:go_default_library",
+        "//pkg/apiserver/handlers/responsewriters:go_default_library",
+        "//pkg/apiserver/metrics:go_default_library",
+        "//pkg/apiserver/request:go_default_library",
+        "//pkg/fields:go_default_library",
+        "//pkg/httplog:go_default_library",
+        "//pkg/runtime:go_default_library",
+        "//pkg/runtime/schema:go_default_library",
+        "//pkg/runtime/serializer/streaming:go_default_library",
+        "//pkg/util:go_default_library",
+        "//pkg/util/httpstream:go_default_library",
+        "//pkg/util/net:go_default_library",
+        "//pkg/util/proxy:go_default_library",
+        "//pkg/util/runtime:go_default_library",
+        "//pkg/util/sets:go_default_library",
+        "//pkg/util/strategicpatch:go_default_library",
+        "//pkg/util/version:go_default_library",
+        "//pkg/util/wsstream:go_default_library",
+        "//pkg/watch:go_default_library",
+        "//pkg/watch/versioned:go_default_library",
+        "//vendor:github.com/emicklei/go-restful",
+        "//vendor:github.com/evanphx/json-patch",
+        "//vendor:github.com/golang/glog",
+        "//vendor:golang.org/x/net/websocket",
+    ],
+)
diff --git a/pkg/apiserver/handlers/errors/BUILD b/pkg/apiserver/handlers/errors/BUILD
new file mode 100644
index 00000000000..790d7132542
--- /dev/null
+++ b/pkg/apiserver/handlers/errors/BUILD
@@ -0,0 +1,36 @@
+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 = ["errors_test.go"],
+    library = "go_default_library",
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/api:go_default_library",
+        "//pkg/api/errors:go_default_library",
+        "//pkg/apis/meta/v1:go_default_library",
+        "//pkg/runtime/schema:go_default_library",
+    ],
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "doc.go",
+        "errors.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/apis/meta/v1:go_default_library",
+        "//pkg/storage:go_default_library",
+        "//pkg/util/runtime:go_default_library",
+    ],
+)
diff --git a/pkg/apiserver/handlers/negotiation/BUILD b/pkg/apiserver/handlers/negotiation/BUILD
new file mode 100644
index 00000000000..88b50de73a7
--- /dev/null
+++ b/pkg/apiserver/handlers/negotiation/BUILD
@@ -0,0 +1,36 @@
+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 = [
+        "//pkg/apis/meta/v1:go_default_library",
+        "//pkg/runtime:go_default_library",
+    ],
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "doc.go",
+        "errors.go",
+        "negotiate.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/apis/meta/v1:go_default_library",
+        "//pkg/runtime:go_default_library",
+        "//pkg/runtime/schema:go_default_library",
+        "//vendor:bitbucket.org/ww/goautoneg",
+    ],
+)
diff --git a/pkg/apiserver/handlers/responsewriters/BUILD b/pkg/apiserver/handlers/responsewriters/BUILD
new file mode 100644
index 00000000000..9bf6dbc4d55
--- /dev/null
+++ b/pkg/apiserver/handlers/responsewriters/BUILD
@@ -0,0 +1,27 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "doc.go",
+        "writers.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//pkg/api/rest:go_default_library",
+        "//pkg/apiserver/handlers/errors:go_default_library",
+        "//pkg/apiserver/handlers/negotiation:go_default_library",
+        "//pkg/runtime:go_default_library",
+        "//pkg/runtime/schema:go_default_library",
+        "//pkg/util/flushwriter:go_default_library",
+        "//pkg/util/runtime:go_default_library",
+        "//pkg/util/wsstream:go_default_library",
+    ],
+)
diff --git a/pkg/genericapiserver/mux/BUILD b/pkg/genericapiserver/mux/BUILD
index 5967c6578a6..a5b8f40be6d 100644
--- a/pkg/genericapiserver/mux/BUILD
+++ b/pkg/genericapiserver/mux/BUILD
@@ -17,9 +17,13 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/apiserver:go_default_library",
+        "//pkg/api:go_default_library",
+        "//pkg/api/errors:go_default_library",
+        "//pkg/apiserver/handlers/responsewriters:go_default_library",
         "//pkg/runtime:go_default_library",
+        "//pkg/runtime/schema:go_default_library",
         "//vendor:github.com/emicklei/go-restful",
+        "//vendor:github.com/golang/glog",
     ],
 )
 
diff --git a/pkg/genericapiserver/routes/BUILD b/pkg/genericapiserver/routes/BUILD
index d9f3c6ae293..e054c1fed50 100644
--- a/pkg/genericapiserver/routes/BUILD
+++ b/pkg/genericapiserver/routes/BUILD
@@ -22,7 +22,7 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/apis/meta/v1:go_default_library",
-        "//pkg/apiserver:go_default_library",
+        "//pkg/apiserver/handlers/responsewriters:go_default_library",
         "//pkg/apiserver/metrics:go_default_library",
         "//pkg/genericapiserver/mux:go_default_library",
         "//pkg/genericapiserver/openapi:go_default_library",
diff --git a/pkg/master/thirdparty/BUILD b/pkg/master/thirdparty/BUILD
index 1a67657ba91..b7fb254e98d 100644
--- a/pkg/master/thirdparty/BUILD
+++ b/pkg/master/thirdparty/BUILD
@@ -19,6 +19,7 @@ go_library(
         "//pkg/apis/extensions:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
         "//pkg/apiserver:go_default_library",
+        "//pkg/apiserver/handlers:go_default_library",
         "//pkg/genericapiserver:go_default_library",
         "//pkg/registry/extensions/rest:go_default_library",
         "//pkg/registry/extensions/thirdpartyresourcedata:go_default_library",