diff --git a/build/root/Makefile b/build/root/Makefile
index 44df2b2570d..01510c05fe2 100644
--- a/build/root/Makefile
+++ b/build/root/Makefile
@@ -425,7 +425,6 @@ define CMD_HELP_INFO
 #   make kubectl kube-proxy
 endef
 #TODO: make EXCLUDE_TARGET auto-generated when there are other files in cmd/
-#TODO: should we exclude the target "libs" but include "cmd/libs/go2idl/*"?
 EXCLUDE_TARGET=OWNERS
 .PHONY: $(filter-out %$(EXCLUDE_TARGET),$(notdir $(abspath $(wildcard cmd/*/))))
 ifeq ($(PRINT_HELP),y)
diff --git a/build/root/Makefile.generated_files b/build/root/Makefile.generated_files
index 0b34b91b639..08c59d8aa8f 100644
--- a/build/root/Makefile.generated_files
+++ b/build/root/Makefile.generated_files
@@ -69,7 +69,7 @@ verify_generated_files: verify_gen_deepcopy    \
 #     # expect one file to be regenerated
 #     make gen_deepcopy
 #     # expect nothing to be rebuilt, finish in O(seconds)
-#     touch cmd/libs/go2idl/deepcopy-gen/main.go
+#     touch vendor/k8s.io/kube-gen/cmd/deepcopy-gen/main.go
 #     make gen_deepcopy
 #     # expect deepcopy-gen is built exactly once
 #     # expect many files to be regenerated
@@ -88,7 +88,7 @@ verify_generated_files: verify_gen_deepcopy    \
 #     # expect one file to be regenerated
 #     make gen_conversion
 #     # expect nothing to be rebuilt, finish in O(seconds)
-#     touch cmd/libs/go2idl/conversion-gen/main.go
+#     touch vendor/k8s.io/kube-gen/cmd/conversion-gen/main.go
 #     make gen_conversion
 #     # expect conversion-gen is built exactly once
 #     # expect many files to be regenerated
@@ -274,7 +274,7 @@ $(META_DIR)/$(DEEPCOPY_GEN).mk:
 	(echo -n "$(DEEPCOPY_GEN): ";                                         \
 	 ./hack/run-in-gopath.sh go list                                      \
 	     -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}'  \
-	     ./cmd/libs/go2idl/deepcopy-gen                                   \
+	     ./vendor/k8s.io/kube-gen/cmd/deepcopy-gen                                   \
 	     | grep --color=never "^$(PRJ_SRC_PATH)/"                         \
 	     | xargs ./hack/run-in-gopath.sh go list                          \
 	         -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}'  \
@@ -299,7 +299,7 @@ sinclude $(META_DIR)/$(DEEPCOPY_GEN).mk
 # newer than the binary, and try to rebuild it over and over.  So we touch it,
 # and make is happy.
 $(DEEPCOPY_GEN):
-	hack/make-rules/build.sh cmd/libs/go2idl/deepcopy-gen
+	hack/make-rules/build.sh ./vendor/k8s.io/kube-gen/cmd/deepcopy-gen
 	touch $@
 
 #
@@ -424,7 +424,7 @@ $(META_DIR)/$(DEFAULTER_GEN).mk:
 	(echo -n "$(DEFAULTER_GEN): ";                                        \
 	 ./hack/run-in-gopath.sh go list                                      \
 	     -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}'  \
-	     ./cmd/libs/go2idl/defaulter-gen                                  \
+	     ./vendor/k8s.io/kube-gen/cmd/defaulter-gen                                  \
 	     | grep --color=never "^$(PRJ_SRC_PATH)/"                         \
 	     | xargs ./hack/run-in-gopath.sh go list                          \
 	         -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}'  \
@@ -449,7 +449,7 @@ sinclude $(META_DIR)/$(DEFAULTER_GEN).mk
 # newer than the binary, and try to rebuild it over and over.  So we touch it,
 # and make is happy.
 $(DEFAULTER_GEN):
-	hack/make-rules/build.sh cmd/libs/go2idl/defaulter-gen
+	hack/make-rules/build.sh ./vendor/k8s.io/kube-gen/cmd/defaulter-gen
 	touch $@
 
 #
@@ -522,7 +522,7 @@ $(META_DIR)/$(OPENAPI_GEN).mk:
 	(echo -n "$(OPENAPI_GEN): ";                                          \
 	 ./hack/run-in-gopath.sh go list                                      \
 	     -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}'  \
-	     ./cmd/libs/go2idl/openapi-gen                                    \
+	     ./vendor/k8s.io/kube-gen/cmd/openapi-gen                                    \
 	     | grep --color=never "^$(PRJ_SRC_PATH)/"                         \
 	     | xargs ./hack/run-in-gopath.sh go list                          \
 	         -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}'  \
@@ -547,7 +547,7 @@ sinclude $(META_DIR)/$(OPENAPI_GEN).mk
 # newer than the binary, and try to rebuild it over and over.  So we touch it,
 # and make is happy.
 $(OPENAPI_GEN):
-	hack/make-rules/build.sh cmd/libs/go2idl/openapi-gen
+	hack/make-rules/build.sh ./vendor/k8s.io/kube-gen/cmd/openapi-gen
 	touch $@
 
 #
@@ -716,7 +716,7 @@ $(META_DIR)/$(CONVERSION_GEN).mk:
 	(echo -n "$(CONVERSION_GEN): ";                                       \
 	 ./hack/run-in-gopath.sh go list                                      \
 	     -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}'  \
-	     ./cmd/libs/go2idl/conversion-gen                                 \
+	     ./vendor/k8s.io/kube-gen/cmd/conversion-gen                                 \
 	     | grep --color=never "^$(PRJ_SRC_PATH)/"                         \
 	     | xargs ./hack/run-in-gopath.sh go list                          \
 	         -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}'  \
@@ -741,5 +741,5 @@ sinclude $(META_DIR)/$(CONVERSION_GEN).mk
 # newer than the binary, and try to rebuild it over and over.  So we touch it,
 # and make is happy.
 $(CONVERSION_GEN):
-	hack/make-rules/build.sh cmd/libs/go2idl/conversion-gen
+	hack/make-rules/build.sh ./vendor/k8s.io/kube-gen/cmd/conversion-gen
 	touch $@
diff --git a/cmd/BUILD b/cmd/BUILD
index 1b3b8749c3b..668d665382a 100644
--- a/cmd/BUILD
+++ b/cmd/BUILD
@@ -31,16 +31,6 @@ filegroup(
         "//cmd/kubectl:all-srcs",
         "//cmd/kubelet:all-srcs",
         "//cmd/kubemark:all-srcs",
-        "//cmd/libs/go2idl/client-gen:all-srcs",
-        "//cmd/libs/go2idl/conversion-gen:all-srcs",
-        "//cmd/libs/go2idl/deepcopy-gen:all-srcs",
-        "//cmd/libs/go2idl/defaulter-gen:all-srcs",
-        "//cmd/libs/go2idl/go-to-protobuf:all-srcs",
-        "//cmd/libs/go2idl/import-boss:all-srcs",
-        "//cmd/libs/go2idl/informer-gen:all-srcs",
-        "//cmd/libs/go2idl/lister-gen:all-srcs",
-        "//cmd/libs/go2idl/openapi-gen:all-srcs",
-        "//cmd/libs/go2idl/set-gen:all-srcs",
         "//cmd/linkcheck:all-srcs",
         "//cmd/mungedocs:all-srcs",
     ],
diff --git a/hack/.golint_failures b/hack/.golint_failures
index 74f1571a0be..ded21643ef7 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -33,17 +33,6 @@ cmd/kubectl/app
 cmd/kubelet/app
 cmd/kubelet/app/options
 cmd/kubemark
-cmd/libs/go2idl/client-gen/args
-cmd/libs/go2idl/client-gen/generators/fake
-cmd/libs/go2idl/client-gen/generators/scheme
-cmd/libs/go2idl/client-gen/test_apis/testgroup
-cmd/libs/go2idl/client-gen/test_apis/testgroup/v1
-cmd/libs/go2idl/client-gen/types
-cmd/libs/go2idl/conversion-gen/generators
-cmd/libs/go2idl/go-to-protobuf/protobuf
-cmd/libs/go2idl/informer-gen/generators
-cmd/libs/go2idl/lister-gen/generators
-cmd/libs/go2idl/openapi-gen/generators
 cmd/mungedocs
 examples/guestbook-go
 federation/apis/core
@@ -785,6 +774,17 @@ staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister
 staging/src/k8s.io/kube-aggregator/pkg/controllers/status
 staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice
 staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/etcd
+staging/src/k8s.io/kube-gen/cmd/client-gen/args
+staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake
+staging/src/k8s.io/kube-gen/cmd/client-gen/generators/scheme
+staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup
+staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1
+staging/src/k8s.io/kube-gen/cmd/client-gen/types
+staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators
+staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf
+staging/src/k8s.io/kube-gen/cmd/informer-gen/generators
+staging/src/k8s.io/kube-gen/cmd/lister-gen/generators
+staging/src/k8s.io/kube-gen/cmd/openapi-gen/generators
 staging/src/k8s.io/metrics/pkg/apis/custom_metrics
 staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1
 staging/src/k8s.io/metrics/pkg/apis/metrics
diff --git a/hack/make-rules/helpers/cache_go_dirs.sh b/hack/make-rules/helpers/cache_go_dirs.sh
index 72715118b44..dd385e622d5 100755
--- a/hack/make-rules/helpers/cache_go_dirs.sh
+++ b/hack/make-rules/helpers/cache_go_dirs.sh
@@ -39,7 +39,7 @@ function kfind() {
     # include the "special" vendor directories which are actually part
     # of the Kubernetes source tree - generators will use these for
     # including certain core API concepts.
-    find -H . ./vendor/k8s.io/apimachinery ./vendor/k8s.io/apiserver ./vendor/k8s.io/kube-aggregator ./vendor/k8s.io/apiextensions-apiserver ./vendor/k8s.io/metrics ./vendor/k8s.io/sample-apiserver ./vendor/k8s.io/api ./vendor/k8s.io/client-go \
+    find -H . ./vendor/k8s.io/apimachinery ./vendor/k8s.io/apiserver ./vendor/k8s.io/kube-aggregator ./vendor/k8s.io/apiextensions-apiserver ./vendor/k8s.io/metrics ./vendor/k8s.io/sample-apiserver ./vendor/k8s.io/api ./vendor/k8s.io/client-go ./vendor/k8s.io/kube-gen \
         \(                         \
         -not \(                    \
             \(                     \
diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh
index 6d4cc2c748a..e243b22aba7 100755
--- a/hack/make-rules/test.sh
+++ b/hack/make-rules/test.sh
@@ -274,11 +274,11 @@ runTests() {
   # separate files.
 
   # ignore paths:
-  # cmd/libs/go2idl/generator: is fragile when run under coverage, so ignore it for now.
+  # vendor/k8s.io/kube-gen/cmd/generator: is fragile when run under coverage, so ignore it for now.
   #                            https://github.com/kubernetes/kubernetes/issues/24967
   # vendor/k8s.io/client-go/1.4/rest: causes cover internal errors
   #                            https://github.com/golang/go/issues/16540
-  cover_ignore_dirs="cmd/libs/go2idl/generator|vendor/k8s.io/client-go/1.4/rest"
+  cover_ignore_dirs="vendor/k8s.io/kube-gen/cmd/generator|vendor/k8s.io/client-go/1.4/rest"
   for path in $(echo $cover_ignore_dirs | sed 's/|/ /g'); do
       echo -e "skipped\tk8s.io/kubernetes/$path"
   done
diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
index a9cef38cf1d..8fcf51aeb4c 100755
--- a/hack/update-codegen.sh
+++ b/hack/update-codegen.sh
@@ -24,9 +24,9 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 kube::golang::setup_env
 
 BUILD_TARGETS=(
-  cmd/libs/go2idl/client-gen
-  cmd/libs/go2idl/lister-gen
-  cmd/libs/go2idl/informer-gen
+  vendor/k8s.io/kube-gen/cmd/client-gen
+  vendor/k8s.io/kube-gen/cmd/lister-gen
+  vendor/k8s.io/kube-gen/cmd/informer-gen
 )
 make -C "${KUBE_ROOT}" WHAT="${BUILD_TARGETS[*]}"
 
@@ -60,7 +60,7 @@ GV_DIRS_CSV=$(IFS=',';echo "${GV_DIRS[*]// /,}";IFS=$)
 # This can be called with one flag, --verify-only, so it works for both the
 # update- and verify- scripts.
 ${clientgen} "$@"
-${clientgen} -t "$@"
+${clientgen} -t "$@" --output-base "${KUBE_ROOT}/vendor"
 ${clientgen} --clientset-name="clientset" --input-base="k8s.io/kubernetes/vendor/k8s.io/api" --input="${GV_DIRS_CSV}" "$@"
 # Clientgen for federation clientset.
 ${clientgen} --clientset-name=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/","api/","extensions/","batch/","autoscaling/" --included-types-overrides="api/Service,api/Namespace,extensions/ReplicaSet,api/Secret,extensions/Ingress,extensions/Deployment,extensions/DaemonSet,api/ConfigMap,api/Event,batch/Job,autoscaling/HorizontalPodAutoscaler"   "$@"
diff --git a/hack/update-generated-protobuf-dockerized.sh b/hack/update-generated-protobuf-dockerized.sh
index afa5cd4225b..17716e936fd 100755
--- a/hack/update-generated-protobuf-dockerized.sh
+++ b/hack/update-generated-protobuf-dockerized.sh
@@ -24,8 +24,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 kube::golang::setup_env
 
 BINS=(
-	cmd/libs/go2idl/go-to-protobuf
-	cmd/libs/go2idl/go-to-protobuf/protoc-gen-gogo
+	vendor/k8s.io/kube-gen/cmd/go-to-protobuf
+	vendor/k8s.io/kube-gen/cmd/go-to-protobuf/protoc-gen-gogo
 )
 make -C "${KUBE_ROOT}" WHAT="${BINS[*]}"
 
diff --git a/hack/update-generated-runtime-dockerized.sh b/hack/update-generated-runtime-dockerized.sh
index 8aaa9bde5fa..febcc48dca1 100755
--- a/hack/update-generated-runtime-dockerized.sh
+++ b/hack/update-generated-runtime-dockerized.sh
@@ -25,7 +25,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 kube::golang::setup_env
 
 BINS=(
-	cmd/libs/go2idl/go-to-protobuf/protoc-gen-gogo
+	vendor/k8s.io/kube-gen/cmd/go-to-protobuf/protoc-gen-gogo
 )
 make -C "${KUBE_ROOT}" WHAT="${BINS[*]}"
 
diff --git a/hack/verify-api-groups.sh b/hack/verify-api-groups.sh
index 3acb3660adf..ba1cebcf7aa 100755
--- a/hack/verify-api-groups.sh
+++ b/hack/verify-api-groups.sh
@@ -71,7 +71,7 @@ groups_without_codegen=(
 	"imagepolicy"
 	"admission"
 )
-client_gen_file="${KUBE_ROOT}/cmd/libs/go2idl/client-gen/main.go"
+client_gen_file="${KUBE_ROOT}/vendor/k8s.io/kube-gen/cmd/client-gen/main.go"
 
 for group_dirname in "${group_dirnames[@]}"; do
 	if ! grep -q "${group_dirname}/" "${client_gen_file}" ; then
diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh
index 395c222362d..a8249a0d8a4 100755
--- a/hack/verify-codegen.sh
+++ b/hack/verify-codegen.sh
@@ -24,6 +24,9 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 kube::golang::setup_env
 
 # call verify on sub-project for now
+#
+# Note: these must be before the main script call because the later calls the sub-project's
+#       update-codegen.sh scripts. We wouldn't see any error on changes then.
 vendor/k8s.io/kube-aggregator/hack/verify-codegen.sh
 vendor/k8s.io/sample-apiserver/hack/verify-codegen.sh
 vendor/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh
diff --git a/hack/verify-import-boss.sh b/hack/verify-import-boss.sh
index 635556d85da..67fdb86c806 100755
--- a/hack/verify-import-boss.sh
+++ b/hack/verify-import-boss.sh
@@ -23,6 +23,6 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
 
-make -C "${KUBE_ROOT}" WHAT=cmd/libs/go2idl/import-boss
+make -C "${KUBE_ROOT}" WHAT=vendor/k8s.io/kube-gen/cmd/import-boss
 
 $(kube::util::find-binary "import-boss") --verify-only
diff --git a/hack/verify-staging-imports.sh b/hack/verify-staging-imports.sh
index 93c20daa6ee..3b774026440 100755
--- a/hack/verify-staging-imports.sh
+++ b/hack/verify-staging-imports.sh
@@ -67,6 +67,7 @@ function print_forbidden_imports () {
 RC=0
 print_forbidden_imports apimachinery should_be_leaf || RC=1
 print_forbidden_imports api k8s.io/apimachinery || RC=1
+print_forbidden_imports kube-gen k8s.io/apimachinery k8s.io/client-go k8s.io/gengo || RC=1
 print_forbidden_imports client-go k8s.io/apimachinery k8s.io/api || RC=1
 print_forbidden_imports apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/api || RC=1
 print_forbidden_imports metrics k8s.io/apimachinery k8s.io/client-go k8s.io/api || RC=1
diff --git a/pkg/generated/openapi/BUILD b/pkg/generated/openapi/BUILD
index a0b0b9c766d..1f3f996b67f 100644
--- a/pkg/generated/openapi/BUILD
+++ b/pkg/generated/openapi/BUILD
@@ -8,7 +8,6 @@ openapi_library(
     name = "go_default_library",
     srcs = ["doc.go"],
     openapi_targets = [
-        "cmd/libs/go2idl/client-gen/test_apis/testgroup/v1",
         "federation/apis/federation/v1beta1",
         "pkg/apis/abac/v0",
         "pkg/apis/abac/v1beta1",
@@ -51,6 +50,7 @@ openapi_library(
         "k8s.io/apiserver/pkg/apis/example/v1",
         "k8s.io/client-go/pkg/version",
         "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1",
+        "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1",
         "k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1",
         "k8s.io/metrics/pkg/apis/metrics/v1alpha1",
     ],
diff --git a/pkg/generated/openapi/def.bzl b/pkg/generated/openapi/def.bzl
index b7919d7762d..a8a02c8ce9a 100644
--- a/pkg/generated/openapi/def.bzl
+++ b/pkg/generated/openapi/def.bzl
@@ -17,7 +17,7 @@ def openapi_library(name, tags, srcs, openapi_targets=[], vendor_targets=[]):
       srcs = srcs + ["//hack/boilerplate:boilerplate.go.txt"],
       outs = ["zz_generated.openapi.go"],
       cmd = " ".join([
-        "$(location //cmd/libs/go2idl/openapi-gen)",
+        "$(location //vendor/k8s.io/kube-gen/cmd/openapi-gen)",
         "--v 1",
         "--logtostderr",
         "--go-header-file $(location //hack/boilerplate:boilerplate.go.txt)",
@@ -27,5 +27,5 @@ def openapi_library(name, tags, srcs, openapi_targets=[], vendor_targets=[]):
         "&& cp pkg/generated/openapi/zz_generated.openapi.go $(GENDIR)/pkg/generated/openapi",
       ]),
       go_deps = deps,
-      tools = ["//cmd/libs/go2idl/openapi-gen"],
+      tools = ["//vendor/k8s.io/kube-gen/cmd/openapi-gen"],
 )
diff --git a/staging/prime-apimachinery.sh b/staging/prime-apimachinery.sh
index 04930a38c24..0a05d7c8f24 100755
--- a/staging/prime-apimachinery.sh
+++ b/staging/prime-apimachinery.sh
@@ -72,7 +72,7 @@ while read package; do
 done <${dir}/packages.txt
 
 # this file generates something or other, but we don't want to accidentally have it generate into an apimachinery package
-git checkout cmd/libs/go2idl/set-gen/main.go
+git checkout vendor/k8s.io/kube-gen/cmd/set-gen/main.go
 
 
 # now run gofmt to get the sorting right
diff --git a/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh b/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
index fae9395fc41..1378d0f7292 100755
--- a/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
+++ b/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
@@ -41,7 +41,7 @@ trap cleanup EXIT
 
 echo "Building client-gen"
 CLIENTGEN="${PWD}/client-gen-binary"
-go build -o "${CLIENTGEN}" ./cmd/libs/go2idl/client-gen
+go build -o "${CLIENTGEN}" k8s.io/kube-gen/cmd/client-gen
 
 PREFIX=k8s.io/apiextensions-apiserver/pkg/apis
 INPUT_BASE="--input-base ${PREFIX}"
@@ -58,7 +58,7 @@ ${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiextensions/v1
 
 echo "Building lister-gen"
 listergen="${PWD}/lister-gen"
-go build -o "${listergen}" ./cmd/libs/go2idl/lister-gen
+go build -o "${listergen}" k8s.io/kube-gen/cmd/lister-gen
 
 LISTER_INPUT="--input-dirs k8s.io/apiextensions-apiserver/pkg/apis/apiextensions --input-dirs k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 LISTER_PATH="--output-package k8s.io/apiextensions-apiserver/pkg/client/listers"
@@ -67,7 +67,7 @@ ${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${KUBE_ROOT}/vendor
 
 echo "Building informer-gen"
 informergen="${PWD}/informer-gen"
-go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen
+go build -o "${informergen}" k8s.io/kube-gen/cmd/informer-gen
 
 ${informergen} \
   --output-base ${KUBE_ROOT}/vendor \
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD b/staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD
index 97b4bb90821..255ffdd1128 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD
+++ b/staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD
@@ -36,7 +36,7 @@ go_genrule(
         "string.go",
     ],
     cmd = """
-$(location //cmd/libs/go2idl/set-gen) \
+$(location //vendor/k8s.io/kube-gen/cmd/set-gen) \
     --input-dirs ./vendor/k8s.io/apimachinery/pkg/util/sets/types \
     --output-base $(GENDIR)/vendor/k8s.io/apimachinery/pkg/util \
     --go-header-file $(location //hack/boilerplate:boilerplate.go.txt) \
@@ -46,7 +46,7 @@ $(location //cmd/libs/go2idl/set-gen) \
         "//vendor/k8s.io/apimachinery/pkg/util/sets/types:go_default_library",
     ],
     tools = [
-        "//cmd/libs/go2idl/set-gen",
+        "//vendor/k8s.io/kube-gen/cmd/set-gen",
     ],
 )
 
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/sets/types/types.go b/staging/src/k8s.io/apimachinery/pkg/util/sets/types/types.go
index 2599851c920..f7a280ec77f 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/sets/types/types.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/sets/types/types.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package types just provides input types to the set generator. It also
 // contains a "go generate" block.
-// (You must first `go install k8s.io/kubernetes/cmd/libs/go2idl/set-gen`)
+// (You must first `go install k8s.io/kube-gen/cmd/set-gen`)
 package types
 
 //go:generate set-gen -i k8s.io/kubernetes/pkg/util/sets/types
diff --git a/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go b/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go
index ec70bcca9f8..94b901383c7 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go
@@ -155,7 +155,7 @@ func (o *openAPI) buildDefinitionRecursively(name string) error {
 
 // buildDefinitionForType build a definition for a given type and return a referable name to it's definition.
 // This is the main function that keep track of definitions used in this spec and is depend on code generated
-// by k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen.
+// by k8s.io/kube-gen/cmd/openapi-gen.
 func (o *openAPI) buildDefinitionForType(sample interface{}) (string, error) {
 	t := reflect.TypeOf(sample)
 	if t.Kind() == reflect.Ptr {
diff --git a/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh b/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
index 78b3e9266c0..9f6e3a3c545 100755
--- a/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
+++ b/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
@@ -41,7 +41,7 @@ trap cleanup EXIT
 
 echo "Building client-gen"
 CLIENTGEN="${PWD}/client-gen-binary"
-go build -o "${CLIENTGEN}" ./cmd/libs/go2idl/client-gen
+go build -o "${CLIENTGEN}" k8s.io/kube-gen/cmd/client-gen
 
 PREFIX=k8s.io/kube-aggregator/pkg/apis
 INPUT_BASE="--input-base ${PREFIX}"
@@ -58,7 +58,7 @@ ${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/
 
 echo "Building lister-gen"
 listergen="${PWD}/lister-gen"
-go build -o "${listergen}" ./cmd/libs/go2idl/lister-gen
+go build -o "${listergen}" k8s.io/kube-gen/cmd/lister-gen
 
 LISTER_INPUT="--input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
 LISTER_PATH="--output-package k8s.io/kube-aggregator/pkg/client/listers"
@@ -67,7 +67,7 @@ ${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${KUBE_ROOT}/vendor
 
 echo "Building informer-gen"
 informergen="${PWD}/informer-gen"
-go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen
+go build -o "${informergen}" k8s.io/kube-gen/cmd/informer-gen
 
 ${informergen} \
   --output-base ${KUBE_ROOT}/vendor \
diff --git a/staging/src/k8s.io/kube-gen/cmd/OWNERS b/staging/src/k8s.io/kube-gen/OWNERS
similarity index 100%
rename from staging/src/k8s.io/kube-gen/cmd/OWNERS
rename to staging/src/k8s.io/kube-gen/OWNERS
diff --git a/staging/src/k8s.io/kube-gen/cmd/.import-restrictions b/staging/src/k8s.io/kube-gen/cmd/.import-restrictions
deleted file mode 100644
index 8832a0234bc..00000000000
--- a/staging/src/k8s.io/kube-gen/cmd/.import-restrictions
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "Rules": [
-    {
-      "SelectorRegexp": "k8s[.]io",
-      "AllowedPrefixes": [
-        "k8s.io/kubernetes/cmd/libs/go2idl",
-        "k8s.io/gengo",
-        "k8s.io/kubernetes/third_party",
-        "k8s.io/apimachinery/third_party",
-        "k8s.io/apimachinery/pkg/util/sets"
-      ]
-    }
-  ]
-}
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/BUILD b/staging/src/k8s.io/kube-gen/cmd/client-gen/BUILD
index 6a13076b0fb..5a86367a403 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/BUILD
@@ -19,32 +19,11 @@ go_library(
     srcs = ["main.go"],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/client-gen/args:go_default_library",
-        "//cmd/libs/go2idl/client-gen/generators:go_default_library",
-        "//cmd/libs/go2idl/client-gen/types:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/args:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/generators:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//cmd/libs/go2idl/client-gen/args:all-srcs",
-        "//cmd/libs/go2idl/client-gen/generators:all-srcs",
-        "//cmd/libs/go2idl/client-gen/path:all-srcs",
-        "//cmd/libs/go2idl/client-gen/test_apis/testgroup:all-srcs",
-        "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset:all-srcs",
-        "//cmd/libs/go2idl/client-gen/types:all-srcs",
-    ],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/README.md b/staging/src/k8s.io/kube-gen/cmd/client-gen/README.md
index 0174fb1f451..44e742de9d8 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/README.md
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/README.md
@@ -1,4 +1,4 @@
 See [generating-clientset.md](https://kubernetes.io/docs/devel/generating-clientset.md)
 
 
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cmd/libs/go2idl/client-gen/README.md?pixel)]()
+[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/staging/src/k8s.io/kube-gen/client-gen/README.md?pixel)]()
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/args/BUILD b/staging/src/k8s.io/kube-gen/cmd/client-gen/args/BUILD
index f55c5f3527b..70f3ae8b86a 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/args/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/args/BUILD
@@ -11,18 +11,5 @@ go_library(
     name = "go_default_library",
     srcs = ["args.go"],
     tags = ["automanaged"],
-    deps = ["//cmd/libs/go2idl/client-gen/types:go_default_library"],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
+    deps = ["//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library"],
 )
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/args/args.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/args/args.go
index 80de8f72281..29dc92c9cd0 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/args/args.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/args/args.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 package args
 
-import "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
+import "k8s.io/kube-gen/cmd/client-gen/types"
 
 // ClientGenArgs is a wrapper for arguments to client-gen.
 type Args struct {
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/BUILD b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/BUILD
index 72b1eb726b1..74343558358 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/BUILD
@@ -19,32 +19,15 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/client-gen/args:go_default_library",
-        "//cmd/libs/go2idl/client-gen/generators/fake:go_default_library",
-        "//cmd/libs/go2idl/client-gen/generators/scheme:go_default_library",
-        "//cmd/libs/go2idl/client-gen/path:go_default_library",
-        "//cmd/libs/go2idl/client-gen/types:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
         "//vendor/k8s.io/gengo/generator:go_default_library",
         "//vendor/k8s.io/gengo/namer:go_default_library",
         "//vendor/k8s.io/gengo/types:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/args:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/generators/fake:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/generators/scheme:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/path:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//cmd/libs/go2idl/client-gen/generators/fake:all-srcs",
-        "//cmd/libs/go2idl/client-gen/generators/scheme:all-srcs",
-    ],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/client_generator.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/client_generator.go
index 4c185c7be27..0adac31cadb 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/client_generator.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/client_generator.go
@@ -26,11 +26,11 @@ import (
 	"k8s.io/gengo/generator"
 	"k8s.io/gengo/namer"
 	"k8s.io/gengo/types"
-	clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args"
-	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/fake"
-	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/scheme"
-	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/path"
-	clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
+	clientgenargs "k8s.io/kube-gen/cmd/client-gen/args"
+	"k8s.io/kube-gen/cmd/client-gen/generators/fake"
+	"k8s.io/kube-gen/cmd/client-gen/generators/scheme"
+	"k8s.io/kube-gen/cmd/client-gen/path"
+	clientgentypes "k8s.io/kube-gen/cmd/client-gen/types"
 
 	"github.com/golang/glog"
 )
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/BUILD b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/BUILD
index 08ad1ac1daa..c39ef73d348 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/BUILD
@@ -17,26 +17,13 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/client-gen/args:go_default_library",
-        "//cmd/libs/go2idl/client-gen/generators/scheme:go_default_library",
-        "//cmd/libs/go2idl/client-gen/path:go_default_library",
-        "//cmd/libs/go2idl/client-gen/types:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/k8s.io/gengo/generator:go_default_library",
         "//vendor/k8s.io/gengo/namer:go_default_library",
         "//vendor/k8s.io/gengo/types:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/args:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/generators/scheme:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/path:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/fake_client_generator.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/fake_client_generator.go
index 82ad85a99c5..7b3817fb93c 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/fake_client_generator.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/fake_client_generator.go
@@ -24,9 +24,9 @@ import (
 
 	"k8s.io/gengo/generator"
 	"k8s.io/gengo/types"
-	clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args"
-	scheme "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/scheme"
-	clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
+	clientgenargs "k8s.io/kube-gen/cmd/client-gen/args"
+	scheme "k8s.io/kube-gen/cmd/client-gen/generators/scheme"
+	clientgentypes "k8s.io/kube-gen/cmd/client-gen/types"
 )
 
 func PackageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clientsetPackage string, inputPackage string, boilerplate []byte, generatedBy string) generator.Package {
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/generator_fake_for_clientset.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/generator_fake_for_clientset.go
index 00730594533..665c88a583e 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/generator_fake_for_clientset.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/generator_fake_for_clientset.go
@@ -25,7 +25,7 @@ import (
 	"k8s.io/gengo/generator"
 	"k8s.io/gengo/namer"
 	"k8s.io/gengo/types"
-	clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
+	clientgentypes "k8s.io/kube-gen/cmd/client-gen/types"
 )
 
 // genClientset generates a package for a clientset.
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/generator_fake_for_type.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/generator_fake_for_type.go
index 05331888889..e68dd57c0e6 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/generator_fake_for_type.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake/generator_fake_for_type.go
@@ -24,7 +24,7 @@ import (
 	"k8s.io/gengo/generator"
 	"k8s.io/gengo/namer"
 	"k8s.io/gengo/types"
-	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/path"
+	"k8s.io/kube-gen/cmd/client-gen/path"
 )
 
 // genFakeForType produces a file for each top-level type.
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/generator_for_clientset.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/generator_for_clientset.go
index 4a22ac79c91..37def92ba08 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/generator_for_clientset.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/generator_for_clientset.go
@@ -25,7 +25,7 @@ import (
 	"k8s.io/gengo/generator"
 	"k8s.io/gengo/namer"
 	"k8s.io/gengo/types"
-	clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
+	clientgentypes "k8s.io/kube-gen/cmd/client-gen/types"
 )
 
 // genClientset generates a package for a clientset.
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/generator_for_group.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/generator_for_group.go
index c419ad25149..c10f13f9f63 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/generator_for_group.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/generator_for_group.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/gengo/generator"
 	"k8s.io/gengo/namer"
 	"k8s.io/gengo/types"
-	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/path"
+	"k8s.io/kube-gen/cmd/client-gen/path"
 )
 
 // genGroup produces a file for a group client, e.g. ExtensionsClient for the extension group.
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/scheme/BUILD b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/scheme/BUILD
index d3f058386c8..6ad451a369e 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/scheme/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/scheme/BUILD
@@ -12,23 +12,10 @@ go_library(
     srcs = ["generator_for_scheme.go"],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/client-gen/path:go_default_library",
-        "//cmd/libs/go2idl/client-gen/types:go_default_library",
         "//vendor/k8s.io/gengo/generator:go_default_library",
         "//vendor/k8s.io/gengo/namer:go_default_library",
         "//vendor/k8s.io/gengo/types:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/path:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/scheme/generator_for_scheme.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/scheme/generator_for_scheme.go
index e4a2b02e14d..d703024d683 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/scheme/generator_for_scheme.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/scheme/generator_for_scheme.go
@@ -26,8 +26,8 @@ import (
 	"k8s.io/gengo/generator"
 	"k8s.io/gengo/namer"
 	"k8s.io/gengo/types"
-	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/path"
-	clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
+	"k8s.io/kube-gen/cmd/client-gen/path"
+	clientgentypes "k8s.io/kube-gen/cmd/client-gen/types"
 )
 
 // GenScheme produces a package for a clientset with the scheme, codecs and parameter codecs.
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/main.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/main.go
index f845e9b62c0..073123cab9f 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/main.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/main.go
@@ -24,9 +24,9 @@ import (
 	"strings"
 
 	"k8s.io/gengo/args"
-	clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args"
-	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators"
-	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
+	clientgenargs "k8s.io/kube-gen/cmd/client-gen/args"
+	"k8s.io/kube-gen/cmd/client-gen/generators"
+	"k8s.io/kube-gen/cmd/client-gen/types"
 
 	"github.com/golang/glog"
 	flag "github.com/spf13/pflag"
@@ -172,15 +172,15 @@ func main() {
 
 	if *test {
 		arguments.InputDirs = append(dependencies, []string{
-			"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup",
+			"k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup",
 		}...)
 		arguments.CustomArgs = clientgenargs.Args{
 			Groups: []types.GroupVersions{{Group: "testgroup", Versions: []types.Version{""}}},
 			GroupVersionToInputPath: map[types.GroupVersion]string{
-				{Group: "testgroup", Version: ""}: "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup",
+				{Group: "testgroup", Version: ""}: "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup",
 			},
 			ClientsetName:       "test_internalclientset",
-			ClientsetOutputPath: "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/",
+			ClientsetOutputPath: "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/",
 			ClientsetOnly:       false,
 			FakeClient:          true,
 			CmdArgs:             cmdArgs,
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/path/BUILD b/staging/src/k8s.io/kube-gen/cmd/client-gen/path/BUILD
index 1c967c9b846..36379c61658 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/path/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/path/BUILD
@@ -12,16 +12,3 @@ go_library(
     srcs = ["path.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/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/BUILD b/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/BUILD
index 5759d3ca602..6e2604388ad 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/BUILD
@@ -23,20 +23,3 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//cmd/libs/go2idl/client-gen/test_apis/testgroup/install:all-srcs",
-        "//cmd/libs/go2idl/client-gen/test_apis/testgroup/v1:all-srcs",
-    ],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/doc.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/doc.go
index eea3a05494e..923a74dd2dc 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/doc.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
 // +groupName=testgroup.k8s.io
-package testgroup // import "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup"
+package testgroup // import "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup"
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install/BUILD b/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install/BUILD
index fedce5e9754..3b2ce818903 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install/BUILD
@@ -12,24 +12,10 @@ go_library(
     srcs = ["install.go"],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library",
-        "//cmd/libs/go2idl/client-gen/test_apis/testgroup/v1:go_default_library",
-        "//pkg/api:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install/install.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install/install.go
index c7f37c07b37..3a6e00d6ccf 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install/install.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install/install.go
@@ -22,22 +22,17 @@ import (
 	"k8s.io/apimachinery/pkg/apimachinery/announced"
 	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup"
-	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1"
-	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup"
+	"k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1"
 )
 
-func init() {
-	Install(api.GroupFactoryRegistry, api.Registry, api.Scheme)
-}
-
 // Install registers the API group and adds types to a scheme
 func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) {
 	if err := announced.NewGroupMetaFactory(
 		&announced.GroupMetaFactoryArgs{
 			GroupName:                  testgroup.SchemeGroupVersion.Group,
 			VersionPreferenceOrder:     []string{v1.SchemeGroupVersion.Version},
-			ImportPrefix:               "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup",
+			ImportPrefix:               "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup",
 			AddInternalObjectsToScheme: testgroup.AddToScheme,
 		},
 		announced.VersionToSchemeFunc{
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/BUILD b/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/BUILD
index 6a1709b50f1..236a65c2ab6 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/BUILD
@@ -26,16 +26,3 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/zz_generated.deepcopy.go
similarity index 100%
rename from cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/zz_generated.deepcopy.go
rename to staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1/zz_generated.deepcopy.go
diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/zz_generated.deepcopy.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/zz_generated.deepcopy.go
similarity index 100%
rename from cmd/libs/go2idl/client-gen/test_apis/testgroup/zz_generated.deepcopy.go
rename to staging/src/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/zz_generated.deepcopy.go
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD
index 99464b10236..91343e4b333 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD
@@ -16,11 +16,11 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/k8s.io/client-go/discovery:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
         "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library",
     ],
 )
 
@@ -34,21 +34,3 @@ go_test(
         "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake:all-srcs",
-        "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme:all-srcs",
-        "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:all-srcs",
-    ],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go
index 477ded4dbe6..7af83bbc98c 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go
@@ -21,7 +21,7 @@ import (
 	discovery "k8s.io/client-go/discovery"
 	rest "k8s.io/client-go/rest"
 	flowcontrol "k8s.io/client-go/util/flowcontrol"
-	testgroupinternalversion "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion"
+	testgroupinternalversion "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion"
 )
 
 type Interface interface {
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD
index cd65e8c4f99..07d0793908d 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD
@@ -16,10 +16,6 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library",
-        "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset:go_default_library",
-        "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library",
-        "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
@@ -28,18 +24,9 @@ go_library(
         "//vendor/k8s.io/client-go/discovery:go_default_library",
         "//vendor/k8s.io/client-go/discovery/fake:go_default_library",
         "//vendor/k8s.io/client-go/testing:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go
index e1529933d4a..83d0afd2679 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go
@@ -22,9 +22,9 @@ import (
 	"k8s.io/client-go/discovery"
 	fakediscovery "k8s.io/client-go/discovery/fake"
 	"k8s.io/client-go/testing"
-	clientset "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset"
-	testgroupinternalversion "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion"
-	faketestgroupinternalversion "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake"
+	clientset "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset"
+	testgroupinternalversion "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion"
+	faketestgroupinternalversion "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake"
 )
 
 // NewSimpleClientset returns a clientset that will respond with the provided objects.
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/register.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/register.go
index e22ecdb1307..ab9c7553c01 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/register.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/fake/register.go
@@ -21,7 +21,7 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
-	testgroupinternalversion "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup"
+	testgroupinternalversion "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup"
 )
 
 var scheme = runtime.NewScheme()
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/BUILD b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/BUILD
index 2b9d336a275..2e1bed5f444 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/BUILD
@@ -15,25 +15,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/client-gen/test_apis/testgroup/install:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/register.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/register.go
index d59edd0bfcf..f7a4896ccb0 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/register.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/register.go
@@ -23,7 +23,7 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
-	testgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/install"
+	testgroup "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/install"
 	os "os"
 )
 
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD
index c7af1673284..22b91f0425c 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD
@@ -17,27 +17,11 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library",
-        "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake:all-srcs",
-    ],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD
index 9d5e0d759c3..f7497083dc9 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD
@@ -16,8 +16,6 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library",
-        "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
@@ -25,18 +23,7 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
         "//vendor/k8s.io/client-go/testing:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go
index f8ed8e9aba2..d99e323d8b4 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go
@@ -19,7 +19,7 @@ package fake
 import (
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
-	internalversion "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion"
+	internalversion "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion"
 )
 
 type FakeTestgroup struct {
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go
index ec274fda8b4..4d57a18b9be 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go
@@ -23,7 +23,7 @@ import (
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
 	testing "k8s.io/client-go/testing"
-	testgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup"
+	testgroup "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup"
 )
 
 // FakeTestTypes implements TestTypeInterface
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go
index 64c66351b31..22dab51cd56 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go
@@ -18,7 +18,7 @@ package internalversion
 
 import (
 	rest "k8s.io/client-go/rest"
-	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme"
+	"k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme"
 )
 
 type TestgroupInterface interface {
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go
index 2193059d862..daad70275c9 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go
@@ -21,8 +21,8 @@ import (
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
 	rest "k8s.io/client-go/rest"
-	testgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup"
-	scheme "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme"
+	testgroup "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup"
+	scheme "k8s.io/kube-gen/cmd/client-gen/testoutput/clientset_generated/test_internalclientset/scheme"
 )
 
 // TestTypesGetter has a method to return a TestTypeInterface.
diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/types/BUILD b/staging/src/k8s.io/kube-gen/cmd/client-gen/types/BUILD
index 9fe181571b0..030984f0d8b 100644
--- a/staging/src/k8s.io/kube-gen/cmd/client-gen/types/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/types/BUILD
@@ -24,16 +24,3 @@ go_test(
     library = ":go_default_library",
     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/staging/src/k8s.io/kube-gen/cmd/conversion-gen/BUILD b/staging/src/k8s.io/kube-gen/cmd/conversion-gen/BUILD
index 7368f26fc98..a079847d760 100644
--- a/staging/src/k8s.io/kube-gen/cmd/conversion-gen/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/conversion-gen/BUILD
@@ -19,25 +19,9 @@ go_library(
     srcs = ["main.go"],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/conversion-gen/generators:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/conversion-gen/generators:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//cmd/libs/go2idl/conversion-gen/generators:all-srcs",
-    ],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators/BUILD b/staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators/BUILD
index c790cd13d8a..9abbb92963b 100644
--- a/staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators/BUILD
@@ -20,16 +20,3 @@ go_library(
         "//vendor/k8s.io/gengo/types:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/conversion-gen/main.go b/staging/src/k8s.io/kube-gen/cmd/conversion-gen/main.go
index 5882bcd770f..031c7d6d763 100644
--- a/staging/src/k8s.io/kube-gen/cmd/conversion-gen/main.go
+++ b/staging/src/k8s.io/kube-gen/cmd/conversion-gen/main.go
@@ -38,7 +38,7 @@ import (
 	"path/filepath"
 
 	"k8s.io/gengo/args"
-	"k8s.io/kubernetes/cmd/libs/go2idl/conversion-gen/generators"
+	"k8s.io/kube-gen/cmd/conversion-gen/generators"
 
 	"github.com/golang/glog"
 	"github.com/spf13/pflag"
diff --git a/staging/src/k8s.io/kube-gen/cmd/deepcopy-gen/BUILD b/staging/src/k8s.io/kube-gen/cmd/deepcopy-gen/BUILD
index ca99b067aaf..c26d5b0d28a 100644
--- a/staging/src/k8s.io/kube-gen/cmd/deepcopy-gen/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/deepcopy-gen/BUILD
@@ -25,16 +25,3 @@ go_library(
         "//vendor/k8s.io/gengo/examples/deepcopy-gen/generators:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/defaulter-gen/BUILD b/staging/src/k8s.io/kube-gen/cmd/defaulter-gen/BUILD
index 6dc63230948..38bde6b896a 100644
--- a/staging/src/k8s.io/kube-gen/cmd/defaulter-gen/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/defaulter-gen/BUILD
@@ -25,16 +25,3 @@ go_library(
         "//vendor/k8s.io/gengo/examples/defaulter-gen/generators:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/BUILD b/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/BUILD
index edf7aadf8a3..5369a4736da 100644
--- a/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/BUILD
@@ -19,24 +19,7 @@ go_library(
     srcs = ["main.go"],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/go-to-protobuf/protobuf:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//cmd/libs/go2idl/go-to-protobuf/protobuf:all-srcs",
-        "//cmd/libs/go2idl/go-to-protobuf/protoc-gen-gogo:all-srcs",
-    ],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/main.go b/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/main.go
index 66a0107882b..e9b11d2a4fa 100644
--- a/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/main.go
+++ b/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/main.go
@@ -19,7 +19,7 @@ limitations under the License.
 package main
 
 import (
-	"k8s.io/kubernetes/cmd/libs/go2idl/go-to-protobuf/protobuf"
+	"k8s.io/kube-gen/cmd/go-to-protobuf/protobuf"
 
 	flag "github.com/spf13/pflag"
 )
diff --git a/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf/BUILD b/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf/BUILD
index 8946b24a476..ed1f50327ca 100644
--- a/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf/BUILD
@@ -38,16 +38,3 @@ go_test(
     library = ":go_default_library",
     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/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protoc-gen-gogo/BUILD b/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protoc-gen-gogo/BUILD
index 76e877bf3a0..bef52814be8 100644
--- a/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protoc-gen-gogo/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protoc-gen-gogo/BUILD
@@ -25,16 +25,3 @@ go_library(
         "//vendor/github.com/gogo/protobuf/vanity/command:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/import-boss/BUILD b/staging/src/k8s.io/kube-gen/cmd/import-boss/BUILD
index 064c5eea476..50f0b749884 100644
--- a/staging/src/k8s.io/kube-gen/cmd/import-boss/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/import-boss/BUILD
@@ -24,16 +24,3 @@ go_library(
         "//vendor/k8s.io/gengo/examples/import-boss/generators:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/informer-gen/BUILD b/staging/src/k8s.io/kube-gen/cmd/informer-gen/BUILD
index 174bad398eb..a68d2beb17a 100644
--- a/staging/src/k8s.io/kube-gen/cmd/informer-gen/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/informer-gen/BUILD
@@ -19,25 +19,9 @@ go_library(
     srcs = ["main.go"],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/informer-gen/generators:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/informer-gen/generators:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//cmd/libs/go2idl/informer-gen/generators:all-srcs",
-    ],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/BUILD b/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/BUILD
index 3c8585e697e..5d2e3861c4c 100644
--- a/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/BUILD
@@ -23,25 +23,12 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/client-gen/types:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
         "//vendor/k8s.io/gengo/generator:go_default_library",
         "//vendor/k8s.io/gengo/namer:go_default_library",
         "//vendor/k8s.io/gengo/types:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/factory.go b/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/factory.go
index 1f87d04272f..ffba1944885 100644
--- a/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/factory.go
+++ b/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/factory.go
@@ -22,7 +22,7 @@ import (
 	"k8s.io/gengo/generator"
 	"k8s.io/gengo/namer"
 	"k8s.io/gengo/types"
-	clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
+	clientgentypes "k8s.io/kube-gen/cmd/client-gen/types"
 
 	"github.com/golang/glog"
 )
diff --git a/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/generic.go b/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/generic.go
index fcce9332872..d3c161e1812 100644
--- a/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/generic.go
+++ b/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/generic.go
@@ -24,7 +24,7 @@ import (
 	"k8s.io/gengo/generator"
 	"k8s.io/gengo/namer"
 	"k8s.io/gengo/types"
-	clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
+	clientgentypes "k8s.io/kube-gen/cmd/client-gen/types"
 )
 
 // genericGenerator generates the generic informer.
diff --git a/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/groupinterface.go b/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/groupinterface.go
index b1934210f89..2d2c9b3b7bd 100644
--- a/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/groupinterface.go
+++ b/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/groupinterface.go
@@ -24,7 +24,7 @@ import (
 	"k8s.io/gengo/generator"
 	"k8s.io/gengo/namer"
 	"k8s.io/gengo/types"
-	clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
+	clientgentypes "k8s.io/kube-gen/cmd/client-gen/types"
 )
 
 // groupInterfaceGenerator generates the per-group interface file.
diff --git a/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/informer.go b/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/informer.go
index e48be0fce5b..838f68e2700 100644
--- a/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/informer.go
+++ b/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/informer.go
@@ -24,7 +24,7 @@ import (
 	"k8s.io/gengo/generator"
 	"k8s.io/gengo/namer"
 	"k8s.io/gengo/types"
-	clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
+	clientgentypes "k8s.io/kube-gen/cmd/client-gen/types"
 
 	"github.com/golang/glog"
 )
diff --git a/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/packages.go b/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/packages.go
index b83e5987b8b..f68d669cc24 100644
--- a/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/packages.go
+++ b/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators/packages.go
@@ -25,7 +25,7 @@ import (
 	"k8s.io/gengo/generator"
 	"k8s.io/gengo/namer"
 	"k8s.io/gengo/types"
-	clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
+	clientgentypes "k8s.io/kube-gen/cmd/client-gen/types"
 
 	"github.com/golang/glog"
 )
diff --git a/staging/src/k8s.io/kube-gen/cmd/informer-gen/main.go b/staging/src/k8s.io/kube-gen/cmd/informer-gen/main.go
index 5bde903cfe3..91fc9cc96bd 100644
--- a/staging/src/k8s.io/kube-gen/cmd/informer-gen/main.go
+++ b/staging/src/k8s.io/kube-gen/cmd/informer-gen/main.go
@@ -20,7 +20,7 @@ import (
 	"path/filepath"
 
 	"k8s.io/gengo/args"
-	"k8s.io/kubernetes/cmd/libs/go2idl/informer-gen/generators"
+	"k8s.io/kube-gen/cmd/informer-gen/generators"
 
 	"github.com/golang/glog"
 	"github.com/spf13/pflag"
diff --git a/staging/src/k8s.io/kube-gen/cmd/lister-gen/BUILD b/staging/src/k8s.io/kube-gen/cmd/lister-gen/BUILD
index 077554267f4..01f298d0834 100644
--- a/staging/src/k8s.io/kube-gen/cmd/lister-gen/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/lister-gen/BUILD
@@ -19,25 +19,9 @@ go_library(
     srcs = ["main.go"],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/lister-gen/generators:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/lister-gen/generators:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//cmd/libs/go2idl/lister-gen/generators:all-srcs",
-    ],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/BUILD b/staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/BUILD
index ce69a8aad57..3544fb3f77b 100644
--- a/staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/BUILD
@@ -16,24 +16,11 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/client-gen/types:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
         "//vendor/k8s.io/gengo/generator:go_default_library",
         "//vendor/k8s.io/gengo/namer:go_default_library",
         "//vendor/k8s.io/gengo/types:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/client-gen/types:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/lister.go b/staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/lister.go
index 632b1e4c762..45bd9dbc329 100644
--- a/staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/lister.go
+++ b/staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/lister.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/gengo/generator"
 	"k8s.io/gengo/namer"
 	"k8s.io/gengo/types"
-	clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types"
+	clientgentypes "k8s.io/kube-gen/cmd/client-gen/types"
 
 	"github.com/golang/glog"
 )
diff --git a/staging/src/k8s.io/kube-gen/cmd/lister-gen/main.go b/staging/src/k8s.io/kube-gen/cmd/lister-gen/main.go
index 88ba462acd7..4af9d97b32b 100644
--- a/staging/src/k8s.io/kube-gen/cmd/lister-gen/main.go
+++ b/staging/src/k8s.io/kube-gen/cmd/lister-gen/main.go
@@ -20,7 +20,7 @@ import (
 	"path/filepath"
 
 	"k8s.io/gengo/args"
-	"k8s.io/kubernetes/cmd/libs/go2idl/lister-gen/generators"
+	"k8s.io/kube-gen/cmd/lister-gen/generators"
 
 	"github.com/golang/glog"
 	"github.com/spf13/pflag"
diff --git a/staging/src/k8s.io/kube-gen/cmd/openapi-gen/.import-restrictions b/staging/src/k8s.io/kube-gen/cmd/openapi-gen/.import-restrictions
deleted file mode 100644
index fdd44f087a9..00000000000
--- a/staging/src/k8s.io/kube-gen/cmd/openapi-gen/.import-restrictions
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "Rules": [
-    {
-      "SelectorRegexp": "k8s[.]io",
-      "AllowedPrefixes": [
-        "k8s.io/kubernetes/cmd/libs/go2idl",
-        "k8s.io/apimachinery/pkg/openapi",
-        "k8s.io/gengo",
-        "k8s.io/kubernetes/third_party",
-        "k8s.io/apimachinery/third_party",
-        "k8s.io/apimachinery/pkg/util/sets"
-      ]
-    }
-  ]
-}
diff --git a/staging/src/k8s.io/kube-gen/cmd/openapi-gen/BUILD b/staging/src/k8s.io/kube-gen/cmd/openapi-gen/BUILD
index fb2e61a4732..b5343fd9c33 100644
--- a/staging/src/k8s.io/kube-gen/cmd/openapi-gen/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/openapi-gen/BUILD
@@ -19,24 +19,8 @@ go_library(
     srcs = ["main.go"],
     tags = ["automanaged"],
     deps = [
-        "//cmd/libs/go2idl/openapi-gen/generators:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/k8s.io/gengo/args:go_default_library",
+        "//vendor/k8s.io/kube-gen/cmd/openapi-gen/generators:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//cmd/libs/go2idl/openapi-gen/generators:all-srcs",
-    ],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/openapi-gen/generators/BUILD b/staging/src/k8s.io/kube-gen/cmd/openapi-gen/generators/BUILD
index a0fdefe2763..db51ec8763c 100644
--- a/staging/src/k8s.io/kube-gen/cmd/openapi-gen/generators/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/openapi-gen/generators/BUILD
@@ -35,16 +35,3 @@ go_test(
         "//vendor/k8s.io/gengo/types:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/kube-gen/cmd/openapi-gen/main.go b/staging/src/k8s.io/kube-gen/cmd/openapi-gen/main.go
index ccf861d8687..b56bab79e21 100644
--- a/staging/src/k8s.io/kube-gen/cmd/openapi-gen/main.go
+++ b/staging/src/k8s.io/kube-gen/cmd/openapi-gen/main.go
@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 
 	"k8s.io/gengo/args"
-	"k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators"
+	"k8s.io/kube-gen/cmd/openapi-gen/generators"
 
 	"github.com/golang/glog"
 )
diff --git a/staging/src/k8s.io/kube-gen/cmd/set-gen/BUILD b/staging/src/k8s.io/kube-gen/cmd/set-gen/BUILD
index 933e682f90a..e414977e9be 100644
--- a/staging/src/k8s.io/kube-gen/cmd/set-gen/BUILD
+++ b/staging/src/k8s.io/kube-gen/cmd/set-gen/BUILD
@@ -28,16 +28,3 @@ go_library(
         "//vendor/k8s.io/gengo/examples/set-gen/generators:go_default_library",
     ],
 )
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/staging/src/k8s.io/metrics/hack/update-codegen.sh b/staging/src/k8s.io/metrics/hack/update-codegen.sh
index 785ece8eed2..0f60dd861d7 100755
--- a/staging/src/k8s.io/metrics/hack/update-codegen.sh
+++ b/staging/src/k8s.io/metrics/hack/update-codegen.sh
@@ -30,7 +30,7 @@ trap cleanup EXIT
 
 echo "Building client-gen"
 CLIENTGEN="${PWD}/client-gen-binary"
-go build -o "${CLIENTGEN}" ./cmd/libs/go2idl/client-gen
+go build -o "${CLIENTGEN}" k8s.io/kube-gen/cmd/client-gen
 
 PREFIX=k8s.io/metrics/pkg/apis
 INPUT_BASE="--input-base ${PREFIX}"
diff --git a/staging/src/k8s.io/sample-apiserver/hack/update-codegen.sh b/staging/src/k8s.io/sample-apiserver/hack/update-codegen.sh
index 8e8e5582138..dfaea62b9ff 100755
--- a/staging/src/k8s.io/sample-apiserver/hack/update-codegen.sh
+++ b/staging/src/k8s.io/sample-apiserver/hack/update-codegen.sh
@@ -49,20 +49,20 @@ function generate_group() {
   )
 
   echo "Building client-gen"
-  go build -o "${clientgen}" k8s.io/kubernetes/cmd/libs/go2idl/client-gen
+  go build -o "${clientgen}" k8s.io/kube-gen/cmd/client-gen
 
   echo "generating clientset for group ${GROUP_NAME} and version ${VERSION} at ${GOPATH}/${BASE_PATH}${CLIENT_PKG}"
   ${clientgen} --input-base ${PREFIX} --input ${INPUT_APIS[@]} --clientset-path ${CLIENT_PKG}/clientset_generated --output-base=${GOPATH}/src/${BASE_PATH}
   ${clientgen} --clientset-name="clientset" --input-base ${PREFIX} --input ${GROUP_NAME}/${VERSION} --clientset-path ${CLIENT_PKG}/clientset_generated --output-base=${GOPATH}/src/${BASE_PATH}
   
   echo "Building lister-gen"
-  go build -o "${listergen}" k8s.io/kubernetes/cmd/libs/go2idl/lister-gen
+  go build -o "${listergen}" k8s.io/kube-gen/cmd/lister-gen
 
   echo "generating listers for group ${GROUP_NAME} and version ${VERSION} at ${GOPATH}/${BASE_PATH}${LISTERS_PKG}"
   ${listergen} --input-dirs ${BASE_PKG}/pkg/apis/wardle --input-dirs ${BASE_PKG}/pkg/apis/${GROUP_NAME}/${VERSION} --output-package ${LISTERS_PKG} --output-base ${SERVER_BASE}
 
   echo "Building informer-gen"
-  go build -o "${informergen}" k8s.io/kubernetes/cmd/libs/go2idl/informer-gen
+  go build -o "${informergen}" k8s.io/kube-gen/cmd/informer-gen
 
   echo "generating informers for group ${GROUP_NAME} and version ${VERSION} at ${GOPATH}/${BASE_PATH}${INFORMERS_PKG}"
   ${informergen} \
diff --git a/vendor/k8s.io/kube-gen b/vendor/k8s.io/kube-gen
new file mode 120000
index 00000000000..c57d0e8c389
--- /dev/null
+++ b/vendor/k8s.io/kube-gen
@@ -0,0 +1 @@
+../../staging/src/k8s.io/kube-gen
\ No newline at end of file