diff --git a/staging/src/k8s.io/api/doc.go b/staging/src/k8s.io/api/doc.go
new file mode 100644
index 00000000000..3248f7885cc
--- /dev/null
+++ b/staging/src/k8s.io/api/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package api // import "k8s.io/api"
diff --git a/staging/src/k8s.io/api/roundtrip_test.go b/staging/src/k8s.io/api/roundtrip_test.go
index a824eb6c8e9..1cc2c83f728 100644
--- a/staging/src/k8s.io/api/roundtrip_test.go
+++ b/staging/src/k8s.io/api/roundtrip_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package testing
+package api
 
 import (
 	"math/rand"
diff --git a/staging/src/k8s.io/apimachinery/doc.go b/staging/src/k8s.io/apimachinery/doc.go
new file mode 100644
index 00000000000..23f56769909
--- /dev/null
+++ b/staging/src/k8s.io/apimachinery/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package apimachinery // import "k8s.io/apimachinery"
diff --git a/staging/src/k8s.io/apiserver/doc.go b/staging/src/k8s.io/apiserver/doc.go
new file mode 100644
index 00000000000..be78efac8ed
--- /dev/null
+++ b/staging/src/k8s.io/apiserver/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package apiserver // import "k8s.io/apiserver"
diff --git a/staging/src/k8s.io/cli-runtime/doc.go b/staging/src/k8s.io/cli-runtime/doc.go
new file mode 100644
index 00000000000..9bf7ea0eebd
--- /dev/null
+++ b/staging/src/k8s.io/cli-runtime/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cliruntime // import "k8s.io/cli-runtime"
diff --git a/staging/src/k8s.io/client-go/doc.go b/staging/src/k8s.io/client-go/doc.go
new file mode 100644
index 00000000000..2d69be7194b
--- /dev/null
+++ b/staging/src/k8s.io/client-go/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package clientgo // import "k8s.io/client-go"
diff --git a/staging/src/k8s.io/cluster-bootstrap/doc.go b/staging/src/k8s.io/cluster-bootstrap/doc.go
new file mode 100644
index 00000000000..f7ed9686bea
--- /dev/null
+++ b/staging/src/k8s.io/cluster-bootstrap/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package clusterbootstrap // import "k8s.io/cluster-bootstrap"
diff --git a/staging/src/k8s.io/code-generator/doc.go b/staging/src/k8s.io/code-generator/doc.go
new file mode 100644
index 00000000000..fd867306974
--- /dev/null
+++ b/staging/src/k8s.io/code-generator/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package codegenerator // import "k8s.io/code-generator"
diff --git a/staging/src/k8s.io/code-generator/tools.go b/staging/src/k8s.io/code-generator/tools.go
index ce7f7f47632..fb797be0327 100644
--- a/staging/src/k8s.io/code-generator/tools.go
+++ b/staging/src/k8s.io/code-generator/tools.go
@@ -19,7 +19,7 @@ limitations under the License.
 
 // This package contains code generation utilities
 // This package imports things required by build scripts, to force `go mod` to see them as dependencies
-package tools
+package codegenerator
 
 import (
 	_ "k8s.io/code-generator/cmd/client-gen"
diff --git a/staging/src/k8s.io/component-base/doc.go b/staging/src/k8s.io/component-base/doc.go
new file mode 100644
index 00000000000..7ee34e9dae5
--- /dev/null
+++ b/staging/src/k8s.io/component-base/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package componentbase // import "k8s.io/component-base"
diff --git a/staging/src/k8s.io/component-helpers/doc.go b/staging/src/k8s.io/component-helpers/doc.go
new file mode 100644
index 00000000000..fa7a3ee24de
--- /dev/null
+++ b/staging/src/k8s.io/component-helpers/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package componenthelpers // import "k8s.io/component-helpers"
diff --git a/staging/src/k8s.io/cri-api/doc.go b/staging/src/k8s.io/cri-api/doc.go
new file mode 100644
index 00000000000..c74e04a34be
--- /dev/null
+++ b/staging/src/k8s.io/cri-api/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package criapi // import "k8s.io/cri-api"
diff --git a/staging/src/k8s.io/kube-controller-manager/doc.go b/staging/src/k8s.io/kube-controller-manager/doc.go
new file mode 100644
index 00000000000..872ff13c645
--- /dev/null
+++ b/staging/src/k8s.io/kube-controller-manager/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kubecontrollermanager // import "k8s.io/kube-controller-manager"
diff --git a/staging/src/k8s.io/kube-proxy/doc.go b/staging/src/k8s.io/kube-proxy/doc.go
new file mode 100644
index 00000000000..85975687e46
--- /dev/null
+++ b/staging/src/k8s.io/kube-proxy/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kubeproxy // import "k8s.io/kube-proxy"
diff --git a/staging/src/k8s.io/kube-scheduler/doc.go b/staging/src/k8s.io/kube-scheduler/doc.go
new file mode 100644
index 00000000000..b549e979eb6
--- /dev/null
+++ b/staging/src/k8s.io/kube-scheduler/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kubescheduler // import "k8s.io/kube-scheduler"
diff --git a/staging/src/k8s.io/kubectl/doc.go b/staging/src/k8s.io/kubectl/doc.go
new file mode 100644
index 00000000000..c6983d686a6
--- /dev/null
+++ b/staging/src/k8s.io/kubectl/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kubectl // import "k8s.io/kubectl"
diff --git a/staging/src/k8s.io/kubelet/doc.go b/staging/src/k8s.io/kubelet/doc.go
new file mode 100644
index 00000000000..c28502e873f
--- /dev/null
+++ b/staging/src/k8s.io/kubelet/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kubelet // import "k8s.io/kubelet"
diff --git a/staging/src/k8s.io/legacy-cloud-providers/doc.go b/staging/src/k8s.io/legacy-cloud-providers/doc.go
new file mode 100644
index 00000000000..8756548d4b0
--- /dev/null
+++ b/staging/src/k8s.io/legacy-cloud-providers/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package legacycloudproviders // import "k8s.io/legacy-cloud-providers"
diff --git a/staging/src/k8s.io/metrics/doc.go b/staging/src/k8s.io/metrics/doc.go
new file mode 100644
index 00000000000..3e5588c70d2
--- /dev/null
+++ b/staging/src/k8s.io/metrics/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package metrics // import "k8s.io/metrics"
diff --git a/staging/src/k8s.io/sample-cli-plugin/doc.go b/staging/src/k8s.io/sample-cli-plugin/doc.go
new file mode 100644
index 00000000000..442ca2f840b
--- /dev/null
+++ b/staging/src/k8s.io/sample-cli-plugin/doc.go
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package samplecliplugin // import "k8s.io/sample-cli-plugin"