diff --git a/.flake8 b/.flake8
index 70cbc719..af25e839 100644
--- a/.flake8
+++ b/.flake8
@@ -6,6 +6,5 @@ exclude =
     ./tests/allure_behave/acceptance/**/test-data/**
     ./tests/allure_behave/acceptance/behave_support/background/background_steps.py
 per-file-ignores =
-    ./allure-python-commons/src/model2.py:A003
-    ./allure-python-commons/src/types.py:A005
+    ./allure-python-commons/src/allure_commons/types.py:A005
     ./allure-robotframework/src/listener/types.py:A005
diff --git a/allure-python-commons/pyproject.toml b/allure-python-commons/pyproject.toml
index 2cf00cbc..9fd4df26 100644
--- a/allure-python-commons/pyproject.toml
+++ b/allure-python-commons/pyproject.toml
@@ -1,3 +1,3 @@
 [tool.poe.tasks]
 linter = "flake8 --extend-ignore=A001,A002,A003 ./src"
-tests = "python -m doctest ./src/*.py"
+tests = "python -m doctest ./src/allure_commons/*.py"
diff --git a/allure-python-commons/setup.py b/allure-python-commons/setup.py
index ee645587..75bb2332 100644
--- a/allure-python-commons/setup.py
+++ b/allure-python-commons/setup.py
@@ -4,19 +4,19 @@
 PACKAGE = "allure-python-commons"
 
 classifiers = [
-    'Development Status :: 5 - Production/Stable',
-    'Intended Audience :: Developers',
-    'License :: OSI Approved :: Apache Software License',
-    'Topic :: Software Development :: Quality Assurance',
-    'Topic :: Software Development :: Testing',
-    'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3 :: Only',
-    'Programming Language :: Python :: 3.8',
-    'Programming Language :: Python :: 3.9',
-    'Programming Language :: Python :: 3.10',
-    'Programming Language :: Python :: 3.11',
-    'Programming Language :: Python :: 3.12',
-    'Programming Language :: Python :: 3.13',
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: Apache Software License",
+    "Topic :: Software Development :: Quality Assurance",
+    "Topic :: Software Development :: Testing",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 
 install_requires = [
@@ -33,10 +33,10 @@ def main():
     setup(
         name=PACKAGE,
         use_scm_version={"root": "..", "relative_to": __file__},
-        setup_requires=['setuptools_scm'],
+        setup_requires=["setuptools_scm"],
         description=(
             "Contains the API for end users as well as helper functions and "
-            "classes to build Allure adapters for Python test frameworks",
+            "classes to build Allure adapters for Python test frameworks"
         ),
         url="https://allurereport.org/",
         project_urls={
@@ -49,13 +49,16 @@ def main():
         keywords="allure reporting report-engine",
         long_description=get_readme("README.md"),
         long_description_content_type="text/markdown",
-        packages=["allure_commons"],
-        package_dir={"allure_commons": 'src'},
+        packages=["allure_commons", "allure"],
+        package_data={
+            "allure": ["py.typed"],
+            "allure_commons": ["py.typed"],
+        },
+        package_dir={"": "src"},
         install_requires=install_requires,
-        py_modules=['allure', 'allure_commons'],
-        python_requires='>=3.6'
+        python_requires=">=3.6"
     )
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
diff --git a/allure-python-commons/allure.py b/allure-python-commons/src/allure/__init__.py
similarity index 95%
rename from allure-python-commons/allure.py
rename to allure-python-commons/src/allure/__init__.py
index 4acb83e3..c30329a6 100644
--- a/allure-python-commons/allure.py
+++ b/allure-python-commons/src/allure/__init__.py
@@ -3,7 +3,7 @@
 from allure_commons._allure import label
 from allure_commons._allure import severity
 from allure_commons._allure import tag
-from allure_commons._allure import id
+from allure_commons._allure import id  # noqa: A004
 from allure_commons._allure import suite, parent_suite, sub_suite
 from allure_commons._allure import epic, feature, story
 from allure_commons._allure import link, issue, testcase
diff --git a/allure-python-commons/src/allure/py.typed b/allure-python-commons/src/allure/py.typed
new file mode 100644
index 00000000..e69de29b
diff --git a/allure-python-commons/src/__init__.py b/allure-python-commons/src/allure_commons/__init__.py
similarity index 100%
rename from allure-python-commons/src/__init__.py
rename to allure-python-commons/src/allure_commons/__init__.py
diff --git a/allure-python-commons/src/_allure.py b/allure-python-commons/src/allure_commons/_allure.py
similarity index 98%
rename from allure-python-commons/src/_allure.py
rename to allure-python-commons/src/allure_commons/_allure.py
index 4776f81b..b7bbe2a5 100644
--- a/allure-python-commons/src/_allure.py
+++ b/allure-python-commons/src/allure_commons/_allure.py
@@ -1,5 +1,5 @@
 from functools import wraps
-from typing import Any, Callable, TypeVar, overload
+from typing import Any, Callable, TypeVar, Union, overload
 
 from allure_commons._core import plugin_manager
 from allure_commons.types import LabelType, LinkType, ParameterMode
@@ -133,7 +133,7 @@ def link(url, link_type=LinkType.LINK, name=None):
         plugin_manager.hook.add_link(url=url, link_type=link_type, name=name)
 
     @staticmethod
-    def parameter(name, value, excluded=None, mode: ParameterMode = None):
+    def parameter(name, value, excluded=None, mode: Union[ParameterMode, None] = None):
         plugin_manager.hook.add_parameter(name=name, value=value, excluded=excluded, mode=mode)
 
     @staticmethod
diff --git a/allure-python-commons/src/_core.py b/allure-python-commons/src/allure_commons/_core.py
similarity index 100%
rename from allure-python-commons/src/_core.py
rename to allure-python-commons/src/allure_commons/_core.py
diff --git a/allure-python-commons/src/_hooks.py b/allure-python-commons/src/allure_commons/_hooks.py
similarity index 100%
rename from allure-python-commons/src/_hooks.py
rename to allure-python-commons/src/allure_commons/_hooks.py
diff --git a/allure-python-commons/src/lifecycle.py b/allure-python-commons/src/allure_commons/lifecycle.py
similarity index 100%
rename from allure-python-commons/src/lifecycle.py
rename to allure-python-commons/src/allure_commons/lifecycle.py
diff --git a/allure-python-commons/src/logger.py b/allure-python-commons/src/allure_commons/logger.py
similarity index 100%
rename from allure-python-commons/src/logger.py
rename to allure-python-commons/src/allure_commons/logger.py
diff --git a/allure-python-commons/src/mapping.py b/allure-python-commons/src/allure_commons/mapping.py
similarity index 100%
rename from allure-python-commons/src/mapping.py
rename to allure-python-commons/src/allure_commons/mapping.py
diff --git a/allure-python-commons/src/model2.py b/allure-python-commons/src/allure_commons/model2.py
similarity index 94%
rename from allure-python-commons/src/model2.py
rename to allure-python-commons/src/allure_commons/model2.py
index e8fd330a..ccaf4459 100644
--- a/allure-python-commons/src/model2.py
+++ b/allure-python-commons/src/allure_commons/model2.py
@@ -53,7 +53,7 @@ class TestResult(ExecutableItem):
 
 @attrs
 class TestStepResult(ExecutableItem):
-    id = attrib(default=None)
+    id = attrib(default=None)  # noqa: A003
 
 
 @attrs
@@ -82,7 +82,7 @@ class Label:
 
 @attrs
 class Link:
-    type = attrib(default=None)
+    type = attrib(default=None)  # noqa: A003
     url = attrib(default=None)
     name = attrib(default=None)
 
@@ -99,7 +99,7 @@ class StatusDetails:
 class Attachment:
     name = attrib(default=None)
     source = attrib(default=None)
-    type = attrib(default=None)
+    type = attrib(default=None)  # noqa: A003
 
 
 class Status:
diff --git a/allure-python-commons/src/allure_commons/py.typed b/allure-python-commons/src/allure_commons/py.typed
new file mode 100644
index 00000000..e69de29b
diff --git a/allure-python-commons/src/reporter.py b/allure-python-commons/src/allure_commons/reporter.py
similarity index 100%
rename from allure-python-commons/src/reporter.py
rename to allure-python-commons/src/allure_commons/reporter.py
diff --git a/allure-python-commons/src/types.py b/allure-python-commons/src/allure_commons/types.py
similarity index 100%
rename from allure-python-commons/src/types.py
rename to allure-python-commons/src/allure_commons/types.py
diff --git a/allure-python-commons/src/utils.py b/allure-python-commons/src/allure_commons/utils.py
similarity index 100%
rename from allure-python-commons/src/utils.py
rename to allure-python-commons/src/allure_commons/utils.py