diff --git a/cmd/kubeadm/app/apis/kubeadm/doc.go b/cmd/kubeadm/app/apis/kubeadm/doc.go
index 21b45eda4ad..8998f14fe79 100644
--- a/cmd/kubeadm/app/apis/kubeadm/doc.go
+++ b/cmd/kubeadm/app/apis/kubeadm/doc.go
@@ -14,10 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package kubeadm is the package that contains the libraries that drive the kubeadm binary.
-// kubeadm is responsible for handling a Kubernetes cluster's lifecycle.
-
 // +k8s:deepcopy-gen=package
 // +groupName=kubeadm.k8s.io
 
+// Package kubeadm is the package that contains the libraries that drive the kubeadm binary.
+// kubeadm is responsible for handling a Kubernetes cluster's lifecycle.
 package kubeadm // import "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/doc.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/doc.go
index 578b1b2269e..d833da6f3b6 100644
--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/doc.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/doc.go
@@ -14,9 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1alpha2 is the package that contains the libraries that drive the kubeadm binary.
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=kubeadm.k8s.io
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm
+
+// Package v1alpha2 is the package that contains the libraries that drive the kubeadm binary.
 package v1alpha2 // import "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha2"
diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha3/doc.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha3/doc.go
index 5186e1fba14..40cb2ae4e60 100644
--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha3/doc.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha3/doc.go
@@ -14,6 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// +k8s:defaulter-gen=TypeMeta
+// +groupName=kubeadm.k8s.io
+// +k8s:deepcopy-gen=package
+// +k8s:conversion-gen=k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm
+
 // Package v1alpha3 is the API (config file) for driving the kubeadm binary.
 // Some of these options are also available as command line flags, but
 // the preferred way to configure kubeadm is to pass a YAML file in with the
@@ -90,9 +95,4 @@ limitations under the License.
 //
 // TODO: The BootstrapTokenString object should move out to either k8s.io/client-go or k8s.io/api in the future
 // (probably as part of Bootstrap Tokens going GA). It should not be staged under the kubeadm API as it is now.
-//
-// +k8s:defaulter-gen=TypeMeta
-// +groupName=kubeadm.k8s.io
-// +k8s:deepcopy-gen=package
-// +k8s:conversion-gen=k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm
 package v1alpha3 // import "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha3"
diff --git a/pkg/apis/abac/v0/doc.go b/pkg/apis/abac/v0/doc.go
index bd73e3f49a4..b8d89497834 100644
--- a/pkg/apis/abac/v0/doc.go
+++ b/pkg/apis/abac/v0/doc.go
@@ -17,4 +17,5 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 
 // +groupName=abac.authorization.kubernetes.io
+
 package v0 // import "k8s.io/kubernetes/pkg/apis/abac/v0"
diff --git a/pkg/apis/abac/v1beta1/doc.go b/pkg/apis/abac/v1beta1/doc.go
index 3fa41e6b849..62ac4e21d6f 100644
--- a/pkg/apis/abac/v1beta1/doc.go
+++ b/pkg/apis/abac/v1beta1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // +groupName=abac.authorization.kubernetes.io
+
 package v1beta1 // import "k8s.io/kubernetes/pkg/apis/abac/v1beta1"
diff --git a/pkg/apis/admission/doc.go b/pkg/apis/admission/doc.go
index 64273253a95..bbf4d2e92d2 100644
--- a/pkg/apis/admission/doc.go
+++ b/pkg/apis/admission/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=admission.k8s.io
+
 package admission // import "k8s.io/kubernetes/pkg/apis/admission"
diff --git a/pkg/apis/admission/v1beta1/doc.go b/pkg/apis/admission/v1beta1/doc.go
index 1bb4d198e48..b86242990bc 100644
--- a/pkg/apis/admission/v1beta1/doc.go
+++ b/pkg/apis/admission/v1beta1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/admission/v1beta1
 
 // +groupName=admission.k8s.io
+
 package v1beta1 // import "k8s.io/kubernetes/pkg/apis/admission/v1beta1"
diff --git a/pkg/apis/admissionregistration/doc.go b/pkg/apis/admissionregistration/doc.go
index 7b76bb29b24..8c2f04230ad 100644
--- a/pkg/apis/admissionregistration/doc.go
+++ b/pkg/apis/admissionregistration/doc.go
@@ -15,10 +15,10 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+// +groupName=admissionregistration.k8s.io
 
 // Package admissionregistration is the internal version of the API.
 // AdmissionConfiguration and AdmissionPluginConfiguration are legacy static admission plugin configuration
 // InitializerConfiguration, ValidatingWebhookConfiguration, and MutatingWebhookConfiguration are for the
 // new dynamic admission controller configuration.
-// +groupName=admissionregistration.k8s.io
 package admissionregistration // import "k8s.io/kubernetes/pkg/apis/admissionregistration"
diff --git a/pkg/apis/admissionregistration/v1alpha1/doc.go b/pkg/apis/admissionregistration/v1alpha1/doc.go
index 43fd23dabf6..833526f715c 100644
--- a/pkg/apis/admissionregistration/v1alpha1/doc.go
+++ b/pkg/apis/admissionregistration/v1alpha1/doc.go
@@ -18,10 +18,10 @@ limitations under the License.
 // +k8s:conversion-gen-external-types=k8s.io/api/admissionregistration/v1alpha1
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/admissionregistration/v1alpha1
+// +groupName=admissionregistration.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
 // AdmissionConfiguration and AdmissionPluginConfiguration are legacy static admission plugin configuration
 // InitializerConfiguration, ValidatingWebhookConfiguration, and MutatingWebhookConfiguration are for the
 // new dynamic admission controller configuration.
-// +groupName=admissionregistration.k8s.io
 package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1"
diff --git a/pkg/apis/admissionregistration/v1beta1/doc.go b/pkg/apis/admissionregistration/v1beta1/doc.go
index cf03718ed26..873110d12dd 100644
--- a/pkg/apis/admissionregistration/v1beta1/doc.go
+++ b/pkg/apis/admissionregistration/v1beta1/doc.go
@@ -18,10 +18,10 @@ limitations under the License.
 // +k8s:conversion-gen-external-types=k8s.io/api/admissionregistration/v1beta1
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/admissionregistration/v1beta1
+// +groupName=admissionregistration.k8s.io
 
 // Package v1beta1 is the v1beta1 version of the API.
 // AdmissionConfiguration and AdmissionPluginConfiguration are legacy static admission plugin configuration
 // InitializerConfiguration, ValidatingWebhookConfiguration, and MutatingWebhookConfiguration are for the
 // new dynamic admission controller configuration.
-// +groupName=admissionregistration.k8s.io
 package v1beta1 // import "k8s.io/kubernetes/pkg/apis/admissionregistration/v1beta1"
diff --git a/pkg/apis/authentication/doc.go b/pkg/apis/authentication/doc.go
index 0afbdd3a3a6..b86561616ec 100644
--- a/pkg/apis/authentication/doc.go
+++ b/pkg/apis/authentication/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=authentication.k8s.io
+
 package authentication // import "k8s.io/kubernetes/pkg/apis/authentication"
diff --git a/pkg/apis/authentication/v1/doc.go b/pkg/apis/authentication/v1/doc.go
index 50ec02077ff..6c4eabafa26 100644
--- a/pkg/apis/authentication/v1/doc.go
+++ b/pkg/apis/authentication/v1/doc.go
@@ -19,4 +19,5 @@ limitations under the License.
 // +groupName=authentication.k8s.io
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/authentication/v1
+
 package v1 // import "k8s.io/kubernetes/pkg/apis/authentication/v1"
diff --git a/pkg/apis/authentication/v1beta1/doc.go b/pkg/apis/authentication/v1beta1/doc.go
index 7f7a5ffa3be..07c1f498330 100644
--- a/pkg/apis/authentication/v1beta1/doc.go
+++ b/pkg/apis/authentication/v1beta1/doc.go
@@ -19,4 +19,5 @@ limitations under the License.
 // +groupName=authentication.k8s.io
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/authentication/v1beta1
+
 package v1beta1 // import "k8s.io/kubernetes/pkg/apis/authentication/v1beta1"
diff --git a/pkg/apis/authorization/doc.go b/pkg/apis/authorization/doc.go
index 5cb3094aba8..896049861f6 100644
--- a/pkg/apis/authorization/doc.go
+++ b/pkg/apis/authorization/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=authorization.k8s.io
+
 package authorization // import "k8s.io/kubernetes/pkg/apis/authorization"
diff --git a/pkg/apis/authorization/v1/doc.go b/pkg/apis/authorization/v1/doc.go
index 11b7605c898..6b4259dffec 100644
--- a/pkg/apis/authorization/v1/doc.go
+++ b/pkg/apis/authorization/v1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/authorization/v1
 
 // +groupName=authorization.k8s.io
+
 package v1 // import "k8s.io/kubernetes/pkg/apis/authorization/v1"
diff --git a/pkg/apis/authorization/v1beta1/doc.go b/pkg/apis/authorization/v1beta1/doc.go
index a958fa36550..3300d9ce20b 100644
--- a/pkg/apis/authorization/v1beta1/doc.go
+++ b/pkg/apis/authorization/v1beta1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/authorization/v1beta1
 
 // +groupName=authorization.k8s.io
+
 package v1beta1 // import "k8s.io/kubernetes/pkg/apis/authorization/v1beta1"
diff --git a/pkg/apis/certificates/doc.go b/pkg/apis/certificates/doc.go
index 65aad6491eb..c752aacaf57 100644
--- a/pkg/apis/certificates/doc.go
+++ b/pkg/apis/certificates/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=certificates.k8s.io
+
 package certificates // import "k8s.io/kubernetes/pkg/apis/certificates"
diff --git a/pkg/apis/certificates/v1beta1/doc.go b/pkg/apis/certificates/v1beta1/doc.go
index d5f13dfff3a..8ba037c2592 100644
--- a/pkg/apis/certificates/v1beta1/doc.go
+++ b/pkg/apis/certificates/v1beta1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/certificates/v1beta1
 
 // +groupName=certificates.k8s.io
+
 package v1beta1 // import "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
diff --git a/pkg/apis/coordination/doc.go b/pkg/apis/coordination/doc.go
index c8e6b5ce605..8cce2eda252 100644
--- a/pkg/apis/coordination/doc.go
+++ b/pkg/apis/coordination/doc.go
@@ -17,4 +17,5 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 
 // +groupName=coordination.k8s.io
+
 package coordination // import "k8s.io/kubernetes/pkg/apis/coordination"
diff --git a/pkg/apis/coordination/v1beta1/doc.go b/pkg/apis/coordination/v1beta1/doc.go
index 406dbe4b33d..da30f7fc2be 100644
--- a/pkg/apis/coordination/v1beta1/doc.go
+++ b/pkg/apis/coordination/v1beta1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/coordination/v1beta1
 
 // +groupName=coordination.k8s.io
+
 package v1beta1 // import "k8s.io/kubernetes/pkg/apis/coordination/v1beta1"
diff --git a/pkg/apis/events/doc.go b/pkg/apis/events/doc.go
index 15095ad3a29..a2a963f7fcb 100644
--- a/pkg/apis/events/doc.go
+++ b/pkg/apis/events/doc.go
@@ -15,4 +15,5 @@ limitations under the License.
 */
 
 // +groupName=events.k8s.io
+
 package events // import "k8s.io/kubernetes/pkg/apis/events"
diff --git a/pkg/apis/events/v1beta1/doc.go b/pkg/apis/events/v1beta1/doc.go
index 174190914fa..17d89c67972 100644
--- a/pkg/apis/events/v1beta1/doc.go
+++ b/pkg/apis/events/v1beta1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/events/v1beta1
 
 // +groupName=events.k8s.io
+
 package v1beta1 // import "k8s.io/kubernetes/pkg/apis/events/v1beta1"
diff --git a/pkg/apis/imagepolicy/doc.go b/pkg/apis/imagepolicy/doc.go
index a0af1868e13..bfcdee2a481 100644
--- a/pkg/apis/imagepolicy/doc.go
+++ b/pkg/apis/imagepolicy/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=imagepolicy.k8s.io
+
 package imagepolicy // import "k8s.io/kubernetes/pkg/apis/imagepolicy"
diff --git a/pkg/apis/imagepolicy/v1alpha1/doc.go b/pkg/apis/imagepolicy/v1alpha1/doc.go
index b517ce45438..3d596bd022f 100644
--- a/pkg/apis/imagepolicy/v1alpha1/doc.go
+++ b/pkg/apis/imagepolicy/v1alpha1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/imagepolicy/v1alpha1
 
 // +groupName=imagepolicy.k8s.io
+
 package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1"
diff --git a/pkg/apis/networking/doc.go b/pkg/apis/networking/doc.go
index 8b013e34867..218cd6c2f78 100644
--- a/pkg/apis/networking/doc.go
+++ b/pkg/apis/networking/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=networking.k8s.io
+
 package networking // import "k8s.io/kubernetes/pkg/apis/networking"
diff --git a/pkg/apis/networking/v1/doc.go b/pkg/apis/networking/v1/doc.go
index f53cbf3dc65..4a2e671e711 100644
--- a/pkg/apis/networking/v1/doc.go
+++ b/pkg/apis/networking/v1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/networking/v1
 // +groupName=networking.k8s.io
+
 package v1 // import "k8s.io/kubernetes/pkg/apis/networking/v1"
diff --git a/pkg/apis/rbac/doc.go b/pkg/apis/rbac/doc.go
index bebcb771d12..ea2309eea74 100644
--- a/pkg/apis/rbac/doc.go
+++ b/pkg/apis/rbac/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=rbac.authorization.k8s.io
+
 package rbac // import "k8s.io/kubernetes/pkg/apis/rbac"
diff --git a/pkg/apis/rbac/v1/doc.go b/pkg/apis/rbac/v1/doc.go
index 5608caba705..b96dc30bc51 100644
--- a/pkg/apis/rbac/v1/doc.go
+++ b/pkg/apis/rbac/v1/doc.go
@@ -21,4 +21,5 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 
 // +groupName=rbac.authorization.k8s.io
+
 package v1 // import "k8s.io/kubernetes/pkg/apis/rbac/v1"
diff --git a/pkg/apis/rbac/v1alpha1/doc.go b/pkg/apis/rbac/v1alpha1/doc.go
index 365f3881436..67aacff933b 100644
--- a/pkg/apis/rbac/v1alpha1/doc.go
+++ b/pkg/apis/rbac/v1alpha1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/rbac/v1alpha1
 
 // +groupName=rbac.authorization.k8s.io
+
 package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
diff --git a/pkg/apis/rbac/v1beta1/doc.go b/pkg/apis/rbac/v1beta1/doc.go
index 7ba759013a2..854453e8df1 100644
--- a/pkg/apis/rbac/v1beta1/doc.go
+++ b/pkg/apis/rbac/v1beta1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/rbac/v1beta1
 
 // +groupName=rbac.authorization.k8s.io
+
 package v1beta1 // import "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
diff --git a/pkg/apis/scheduling/doc.go b/pkg/apis/scheduling/doc.go
index f2745c227e2..bab0ae332af 100644
--- a/pkg/apis/scheduling/doc.go
+++ b/pkg/apis/scheduling/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=scheduling.k8s.io
+
 package scheduling // import "k8s.io/kubernetes/pkg/apis/scheduling"
diff --git a/pkg/apis/scheduling/v1alpha1/doc.go b/pkg/apis/scheduling/v1alpha1/doc.go
index e2bf21c7697..f3149504705 100644
--- a/pkg/apis/scheduling/v1alpha1/doc.go
+++ b/pkg/apis/scheduling/v1alpha1/doc.go
@@ -19,4 +19,5 @@ limitations under the License.
 // +groupName=scheduling.k8s.io
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/scheduling/v1alpha1
+
 package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/scheduling/v1alpha1"
diff --git a/pkg/apis/scheduling/v1beta1/doc.go b/pkg/apis/scheduling/v1beta1/doc.go
index 117381f65f4..ba57c832261 100644
--- a/pkg/apis/scheduling/v1beta1/doc.go
+++ b/pkg/apis/scheduling/v1beta1/doc.go
@@ -19,4 +19,5 @@ limitations under the License.
 // +groupName=scheduling.k8s.io
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/scheduling/v1beta1
+
 package v1beta1 // import "k8s.io/kubernetes/pkg/apis/scheduling/v1beta1"
diff --git a/pkg/apis/settings/doc.go b/pkg/apis/settings/doc.go
index 6093e3e8241..297432dceb4 100644
--- a/pkg/apis/settings/doc.go
+++ b/pkg/apis/settings/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=settings.k8s.io
+
 package settings // import "k8s.io/kubernetes/pkg/apis/settings"
diff --git a/pkg/apis/settings/v1alpha1/doc.go b/pkg/apis/settings/v1alpha1/doc.go
index 4422bb3e77b..998e91f833c 100644
--- a/pkg/apis/settings/v1alpha1/doc.go
+++ b/pkg/apis/settings/v1alpha1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/settings/v1alpha1
 
 // +groupName=settings.k8s.io
+
 package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/settings/v1alpha1"
diff --git a/pkg/apis/storage/doc.go b/pkg/apis/storage/doc.go
index 5220b981e47..52b2c2d822c 100644
--- a/pkg/apis/storage/doc.go
+++ b/pkg/apis/storage/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=storage.k8s.io
+
 package storage // import "k8s.io/kubernetes/pkg/apis/storage"
diff --git a/pkg/apis/storage/v1/doc.go b/pkg/apis/storage/v1/doc.go
index 617aa14c1aa..4019b756571 100644
--- a/pkg/apis/storage/v1/doc.go
+++ b/pkg/apis/storage/v1/doc.go
@@ -19,4 +19,5 @@ limitations under the License.
 // +groupName=storage.k8s.io
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/storage/v1
+
 package v1
diff --git a/pkg/apis/storage/v1alpha1/doc.go b/pkg/apis/storage/v1alpha1/doc.go
index 07c766c3a28..e3df1a90696 100644
--- a/pkg/apis/storage/v1alpha1/doc.go
+++ b/pkg/apis/storage/v1alpha1/doc.go
@@ -19,4 +19,5 @@ limitations under the License.
 // +groupName=storage.k8s.io
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/storage/v1alpha1
+
 package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/storage/v1alpha1"
diff --git a/pkg/apis/storage/v1beta1/doc.go b/pkg/apis/storage/v1beta1/doc.go
index a5b0ca68ab8..ed4fe193a11 100644
--- a/pkg/apis/storage/v1beta1/doc.go
+++ b/pkg/apis/storage/v1beta1/doc.go
@@ -19,4 +19,5 @@ limitations under the License.
 // +groupName=storage.k8s.io
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/storage/v1beta1
+
 package v1beta1 // import "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
diff --git a/pkg/version/doc.go b/pkg/version/doc.go
index e4d68bc9f49..a4a1c035fc8 100644
--- a/pkg/version/doc.go
+++ b/pkg/version/doc.go
@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// +k8s:openapi-gen=true
+
 // Package version supplies version information collected at build time to
 // kubernetes components.
-// +k8s:openapi-gen=true
 package version // import "k8s.io/kubernetes/pkg/version"
diff --git a/plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1/doc.go b/plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1/doc.go
index cf325fa9f2b..09fdc9fc39b 100644
--- a/plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1/doc.go
+++ b/plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1/doc.go
@@ -17,7 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/kubernetes/plugin/pkg/admission/eventratelimit/apis/eventratelimit
 // +k8s:defaulter-gen=TypeMeta
+// +groupName=eventratelimit.admission.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-// +groupName=eventratelimit.admission.k8s.io
 package v1alpha1 // import "k8s.io/kubernetes/plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1"
diff --git a/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1/doc.go b/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1/doc.go
index c21764baee8..03571ab2bcf 100644
--- a/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1/doc.go
+++ b/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1/doc.go
@@ -17,7 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/kubernetes/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction
 // +k8s:defaulter-gen=TypeMeta
+// +groupName=podtolerationrestriction.admission.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-// +groupName=podtolerationrestriction.admission.k8s.io
 package v1alpha1 // import "k8s.io/kubernetes/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1"
diff --git a/plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1/doc.go b/plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1/doc.go
index 53508c2f2da..5e8dc097580 100644
--- a/plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1/doc.go
+++ b/plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1/doc.go
@@ -17,7 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/kubernetes/plugin/pkg/admission/resourcequota/apis/resourcequota
 // +k8s:defaulter-gen=TypeMeta
+// +groupName=resourcequota.admission.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-// +groupName=resourcequota.admission.k8s.io
 package v1alpha1 // import "k8s.io/kubernetes/plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1"
diff --git a/plugin/pkg/admission/resourcequota/apis/resourcequota/v1beta1/doc.go b/plugin/pkg/admission/resourcequota/apis/resourcequota/v1beta1/doc.go
index c86fedd4f94..3f4dd11b218 100644
--- a/plugin/pkg/admission/resourcequota/apis/resourcequota/v1beta1/doc.go
+++ b/plugin/pkg/admission/resourcequota/apis/resourcequota/v1beta1/doc.go
@@ -17,7 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/kubernetes/plugin/pkg/admission/resourcequota/apis/resourcequota
 // +k8s:defaulter-gen=TypeMeta
+// +groupName=resourcequota.admission.k8s.io
 
 // Package v1beta1 is the v1beta1 version of the API.
-// +groupName=resourcequota.admission.k8s.io
 package v1beta1 // import "k8s.io/kubernetes/plugin/pkg/admission/resourcequota/apis/resourcequota/v1beta1"
diff --git a/staging/src/k8s.io/api/admission/v1beta1/doc.go b/staging/src/k8s.io/api/admission/v1beta1/doc.go
index a26d4d45a45..f5135f0f308 100644
--- a/staging/src/k8s.io/api/admission/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/admission/v1beta1/doc.go
@@ -18,4 +18,5 @@ limitations under the License.
 // +k8s:openapi-gen=false
 
 // +groupName=admission.k8s.io
+
 package v1beta1 // import "k8s.io/api/admission/v1beta1"
diff --git a/staging/src/k8s.io/api/admissionregistration/v1alpha1/doc.go b/staging/src/k8s.io/api/admissionregistration/v1alpha1/doc.go
index 8a5d1fbbb6e..d29913cf52c 100644
--- a/staging/src/k8s.io/api/admissionregistration/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/admissionregistration/v1alpha1/doc.go
@@ -16,10 +16,10 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +k8s:openapi-gen=true
+// +groupName=admissionregistration.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
 // AdmissionConfiguration and AdmissionPluginConfiguration are legacy static admission plugin configuration
 // InitializerConfiguration and validatingWebhookConfiguration is for the
 // new dynamic admission controller configuration.
-// +groupName=admissionregistration.k8s.io
 package v1alpha1 // import "k8s.io/api/admissionregistration/v1alpha1"
diff --git a/staging/src/k8s.io/api/admissionregistration/v1beta1/doc.go b/staging/src/k8s.io/api/admissionregistration/v1beta1/doc.go
index afbb3d6d3ad..2b29efaca4a 100644
--- a/staging/src/k8s.io/api/admissionregistration/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/admissionregistration/v1beta1/doc.go
@@ -16,10 +16,10 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +k8s:openapi-gen=true
+// +groupName=admissionregistration.k8s.io
 
 // Package v1beta1 is the v1beta1 version of the API.
 // AdmissionConfiguration and AdmissionPluginConfiguration are legacy static admission plugin configuration
 // InitializerConfiguration and validatingWebhookConfiguration is for the
 // new dynamic admission controller configuration.
-// +groupName=admissionregistration.k8s.io
 package v1beta1 // import "k8s.io/api/admissionregistration/v1beta1"
diff --git a/staging/src/k8s.io/api/authentication/v1/doc.go b/staging/src/k8s.io/api/authentication/v1/doc.go
index 2d2ed2ee821..193f154abe9 100644
--- a/staging/src/k8s.io/api/authentication/v1/doc.go
+++ b/staging/src/k8s.io/api/authentication/v1/doc.go
@@ -17,4 +17,5 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=authentication.k8s.io
 // +k8s:openapi-gen=true
+
 package v1 // import "k8s.io/api/authentication/v1"
diff --git a/staging/src/k8s.io/api/authentication/v1beta1/doc.go b/staging/src/k8s.io/api/authentication/v1beta1/doc.go
index e0de315d40d..919f3c42fdd 100644
--- a/staging/src/k8s.io/api/authentication/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/authentication/v1beta1/doc.go
@@ -17,4 +17,5 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=authentication.k8s.io
 // +k8s:openapi-gen=true
+
 package v1beta1 // import "k8s.io/api/authentication/v1beta1"
diff --git a/staging/src/k8s.io/api/authorization/v1/doc.go b/staging/src/k8s.io/api/authorization/v1/doc.go
index c06b798df8c..c63ac28cfa7 100644
--- a/staging/src/k8s.io/api/authorization/v1/doc.go
+++ b/staging/src/k8s.io/api/authorization/v1/doc.go
@@ -18,4 +18,5 @@ limitations under the License.
 // +k8s:openapi-gen=true
 
 // +groupName=authorization.k8s.io
+
 package v1 // import "k8s.io/api/authorization/v1"
diff --git a/staging/src/k8s.io/api/authorization/v1beta1/doc.go b/staging/src/k8s.io/api/authorization/v1beta1/doc.go
index ea4f802e289..324f293a17c 100644
--- a/staging/src/k8s.io/api/authorization/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/authorization/v1beta1/doc.go
@@ -18,4 +18,5 @@ limitations under the License.
 // +k8s:openapi-gen=true
 
 // +groupName=authorization.k8s.io
+
 package v1beta1 // import "k8s.io/api/authorization/v1beta1"
diff --git a/staging/src/k8s.io/api/certificates/v1beta1/doc.go b/staging/src/k8s.io/api/certificates/v1beta1/doc.go
index fb23aadb0e9..8473b640fa5 100644
--- a/staging/src/k8s.io/api/certificates/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/certificates/v1beta1/doc.go
@@ -18,4 +18,5 @@ limitations under the License.
 // +k8s:openapi-gen=true
 
 // +groupName=certificates.k8s.io
+
 package v1beta1 // import "k8s.io/api/certificates/v1beta1"
diff --git a/staging/src/k8s.io/api/coordination/v1beta1/doc.go b/staging/src/k8s.io/api/coordination/v1beta1/doc.go
index fecb513fcfa..bc95fd17d4d 100644
--- a/staging/src/k8s.io/api/coordination/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/coordination/v1beta1/doc.go
@@ -18,4 +18,5 @@ limitations under the License.
 // +k8s:openapi-gen=true
 
 // +groupName=coordination.k8s.io
+
 package v1beta1 // import "k8s.io/api/coordination/v1beta1"
diff --git a/staging/src/k8s.io/api/events/v1beta1/doc.go b/staging/src/k8s.io/api/events/v1beta1/doc.go
index 8b1a3e312de..bd269c6d235 100644
--- a/staging/src/k8s.io/api/events/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/events/v1beta1/doc.go
@@ -18,4 +18,5 @@ limitations under the License.
 // +k8s:openapi-gen=true
 
 // +groupName=events.k8s.io
+
 package v1beta1 // import "k8s.io/api/events/v1beta1"
diff --git a/staging/src/k8s.io/api/imagepolicy/v1alpha1/doc.go b/staging/src/k8s.io/api/imagepolicy/v1alpha1/doc.go
index 3b4840ad64e..598dff2a82a 100644
--- a/staging/src/k8s.io/api/imagepolicy/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/imagepolicy/v1alpha1/doc.go
@@ -18,4 +18,5 @@ limitations under the License.
 // +k8s:openapi-gen=true
 
 // +groupName=imagepolicy.k8s.io
+
 package v1alpha1 // import "k8s.io/api/imagepolicy/v1alpha1"
diff --git a/staging/src/k8s.io/api/networking/v1/doc.go b/staging/src/k8s.io/api/networking/v1/doc.go
index ef9ae2ae4cf..887c3664796 100644
--- a/staging/src/k8s.io/api/networking/v1/doc.go
+++ b/staging/src/k8s.io/api/networking/v1/doc.go
@@ -17,4 +17,5 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:openapi-gen=true
 // +groupName=networking.k8s.io
+
 package v1 // import "k8s.io/api/networking/v1"
diff --git a/staging/src/k8s.io/api/policy/v1beta1/doc.go b/staging/src/k8s.io/api/policy/v1beta1/doc.go
index 9c456f9237f..74611c6ba5d 100644
--- a/staging/src/k8s.io/api/policy/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/policy/v1beta1/doc.go
@@ -15,9 +15,9 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+// +k8s:openapi-gen=true
 
 // Package policy is for any kind of policy object.  Suitable examples, even if
 // they aren't all here, are PodDisruptionBudget, PodSecurityPolicy,
 // NetworkPolicy, etc.
-// +k8s:openapi-gen=true
 package v1beta1 // import "k8s.io/api/policy/v1beta1"
diff --git a/staging/src/k8s.io/api/rbac/v1/doc.go b/staging/src/k8s.io/api/rbac/v1/doc.go
index 28ceb269b4e..76899ef0965 100644
--- a/staging/src/k8s.io/api/rbac/v1/doc.go
+++ b/staging/src/k8s.io/api/rbac/v1/doc.go
@@ -18,4 +18,5 @@ limitations under the License.
 // +k8s:openapi-gen=true
 
 // +groupName=rbac.authorization.k8s.io
+
 package v1 // import "k8s.io/api/rbac/v1"
diff --git a/staging/src/k8s.io/api/rbac/v1alpha1/doc.go b/staging/src/k8s.io/api/rbac/v1alpha1/doc.go
index 5236a477f00..f2547a58f77 100644
--- a/staging/src/k8s.io/api/rbac/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/rbac/v1alpha1/doc.go
@@ -18,4 +18,5 @@ limitations under the License.
 // +k8s:openapi-gen=true
 
 // +groupName=rbac.authorization.k8s.io
+
 package v1alpha1 // import "k8s.io/api/rbac/v1alpha1"
diff --git a/staging/src/k8s.io/api/rbac/v1beta1/doc.go b/staging/src/k8s.io/api/rbac/v1beta1/doc.go
index 4b77c9c6b83..516625eeeae 100644
--- a/staging/src/k8s.io/api/rbac/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/rbac/v1beta1/doc.go
@@ -18,4 +18,5 @@ limitations under the License.
 // +k8s:openapi-gen=true
 
 // +groupName=rbac.authorization.k8s.io
+
 package v1beta1 // import "k8s.io/api/rbac/v1beta1"
diff --git a/staging/src/k8s.io/api/scheduling/v1alpha1/doc.go b/staging/src/k8s.io/api/scheduling/v1alpha1/doc.go
index e10d07ff742..05a454a529c 100644
--- a/staging/src/k8s.io/api/scheduling/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/scheduling/v1alpha1/doc.go
@@ -18,4 +18,5 @@ limitations under the License.
 // +k8s:openapi-gen=true
 
 // +groupName=scheduling.k8s.io
+
 package v1alpha1 // import "k8s.io/api/scheduling/v1alpha1"
diff --git a/staging/src/k8s.io/api/scheduling/v1beta1/doc.go b/staging/src/k8s.io/api/scheduling/v1beta1/doc.go
index f2dd1cfac70..7cf1af2124c 100644
--- a/staging/src/k8s.io/api/scheduling/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/scheduling/v1beta1/doc.go
@@ -18,4 +18,5 @@ limitations under the License.
 // +k8s:openapi-gen=true
 
 // +groupName=scheduling.k8s.io
+
 package v1beta1 // import "k8s.io/api/scheduling/v1beta1"
diff --git a/staging/src/k8s.io/api/settings/v1alpha1/doc.go b/staging/src/k8s.io/api/settings/v1alpha1/doc.go
index 05a62c569ed..9126211d645 100644
--- a/staging/src/k8s.io/api/settings/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/settings/v1alpha1/doc.go
@@ -18,4 +18,5 @@ limitations under the License.
 // +k8s:openapi-gen=true
 
 // +groupName=settings.k8s.io
+
 package v1alpha1 // import "k8s.io/api/settings/v1alpha1"
diff --git a/staging/src/k8s.io/api/storage/v1/doc.go b/staging/src/k8s.io/api/storage/v1/doc.go
index 8f4a4045c43..ff8bb34ca1c 100644
--- a/staging/src/k8s.io/api/storage/v1/doc.go
+++ b/staging/src/k8s.io/api/storage/v1/doc.go
@@ -17,4 +17,5 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=storage.k8s.io
 // +k8s:openapi-gen=true
+
 package v1
diff --git a/staging/src/k8s.io/api/storage/v1alpha1/doc.go b/staging/src/k8s.io/api/storage/v1alpha1/doc.go
index aa94aff7fbb..0056b00d975 100644
--- a/staging/src/k8s.io/api/storage/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/storage/v1alpha1/doc.go
@@ -17,4 +17,5 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +groupName=storage.k8s.io
 // +k8s:openapi-gen=true
+
 package v1alpha1 // import "k8s.io/api/storage/v1alpha1"
diff --git a/staging/src/k8s.io/api/storage/v1beta1/doc.go b/staging/src/k8s.io/api/storage/v1beta1/doc.go
index 8957a4cf245..ea7667dda38 100644
--- a/staging/src/k8s.io/api/storage/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/storage/v1beta1/doc.go
@@ -17,4 +17,5 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=storage.k8s.io
 // +k8s:openapi-gen=true
+
 package v1beta1 // import "k8s.io/api/storage/v1beta1"
diff --git a/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr/v1/doc.go b/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr/v1/doc.go
index 73d79a45d57..d58bcc1e620 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr/v1/doc.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr/v1/doc.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+// +groupName=cr.example.apiextensions.k8s.io
 
 // Package v1 is the v1 version of the API.
-// +groupName=cr.example.apiextensions.k8s.io
 package v1
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/doc.go
index 0517ec6a844..2a6b02dccd2 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/doc.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/doc.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+// +groupName=apiextensions.k8s.io
 
 // Package apiextensions is the internal version of the API.
-// +groupName=apiextensions.k8s.io
 package apiextensions // import "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go
index 50ab2b54c69..acd09aca287 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go
@@ -17,8 +17,8 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
 // +k8s:defaulter-gen=TypeMeta
+// +k8s:openapi-gen=true
+// +groupName=apiextensions.k8s.io
 
 // Package v1beta1 is the v1beta1 version of the API.
-// +groupName=apiextensions.k8s.io
-// +k8s:openapi-gen=true
 package v1beta1 // import "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go
index 61f201cdf5d..dbaa87c879f 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go
@@ -19,4 +19,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // +groupName=meta.k8s.io
+
 package v1 // import "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/doc.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/doc.go
index dc461cc2968..46b0e133c37 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/doc.go
@@ -19,4 +19,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // +groupName=meta.k8s.io
+
 package v1beta1
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/doc.go b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/doc.go
index 732d2038130..5c872fdbf30 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // +groupName=testapigroup.apimachinery.k8s.io
+
 package v1 // import "k8s.io/apimachinery/pkg/apis/testapigroup/v1"
diff --git a/staging/src/k8s.io/apimachinery/pkg/version/doc.go b/staging/src/k8s.io/apimachinery/pkg/version/doc.go
index 5e77af7ea9a..29574fd6d58 100644
--- a/staging/src/k8s.io/apimachinery/pkg/version/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/version/doc.go
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package version supplies the type for version information collected at build time.
 // +k8s:openapi-gen=true
+
+// Package version supplies the type for version information collected at build time.
 package version // import "k8s.io/apimachinery/pkg/version"
diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1/doc.go
index 04c376f7795..703f467f9fc 100644
--- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1/doc.go
@@ -17,7 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission
 // +k8s:defaulter-gen=TypeMeta
+// +groupName=apiserver.config.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-// +groupName=apiserver.config.k8s.io
 package v1alpha1
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/apiserver/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/apiserver/doc.go
index a89863a35fc..88db1ffa67a 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/apiserver/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/apiserver/doc.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+// +groupName=apiserver.k8s.io
 
 // Package apiserver is the internal version of the API.
-// +groupName=apiserver.k8s.io
 package apiserver // import "k8s.io/apiserver/pkg/apis/apiserver"
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1/doc.go
index 7dd031a793c..82ebd0c455d 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1/doc.go
@@ -17,7 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/apiserver/pkg/apis/apiserver
 // +k8s:defaulter-gen=TypeMeta
+// +groupName=apiserver.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-// +groupName=apiserver.k8s.io
 package v1alpha1 // import "k8s.io/apiserver/pkg/apis/apiserver/v1alpha1"
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/audit/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/audit/doc.go
index 34bc671e8d1..deda9cbd63c 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/audit/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/audit/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=audit.k8s.io
+
 package audit // import "k8s.io/apiserver/pkg/apis/audit"
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1/doc.go
index 9d936254817..b8f818ffdb2 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // +groupName=audit.k8s.io
+
 package v1 // import "k8s.io/apiserver/pkg/apis/audit/v1"
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/doc.go
index 27cc4c5ea52..d2cbdd9919b 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // +groupName=audit.k8s.io
+
 package v1alpha1 // import "k8s.io/apiserver/pkg/apis/audit/v1alpha1"
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1beta1/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1beta1/doc.go
index 38814725867..d43a807c3de 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1beta1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1beta1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // +groupName=audit.k8s.io
+
 package v1beta1 // import "k8s.io/apiserver/pkg/apis/audit/v1beta1"
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/example/doc.go
index 2676eee8197..d8b341a395b 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/example/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/example/doc.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=example.k8s.io
-//
+
 // package example contains an example API used to demonstrate how to create api groups. Moreover, this is
 // used within tests.
 package example // import "k8s.io/apiserver/pkg/apis/example"
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example/v1/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/example/v1/doc.go
index 4b22d37fb27..33a3ef04b33 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/example/v1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/example/v1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // +groupName=example.apiserver.k8s.io
+
 package v1 // import "k8s.io/apiserver/pkg/apis/example/v1"
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/example2/v1/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/example2/v1/doc.go
index 5784d44f398..8625365586f 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/example2/v1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/example2/v1/doc.go
@@ -21,4 +21,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // +groupName=example2.apiserver.k8s.io
+
 package v1 // import "k8s.io/apiserver/pkg/apis/example2/v1"
diff --git a/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/doc.go b/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/doc.go
index d06482d554d..b99459757e5 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=client.authentication.k8s.io
+
 package clientauthentication // import "k8s.io/client-go/pkg/apis/clientauthentication"
diff --git a/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1/doc.go
index 016adb28a74..19ab7761400 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // +groupName=client.authentication.k8s.io
+
 package v1alpha1 // import "k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1"
diff --git a/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1beta1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1beta1/doc.go
index fbcd9b7fea2..22d1c588bc7 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1beta1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1beta1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // +groupName=client.authentication.k8s.io
+
 package v1beta1 // import "k8s.io/client-go/pkg/apis/clientauthentication/v1beta1"
diff --git a/staging/src/k8s.io/client-go/pkg/version/doc.go b/staging/src/k8s.io/client-go/pkg/version/doc.go
index 30399fb0201..05e997e1335 100644
--- a/staging/src/k8s.io/client-go/pkg/version/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/version/doc.go
@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// +k8s:openapi-gen=true
+
 // Package version supplies version information collected at build time to
 // kubernetes components.
-// +k8s:openapi-gen=true
 package version // import "k8s.io/client-go/pkg/version"
diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/api/doc.go b/staging/src/k8s.io/client-go/tools/clientcmd/api/doc.go
index 0a081871ac8..5871575a669 100644
--- a/staging/src/k8s.io/client-go/tools/clientcmd/api/doc.go
+++ b/staging/src/k8s.io/client-go/tools/clientcmd/api/doc.go
@@ -15,4 +15,5 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+
 package api
diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/api/v1/doc.go b/staging/src/k8s.io/client-go/tools/clientcmd/api/v1/doc.go
index 9750cf73acc..cbf29ccf24d 100644
--- a/staging/src/k8s.io/client-go/tools/clientcmd/api/v1/doc.go
+++ b/staging/src/k8s.io/client-go/tools/clientcmd/api/v1/doc.go
@@ -15,4 +15,5 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+
 package v1
diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example/doc.go b/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example/doc.go
index b221d7eb49c..3285a056fa9 100644
--- a/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example/doc.go
+++ b/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=example.apiserver.code-generator.k8s.io
+
 package example // import "k8s.io/code-generator/_examples/apiserver/apis/example"
diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example/v1/doc.go b/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example/v1/doc.go
index 5b6bd5b306f..6b1fe6c1196 100644
--- a/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example/v1/doc.go
@@ -18,4 +18,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:conversion-gen=k8s.io/code-generator/_examples/apiserver/apis/example
 // +groupName=example.apiserver.code-generator.k8s.io
+
 package v1
diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example2/doc.go b/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example2/doc.go
index 3864803757f..0edb56dcddb 100644
--- a/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example2/doc.go
+++ b/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example2/doc.go
@@ -17,4 +17,5 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +groupName=example.test.apiserver.code-generator.k8s.io
 // +groupGoName=SecondExample
+
 package example2 // import "k8s.io/code-generator/_examples/apiserver/apis/example2"
diff --git a/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example2/v1/doc.go b/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example2/v1/doc.go
index 36bd4549cd5..211aefc8c4a 100644
--- a/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example2/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/_examples/apiserver/apis/example2/v1/doc.go
@@ -19,4 +19,5 @@ limitations under the License.
 // +groupName=example.test.apiserver.code-generator.k8s.io
 // +k8s:conversion-gen=k8s.io/code-generator/_examples/apiserver/apis/example2
 // +groupGoName=SecondExample
+
 package v1
diff --git a/staging/src/k8s.io/code-generator/_examples/crd/apis/example/v1/doc.go b/staging/src/k8s.io/code-generator/_examples/crd/apis/example/v1/doc.go
index e6614c0da66..673ac55d7b4 100644
--- a/staging/src/k8s.io/code-generator/_examples/crd/apis/example/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/_examples/crd/apis/example/v1/doc.go
@@ -17,4 +17,5 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=example.crd.code-generator.k8s.io
+
 package v1
diff --git a/staging/src/k8s.io/code-generator/_examples/crd/apis/example2/v1/doc.go b/staging/src/k8s.io/code-generator/_examples/crd/apis/example2/v1/doc.go
index 6521d83ff39..5d1cbec5efb 100644
--- a/staging/src/k8s.io/code-generator/_examples/crd/apis/example2/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/_examples/crd/apis/example2/v1/doc.go
@@ -18,4 +18,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=example.test.crd.code-generator.k8s.io
 // +groupGoName=SecondExample
+
 package v1
diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/doc.go
index def606a7e53..3bd2bc737c8 100644
--- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/doc.go
+++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/doc.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+// +groupName=apiregistration.k8s.io
 
 // Package api is the internal version of the API.
-// +groupName=apiregistration.k8s.io
 package apiregistration // import "k8s.io/kube-aggregator/pkg/apis/apiregistration"
diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/doc.go
index 33f07794e3a..026517b490f 100644
--- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/doc.go
+++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/doc.go
@@ -17,6 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/kube-aggregator/pkg/apis/apiregistration
 // +k8s:openapi-gen=true
+// +groupName=apiregistration.k8s.io
 
 // Package v1beta1 contains the API Registration API, which is responsible for
 // registering an API `Group`/`Version` with another kubernetes like API server.
@@ -31,6 +32,4 @@ limitations under the License.
 // The return status is a set of conditions for this aggregation. Currently
 // there is only one condition named "Available", if true, it means the
 // api/server requests will be redirected to specified API server.
-//
-// +groupName=apiregistration.k8s.io
 package v1 // import "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go
index d5de2002bb1..ad50d368306 100644
--- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go
+++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go
@@ -17,6 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/kube-aggregator/pkg/apis/apiregistration
 // +k8s:openapi-gen=true
+// +groupName=apiregistration.k8s.io
 
 // Package v1beta1 contains the API Registration API, which is responsible for
 // registering an API `Group`/`Version` with another kubernetes like API server.
@@ -31,6 +32,4 @@ limitations under the License.
 // The return status is a set of conditions for this aggregation. Currently
 // there is only one condition named "Available", if true, it means the
 // api/server requests will be redirected to specified API server.
-//
-// +groupName=apiregistration.k8s.io
 package v1beta1 // import "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
diff --git a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/doc.go b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/doc.go
index 73997cac16b..6810baab230 100644
--- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/doc.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=custom.metrics.k8s.io
+
 package custom_metrics
diff --git a/staging/src/k8s.io/metrics/pkg/apis/external_metrics/doc.go b/staging/src/k8s.io/metrics/pkg/apis/external_metrics/doc.go
index c450a1e3b64..5c6ecec9732 100644
--- a/staging/src/k8s.io/metrics/pkg/apis/external_metrics/doc.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/external_metrics/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=external.metrics.k8s.io
+
 package external_metrics
diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/doc.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/doc.go
index 9437a13f8af..0f970b0cebc 100644
--- a/staging/src/k8s.io/metrics/pkg/apis/metrics/doc.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=metrics.k8s.io
+
 package metrics
diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/doc.go
index 782c51d19c0..3b200cf7392 100644
--- a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/doc.go
+++ b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/doc.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+// +groupName=wardle.k8s.io
 
 // Package api is the internal version of the API.
-// +groupName=wardle.k8s.io
 package wardle
diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/doc.go
index 22f06f63c90..8b5d3d74241 100644
--- a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/doc.go
+++ b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/doc.go
@@ -17,7 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/sample-apiserver/pkg/apis/wardle
 // +k8s:defaulter-gen=TypeMeta
+// +groupName=wardle.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-// +groupName=wardle.k8s.io
 package v1alpha1
diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1/doc.go
index aa2f7a5b12b..788d82a99c6 100644
--- a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1/doc.go
+++ b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1/doc.go
@@ -17,7 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/sample-apiserver/pkg/apis/wardle
 // +k8s:defaulter-gen=TypeMeta
+// +groupName=wardle.k8s.io
 
 // Package v1beta1 is the v1beta1 version of the API.
-// +groupName=wardle.k8s.io
 package v1beta1
diff --git a/staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1/doc.go b/staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1/doc.go
index b445526984d..e6c135eed8d 100644
--- a/staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1/doc.go
+++ b/staging/src/k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1/doc.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+// +groupName=samplecontroller.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
-// +groupName=samplecontroller.k8s.io
 package v1alpha1