diff --git a/dapr/actor/py.typed b/dapr/py.typed
similarity index 100%
rename from dapr/actor/py.typed
rename to dapr/py.typed
diff --git a/dapr/aio/clients/py.typed b/ext/dapr-ext-fastapi/dapr/ext/fastapi/py.typed
similarity index 100%
rename from dapr/aio/clients/py.typed
rename to ext/dapr-ext-fastapi/dapr/ext/fastapi/py.typed
diff --git a/ext/dapr-ext-fastapi/setup.cfg b/ext/dapr-ext-fastapi/setup.cfg
index f0de1d350..8b37613fb 100644
--- a/ext/dapr-ext-fastapi/setup.cfg
+++ b/ext/dapr-ext-fastapi/setup.cfg
@@ -34,3 +34,7 @@ include =
 
 exclude =
     tests
+
+[options.package_data]
+dapr.ext.fastapi =
+    py.typed
diff --git a/dapr/clients/py.typed b/ext/dapr-ext-grpc/dapr/ext/grpc/py.typed
similarity index 100%
rename from dapr/clients/py.typed
rename to ext/dapr-ext-grpc/dapr/ext/grpc/py.typed
diff --git a/ext/dapr-ext-grpc/setup.cfg b/ext/dapr-ext-grpc/setup.cfg
index e2eaaf887..7d4d2e898 100644
--- a/ext/dapr-ext-grpc/setup.cfg
+++ b/ext/dapr-ext-grpc/setup.cfg
@@ -33,3 +33,7 @@ include =
 
 exclude =
     tests
+
+[options.package_data]
+dapr.ext.grpc =
+    py.typed
\ No newline at end of file
diff --git a/dapr/conf/py.typed b/ext/dapr-ext-langgraph/dapr/ext/langgraph/py.typed
similarity index 100%
rename from dapr/conf/py.typed
rename to ext/dapr-ext-langgraph/dapr/ext/langgraph/py.typed
diff --git a/ext/dapr-ext-langgraph/setup.cfg b/ext/dapr-ext-langgraph/setup.cfg
index bb32e782c..a2a851a6f 100644
--- a/ext/dapr-ext-langgraph/setup.cfg
+++ b/ext/dapr-ext-langgraph/setup.cfg
@@ -34,3 +34,7 @@ include =
 
 exclude =
     tests
+
+[options.package_data]
+dapr.ext.langgraph =
+    py.typed
\ No newline at end of file
diff --git a/dapr/proto/py.typed b/ext/dapr-ext-workflow/dapr/ext/workflow/py.typed
similarity index 100%
rename from dapr/proto/py.typed
rename to ext/dapr-ext-workflow/dapr/ext/workflow/py.typed
diff --git a/ext/dapr-ext-workflow/setup.cfg b/ext/dapr-ext-workflow/setup.cfg
index fdf8bd4dc..a621308fc 100644
--- a/ext/dapr-ext-workflow/setup.cfg
+++ b/ext/dapr-ext-workflow/setup.cfg
@@ -33,3 +33,7 @@ include =
 
 exclude =
     tests
+
+[options.package_data]
+dapr.ext.workflow =
+    py.typed
diff --git a/dapr/serializers/py.typed b/ext/flask_dapr/flask_dapr/py.typed
similarity index 100%
rename from dapr/serializers/py.typed
rename to ext/flask_dapr/flask_dapr/py.typed
diff --git a/ext/flask_dapr/setup.cfg b/ext/flask_dapr/setup.cfg
index 4bc95bc6f..826136c54 100644
--- a/ext/flask_dapr/setup.cfg
+++ b/ext/flask_dapr/setup.cfg
@@ -27,3 +27,7 @@ zip_safe = false
 install_requires =
     Flask >= 1.1
     dapr >= 1.16.0.dev
+
+[options.package_data]
+flask_dapr =
+    py.typed
diff --git a/py.typed b/py.typed
deleted file mode 100644
index e69de29bb..000000000
diff --git a/setup.cfg b/setup.cfg
index de9ecc33b..e68961557 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -42,13 +42,5 @@ exclude =
     tests
 
 [options.package_data]
-dapr.actor =
-    py.typed
-dapr.clients =
-    py.typed
-dapr.conf =
-    py.typed
-dapr.proto =
-    py.typed
-dapr.serializers =
+dapr =
     py.typed