diff --git a/pkg/util/metrics/BUILD b/pkg/util/metrics/BUILD
index 9545c23ea10..f6ebcabce7b 100644
--- a/pkg/util/metrics/BUILD
+++ b/pkg/util/metrics/BUILD
@@ -8,43 +8,20 @@ load(
 
 go_library(
     name = "go_default_library",
-    srcs = [
-        "counter.go",
-        "metric.go",
-        "opts.go",
-        "registry.go",
-        "util.go",
-        "version_parser.go",
-        "wrappers.go",
-    ],
+    srcs = ["util.go"],
     importpath = "k8s.io/kubernetes/pkg/util/metrics",
     deps = [
-        "//pkg/version:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/version:go_default_library",
         "//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library",
-        "//vendor/github.com/blang/semver:go_default_library",
         "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
-        "//vendor/github.com/prometheus/client_model/go:go_default_library",
-        "//vendor/k8s.io/klog:go_default_library",
     ],
 )
 
 go_test(
     name = "go_default_test",
-    srcs = [
-        "counter_test.go",
-        "registry_test.go",
-        "util_test.go",
-        "version_parser_test.go",
-    ],
+    srcs = ["util_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//staging/src/k8s.io/apimachinery/pkg/version:go_default_library",
         "//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library",
-        "//vendor/github.com/blang/semver:go_default_library",
-        "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
-        "//vendor/github.com/prometheus/common/expfmt:go_default_library",
-        "//vendor/github.com/stretchr/testify/assert:go_default_library",
     ],
 )
 
@@ -57,6 +34,9 @@ filegroup(
 
 filegroup(
     name = "all-srcs",
-    srcs = [":package-srcs"],
+    srcs = [
+        ":package-srcs",
+        "//pkg/util/metrics/framework:all-srcs",
+    ],
     tags = ["automanaged"],
 )
diff --git a/pkg/util/metrics/framework/BUILD b/pkg/util/metrics/framework/BUILD
new file mode 100644
index 00000000000..1314bbde4a1
--- /dev/null
+++ b/pkg/util/metrics/framework/BUILD
@@ -0,0 +1,58 @@
+package(default_visibility = ["//visibility:public"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+    "go_test",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "counter.go",
+        "metric.go",
+        "opts.go",
+        "registry.go",
+        "version_parser.go",
+        "wrappers.go",
+    ],
+    importpath = "k8s.io/kubernetes/pkg/util/metrics/framework",
+    deps = [
+        "//pkg/version:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/version:go_default_library",
+        "//vendor/github.com/blang/semver:go_default_library",
+        "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
+        "//vendor/github.com/prometheus/client_model/go:go_default_library",
+        "//vendor/k8s.io/klog:go_default_library",
+    ],
+)
+
+go_test(
+    name = "go_default_test",
+    srcs = [
+        "counter_test.go",
+        "registry_test.go",
+        "version_parser_test.go",
+    ],
+    embed = [":go_default_library"],
+    deps = [
+        "//staging/src/k8s.io/apimachinery/pkg/version:go_default_library",
+        "//vendor/github.com/blang/semver:go_default_library",
+        "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
+        "//vendor/github.com/prometheus/common/expfmt:go_default_library",
+        "//vendor/github.com/stretchr/testify/assert:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+)
diff --git a/pkg/util/metrics/counter.go b/pkg/util/metrics/framework/counter.go
similarity index 99%
rename from pkg/util/metrics/counter.go
rename to pkg/util/metrics/framework/counter.go
index 69367ac5822..d02b7fd8369 100644
--- a/pkg/util/metrics/counter.go
+++ b/pkg/util/metrics/framework/counter.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package metrics
+package framework
 
 import (
 	"github.com/blang/semver"
diff --git a/pkg/util/metrics/counter_test.go b/pkg/util/metrics/framework/counter_test.go
similarity index 99%
rename from pkg/util/metrics/counter_test.go
rename to pkg/util/metrics/framework/counter_test.go
index 742230b51e4..26db8c1c5ac 100644
--- a/pkg/util/metrics/counter_test.go
+++ b/pkg/util/metrics/framework/counter_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package metrics
+package framework
 
 import (
 	"bytes"
diff --git a/pkg/util/metrics/metric.go b/pkg/util/metrics/framework/metric.go
similarity index 99%
rename from pkg/util/metrics/metric.go
rename to pkg/util/metrics/framework/metric.go
index 7231c2af2ce..6f41041e09e 100644
--- a/pkg/util/metrics/metric.go
+++ b/pkg/util/metrics/framework/metric.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package metrics
+package framework
 
 import (
 	"github.com/blang/semver"
diff --git a/pkg/util/metrics/opts.go b/pkg/util/metrics/framework/opts.go
similarity index 99%
rename from pkg/util/metrics/opts.go
rename to pkg/util/metrics/framework/opts.go
index f13e7edffd1..44597601697 100644
--- a/pkg/util/metrics/opts.go
+++ b/pkg/util/metrics/framework/opts.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package metrics
+package framework
 
 import (
 	"fmt"
diff --git a/pkg/util/metrics/registry.go b/pkg/util/metrics/framework/registry.go
similarity index 99%
rename from pkg/util/metrics/registry.go
rename to pkg/util/metrics/framework/registry.go
index 2c15f95ca74..9b42b935e0d 100644
--- a/pkg/util/metrics/registry.go
+++ b/pkg/util/metrics/framework/registry.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package metrics
+package framework
 
 import (
 	"github.com/blang/semver"
diff --git a/pkg/util/metrics/registry_test.go b/pkg/util/metrics/framework/registry_test.go
similarity index 99%
rename from pkg/util/metrics/registry_test.go
rename to pkg/util/metrics/framework/registry_test.go
index aeea754bb88..7d72e78aadf 100644
--- a/pkg/util/metrics/registry_test.go
+++ b/pkg/util/metrics/framework/registry_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package metrics
+package framework
 
 import (
 	"github.com/blang/semver"
diff --git a/pkg/util/metrics/version_parser.go b/pkg/util/metrics/framework/version_parser.go
similarity index 98%
rename from pkg/util/metrics/version_parser.go
rename to pkg/util/metrics/framework/version_parser.go
index df79582d372..2d94f33c0d3 100644
--- a/pkg/util/metrics/version_parser.go
+++ b/pkg/util/metrics/framework/version_parser.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package metrics
+package framework
 
 import (
 	"fmt"
diff --git a/pkg/util/metrics/version_parser_test.go b/pkg/util/metrics/framework/version_parser_test.go
similarity index 98%
rename from pkg/util/metrics/version_parser_test.go
rename to pkg/util/metrics/framework/version_parser_test.go
index 648f78948ac..ac02ae5bb77 100644
--- a/pkg/util/metrics/version_parser_test.go
+++ b/pkg/util/metrics/framework/version_parser_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package metrics
+package framework
 
 import (
 	apimachineryversion "k8s.io/apimachinery/pkg/version"
diff --git a/pkg/util/metrics/wrappers.go b/pkg/util/metrics/framework/wrappers.go
similarity index 99%
rename from pkg/util/metrics/wrappers.go
rename to pkg/util/metrics/framework/wrappers.go
index 29d44ceb2c0..c085bed8e1a 100644
--- a/pkg/util/metrics/wrappers.go
+++ b/pkg/util/metrics/framework/wrappers.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package metrics
+package framework
 
 import (
 	"github.com/prometheus/client_golang/prometheus"