diff --git a/pkg/admission/BUILD b/pkg/admission/BUILD
index 294e34eaf..761a7b149 100644
--- a/pkg/admission/BUILD
+++ b/pkg/admission/BUILD
@@ -68,7 +68,7 @@ filegroup(
         "//staging/src/k8s.io/apiserver/pkg/admission/initializer:all-srcs",
         "//staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization:all-srcs",
         "//staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook:all-srcs",
+        "//staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook:all-srcs",
     ],
     tags = ["automanaged"],
 )
diff --git a/pkg/admission/plugin/webhook/webhook/BUILD b/pkg/admission/plugin/webhook/BUILD
similarity index 95%
rename from pkg/admission/plugin/webhook/webhook/BUILD
rename to pkg/admission/plugin/webhook/BUILD
index 78d390927..5a29c15d2 100644
--- a/pkg/admission/plugin/webhook/webhook/BUILD
+++ b/pkg/admission/plugin/webhook/BUILD
@@ -11,7 +11,7 @@ go_library(
         "rules.go",
         "serviceresolver.go",
     ],
-    importpath = "k8s.io/apiserver/pkg/admission/plugin/webhook/webhook",
+    importpath = "k8s.io/apiserver/pkg/admission/plugin/webhook",
     visibility = ["//visibility:public"],
     deps = [
         "//vendor/github.com/golang/glog:go_default_library",
@@ -44,7 +44,7 @@ go_test(
         "rules_test.go",
         "serviceresolver_test.go",
     ],
-    importpath = "k8s.io/apiserver/pkg/admission/plugin/webhook/webhook",
+    importpath = "k8s.io/apiserver/pkg/admission/plugin/webhook",
     library = ":go_default_library",
     deps = [
         "//vendor/k8s.io/api/admission/v1alpha1:go_default_library",
diff --git a/pkg/admission/plugin/webhook/webhook/admission.go b/pkg/admission/plugin/webhook/admission.go
similarity index 100%
rename from pkg/admission/plugin/webhook/webhook/admission.go
rename to pkg/admission/plugin/webhook/admission.go
diff --git a/pkg/admission/plugin/webhook/webhook/admission_test.go b/pkg/admission/plugin/webhook/admission_test.go
similarity index 100%
rename from pkg/admission/plugin/webhook/webhook/admission_test.go
rename to pkg/admission/plugin/webhook/admission_test.go
diff --git a/pkg/admission/plugin/webhook/webhook/admissionreview.go b/pkg/admission/plugin/webhook/admissionreview.go
similarity index 100%
rename from pkg/admission/plugin/webhook/webhook/admissionreview.go
rename to pkg/admission/plugin/webhook/admissionreview.go
diff --git a/pkg/admission/plugin/webhook/webhook/authentication.go b/pkg/admission/plugin/webhook/authentication.go
similarity index 100%
rename from pkg/admission/plugin/webhook/webhook/authentication.go
rename to pkg/admission/plugin/webhook/authentication.go
diff --git a/pkg/admission/plugin/webhook/webhook/authentication_test.go b/pkg/admission/plugin/webhook/authentication_test.go
similarity index 100%
rename from pkg/admission/plugin/webhook/webhook/authentication_test.go
rename to pkg/admission/plugin/webhook/authentication_test.go
diff --git a/pkg/admission/plugin/webhook/webhook/certs_test.go b/pkg/admission/plugin/webhook/certs_test.go
similarity index 100%
rename from pkg/admission/plugin/webhook/webhook/certs_test.go
rename to pkg/admission/plugin/webhook/certs_test.go
diff --git a/pkg/admission/plugin/webhook/webhook/config.go b/pkg/admission/plugin/webhook/config.go
similarity index 100%
rename from pkg/admission/plugin/webhook/webhook/config.go
rename to pkg/admission/plugin/webhook/config.go
diff --git a/pkg/admission/plugin/webhook/webhook/doc.go b/pkg/admission/plugin/webhook/doc.go
similarity index 100%
rename from pkg/admission/plugin/webhook/webhook/doc.go
rename to pkg/admission/plugin/webhook/doc.go
diff --git a/pkg/admission/plugin/webhook/webhook/gencerts.sh b/pkg/admission/plugin/webhook/gencerts.sh
similarity index 100%
rename from pkg/admission/plugin/webhook/webhook/gencerts.sh
rename to pkg/admission/plugin/webhook/gencerts.sh
diff --git a/pkg/admission/plugin/webhook/webhook/rules.go b/pkg/admission/plugin/webhook/rules.go
similarity index 100%
rename from pkg/admission/plugin/webhook/webhook/rules.go
rename to pkg/admission/plugin/webhook/rules.go
diff --git a/pkg/admission/plugin/webhook/webhook/rules_test.go b/pkg/admission/plugin/webhook/rules_test.go
similarity index 100%
rename from pkg/admission/plugin/webhook/webhook/rules_test.go
rename to pkg/admission/plugin/webhook/rules_test.go
diff --git a/pkg/admission/plugin/webhook/webhook/serviceresolver.go b/pkg/admission/plugin/webhook/serviceresolver.go
similarity index 100%
rename from pkg/admission/plugin/webhook/webhook/serviceresolver.go
rename to pkg/admission/plugin/webhook/serviceresolver.go
diff --git a/pkg/admission/plugin/webhook/webhook/serviceresolver_test.go b/pkg/admission/plugin/webhook/serviceresolver_test.go
similarity index 100%
rename from pkg/admission/plugin/webhook/webhook/serviceresolver_test.go
rename to pkg/admission/plugin/webhook/serviceresolver_test.go
diff --git a/pkg/server/BUILD b/pkg/server/BUILD
index 77a1caaa5..3d56d3a26 100644
--- a/pkg/server/BUILD
+++ b/pkg/server/BUILD
@@ -85,7 +85,7 @@ go_library(
         "//vendor/k8s.io/apiserver/pkg/admission:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/admission/plugin/initialization:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook:go_default_library",
+        "//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/apis/apiserver/install:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/audit:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/audit/policy:go_default_library",
diff --git a/pkg/server/options/BUILD b/pkg/server/options/BUILD
index 422e9a22c..6672d1a5c 100644
--- a/pkg/server/options/BUILD
+++ b/pkg/server/options/BUILD
@@ -32,7 +32,7 @@ go_library(
         "//vendor/k8s.io/apiserver/pkg/admission/initializer:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/admission/plugin/initialization:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook:go_default_library",
+        "//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/apis/audit/v1beta1:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/audit:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/audit/policy:go_default_library",
diff --git a/pkg/server/options/admission.go b/pkg/server/options/admission.go
index 184afdbe8..601a26d23 100644
--- a/pkg/server/options/admission.go
+++ b/pkg/server/options/admission.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/apiserver/pkg/admission/initializer"
 	"k8s.io/apiserver/pkg/admission/plugin/initialization"
 	"k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle"
-	"k8s.io/apiserver/pkg/admission/plugin/webhook/webhook"
+	"k8s.io/apiserver/pkg/admission/plugin/webhook"
 	"k8s.io/apiserver/pkg/server"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"
diff --git a/pkg/server/plugins.go b/pkg/server/plugins.go
index 99ed7e891..e744c8ae2 100644
--- a/pkg/server/plugins.go
+++ b/pkg/server/plugins.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/apiserver/pkg/admission"
 	"k8s.io/apiserver/pkg/admission/plugin/initialization"
 	"k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle"
-	"k8s.io/apiserver/pkg/admission/plugin/webhook/webhook"
+	"k8s.io/apiserver/pkg/admission/plugin/webhook"
 )
 
 // RegisterAllAdmissionPlugins registers all admission plugins