diff --git a/src/msyrs.pyi b/src/msyrs.pyi
new file mode 100644
index 0000000..1b806b0
--- /dev/null
+++ b/src/msyrs.pyi
@@ -0,0 +1,34 @@
+from polars import DataFrame
+
+__all__ = [
+    "download",
+    "qdf",
+]
+
+class download:
+    __all__ = [
+        "download_jpmaqs_indicators_as_df",
+    ]
+
+    @staticmethod
+    def download_jpmaqs_indicators_as_df(*args, **kwargs) -> DataFrame: ...
+
+class qdf:
+    __all__ = [
+        "load_qdf",
+        "load_qdf_from_download_bank",
+        "reduce_dataframe",
+        "update_dataframe",
+        "pivot_dataframe_by_ticker",
+    ]
+
+    @staticmethod
+    def load_qdf(*args, **kwargs) -> DataFrame: ...
+    @staticmethod
+    def load_qdf_from_download_bank(*args, **kwargs) -> DataFrame: ...
+    @staticmethod
+    def reduce_dataframe(*args, **kwargs) -> DataFrame: ...
+    @staticmethod
+    def update_dataframe(*args, **kwargs) -> DataFrame: ...
+    @staticmethod
+    def pivot_dataframe_by_ticker(*args, **kwargs) -> DataFrame: ...
diff --git a/src/py/download.pyi b/src/py/download.pyi
deleted file mode 100644
index 11d7be1..0000000
--- a/src/py/download.pyi
+++ /dev/null
@@ -1,8 +0,0 @@
-from polars import DataFrame
-
-__all__ = [
-    "download_jpmaqs_indicators_as_df",
-]
-
-def download_jpmaqs_indicators_as_df(*args, **kwargs) -> DataFrame: 
-    ...
diff --git a/src/py/msyrs.pyi b/src/py/msyrs.pyi
deleted file mode 100644
index 19a2412..0000000
--- a/src/py/msyrs.pyi
+++ /dev/null
@@ -1,8 +0,0 @@
-
-import .download # type: ignore
-import .qdf # type: ignore
-
-__all__ = [
-    "download",
-    "qdf",
-]
\ No newline at end of file
diff --git a/src/py/qdf.pyi b/src/py/qdf.pyi
deleted file mode 100644
index 960d281..0000000
--- a/src/py/qdf.pyi
+++ /dev/null
@@ -1,23 +0,0 @@
-from polars import DataFrame
-
-__all__ = [
-    "load_qdf",
-    "load_qdf_from_download_bank",
-    "reduce_dataframe",
-    "update_dataframe",
-]
-
-# qdf/load_qdf.pyi
-def load_qdf(*args, **kwargs) -> DataFrame: ...
-
-# qdf/load_qdf_from_download_bank.pyi
-def load_qdf_from_download_bank(*args, **kwargs) -> DataFrame: ...
-
-# qdf/reduce_dataframe.pyi
-def reduce_dataframe(*args, **kwargs) -> DataFrame: ...
-
-# qdf/update_dataframe.pyi
-def update_dataframe(*args, **kwargs) -> DataFrame: ...
-
-# qdf/pivots.pyi
-def pivot_dataframe_by_ticker(*args, **kwargs) -> DataFrame: ...