diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index 76b244a..f1deb42 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -16,4 +16,4 @@ jobs:
           python -m pip install --upgrade pip
           pip install mypy
       - name: Lint with mypy
-        run: mypy -m lark || true
+        run: mypy -m lark-stubs || true
diff --git a/lark-stubs/__init__.pyi b/lark-stubs/__init__.pyi
new file mode 100644
index 0000000..1226e74
--- /dev/null
+++ b/lark-stubs/__init__.pyi
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
+from .tree import Tree
+from .visitors import Transformer, Visitor, v_args, Discard
+from .visitors import InlineTransformer, inline_args   # XXX Deprecated
+from .exceptions import ParseError, LexError, GrammarError, UnexpectedToken, UnexpectedInput, UnexpectedCharacters
+from .lexer import Token
+from .lark import Lark
+
+__version__: str
diff --git a/lark/exceptions.pyi b/lark-stubs/exceptions.pyi
similarity index 100%
rename from lark/exceptions.pyi
rename to lark-stubs/exceptions.pyi
diff --git a/lark/lark.pyi b/lark-stubs/lark.pyi
similarity index 100%
rename from lark/lark.pyi
rename to lark-stubs/lark.pyi
diff --git a/lark/lexer.pyi b/lark-stubs/lexer.pyi
similarity index 100%
rename from lark/lexer.pyi
rename to lark-stubs/lexer.pyi
diff --git a/lark/reconstruct.pyi b/lark-stubs/reconstruct.pyi
similarity index 100%
rename from lark/reconstruct.pyi
rename to lark-stubs/reconstruct.pyi
diff --git a/lark/tree.pyi b/lark-stubs/tree.pyi
similarity index 100%
rename from lark/tree.pyi
rename to lark-stubs/tree.pyi
diff --git a/lark/visitors.pyi b/lark-stubs/visitors.pyi
similarity index 100%
rename from lark/visitors.pyi
rename to lark-stubs/visitors.pyi
diff --git a/lark/py.typed b/lark/py.typed
deleted file mode 100644
index e69de29..0000000
diff --git a/setup.py b/setup.py
index 650bc16..b7cc052 100644
--- a/setup.py
+++ b/setup.py
@@ -1,17 +1,17 @@
 import re
-from setuptools import setup
+from setuptools import find_packages, setup
 
 __version__ ,= re.findall('__version__ = "(.*)"', open('lark/__init__.py').read())
 
 setup(
     name = "lark-parser",
     version = __version__,
-    packages = ['lark', 'lark.parsers', 'lark.tools', 'lark.grammars'],
+    packages = ['lark', 'lark.parsers', 'lark.tools', 'lark.grammars', 'lark-stubs'],
 
     requires = [],
     install_requires = [],
 
-    package_data = { '': ['*.md', '*.lark', '*.pyi'], 'lark': ['py.typed'] },
+    package_data = {'': ['*.md', '*.lark'], 'lark-stubs': ['*.pyi']},
 
     test_suite = 'tests.__main__',