diff --git a/pkg/BUILD b/pkg/BUILD
index 1f9e10e8879..11d20c8cc2b 100644
--- a/pkg/BUILD
+++ b/pkg/BUILD
@@ -79,6 +79,7 @@ filegroup(
         "//pkg/client/unversioned:all-srcs",
         "//pkg/cloudprovider:all-srcs",
         "//pkg/controller:all-srcs",
+        "//pkg/conversion:all-srcs",
         "//pkg/credentialprovider:all-srcs",
         "//pkg/fieldpath:all-srcs",
         "//pkg/fields:all-srcs",
diff --git a/pkg/conversion/BUILD b/pkg/conversion/BUILD
new file mode 100644
index 00000000000..9f371d60332
--- /dev/null
+++ b/pkg/conversion/BUILD
@@ -0,0 +1,30 @@
+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"],
+    tags = ["automanaged"],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//pkg/conversion/queryparams:all-srcs",
+    ],
+    tags = ["automanaged"],
+)
diff --git a/pkg/conversion/doc.go b/pkg/conversion/doc.go
new file mode 100644
index 00000000000..68f6e8dcc5b
--- /dev/null
+++ b/pkg/conversion/doc.go
@@ -0,0 +1,21 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package conversion only exists until heapster rebases
+// TODO genericapiserver remove this empty package.  Godep fails without this because heapster relies
+// on this package.  This will allow us to start splitting packages, but will force
+// heapster to update on their next kube rebase.
+package conversion
diff --git a/pkg/conversion/queryparams/BUILD b/pkg/conversion/queryparams/BUILD
new file mode 100644
index 00000000000..deefdcef3c1
--- /dev/null
+++ b/pkg/conversion/queryparams/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"],
+    tags = ["automanaged"],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+)
diff --git a/pkg/conversion/queryparams/OWNERS b/pkg/conversion/queryparams/OWNERS
new file mode 100755
index 00000000000..31b24b48a0d
--- /dev/null
+++ b/pkg/conversion/queryparams/OWNERS
@@ -0,0 +1,8 @@
+reviewers:
+- smarterclayton
+- wojtek-t
+- caesarxuchao
+- mikedanese
+- liggitt
+- kargakis
+- dims
diff --git a/pkg/conversion/queryparams/doc.go b/pkg/conversion/queryparams/doc.go
new file mode 100644
index 00000000000..fa1d5e1bc7e
--- /dev/null
+++ b/pkg/conversion/queryparams/doc.go
@@ -0,0 +1,21 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package queryparams only exists until heapster rebases
+// TODO genericapiserver remove this empty package.  Godep fails without this because heapster relies
+// on this package.  This will allow us to start splitting packages, but will force
+// heapster to update on their next kube rebase.
+package queryparams