diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 799a7ed..91426fe 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -22,13 +22,13 @@ jobs:
         python -m pip install flake8 black mypy
     - name: Lint with flake8
       run: |
-        flake8 *.py
+        flake8 unpaddedbase64/ tests/
     - name: Lint with black
       run: |
-        black --check --diff *.py
+        black --check --diff unpaddedbase64/ tests/
     - name: Lint with mypy
       run: |
-        mypy --strict *.py
+        mypy --strict unpaddedbase64/ tests/
 
   test:
     needs: lint
diff --git a/pyproject.toml b/pyproject.toml
index 115d74f..eed1454 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,16 +4,13 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "unpaddedbase64"
-version = "2.0.0"
+version = "2.1.0"
 description = 'Encode and decode Base64 without "=" padding'
 license = "Apache-2.0"
 authors = [ "The Matrix.org Foundation C.I.C." ]
 readme = "README.rst"
 homepage = "https://github.com/matrix-org/python-unpaddedbase64"
 keywords = ["base64"]
-packages = [
-    { include = "unpaddedbase64.py" }
-]
 
 [tool.poetry.urls]
 "Issue Tracker" = "https://github.com/matrix-org/python-unpaddedbase64/issues"
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/test_unpaddedbase64.py b/tests/test_unpaddedbase64.py
similarity index 100%
rename from test_unpaddedbase64.py
rename to tests/test_unpaddedbase64.py
diff --git a/unpaddedbase64.py b/unpaddedbase64/__init__.py
similarity index 100%
rename from unpaddedbase64.py
rename to unpaddedbase64/__init__.py
diff --git a/unpaddedbase64/py.typed b/unpaddedbase64/py.typed
new file mode 100644
index 0000000..e69de29