diff --git a/pyrightconfig.stricter.json b/pyrightconfig.stricter.json
index 08ff5a63e091..74196972b4ee 100644
--- a/pyrightconfig.stricter.json
+++ b/pyrightconfig.stricter.json
@@ -44,11 +44,11 @@
         "stubs/gdb",
         "stubs/geopandas",
         "stubs/google-cloud-ndb",
+        "stubs/grpcio-channelz/grpc_channelz/v1",
+        "stubs/grpcio-health-checking/grpc_health/v1/health_pb2_grpc.pyi",
+        "stubs/grpcio-reflection/grpc_reflection/v1alpha",
+        "stubs/grpcio-status/grpc_status",
         "stubs/grpcio/grpc/__init__.pyi",
-        "stubs/grpcio/grpc_channelz/v1",
-        "stubs/grpcio/grpc_health/v1/health_pb2_grpc.pyi",
-        "stubs/grpcio/grpc_reflection/v1alpha",
-        "stubs/grpcio/grpc_status",
         "stubs/hdbcli/hdbcli/dbapi.pyi",
         "stubs/html5lib",
         "stubs/httplib2",
diff --git a/stubs/grpcio-channelz/METADATA.toml b/stubs/grpcio-channelz/METADATA.toml
new file mode 100644
index 000000000000..bac12ed6b8d8
--- /dev/null
+++ b/stubs/grpcio-channelz/METADATA.toml
@@ -0,0 +1,3 @@
+version = "1.*"
+upstream_repository = "https://github.com/grpc/grpc"
+requires = ["types-grpcio", "types-protobuf"]
diff --git a/stubs/grpcio/grpc_channelz/__init__.pyi b/stubs/grpcio-channelz/grpc_channelz/__init__.pyi
similarity index 100%
rename from stubs/grpcio/grpc_channelz/__init__.pyi
rename to stubs/grpcio-channelz/grpc_channelz/__init__.pyi
diff --git a/stubs/grpcio/grpc_channelz/v1/__init__.pyi b/stubs/grpcio-channelz/grpc_channelz/v1/__init__.pyi
similarity index 100%
rename from stubs/grpcio/grpc_channelz/v1/__init__.pyi
rename to stubs/grpcio-channelz/grpc_channelz/v1/__init__.pyi
diff --git a/stubs/grpcio/grpc_channelz/v1/_async.pyi b/stubs/grpcio-channelz/grpc_channelz/v1/_async.pyi
similarity index 100%
rename from stubs/grpcio/grpc_channelz/v1/_async.pyi
rename to stubs/grpcio-channelz/grpc_channelz/v1/_async.pyi
diff --git a/stubs/grpcio/grpc_channelz/v1/_servicer.pyi b/stubs/grpcio-channelz/grpc_channelz/v1/_servicer.pyi
similarity index 100%
rename from stubs/grpcio/grpc_channelz/v1/_servicer.pyi
rename to stubs/grpcio-channelz/grpc_channelz/v1/_servicer.pyi
diff --git a/stubs/grpcio/grpc_channelz/v1/channelz.pyi b/stubs/grpcio-channelz/grpc_channelz/v1/channelz.pyi
similarity index 100%
rename from stubs/grpcio/grpc_channelz/v1/channelz.pyi
rename to stubs/grpcio-channelz/grpc_channelz/v1/channelz.pyi
diff --git a/stubs/grpcio/grpc_channelz/v1/channelz_pb2.pyi b/stubs/grpcio-channelz/grpc_channelz/v1/channelz_pb2.pyi
similarity index 100%
rename from stubs/grpcio/grpc_channelz/v1/channelz_pb2.pyi
rename to stubs/grpcio-channelz/grpc_channelz/v1/channelz_pb2.pyi
diff --git a/stubs/grpcio/grpc_channelz/v1/channelz_pb2_grpc.pyi b/stubs/grpcio-channelz/grpc_channelz/v1/channelz_pb2_grpc.pyi
similarity index 100%
rename from stubs/grpcio/grpc_channelz/v1/channelz_pb2_grpc.pyi
rename to stubs/grpcio-channelz/grpc_channelz/v1/channelz_pb2_grpc.pyi
diff --git a/stubs/grpcio-health-checking/METADATA.toml b/stubs/grpcio-health-checking/METADATA.toml
new file mode 100644
index 000000000000..bac12ed6b8d8
--- /dev/null
+++ b/stubs/grpcio-health-checking/METADATA.toml
@@ -0,0 +1,3 @@
+version = "1.*"
+upstream_repository = "https://github.com/grpc/grpc"
+requires = ["types-grpcio", "types-protobuf"]
diff --git a/stubs/grpcio/grpc_health/__init__.pyi b/stubs/grpcio-health-checking/grpc_health/__init__.pyi
similarity index 100%
rename from stubs/grpcio/grpc_health/__init__.pyi
rename to stubs/grpcio-health-checking/grpc_health/__init__.pyi
diff --git a/stubs/grpcio/grpc_health/v1/__init__.pyi b/stubs/grpcio-health-checking/grpc_health/v1/__init__.pyi
similarity index 100%
rename from stubs/grpcio/grpc_health/v1/__init__.pyi
rename to stubs/grpcio-health-checking/grpc_health/v1/__init__.pyi
diff --git a/stubs/grpcio/grpc_health/v1/health.pyi b/stubs/grpcio-health-checking/grpc_health/v1/health.pyi
similarity index 100%
rename from stubs/grpcio/grpc_health/v1/health.pyi
rename to stubs/grpcio-health-checking/grpc_health/v1/health.pyi
diff --git a/stubs/grpcio/grpc_health/v1/health_pb2.pyi b/stubs/grpcio-health-checking/grpc_health/v1/health_pb2.pyi
similarity index 100%
rename from stubs/grpcio/grpc_health/v1/health_pb2.pyi
rename to stubs/grpcio-health-checking/grpc_health/v1/health_pb2.pyi
diff --git a/stubs/grpcio/grpc_health/v1/health_pb2_grpc.pyi b/stubs/grpcio-health-checking/grpc_health/v1/health_pb2_grpc.pyi
similarity index 100%
rename from stubs/grpcio/grpc_health/v1/health_pb2_grpc.pyi
rename to stubs/grpcio-health-checking/grpc_health/v1/health_pb2_grpc.pyi
diff --git a/stubs/grpcio/@tests/test_cases/check_reflection.py b/stubs/grpcio-reflection/@tests/test_cases/check_reflection.py
similarity index 100%
rename from stubs/grpcio/@tests/test_cases/check_reflection.py
rename to stubs/grpcio-reflection/@tests/test_cases/check_reflection.py
diff --git a/stubs/grpcio/@tests/test_cases/check_reflection_aio.py b/stubs/grpcio-reflection/@tests/test_cases/check_reflection_aio.py
similarity index 100%
rename from stubs/grpcio/@tests/test_cases/check_reflection_aio.py
rename to stubs/grpcio-reflection/@tests/test_cases/check_reflection_aio.py
diff --git a/stubs/grpcio-reflection/METADATA.toml b/stubs/grpcio-reflection/METADATA.toml
new file mode 100644
index 000000000000..bac12ed6b8d8
--- /dev/null
+++ b/stubs/grpcio-reflection/METADATA.toml
@@ -0,0 +1,3 @@
+version = "1.*"
+upstream_repository = "https://github.com/grpc/grpc"
+requires = ["types-grpcio", "types-protobuf"]
diff --git a/stubs/grpcio/grpc_reflection/__init__.pyi b/stubs/grpcio-reflection/grpc_reflection/__init__.pyi
similarity index 100%
rename from stubs/grpcio/grpc_reflection/__init__.pyi
rename to stubs/grpcio-reflection/grpc_reflection/__init__.pyi
diff --git a/stubs/grpcio/grpc_reflection/v1alpha/__init__.pyi b/stubs/grpcio-reflection/grpc_reflection/v1alpha/__init__.pyi
similarity index 100%
rename from stubs/grpcio/grpc_reflection/v1alpha/__init__.pyi
rename to stubs/grpcio-reflection/grpc_reflection/v1alpha/__init__.pyi
diff --git a/stubs/grpcio/grpc_reflection/v1alpha/_async.pyi b/stubs/grpcio-reflection/grpc_reflection/v1alpha/_async.pyi
similarity index 100%
rename from stubs/grpcio/grpc_reflection/v1alpha/_async.pyi
rename to stubs/grpcio-reflection/grpc_reflection/v1alpha/_async.pyi
diff --git a/stubs/grpcio/grpc_reflection/v1alpha/_base.pyi b/stubs/grpcio-reflection/grpc_reflection/v1alpha/_base.pyi
similarity index 100%
rename from stubs/grpcio/grpc_reflection/v1alpha/_base.pyi
rename to stubs/grpcio-reflection/grpc_reflection/v1alpha/_base.pyi
diff --git a/stubs/grpcio/grpc_reflection/v1alpha/proto_reflection_descriptor_database.pyi b/stubs/grpcio-reflection/grpc_reflection/v1alpha/proto_reflection_descriptor_database.pyi
similarity index 100%
rename from stubs/grpcio/grpc_reflection/v1alpha/proto_reflection_descriptor_database.pyi
rename to stubs/grpcio-reflection/grpc_reflection/v1alpha/proto_reflection_descriptor_database.pyi
diff --git a/stubs/grpcio/grpc_reflection/v1alpha/reflection.pyi b/stubs/grpcio-reflection/grpc_reflection/v1alpha/reflection.pyi
similarity index 100%
rename from stubs/grpcio/grpc_reflection/v1alpha/reflection.pyi
rename to stubs/grpcio-reflection/grpc_reflection/v1alpha/reflection.pyi
diff --git a/stubs/grpcio/grpc_reflection/v1alpha/reflection_pb2.pyi b/stubs/grpcio-reflection/grpc_reflection/v1alpha/reflection_pb2.pyi
similarity index 100%
rename from stubs/grpcio/grpc_reflection/v1alpha/reflection_pb2.pyi
rename to stubs/grpcio-reflection/grpc_reflection/v1alpha/reflection_pb2.pyi
diff --git a/stubs/grpcio/grpc_reflection/v1alpha/reflection_pb2_grpc.pyi b/stubs/grpcio-reflection/grpc_reflection/v1alpha/reflection_pb2_grpc.pyi
similarity index 100%
rename from stubs/grpcio/grpc_reflection/v1alpha/reflection_pb2_grpc.pyi
rename to stubs/grpcio-reflection/grpc_reflection/v1alpha/reflection_pb2_grpc.pyi
diff --git a/stubs/grpcio-status/METADATA.toml b/stubs/grpcio-status/METADATA.toml
new file mode 100644
index 000000000000..f70c0410a6a0
--- /dev/null
+++ b/stubs/grpcio-status/METADATA.toml
@@ -0,0 +1,3 @@
+version = "1.*"
+upstream_repository = "https://github.com/grpc/grpc"
+requires = ["types-grpcio"]
diff --git a/stubs/grpcio/grpc_status/__init__.pyi b/stubs/grpcio-status/grpc_status/__init__.pyi
similarity index 100%
rename from stubs/grpcio/grpc_status/__init__.pyi
rename to stubs/grpcio-status/grpc_status/__init__.pyi
diff --git a/stubs/grpcio/grpc_status/_async.pyi b/stubs/grpcio-status/grpc_status/_async.pyi
similarity index 100%
rename from stubs/grpcio/grpc_status/_async.pyi
rename to stubs/grpcio-status/grpc_status/_async.pyi
diff --git a/stubs/grpcio/grpc_status/rpc_status.pyi b/stubs/grpcio-status/grpc_status/rpc_status.pyi
similarity index 100%
rename from stubs/grpcio/grpc_status/rpc_status.pyi
rename to stubs/grpcio-status/grpc_status/rpc_status.pyi
diff --git a/stubs/grpcio/METADATA.toml b/stubs/grpcio/METADATA.toml
index 9c94f65fb2ef..b81a42967303 100644
--- a/stubs/grpcio/METADATA.toml
+++ b/stubs/grpcio/METADATA.toml
@@ -1,15 +1,6 @@
 version = "1.*"
 upstream_repository = "https://github.com/grpc/grpc"
 partial_stub = true
-requires = [
-    "types-protobuf",
-]
 
 [tool.stubtest]
 ignore_missing_stub = true
-stubtest_requirements = [
-    "grpcio-channelz",
-    "grpcio-health-checking",
-    "grpcio-reflection",
-    "grpcio-status",
-]