diff --git a/plugin/BUILD b/plugin/BUILD
index e0765f5af59..e0af06e389d 100644
--- a/plugin/BUILD
+++ b/plugin/BUILD
@@ -26,8 +26,6 @@ filegroup(
         "//plugin/pkg/admission/namespace/autoprovision:all-srcs",
         "//plugin/pkg/admission/namespace/exists:all-srcs",
         "//plugin/pkg/admission/noderestriction:all-srcs",
-        "//plugin/pkg/admission/persistentvolume/label:all-srcs",
-        "//plugin/pkg/admission/persistentvolume/resize:all-srcs",
         "//plugin/pkg/admission/podnodeselector:all-srcs",
         "//plugin/pkg/admission/podpreset:all-srcs",
         "//plugin/pkg/admission/podtolerationrestriction:all-srcs",
@@ -36,6 +34,8 @@ filegroup(
         "//plugin/pkg/admission/security:all-srcs",
         "//plugin/pkg/admission/securitycontext/scdeny:all-srcs",
         "//plugin/pkg/admission/serviceaccount:all-srcs",
+        "//plugin/pkg/admission/storage/persistentvolume/label:all-srcs",
+        "//plugin/pkg/admission/storage/persistentvolume/resize:all-srcs",
         "//plugin/pkg/admission/storage/storageclass/setdefault:all-srcs",
         "//plugin/pkg/admission/storage/storageobjectinuseprotection:all-srcs",
         "//plugin/pkg/auth:all-srcs",
diff --git a/plugin/pkg/admission/persistentvolume/label/BUILD b/plugin/pkg/admission/storage/persistentvolume/label/BUILD
similarity index 94%
rename from plugin/pkg/admission/persistentvolume/label/BUILD
rename to plugin/pkg/admission/storage/persistentvolume/label/BUILD
index 7a0e4da7156..d38633056c6 100644
--- a/plugin/pkg/admission/persistentvolume/label/BUILD
+++ b/plugin/pkg/admission/storage/persistentvolume/label/BUILD
@@ -12,7 +12,7 @@ go_library(
         "admission.go",
         "doc.go",
     ],
-    importpath = "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/label",
+    importpath = "k8s.io/kubernetes/plugin/pkg/admission/storage/persistentvolume/label",
     deps = [
         "//pkg/apis/core:go_default_library",
         "//pkg/cloudprovider:go_default_library",
diff --git a/plugin/pkg/admission/persistentvolume/label/admission.go b/plugin/pkg/admission/storage/persistentvolume/label/admission.go
similarity index 100%
rename from plugin/pkg/admission/persistentvolume/label/admission.go
rename to plugin/pkg/admission/storage/persistentvolume/label/admission.go
diff --git a/plugin/pkg/admission/persistentvolume/label/admission_test.go b/plugin/pkg/admission/storage/persistentvolume/label/admission_test.go
similarity index 100%
rename from plugin/pkg/admission/persistentvolume/label/admission_test.go
rename to plugin/pkg/admission/storage/persistentvolume/label/admission_test.go
diff --git a/plugin/pkg/admission/persistentvolume/label/doc.go b/plugin/pkg/admission/storage/persistentvolume/label/doc.go
similarity index 95%
rename from plugin/pkg/admission/persistentvolume/label/doc.go
rename to plugin/pkg/admission/storage/persistentvolume/label/doc.go
index b1e2c79e4c8..5a7b3cfbd37 100644
--- a/plugin/pkg/admission/persistentvolume/label/doc.go
+++ b/plugin/pkg/admission/storage/persistentvolume/label/doc.go
@@ -16,4 +16,4 @@ limitations under the License.
 
 // labels created persistent volumes with zone information
 // as provided by the cloud provider
-package label // import "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/label"
+package label // import "k8s.io/kubernetes/plugin/pkg/admission/storage/persistentvolume/label"
diff --git a/plugin/pkg/admission/persistentvolume/resize/BUILD b/plugin/pkg/admission/storage/persistentvolume/resize/BUILD
similarity index 94%
rename from plugin/pkg/admission/persistentvolume/resize/BUILD
rename to plugin/pkg/admission/storage/persistentvolume/resize/BUILD
index fab03d04f02..444764320e5 100644
--- a/plugin/pkg/admission/persistentvolume/resize/BUILD
+++ b/plugin/pkg/admission/storage/persistentvolume/resize/BUILD
@@ -26,7 +26,7 @@ go_test(
 go_library(
     name = "go_default_library",
     srcs = ["admission.go"],
-    importpath = "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/resize",
+    importpath = "k8s.io/kubernetes/plugin/pkg/admission/storage/persistentvolume/resize",
     deps = [
         "//pkg/apis/core:go_default_library",
         "//pkg/apis/core/helper:go_default_library",
diff --git a/plugin/pkg/admission/persistentvolume/resize/admission.go b/plugin/pkg/admission/storage/persistentvolume/resize/admission.go
similarity index 100%
rename from plugin/pkg/admission/persistentvolume/resize/admission.go
rename to plugin/pkg/admission/storage/persistentvolume/resize/admission.go
diff --git a/plugin/pkg/admission/persistentvolume/resize/admission_test.go b/plugin/pkg/admission/storage/persistentvolume/resize/admission_test.go
similarity index 100%
rename from plugin/pkg/admission/persistentvolume/resize/admission_test.go
rename to plugin/pkg/admission/storage/persistentvolume/resize/admission_test.go