diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/BUILD b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/BUILD
similarity index 100%
rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/BUILD
rename to cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/BUILD
diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/clientset.go b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/clientset.go
similarity index 100%
rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/clientset.go
rename to cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/clientset.go
diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/doc.go b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/doc.go
similarity index 100%
rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/doc.go
rename to cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/doc.go
diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/fake/BUILD b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/BUILD
similarity index 100%
rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/fake/BUILD
rename to cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/BUILD
diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/fake/clientset_generated.go b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/clientset_generated.go
similarity index 100%
rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/fake/clientset_generated.go
rename to cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/clientset_generated.go
diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/fake/doc.go b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/doc.go
similarity index 100%
rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/fake/doc.go
rename to cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/fake/doc.go
diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/BUILD b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD
similarity index 100%
rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/BUILD
rename to cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/BUILD
diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/apiregistration_client.go b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go
similarity index 100%
rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/apiregistration_client.go
rename to cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go
diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/apiservice.go b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go
similarity index 100%
rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/apiservice.go
rename to cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go
diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/doc.go b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go
similarity index 100%
rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/doc.go
rename to cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/doc.go
diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/fake/BUILD b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD
similarity index 100%
rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/fake/BUILD
rename to cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/BUILD
diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/fake/doc.go b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go
similarity index 100%
rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/fake/doc.go
rename to cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/doc.go
diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go
similarity index 100%
rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go
rename to cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiregistration_client.go
diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/fake/fake_apiservice.go b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go
similarity index 100%
rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/fake/fake_apiservice.go
rename to cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake/fake_apiservice.go
diff --git a/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/generated_expansion.go b/cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/generated_expansion.go
similarity index 100%
rename from cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5/typed/apiregistration/v1alpha1/generated_expansion.go
rename to cmd/kubernetes-discovery/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/generated_expansion.go