diff --git a/.flake8 b/.flake8
index 3ca504408..9402046ea 100644
--- a/.flake8
+++ b/.flake8
@@ -1,4 +1,4 @@
 [flake8]
 max-line-length = 119
-exclude = src/spdx_tools/spdx/parser/tagvalue/parsetab.py
+exclude = src/spdx_tools/spdx/parser/tagvalue/parsetab.py, src/spdx_tools/spdx/model/__init__.py
 extend-ignore = E203
diff --git a/README.md b/README.md
index 9c82d6ff9..e5c345b26 100644
--- a/README.md
+++ b/README.md
@@ -94,13 +94,13 @@ instead of `bin`.
 
 ## Library usage
 1. **DATA MODEL**
-  * The `src.spdx.model` package constitutes the internal SPDX v2.3 data model (v2.2 is a simply a subset of this).
+  * The `spdx_tools.spdx.model` package constitutes the internal SPDX v2.3 data model (v2.2 is a simply a subset of this). All relevant classes for SPDX document creation are exposed in the [__init__.py](src%2Fspdx_tools%2Fspdx%2Fmodel%2F__init__.py).
   * SPDX objects are implemented via `@dataclass_with_properties`, a custom extension of `@dataclass`.
     * Each class starts with a list of its properties and their possible types. When no default value is provided, the property is mandatory and must be set during initialization.
     * Using the type hints, type checking is enforced when initializing a new instance or setting/getting a property on an instance
       (wrong types will raise `ConstructorTypeError` or `TypeError`, respectively). This makes it easy to catch invalid properties early and only construct valid documents.
     * Note: in-place manipulations like `list.append(item)` will circumvent the type checking (a `TypeError` will still be raised when reading `list` again). We recommend using `list = list + [item]` instead.
-  * The main entry point of an SPDX document is the `Document` class, which links to all other classes.
+  * The main entry point of an SPDX document is the `Document` class from the [document.py](src%2Fspdx_tools%2Fspdx%2Fmodel%2Fdocument.py) module, which links to all other classes.
   * For license handling, the [license_expression](https://github.com/nexB/license-expression) library is used.
   * Note on `documentDescribes` and `hasFiles`: These fields will be converted to relationships in the internal data model. As they are deprecated, these fields will not be written in the output.
 2. **PARSING**
@@ -123,9 +123,9 @@ import logging
 
 from license_expression import get_spdx_licensing
 
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.file import File, FileType
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm
+from spdx_tools.spdx.model import File, FileType
+from spdx_tools.spdx.model import Relationship, RelationshipType
 from spdx_tools.spdx.parser.parse_anything import parse_file
 from spdx_tools.spdx.validation.document_validator import validate_full_spdx_document
 from spdx_tools.spdx.writer.write_anything import write_file
diff --git a/pyproject.toml b/pyproject.toml
index c9756834b..7ec03780b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -61,3 +61,4 @@ include = "(^/src/.*.py|^/tests/.*.py)"
 [tool.isort]
 profile = "black"
 line_length = 119
+skip = ["__init__.py"]
diff --git a/src/spdx_tools/spdx/clitools/pyspdxtools.py b/src/spdx_tools/spdx/clitools/pyspdxtools.py
index 1983106d6..556033aee 100644
--- a/src/spdx_tools/spdx/clitools/pyspdxtools.py
+++ b/src/spdx_tools/spdx/clitools/pyspdxtools.py
@@ -19,7 +19,7 @@
 import click
 
 from spdx_tools.spdx.graph_generation import export_graph_from_document
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.parse_anything import parse_file
 from spdx_tools.spdx.validation.document_validator import validate_full_spdx_document
diff --git a/src/spdx_tools/spdx/document_utils.py b/src/spdx_tools/spdx/document_utils.py
index 0afc01702..eb3612ab6 100644
--- a/src/spdx_tools/spdx/document_utils.py
+++ b/src/spdx_tools/spdx/document_utils.py
@@ -4,10 +4,7 @@
 from copy import deepcopy
 from typing import Any, Dict, List, Union
 
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.file import File
-from spdx_tools.spdx.model.package import Package
-from spdx_tools.spdx.model.snippet import Snippet
+from spdx_tools.spdx.model import Document, File, Package, Snippet
 
 
 def get_contained_spdx_element_ids(document: Document) -> List[str]:
diff --git a/src/spdx_tools/spdx/graph_generation.py b/src/spdx_tools/spdx/graph_generation.py
index 6052af995..1ef70a1c8 100644
--- a/src/spdx_tools/spdx/graph_generation.py
+++ b/src/spdx_tools/spdx/graph_generation.py
@@ -3,17 +3,14 @@
 # SPDX-License-Identifier: Apache-2.0
 from typing import Dict, List, Union
 
-from spdx_tools.spdx.model.file import File
-from spdx_tools.spdx.model.package import Package
-from spdx_tools.spdx.model.snippet import Snippet
+from spdx_tools.spdx.model import File, Package, Snippet
 
 try:
     from networkx import DiGraph
 except ImportError:
     DiGraph = None
 from spdx_tools.spdx.document_utils import get_contained_spdx_elements
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.relationship import Relationship
+from spdx_tools.spdx.model import Document, Relationship
 
 
 def export_graph_from_document(document: Document, file_name: str) -> None:
diff --git a/src/spdx_tools/spdx/jsonschema/annotation_converter.py b/src/spdx_tools/spdx/jsonschema/annotation_converter.py
index a345353e4..7fbedf51f 100644
--- a/src/spdx_tools/spdx/jsonschema/annotation_converter.py
+++ b/src/spdx_tools/spdx/jsonschema/annotation_converter.py
@@ -7,8 +7,7 @@
 from spdx_tools.spdx.jsonschema.annotation_properties import AnnotationProperty
 from spdx_tools.spdx.jsonschema.converter import TypedConverter
 from spdx_tools.spdx.jsonschema.json_property import JsonProperty
-from spdx_tools.spdx.model.annotation import Annotation
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Annotation, Document
 
 
 class AnnotationConverter(TypedConverter[Annotation]):
diff --git a/src/spdx_tools/spdx/jsonschema/checksum_converter.py b/src/spdx_tools/spdx/jsonschema/checksum_converter.py
index 536e65974..a1d2bb9fd 100644
--- a/src/spdx_tools/spdx/jsonschema/checksum_converter.py
+++ b/src/spdx_tools/spdx/jsonschema/checksum_converter.py
@@ -6,8 +6,7 @@
 from spdx_tools.spdx.jsonschema.checksum_properties import ChecksumProperty
 from spdx_tools.spdx.jsonschema.converter import TypedConverter
 from spdx_tools.spdx.jsonschema.json_property import JsonProperty
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm, Document
 
 
 class ChecksumConverter(TypedConverter[Checksum]):
diff --git a/src/spdx_tools/spdx/jsonschema/converter.py b/src/spdx_tools/spdx/jsonschema/converter.py
index a613e3f3c..4ec479623 100644
--- a/src/spdx_tools/spdx/jsonschema/converter.py
+++ b/src/spdx_tools/spdx/jsonschema/converter.py
@@ -6,7 +6,7 @@
 
 from spdx_tools.spdx.casing_tools import snake_case_to_camel_case
 from spdx_tools.spdx.jsonschema.json_property import JsonProperty
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 
 MISSING_IMPLEMENTATION_MESSAGE = "Must be implemented"
 
diff --git a/src/spdx_tools/spdx/jsonschema/creation_info_converter.py b/src/spdx_tools/spdx/jsonschema/creation_info_converter.py
index 9d8832a03..6e84bfe19 100644
--- a/src/spdx_tools/spdx/jsonschema/creation_info_converter.py
+++ b/src/spdx_tools/spdx/jsonschema/creation_info_converter.py
@@ -8,7 +8,7 @@
 from spdx_tools.spdx.jsonschema.creation_info_properties import CreationInfoProperty
 from spdx_tools.spdx.jsonschema.json_property import JsonProperty
 from spdx_tools.spdx.jsonschema.optional_utils import apply_if_present
-from spdx_tools.spdx.model.document import CreationInfo, Document
+from spdx_tools.spdx.model import CreationInfo, Document
 
 
 class CreationInfoConverter(TypedConverter[CreationInfo]):
diff --git a/src/spdx_tools/spdx/jsonschema/document_converter.py b/src/spdx_tools/spdx/jsonschema/document_converter.py
index 1ccf74fd4..4d001c75c 100644
--- a/src/spdx_tools/spdx/jsonschema/document_converter.py
+++ b/src/spdx_tools/spdx/jsonschema/document_converter.py
@@ -15,7 +15,7 @@
 from spdx_tools.spdx.jsonschema.package_converter import PackageConverter
 from spdx_tools.spdx.jsonschema.relationship_converter import RelationshipConverter
 from spdx_tools.spdx.jsonschema.snippet_converter import SnippetConverter
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 
 
 class DocumentConverter(TypedConverter[Document]):
diff --git a/src/spdx_tools/spdx/jsonschema/external_document_ref_converter.py b/src/spdx_tools/spdx/jsonschema/external_document_ref_converter.py
index f9d483a9b..c2e803662 100644
--- a/src/spdx_tools/spdx/jsonschema/external_document_ref_converter.py
+++ b/src/spdx_tools/spdx/jsonschema/external_document_ref_converter.py
@@ -7,8 +7,7 @@
 from spdx_tools.spdx.jsonschema.converter import TypedConverter
 from spdx_tools.spdx.jsonschema.external_document_ref_properties import ExternalDocumentRefProperty
 from spdx_tools.spdx.jsonschema.json_property import JsonProperty
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.external_document_ref import ExternalDocumentRef
+from spdx_tools.spdx.model import Document, ExternalDocumentRef
 
 
 class ExternalDocumentRefConverter(TypedConverter[ExternalDocumentRef]):
diff --git a/src/spdx_tools/spdx/jsonschema/external_package_ref_converter.py b/src/spdx_tools/spdx/jsonschema/external_package_ref_converter.py
index f6fec734e..36d528e26 100644
--- a/src/spdx_tools/spdx/jsonschema/external_package_ref_converter.py
+++ b/src/spdx_tools/spdx/jsonschema/external_package_ref_converter.py
@@ -6,8 +6,7 @@
 from spdx_tools.spdx.jsonschema.converter import TypedConverter
 from spdx_tools.spdx.jsonschema.external_package_ref_properties import ExternalPackageRefProperty
 from spdx_tools.spdx.jsonschema.json_property import JsonProperty
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.package import ExternalPackageRef
+from spdx_tools.spdx.model import Document, ExternalPackageRef
 
 
 class ExternalPackageRefConverter(TypedConverter[ExternalPackageRef]):
diff --git a/src/spdx_tools/spdx/jsonschema/extracted_licensing_info_converter.py b/src/spdx_tools/spdx/jsonschema/extracted_licensing_info_converter.py
index 6f49c2505..d7ada1c95 100644
--- a/src/spdx_tools/spdx/jsonschema/extracted_licensing_info_converter.py
+++ b/src/spdx_tools/spdx/jsonschema/extracted_licensing_info_converter.py
@@ -7,8 +7,7 @@
 from spdx_tools.spdx.jsonschema.extracted_licensing_info_properties import ExtractedLicensingInfoProperty
 from spdx_tools.spdx.jsonschema.json_property import JsonProperty
 from spdx_tools.spdx.jsonschema.optional_utils import apply_if_present
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.extracted_licensing_info import ExtractedLicensingInfo
+from spdx_tools.spdx.model import Document, ExtractedLicensingInfo
 
 
 class ExtractedLicensingInfoConverter(TypedConverter[ExtractedLicensingInfo]):
diff --git a/src/spdx_tools/spdx/jsonschema/file_converter.py b/src/spdx_tools/spdx/jsonschema/file_converter.py
index 6ce642110..20173f606 100644
--- a/src/spdx_tools/spdx/jsonschema/file_converter.py
+++ b/src/spdx_tools/spdx/jsonschema/file_converter.py
@@ -9,8 +9,7 @@
 from spdx_tools.spdx.jsonschema.file_properties import FileProperty
 from spdx_tools.spdx.jsonschema.json_property import JsonProperty
 from spdx_tools.spdx.jsonschema.optional_utils import apply_if_present
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.file import File
+from spdx_tools.spdx.model import Document, File
 
 
 class FileConverter(TypedConverter[File]):
diff --git a/src/spdx_tools/spdx/jsonschema/package_converter.py b/src/spdx_tools/spdx/jsonschema/package_converter.py
index 992eb649a..279eeb473 100644
--- a/src/spdx_tools/spdx/jsonschema/package_converter.py
+++ b/src/spdx_tools/spdx/jsonschema/package_converter.py
@@ -12,9 +12,7 @@
 from spdx_tools.spdx.jsonschema.optional_utils import apply_if_present
 from spdx_tools.spdx.jsonschema.package_properties import PackageProperty
 from spdx_tools.spdx.jsonschema.package_verification_code_converter import PackageVerificationCodeConverter
-from spdx_tools.spdx.model.actor import Actor
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.package import Package
+from spdx_tools.spdx.model import Actor, Document, Package
 
 
 class PackageConverter(TypedConverter[Package]):
diff --git a/src/spdx_tools/spdx/jsonschema/package_verification_code_converter.py b/src/spdx_tools/spdx/jsonschema/package_verification_code_converter.py
index f2a2f27e2..4076bb151 100644
--- a/src/spdx_tools/spdx/jsonschema/package_verification_code_converter.py
+++ b/src/spdx_tools/spdx/jsonschema/package_verification_code_converter.py
@@ -6,8 +6,7 @@
 from spdx_tools.spdx.jsonschema.converter import TypedConverter
 from spdx_tools.spdx.jsonschema.json_property import JsonProperty
 from spdx_tools.spdx.jsonschema.package_verification_code_properties import PackageVerificationCodeProperty
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.package import PackageVerificationCode
+from spdx_tools.spdx.model import Document, PackageVerificationCode
 
 
 class PackageVerificationCodeConverter(TypedConverter[PackageVerificationCode]):
diff --git a/src/spdx_tools/spdx/jsonschema/relationship_converter.py b/src/spdx_tools/spdx/jsonschema/relationship_converter.py
index e3be442b9..23b479e9e 100644
--- a/src/spdx_tools/spdx/jsonschema/relationship_converter.py
+++ b/src/spdx_tools/spdx/jsonschema/relationship_converter.py
@@ -6,8 +6,7 @@
 from spdx_tools.spdx.jsonschema.converter import TypedConverter
 from spdx_tools.spdx.jsonschema.json_property import JsonProperty
 from spdx_tools.spdx.jsonschema.relationship_properties import RelationshipProperty
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.relationship import Relationship
+from spdx_tools.spdx.model import Document, Relationship
 
 
 class RelationshipConverter(TypedConverter[Relationship]):
diff --git a/src/spdx_tools/spdx/jsonschema/snippet_converter.py b/src/spdx_tools/spdx/jsonschema/snippet_converter.py
index 1d74a9c4d..d0736a943 100644
--- a/src/spdx_tools/spdx/jsonschema/snippet_converter.py
+++ b/src/spdx_tools/spdx/jsonschema/snippet_converter.py
@@ -8,8 +8,7 @@
 from spdx_tools.spdx.jsonschema.json_property import JsonProperty
 from spdx_tools.spdx.jsonschema.optional_utils import apply_if_present
 from spdx_tools.spdx.jsonschema.snippet_properties import SnippetProperty
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.snippet import Snippet
+from spdx_tools.spdx.model import Document, Snippet
 
 
 class SnippetConverter(TypedConverter[Snippet]):
diff --git a/src/spdx_tools/spdx/model/__init__.py b/src/spdx_tools/spdx/model/__init__.py
index e69de29bb..cec8cfe19 100644
--- a/src/spdx_tools/spdx/model/__init__.py
+++ b/src/spdx_tools/spdx/model/__init__.py
@@ -0,0 +1,19 @@
+from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
+from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model.version import Version
+from spdx_tools.spdx.model.actor import Actor, ActorType
+from spdx_tools.spdx.model.annotation import Annotation, AnnotationType
+from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
+from spdx_tools.spdx.model.external_document_ref import ExternalDocumentRef
+from spdx_tools.spdx.model.extracted_licensing_info import ExtractedLicensingInfo
+from spdx_tools.spdx.model.file import File, FileType
+from spdx_tools.spdx.model.package import (
+    ExternalPackageRef,
+    ExternalPackageRefCategory,
+    Package,
+    PackagePurpose,
+    PackageVerificationCode,
+)
+from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
+from spdx_tools.spdx.model.snippet import Snippet
+from spdx_tools.spdx.model.document import CreationInfo, Document
diff --git a/src/spdx_tools/spdx/model/annotation.py b/src/spdx_tools/spdx/model/annotation.py
index d128e57a9..6ada0607b 100644
--- a/src/spdx_tools/spdx/model/annotation.py
+++ b/src/spdx_tools/spdx/model/annotation.py
@@ -6,7 +6,7 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx.model.actor import Actor
+from spdx_tools.spdx.model import Actor
 
 
 class AnnotationType(Enum):
diff --git a/src/spdx_tools/spdx/model/document.py b/src/spdx_tools/spdx/model/document.py
index b6c7128b5..ecfddc6a1 100644
--- a/src/spdx_tools/spdx/model/document.py
+++ b/src/spdx_tools/spdx/model/document.py
@@ -7,15 +7,17 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx.model.actor import Actor
-from spdx_tools.spdx.model.annotation import Annotation
-from spdx_tools.spdx.model.external_document_ref import ExternalDocumentRef
-from spdx_tools.spdx.model.extracted_licensing_info import ExtractedLicensingInfo
-from spdx_tools.spdx.model.file import File
-from spdx_tools.spdx.model.package import Package
-from spdx_tools.spdx.model.relationship import Relationship
-from spdx_tools.spdx.model.snippet import Snippet
-from spdx_tools.spdx.model.version import Version
+from spdx_tools.spdx.model import (
+    Actor,
+    Annotation,
+    ExternalDocumentRef,
+    ExtractedLicensingInfo,
+    File,
+    Package,
+    Relationship,
+    Snippet,
+    Version,
+)
 
 
 @dataclass_with_properties
diff --git a/src/spdx_tools/spdx/model/external_document_ref.py b/src/spdx_tools/spdx/model/external_document_ref.py
index 5d8233ba9..fbbaf4847 100644
--- a/src/spdx_tools/spdx/model/external_document_ref.py
+++ b/src/spdx_tools/spdx/model/external_document_ref.py
@@ -4,7 +4,7 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx.model.checksum import Checksum
+from spdx_tools.spdx.model import Checksum
 
 
 @dataclass_with_properties
diff --git a/src/spdx_tools/spdx/model/extracted_licensing_info.py b/src/spdx_tools/spdx/model/extracted_licensing_info.py
index 017f82bf3..22df3ec19 100644
--- a/src/spdx_tools/spdx/model/extracted_licensing_info.py
+++ b/src/spdx_tools/spdx/model/extracted_licensing_info.py
@@ -6,7 +6,7 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
+from spdx_tools.spdx.model import SpdxNoAssertion
 
 
 @dataclass_with_properties
diff --git a/src/spdx_tools/spdx/model/file.py b/src/spdx_tools/spdx/model/file.py
index c46ba3f97..1573f7475 100644
--- a/src/spdx_tools/spdx/model/file.py
+++ b/src/spdx_tools/spdx/model/file.py
@@ -9,9 +9,7 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx.model.checksum import Checksum
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import Checksum, SpdxNoAssertion, SpdxNone
 
 
 class FileType(Enum):
diff --git a/src/spdx_tools/spdx/model/package.py b/src/spdx_tools/spdx/model/package.py
index be54abcaf..53bc5e9db 100644
--- a/src/spdx_tools/spdx/model/package.py
+++ b/src/spdx_tools/spdx/model/package.py
@@ -10,10 +10,7 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx.model.actor import Actor
-from spdx_tools.spdx.model.checksum import Checksum
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import Actor, Checksum, SpdxNoAssertion, SpdxNone
 
 
 class PackagePurpose(Enum):
diff --git a/src/spdx_tools/spdx/model/relationship.py b/src/spdx_tools/spdx/model/relationship.py
index e8fe282c5..6005f7e2b 100644
--- a/src/spdx_tools/spdx/model/relationship.py
+++ b/src/spdx_tools/spdx/model/relationship.py
@@ -6,8 +6,7 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import SpdxNoAssertion, SpdxNone
 
 
 class RelationshipType(Enum):
diff --git a/src/spdx_tools/spdx/model/relationship_filters.py b/src/spdx_tools/spdx/model/relationship_filters.py
index 073ee80fc..be04b34b9 100644
--- a/src/spdx_tools/spdx/model/relationship_filters.py
+++ b/src/spdx_tools/spdx/model/relationship_filters.py
@@ -3,9 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 from typing import List
 
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.package import Package
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
+from spdx_tools.spdx.model import Document, Package, Relationship, RelationshipType
 
 
 def find_package_contains_file_relationships(document: Document, package: Package) -> List[Relationship]:
diff --git a/src/spdx_tools/spdx/model/snippet.py b/src/spdx_tools/spdx/model/snippet.py
index d755cdff3..308c726cb 100644
--- a/src/spdx_tools/spdx/model/snippet.py
+++ b/src/spdx_tools/spdx/model/snippet.py
@@ -8,8 +8,7 @@
 
 from spdx_tools.common.typing.dataclass_with_properties import dataclass_with_properties
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import SpdxNoAssertion, SpdxNone
 
 
 @dataclass_with_properties
diff --git a/src/spdx_tools/spdx/parser/actor_parser.py b/src/spdx_tools/spdx/parser/actor_parser.py
index 7a5240f0e..4d20f4629 100644
--- a/src/spdx_tools/spdx/parser/actor_parser.py
+++ b/src/spdx_tools/spdx/parser/actor_parser.py
@@ -4,7 +4,7 @@
 import re
 from typing import Match, Optional, Pattern
 
-from spdx_tools.spdx.model.actor import Actor, ActorType
+from spdx_tools.spdx.model import Actor, ActorType
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.parsing_functions import construct_or_raise_parsing_error
 
diff --git a/src/spdx_tools/spdx/parser/json/json_parser.py b/src/spdx_tools/spdx/parser/json/json_parser.py
index 3ef908ec9..0864caec6 100644
--- a/src/spdx_tools/spdx/parser/json/json_parser.py
+++ b/src/spdx_tools/spdx/parser/json/json_parser.py
@@ -4,7 +4,7 @@
 import json
 from typing import Dict
 
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 from spdx_tools.spdx.parser.jsonlikedict.json_like_dict_parser import JsonLikeDictParser
 
 
diff --git a/src/spdx_tools/spdx/parser/jsonlikedict/annotation_parser.py b/src/spdx_tools/spdx/parser/jsonlikedict/annotation_parser.py
index 5d38aa616..02e47a1b0 100644
--- a/src/spdx_tools/spdx/parser/jsonlikedict/annotation_parser.py
+++ b/src/spdx_tools/spdx/parser/jsonlikedict/annotation_parser.py
@@ -5,8 +5,7 @@
 from typing import Dict, List, Optional
 
 from spdx_tools.spdx.datetime_conversions import datetime_from_str
-from spdx_tools.spdx.model.actor import Actor
-from spdx_tools.spdx.model.annotation import Annotation, AnnotationType
+from spdx_tools.spdx.model import Actor, Annotation, AnnotationType
 from spdx_tools.spdx.parser.actor_parser import ActorParser
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.jsonlikedict.dict_parsing_functions import (
diff --git a/src/spdx_tools/spdx/parser/jsonlikedict/checksum_parser.py b/src/spdx_tools/spdx/parser/jsonlikedict/checksum_parser.py
index e9d0b3ad5..de1eada17 100644
--- a/src/spdx_tools/spdx/parser/jsonlikedict/checksum_parser.py
+++ b/src/spdx_tools/spdx/parser/jsonlikedict/checksum_parser.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 from typing import Dict, Optional
 
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm
 from spdx_tools.spdx.parser.jsonlikedict.dict_parsing_functions import json_str_to_enum_name
 from spdx_tools.spdx.parser.logger import Logger
 from spdx_tools.spdx.parser.parsing_functions import (
diff --git a/src/spdx_tools/spdx/parser/jsonlikedict/creation_info_parser.py b/src/spdx_tools/spdx/parser/jsonlikedict/creation_info_parser.py
index 98af85e97..dbad22d11 100644
--- a/src/spdx_tools/spdx/parser/jsonlikedict/creation_info_parser.py
+++ b/src/spdx_tools/spdx/parser/jsonlikedict/creation_info_parser.py
@@ -5,11 +5,7 @@
 from typing import Dict, List, Optional
 
 from spdx_tools.spdx.datetime_conversions import datetime_from_str
-from spdx_tools.spdx.model.actor import Actor
-from spdx_tools.spdx.model.checksum import Checksum
-from spdx_tools.spdx.model.document import CreationInfo
-from spdx_tools.spdx.model.external_document_ref import ExternalDocumentRef
-from spdx_tools.spdx.model.version import Version
+from spdx_tools.spdx.model import Actor, Checksum, CreationInfo, ExternalDocumentRef, Version
 from spdx_tools.spdx.parser.actor_parser import ActorParser
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.jsonlikedict.checksum_parser import ChecksumParser
diff --git a/src/spdx_tools/spdx/parser/jsonlikedict/dict_parsing_functions.py b/src/spdx_tools/spdx/parser/jsonlikedict/dict_parsing_functions.py
index b8cbef483..6320b5bc0 100644
--- a/src/spdx_tools/spdx/parser/jsonlikedict/dict_parsing_functions.py
+++ b/src/spdx_tools/spdx/parser/jsonlikedict/dict_parsing_functions.py
@@ -3,8 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 from typing import Any, Callable, Dict, List, Optional
 
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.logger import Logger
 from spdx_tools.spdx.parser.parsing_functions import raise_parsing_error_if_logger_has_messages
diff --git a/src/spdx_tools/spdx/parser/jsonlikedict/extracted_licensing_info_parser.py b/src/spdx_tools/spdx/parser/jsonlikedict/extracted_licensing_info_parser.py
index 8b22f8443..8a75de24d 100644
--- a/src/spdx_tools/spdx/parser/jsonlikedict/extracted_licensing_info_parser.py
+++ b/src/spdx_tools/spdx/parser/jsonlikedict/extracted_licensing_info_parser.py
@@ -3,8 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 from typing import Dict, List, Optional, Union
 
-from spdx_tools.spdx.model.extracted_licensing_info import ExtractedLicensingInfo
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
+from spdx_tools.spdx.model import ExtractedLicensingInfo, SpdxNoAssertion
 from spdx_tools.spdx.parser.jsonlikedict.dict_parsing_functions import parse_field_or_no_assertion
 from spdx_tools.spdx.parser.logger import Logger
 from spdx_tools.spdx.parser.parsing_functions import construct_or_raise_parsing_error
diff --git a/src/spdx_tools/spdx/parser/jsonlikedict/file_parser.py b/src/spdx_tools/spdx/parser/jsonlikedict/file_parser.py
index 94aa31b04..53a9078db 100644
--- a/src/spdx_tools/spdx/parser/jsonlikedict/file_parser.py
+++ b/src/spdx_tools/spdx/parser/jsonlikedict/file_parser.py
@@ -5,10 +5,7 @@
 
 from license_expression import LicenseExpression
 
-from spdx_tools.spdx.model.checksum import Checksum
-from spdx_tools.spdx.model.file import File, FileType
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import Checksum, File, FileType, SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.parser.jsonlikedict.checksum_parser import ChecksumParser
 from spdx_tools.spdx.parser.jsonlikedict.dict_parsing_functions import (
     parse_field_or_log_error,
diff --git a/src/spdx_tools/spdx/parser/jsonlikedict/json_like_dict_parser.py b/src/spdx_tools/spdx/parser/jsonlikedict/json_like_dict_parser.py
index 3f9b43a11..9465c0c76 100644
--- a/src/spdx_tools/spdx/parser/jsonlikedict/json_like_dict_parser.py
+++ b/src/spdx_tools/spdx/parser/jsonlikedict/json_like_dict_parser.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 from typing import Dict
 
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.jsonlikedict.annotation_parser import AnnotationParser
 from spdx_tools.spdx.parser.jsonlikedict.creation_info_parser import CreationInfoParser
diff --git a/src/spdx_tools/spdx/parser/jsonlikedict/license_expression_parser.py b/src/spdx_tools/spdx/parser/jsonlikedict/license_expression_parser.py
index 08b17f9da..de0b36cab 100644
--- a/src/spdx_tools/spdx/parser/jsonlikedict/license_expression_parser.py
+++ b/src/spdx_tools/spdx/parser/jsonlikedict/license_expression_parser.py
@@ -5,8 +5,7 @@
 
 from license_expression import ExpressionError, LicenseExpression, Licensing
 
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.parser.error import SPDXParsingError
 
 
diff --git a/src/spdx_tools/spdx/parser/jsonlikedict/package_parser.py b/src/spdx_tools/spdx/parser/jsonlikedict/package_parser.py
index 55b6e064d..fb4924a63 100644
--- a/src/spdx_tools/spdx/parser/jsonlikedict/package_parser.py
+++ b/src/spdx_tools/spdx/parser/jsonlikedict/package_parser.py
@@ -7,16 +7,16 @@
 from license_expression import LicenseExpression
 
 from spdx_tools.spdx.datetime_conversions import datetime_from_str
-from spdx_tools.spdx.model.actor import Actor
-from spdx_tools.spdx.model.package import (
+from spdx_tools.spdx.model import (
+    Actor,
     ExternalPackageRef,
     ExternalPackageRefCategory,
     Package,
     PackagePurpose,
     PackageVerificationCode,
+    SpdxNoAssertion,
+    SpdxNone,
 )
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
 from spdx_tools.spdx.parser.actor_parser import ActorParser
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.jsonlikedict.checksum_parser import ChecksumParser
diff --git a/src/spdx_tools/spdx/parser/jsonlikedict/relationship_parser.py b/src/spdx_tools/spdx/parser/jsonlikedict/relationship_parser.py
index e541070b2..5ffc5c6e6 100644
--- a/src/spdx_tools/spdx/parser/jsonlikedict/relationship_parser.py
+++ b/src/spdx_tools/spdx/parser/jsonlikedict/relationship_parser.py
@@ -4,7 +4,7 @@
 from typing import Dict, List, Optional
 
 from spdx_tools.common.typing.constructor_type_errors import ConstructorTypeErrors
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
+from spdx_tools.spdx.model import Relationship, RelationshipType
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.jsonlikedict.dict_parsing_functions import (
     delete_duplicates_from_list,
diff --git a/src/spdx_tools/spdx/parser/jsonlikedict/snippet_parser.py b/src/spdx_tools/spdx/parser/jsonlikedict/snippet_parser.py
index 55745884f..4f501608f 100644
--- a/src/spdx_tools/spdx/parser/jsonlikedict/snippet_parser.py
+++ b/src/spdx_tools/spdx/parser/jsonlikedict/snippet_parser.py
@@ -6,9 +6,7 @@
 
 from license_expression import LicenseExpression
 
-from spdx_tools.spdx.model.snippet import Snippet
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import Snippet, SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.jsonlikedict.dict_parsing_functions import (
     parse_field_or_log_error,
diff --git a/src/spdx_tools/spdx/parser/rdf/annotation_parser.py b/src/spdx_tools/spdx/parser/rdf/annotation_parser.py
index 1a8e2746c..880637bf1 100644
--- a/src/spdx_tools/spdx/parser/rdf/annotation_parser.py
+++ b/src/spdx_tools/spdx/parser/rdf/annotation_parser.py
@@ -4,7 +4,7 @@
 from rdflib import RDFS, BNode, Graph, URIRef
 
 from spdx_tools.spdx.datetime_conversions import datetime_from_str
-from spdx_tools.spdx.model.annotation import Annotation, AnnotationType
+from spdx_tools.spdx.model import Annotation, AnnotationType
 from spdx_tools.spdx.parser.actor_parser import ActorParser
 from spdx_tools.spdx.parser.logger import Logger
 from spdx_tools.spdx.parser.parsing_functions import (
diff --git a/src/spdx_tools/spdx/parser/rdf/checksum_parser.py b/src/spdx_tools/spdx/parser/rdf/checksum_parser.py
index 633b2ad65..722f20340 100644
--- a/src/spdx_tools/spdx/parser/rdf/checksum_parser.py
+++ b/src/spdx_tools/spdx/parser/rdf/checksum_parser.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 from rdflib import BNode, Graph
 
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.logger import Logger
 from spdx_tools.spdx.parser.parsing_functions import (
diff --git a/src/spdx_tools/spdx/parser/rdf/creation_info_parser.py b/src/spdx_tools/spdx/parser/rdf/creation_info_parser.py
index ca83a122c..c21276a53 100644
--- a/src/spdx_tools/spdx/parser/rdf/creation_info_parser.py
+++ b/src/spdx_tools/spdx/parser/rdf/creation_info_parser.py
@@ -12,9 +12,7 @@
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
 from spdx_tools.spdx.datetime_conversions import datetime_from_str
-from spdx_tools.spdx.model.document import CreationInfo
-from spdx_tools.spdx.model.external_document_ref import ExternalDocumentRef
-from spdx_tools.spdx.model.version import Version
+from spdx_tools.spdx.model import CreationInfo, ExternalDocumentRef, Version
 from spdx_tools.spdx.parser.actor_parser import ActorParser
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.logger import Logger
diff --git a/src/spdx_tools/spdx/parser/rdf/extracted_licensing_info_parser.py b/src/spdx_tools/spdx/parser/rdf/extracted_licensing_info_parser.py
index b61b83d48..e77e8e8ad 100644
--- a/src/spdx_tools/spdx/parser/rdf/extracted_licensing_info_parser.py
+++ b/src/spdx_tools/spdx/parser/rdf/extracted_licensing_info_parser.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 from rdflib import RDFS, Graph, URIRef
 
-from spdx_tools.spdx.model.extracted_licensing_info import ExtractedLicensingInfo
+from spdx_tools.spdx.model import ExtractedLicensingInfo
 from spdx_tools.spdx.parser.logger import Logger
 from spdx_tools.spdx.parser.parsing_functions import (
     construct_or_raise_parsing_error,
diff --git a/src/spdx_tools/spdx/parser/rdf/file_parser.py b/src/spdx_tools/spdx/parser/rdf/file_parser.py
index 69067ed24..18512fe6c 100644
--- a/src/spdx_tools/spdx/parser/rdf/file_parser.py
+++ b/src/spdx_tools/spdx/parser/rdf/file_parser.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 from rdflib import RDFS, Graph, URIRef
 
-from spdx_tools.spdx.model.file import File, FileType
+from spdx_tools.spdx.model import File, FileType
 from spdx_tools.spdx.parser.logger import Logger
 from spdx_tools.spdx.parser.parsing_functions import (
     construct_or_raise_parsing_error,
diff --git a/src/spdx_tools/spdx/parser/rdf/graph_parsing_functions.py b/src/spdx_tools/spdx/parser/rdf/graph_parsing_functions.py
index 12d78e680..8ed8faff0 100644
--- a/src/spdx_tools/spdx/parser/rdf/graph_parsing_functions.py
+++ b/src/spdx_tools/spdx/parser/rdf/graph_parsing_functions.py
@@ -10,8 +10,9 @@
 from rdflib.term import BNode, Literal, Node
 
 from spdx_tools.spdx.casing_tools import camel_case_to_snake_case
-from spdx_tools.spdx.model.spdx_no_assertion import SPDX_NO_ASSERTION_STRING, SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SPDX_NONE_STRING, SpdxNone
+from spdx_tools.spdx.model import SpdxNoAssertion, SpdxNone
+from spdx_tools.spdx.model.spdx_no_assertion import SPDX_NO_ASSERTION_STRING
+from spdx_tools.spdx.model.spdx_none import SPDX_NONE_STRING
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.logger import Logger
 from spdx_tools.spdx.rdfschema.namespace import SPDX_NAMESPACE
diff --git a/src/spdx_tools/spdx/parser/rdf/package_parser.py b/src/spdx_tools/spdx/parser/rdf/package_parser.py
index 61d94a667..a3de07749 100644
--- a/src/spdx_tools/spdx/parser/rdf/package_parser.py
+++ b/src/spdx_tools/spdx/parser/rdf/package_parser.py
@@ -7,7 +7,7 @@
 from rdflib.term import BNode
 
 from spdx_tools.spdx.datetime_conversions import datetime_from_str
-from spdx_tools.spdx.model.package import (
+from spdx_tools.spdx.model import (
     ExternalPackageRef,
     ExternalPackageRefCategory,
     Package,
diff --git a/src/spdx_tools/spdx/parser/rdf/rdf_parser.py b/src/spdx_tools/spdx/parser/rdf/rdf_parser.py
index 42d7c7ecc..70236cd0d 100644
--- a/src/spdx_tools/spdx/parser/rdf/rdf_parser.py
+++ b/src/spdx_tools/spdx/parser/rdf/rdf_parser.py
@@ -5,8 +5,7 @@
 
 from rdflib import RDF, Graph
 
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.relationship import RelationshipType
+from spdx_tools.spdx.model import Document, RelationshipType
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.logger import Logger
 from spdx_tools.spdx.parser.parsing_functions import (
diff --git a/src/spdx_tools/spdx/parser/rdf/relationship_parser.py b/src/spdx_tools/spdx/parser/rdf/relationship_parser.py
index c043cb8ca..562e0ab92 100644
--- a/src/spdx_tools/spdx/parser/rdf/relationship_parser.py
+++ b/src/spdx_tools/spdx/parser/rdf/relationship_parser.py
@@ -4,7 +4,7 @@
 from rdflib import RDFS, Graph, URIRef
 from rdflib.term import Node
 
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
+from spdx_tools.spdx.model import Relationship, RelationshipType
 from spdx_tools.spdx.parser.logger import Logger
 from spdx_tools.spdx.parser.parsing_functions import (
     construct_or_raise_parsing_error,
diff --git a/src/spdx_tools/spdx/parser/rdf/snippet_parser.py b/src/spdx_tools/spdx/parser/rdf/snippet_parser.py
index 073d7d9c8..b26d6cdfc 100644
--- a/src/spdx_tools/spdx/parser/rdf/snippet_parser.py
+++ b/src/spdx_tools/spdx/parser/rdf/snippet_parser.py
@@ -7,7 +7,7 @@
 from rdflib.exceptions import UniquenessError
 from rdflib.term import BNode, Node, URIRef
 
-from spdx_tools.spdx.model.snippet import Snippet
+from spdx_tools.spdx.model import Snippet
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.logger import Logger
 from spdx_tools.spdx.parser.parsing_functions import (
diff --git a/src/spdx_tools/spdx/parser/tagvalue/helper_methods.py b/src/spdx_tools/spdx/parser/tagvalue/helper_methods.py
index 484067841..d8cfef77a 100644
--- a/src/spdx_tools/spdx/parser/tagvalue/helper_methods.py
+++ b/src/spdx_tools/spdx/parser/tagvalue/helper_methods.py
@@ -7,13 +7,16 @@
 from ply.yacc import YaccProduction
 
 from spdx_tools.spdx.casing_tools import camel_case_to_snake_case
-from spdx_tools.spdx.model.annotation import Annotation
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.document import CreationInfo
-from spdx_tools.spdx.model.extracted_licensing_info import ExtractedLicensingInfo
-from spdx_tools.spdx.model.file import File
-from spdx_tools.spdx.model.package import Package
-from spdx_tools.spdx.model.snippet import Snippet
+from spdx_tools.spdx.model import (
+    Annotation,
+    Checksum,
+    ChecksumAlgorithm,
+    CreationInfo,
+    ExtractedLicensingInfo,
+    File,
+    Package,
+    Snippet,
+)
 from spdx_tools.spdx.parser.error import SPDXParsingError
 
 
diff --git a/src/spdx_tools/spdx/parser/tagvalue/parser.py b/src/spdx_tools/spdx/parser/tagvalue/parser.py
index e4376fbe0..e6ce74dc4 100644
--- a/src/spdx_tools/spdx/parser/tagvalue/parser.py
+++ b/src/spdx_tools/spdx/parser/tagvalue/parser.py
@@ -19,23 +19,27 @@
 from ply.yacc import LRParser
 
 from spdx_tools.spdx.datetime_conversions import datetime_from_str
-from spdx_tools.spdx.model.annotation import Annotation, AnnotationType
-from spdx_tools.spdx.model.document import CreationInfo, Document
-from spdx_tools.spdx.model.external_document_ref import ExternalDocumentRef
-from spdx_tools.spdx.model.extracted_licensing_info import ExtractedLicensingInfo
-from spdx_tools.spdx.model.file import File, FileType
-from spdx_tools.spdx.model.package import (
+from spdx_tools.spdx.model import (
+    Annotation,
+    AnnotationType,
+    CreationInfo,
+    Document,
+    ExternalDocumentRef,
     ExternalPackageRef,
     ExternalPackageRefCategory,
+    ExtractedLicensingInfo,
+    File,
+    FileType,
     Package,
     PackagePurpose,
     PackageVerificationCode,
+    Relationship,
+    RelationshipType,
+    Snippet,
+    SpdxNoAssertion,
+    SpdxNone,
+    Version,
 )
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
-from spdx_tools.spdx.model.snippet import Snippet
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
-from spdx_tools.spdx.model.version import Version
 from spdx_tools.spdx.parser.actor_parser import ActorParser
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.logger import Logger
diff --git a/src/spdx_tools/spdx/parser/tagvalue/tagvalue_parser.py b/src/spdx_tools/spdx/parser/tagvalue/tagvalue_parser.py
index a617cac96..c28596363 100644
--- a/src/spdx_tools/spdx/parser/tagvalue/tagvalue_parser.py
+++ b/src/spdx_tools/spdx/parser/tagvalue/tagvalue_parser.py
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2023 spdx contributors
 #
 # SPDX-License-Identifier: Apache-2.0
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 from spdx_tools.spdx.parser.tagvalue.parser import Parser
 
 
diff --git a/src/spdx_tools/spdx/parser/xml/xml_parser.py b/src/spdx_tools/spdx/parser/xml/xml_parser.py
index bef87d86b..52863f389 100644
--- a/src/spdx_tools/spdx/parser/xml/xml_parser.py
+++ b/src/spdx_tools/spdx/parser/xml/xml_parser.py
@@ -5,7 +5,7 @@
 
 import xmltodict
 
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.jsonlikedict.json_like_dict_parser import JsonLikeDictParser
 
diff --git a/src/spdx_tools/spdx/parser/yaml/yaml_parser.py b/src/spdx_tools/spdx/parser/yaml/yaml_parser.py
index 86bcd6e49..021858137 100644
--- a/src/spdx_tools/spdx/parser/yaml/yaml_parser.py
+++ b/src/spdx_tools/spdx/parser/yaml/yaml_parser.py
@@ -5,7 +5,7 @@
 
 import yaml
 
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 from spdx_tools.spdx.parser.jsonlikedict.json_like_dict_parser import JsonLikeDictParser
 
 
diff --git a/src/spdx_tools/spdx/validation/actor_validator.py b/src/spdx_tools/spdx/validation/actor_validator.py
index c15b99e02..313f7d3e1 100644
--- a/src/spdx_tools/spdx/validation/actor_validator.py
+++ b/src/spdx_tools/spdx/validation/actor_validator.py
@@ -4,7 +4,7 @@
 
 from typing import List
 
-from spdx_tools.spdx.model.actor import Actor, ActorType
+from spdx_tools.spdx.model import Actor, ActorType
 from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage
 
 
diff --git a/src/spdx_tools/spdx/validation/annotation_validator.py b/src/spdx_tools/spdx/validation/annotation_validator.py
index 309f7c9fa..dbfa1bed2 100644
--- a/src/spdx_tools/spdx/validation/annotation_validator.py
+++ b/src/spdx_tools/spdx/validation/annotation_validator.py
@@ -4,8 +4,7 @@
 
 from typing import List
 
-from spdx_tools.spdx.model.annotation import Annotation
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Annotation, Document
 from spdx_tools.spdx.validation.actor_validator import validate_actor
 from spdx_tools.spdx.validation.spdx_id_validators import validate_spdx_id
 from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage
diff --git a/src/spdx_tools/spdx/validation/checksum_validator.py b/src/spdx_tools/spdx/validation/checksum_validator.py
index 53f40e473..67df436ca 100644
--- a/src/spdx_tools/spdx/validation/checksum_validator.py
+++ b/src/spdx_tools/spdx/validation/checksum_validator.py
@@ -5,7 +5,7 @@
 import re
 from typing import Dict, List
 
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm
 from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage
 
 # in hexadecimal digits
diff --git a/src/spdx_tools/spdx/validation/creation_info_validator.py b/src/spdx_tools/spdx/validation/creation_info_validator.py
index 32de32673..55bac981d 100644
--- a/src/spdx_tools/spdx/validation/creation_info_validator.py
+++ b/src/spdx_tools/spdx/validation/creation_info_validator.py
@@ -5,7 +5,7 @@
 from typing import List
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.document import CreationInfo
+from spdx_tools.spdx.model import CreationInfo
 from spdx_tools.spdx.validation.actor_validator import validate_actors
 from spdx_tools.spdx.validation.external_document_ref_validator import validate_external_document_refs
 from spdx_tools.spdx.validation.uri_validators import validate_uri
diff --git a/src/spdx_tools/spdx/validation/document_validator.py b/src/spdx_tools/spdx/validation/document_validator.py
index b368ff576..41e5c7d9b 100644
--- a/src/spdx_tools/spdx/validation/document_validator.py
+++ b/src/spdx_tools/spdx/validation/document_validator.py
@@ -3,8 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 from typing import List
 
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.relationship import RelationshipType
+from spdx_tools.spdx.model import Document, RelationshipType
 from spdx_tools.spdx.model.relationship_filters import filter_by_type_and_origin, filter_by_type_and_target
 from spdx_tools.spdx.validation.annotation_validator import validate_annotations
 from spdx_tools.spdx.validation.creation_info_validator import validate_creation_info
diff --git a/src/spdx_tools/spdx/validation/external_document_ref_validator.py b/src/spdx_tools/spdx/validation/external_document_ref_validator.py
index 2bbf95566..1dd7da0c3 100644
--- a/src/spdx_tools/spdx/validation/external_document_ref_validator.py
+++ b/src/spdx_tools/spdx/validation/external_document_ref_validator.py
@@ -4,7 +4,7 @@
 
 from typing import List
 
-from spdx_tools.spdx.model.external_document_ref import ExternalDocumentRef
+from spdx_tools.spdx.model import ExternalDocumentRef
 from spdx_tools.spdx.validation.checksum_validator import validate_checksum
 from spdx_tools.spdx.validation.spdx_id_validators import is_valid_external_doc_ref_id
 from spdx_tools.spdx.validation.uri_validators import validate_uri
diff --git a/src/spdx_tools/spdx/validation/external_package_ref_validator.py b/src/spdx_tools/spdx/validation/external_package_ref_validator.py
index c37187f4b..e785891fb 100644
--- a/src/spdx_tools/spdx/validation/external_package_ref_validator.py
+++ b/src/spdx_tools/spdx/validation/external_package_ref_validator.py
@@ -6,11 +6,8 @@
 
 import uritools
 
-from spdx_tools.spdx.model.package import (
-    CATEGORY_TO_EXTERNAL_PACKAGE_REF_TYPES,
-    ExternalPackageRef,
-    ExternalPackageRefCategory,
-)
+from spdx_tools.spdx.model import ExternalPackageRef, ExternalPackageRefCategory
+from spdx_tools.spdx.model.package import CATEGORY_TO_EXTERNAL_PACKAGE_REF_TYPES
 from spdx_tools.spdx.validation.uri_validators import validate_url
 from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage
 
diff --git a/src/spdx_tools/spdx/validation/extracted_licensing_info_validator.py b/src/spdx_tools/spdx/validation/extracted_licensing_info_validator.py
index 7779c2d80..86df9ca77 100644
--- a/src/spdx_tools/spdx/validation/extracted_licensing_info_validator.py
+++ b/src/spdx_tools/spdx/validation/extracted_licensing_info_validator.py
@@ -5,7 +5,7 @@
 import re
 from typing import List, Optional
 
-from spdx_tools.spdx.model.extracted_licensing_info import ExtractedLicensingInfo
+from spdx_tools.spdx.model import ExtractedLicensingInfo
 from spdx_tools.spdx.validation.uri_validators import validate_url
 from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage
 
diff --git a/src/spdx_tools/spdx/validation/file_validator.py b/src/spdx_tools/spdx/validation/file_validator.py
index e461c14b0..77cf6a5d1 100644
--- a/src/spdx_tools/spdx/validation/file_validator.py
+++ b/src/spdx_tools/spdx/validation/file_validator.py
@@ -4,9 +4,7 @@
 
 from typing import List, Optional
 
-from spdx_tools.spdx.model.checksum import ChecksumAlgorithm
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.file import File
+from spdx_tools.spdx.model import ChecksumAlgorithm, Document, File
 from spdx_tools.spdx.validation.checksum_validator import validate_checksums
 from spdx_tools.spdx.validation.license_expression_validator import (
     validate_license_expression,
diff --git a/src/spdx_tools/spdx/validation/license_expression_validator.py b/src/spdx_tools/spdx/validation/license_expression_validator.py
index 72dabe548..e9b52ca7a 100644
--- a/src/spdx_tools/spdx/validation/license_expression_validator.py
+++ b/src/spdx_tools/spdx/validation/license_expression_validator.py
@@ -6,9 +6,7 @@
 
 from license_expression import ExpressionError, ExpressionParseError, LicenseExpression, get_spdx_licensing
 
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import Document, SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage
 
 
diff --git a/src/spdx_tools/spdx/validation/package_validator.py b/src/spdx_tools/spdx/validation/package_validator.py
index 51d887963..dc41dcf4c 100644
--- a/src/spdx_tools/spdx/validation/package_validator.py
+++ b/src/spdx_tools/spdx/validation/package_validator.py
@@ -4,9 +4,7 @@
 
 from typing import List, Optional
 
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.package import Package
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
+from spdx_tools.spdx.model import Document, Package, Relationship, RelationshipType
 from spdx_tools.spdx.model.relationship_filters import filter_by_type_and_origin, filter_by_type_and_target
 from spdx_tools.spdx.validation.checksum_validator import validate_checksums
 from spdx_tools.spdx.validation.external_package_ref_validator import validate_external_package_refs
diff --git a/src/spdx_tools/spdx/validation/package_verification_code_validator.py b/src/spdx_tools/spdx/validation/package_verification_code_validator.py
index db1a0edf2..fb79135ba 100644
--- a/src/spdx_tools/spdx/validation/package_verification_code_validator.py
+++ b/src/spdx_tools/spdx/validation/package_verification_code_validator.py
@@ -5,7 +5,7 @@
 import re
 from typing import List
 
-from spdx_tools.spdx.model.package import PackageVerificationCode
+from spdx_tools.spdx.model import PackageVerificationCode
 from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage
 
 
diff --git a/src/spdx_tools/spdx/validation/relationship_validator.py b/src/spdx_tools/spdx/validation/relationship_validator.py
index 84e97f6d1..1f9430683 100644
--- a/src/spdx_tools/spdx/validation/relationship_validator.py
+++ b/src/spdx_tools/spdx/validation/relationship_validator.py
@@ -4,10 +4,7 @@
 
 from typing import List
 
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import Document, Relationship, RelationshipType, SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.validation.spdx_id_validators import validate_spdx_id
 from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage
 
diff --git a/src/spdx_tools/spdx/validation/snippet_validator.py b/src/spdx_tools/spdx/validation/snippet_validator.py
index db696e45e..aab0e606d 100644
--- a/src/spdx_tools/spdx/validation/snippet_validator.py
+++ b/src/spdx_tools/spdx/validation/snippet_validator.py
@@ -4,8 +4,7 @@
 
 from typing import List, Optional
 
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.snippet import Snippet
+from spdx_tools.spdx.model import Document, Snippet
 from spdx_tools.spdx.validation.license_expression_validator import (
     validate_license_expression,
     validate_license_expressions,
diff --git a/src/spdx_tools/spdx/validation/spdx_id_validators.py b/src/spdx_tools/spdx/validation/spdx_id_validators.py
index 86952a4fc..0d78900a6 100644
--- a/src/spdx_tools/spdx/validation/spdx_id_validators.py
+++ b/src/spdx_tools/spdx/validation/spdx_id_validators.py
@@ -6,8 +6,7 @@
 from typing import List
 
 from spdx_tools.spdx.document_utils import get_contained_spdx_element_ids
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.file import File
+from spdx_tools.spdx.model import Document, File
 
 
 def is_valid_internal_spdx_id(spdx_id: str) -> bool:
diff --git a/src/spdx_tools/spdx/writer/json/json_writer.py b/src/spdx_tools/spdx/writer/json/json_writer.py
index 58c4acbee..0b939c039 100644
--- a/src/spdx_tools/spdx/writer/json/json_writer.py
+++ b/src/spdx_tools/spdx/writer/json/json_writer.py
@@ -6,7 +6,7 @@
 
 from spdx_tools.spdx.document_utils import create_document_without_duplicates
 from spdx_tools.spdx.jsonschema.document_converter import DocumentConverter
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 from spdx_tools.spdx.validation.document_validator import validate_full_spdx_document
 from spdx_tools.spdx.validation.validation_message import ValidationMessage
 
diff --git a/src/spdx_tools/spdx/writer/rdf/annotation_writer.py b/src/spdx_tools/spdx/writer/rdf/annotation_writer.py
index 529f0ccd2..dd51b47e6 100644
--- a/src/spdx_tools/spdx/writer/rdf/annotation_writer.py
+++ b/src/spdx_tools/spdx/writer/rdf/annotation_writer.py
@@ -7,7 +7,7 @@
 
 from spdx_tools.spdx.casing_tools import snake_case_to_camel_case
 from spdx_tools.spdx.datetime_conversions import datetime_to_iso_string
-from spdx_tools.spdx.model.annotation import Annotation
+from spdx_tools.spdx.model import Annotation
 from spdx_tools.spdx.rdfschema.namespace import SPDX_NAMESPACE
 from spdx_tools.spdx.writer.rdf.writer_utils import add_namespace_to_spdx_id
 
diff --git a/src/spdx_tools/spdx/writer/rdf/checksum_writer.py b/src/spdx_tools/spdx/writer/rdf/checksum_writer.py
index 8af75f53b..1f7172e88 100644
--- a/src/spdx_tools/spdx/writer/rdf/checksum_writer.py
+++ b/src/spdx_tools/spdx/writer/rdf/checksum_writer.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 from rdflib import RDF, BNode, Graph, Literal, URIRef
 
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm
 from spdx_tools.spdx.rdfschema.namespace import SPDX_NAMESPACE
 
 
diff --git a/src/spdx_tools/spdx/writer/rdf/creation_info_writer.py b/src/spdx_tools/spdx/writer/rdf/creation_info_writer.py
index b457101b6..6e77bc8d9 100644
--- a/src/spdx_tools/spdx/writer/rdf/creation_info_writer.py
+++ b/src/spdx_tools/spdx/writer/rdf/creation_info_writer.py
@@ -4,7 +4,7 @@
 from rdflib import RDF, RDFS, BNode, Graph, Literal, URIRef
 
 from spdx_tools.spdx.datetime_conversions import datetime_to_iso_string
-from spdx_tools.spdx.model.document import CreationInfo
+from spdx_tools.spdx.model import CreationInfo
 from spdx_tools.spdx.rdfschema.namespace import LICENSE_NAMESPACE, SPDX_NAMESPACE
 from spdx_tools.spdx.writer.rdf.external_document_ref_writer import add_external_document_ref_to_graph
 from spdx_tools.spdx.writer.rdf.writer_utils import add_optional_literal
diff --git a/src/spdx_tools/spdx/writer/rdf/external_document_ref_writer.py b/src/spdx_tools/spdx/writer/rdf/external_document_ref_writer.py
index 536a96434..958ac8b5e 100644
--- a/src/spdx_tools/spdx/writer/rdf/external_document_ref_writer.py
+++ b/src/spdx_tools/spdx/writer/rdf/external_document_ref_writer.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 from rdflib import RDF, Graph, URIRef
 
-from spdx_tools.spdx.model.external_document_ref import ExternalDocumentRef
+from spdx_tools.spdx.model import ExternalDocumentRef
 from spdx_tools.spdx.rdfschema.namespace import SPDX_NAMESPACE
 from spdx_tools.spdx.writer.rdf.checksum_writer import add_checksum_to_graph
 
diff --git a/src/spdx_tools/spdx/writer/rdf/extracted_licensing_info_writer.py b/src/spdx_tools/spdx/writer/rdf/extracted_licensing_info_writer.py
index 89f163b8f..f30ab5d60 100644
--- a/src/spdx_tools/spdx/writer/rdf/extracted_licensing_info_writer.py
+++ b/src/spdx_tools/spdx/writer/rdf/extracted_licensing_info_writer.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 from rdflib import RDF, RDFS, BNode, Graph, Literal, URIRef
 
-from spdx_tools.spdx.model.extracted_licensing_info import ExtractedLicensingInfo
+from spdx_tools.spdx.model import ExtractedLicensingInfo
 from spdx_tools.spdx.rdfschema.namespace import SPDX_NAMESPACE
 from spdx_tools.spdx.writer.rdf.writer_utils import add_literal_or_no_assertion, add_optional_literal
 
diff --git a/src/spdx_tools/spdx/writer/rdf/file_writer.py b/src/spdx_tools/spdx/writer/rdf/file_writer.py
index d3454cc96..649a1e6e0 100644
--- a/src/spdx_tools/spdx/writer/rdf/file_writer.py
+++ b/src/spdx_tools/spdx/writer/rdf/file_writer.py
@@ -6,7 +6,7 @@
 from rdflib import RDF, RDFS, Graph, Literal, URIRef
 
 from spdx_tools.spdx.casing_tools import snake_case_to_camel_case
-from spdx_tools.spdx.model.file import File
+from spdx_tools.spdx.model import File
 from spdx_tools.spdx.rdfschema.namespace import SPDX_NAMESPACE
 from spdx_tools.spdx.writer.rdf.checksum_writer import add_checksum_to_graph
 from spdx_tools.spdx.writer.rdf.license_expression_writer import add_license_expression_or_none_or_no_assertion
diff --git a/src/spdx_tools/spdx/writer/rdf/license_expression_writer.py b/src/spdx_tools/spdx/writer/rdf/license_expression_writer.py
index 6df0d9800..b6acfe1ad 100644
--- a/src/spdx_tools/spdx/writer/rdf/license_expression_writer.py
+++ b/src/spdx_tools/spdx/writer/rdf/license_expression_writer.py
@@ -16,8 +16,7 @@
 from rdflib import RDF, BNode, Graph, URIRef
 from rdflib.term import Literal, Node
 
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.rdfschema.namespace import LICENSE_NAMESPACE, SPDX_NAMESPACE
 
 
diff --git a/src/spdx_tools/spdx/writer/rdf/package_writer.py b/src/spdx_tools/spdx/writer/rdf/package_writer.py
index d678ba99d..90d21c145 100644
--- a/src/spdx_tools/spdx/writer/rdf/package_writer.py
+++ b/src/spdx_tools/spdx/writer/rdf/package_writer.py
@@ -6,12 +6,8 @@
 from rdflib import DOAP, RDF, RDFS, XSD, BNode, Graph, Literal, URIRef
 
 from spdx_tools.spdx.casing_tools import snake_case_to_camel_case
-from spdx_tools.spdx.model.package import (
-    CATEGORY_TO_EXTERNAL_PACKAGE_REF_TYPES,
-    ExternalPackageRef,
-    Package,
-    PackageVerificationCode,
-)
+from spdx_tools.spdx.model import ExternalPackageRef, Package, PackageVerificationCode
+from spdx_tools.spdx.model.package import CATEGORY_TO_EXTERNAL_PACKAGE_REF_TYPES
 from spdx_tools.spdx.rdfschema.namespace import REFERENCE_NAMESPACE, SPDX_NAMESPACE
 from spdx_tools.spdx.writer.rdf.checksum_writer import add_checksum_to_graph
 from spdx_tools.spdx.writer.rdf.license_expression_writer import add_license_expression_or_none_or_no_assertion
diff --git a/src/spdx_tools/spdx/writer/rdf/rdf_writer.py b/src/spdx_tools/spdx/writer/rdf/rdf_writer.py
index 32ba50c80..360337abc 100644
--- a/src/spdx_tools/spdx/writer/rdf/rdf_writer.py
+++ b/src/spdx_tools/spdx/writer/rdf/rdf_writer.py
@@ -7,7 +7,7 @@
 from rdflib.compare import to_isomorphic
 
 from spdx_tools.spdx.document_utils import create_document_without_duplicates
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 from spdx_tools.spdx.rdfschema.namespace import POINTER_NAMESPACE, SPDX_NAMESPACE
 from spdx_tools.spdx.validation.document_validator import validate_full_spdx_document
 from spdx_tools.spdx.validation.validation_message import ValidationMessage
diff --git a/src/spdx_tools/spdx/writer/rdf/relationship_writer.py b/src/spdx_tools/spdx/writer/rdf/relationship_writer.py
index f33018074..82b5b59d5 100644
--- a/src/spdx_tools/spdx/writer/rdf/relationship_writer.py
+++ b/src/spdx_tools/spdx/writer/rdf/relationship_writer.py
@@ -6,9 +6,7 @@
 from rdflib import RDF, RDFS, BNode, Graph, Literal, URIRef
 
 from spdx_tools.spdx.casing_tools import snake_case_to_camel_case
-from spdx_tools.spdx.model.relationship import Relationship
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import Relationship, SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.rdfschema.namespace import SPDX_NAMESPACE
 from spdx_tools.spdx.writer.rdf.writer_utils import add_namespace_to_spdx_id
 
diff --git a/src/spdx_tools/spdx/writer/rdf/snippet_writer.py b/src/spdx_tools/spdx/writer/rdf/snippet_writer.py
index 2f46cc3c1..f45759c9b 100644
--- a/src/spdx_tools/spdx/writer/rdf/snippet_writer.py
+++ b/src/spdx_tools/spdx/writer/rdf/snippet_writer.py
@@ -5,7 +5,7 @@
 
 from rdflib import RDF, RDFS, BNode, Graph, Literal, URIRef
 
-from spdx_tools.spdx.model.snippet import Snippet
+from spdx_tools.spdx.model import Snippet
 from spdx_tools.spdx.rdfschema.namespace import POINTER_NAMESPACE, SPDX_NAMESPACE
 from spdx_tools.spdx.writer.rdf.license_expression_writer import add_license_expression_or_none_or_no_assertion
 from spdx_tools.spdx.writer.rdf.writer_utils import add_namespace_to_spdx_id, add_optional_literal
diff --git a/src/spdx_tools/spdx/writer/rdf/writer_utils.py b/src/spdx_tools/spdx/writer/rdf/writer_utils.py
index a6118208d..9bca3f470 100644
--- a/src/spdx_tools/spdx/writer/rdf/writer_utils.py
+++ b/src/spdx_tools/spdx/writer/rdf/writer_utils.py
@@ -9,8 +9,7 @@
 from rdflib.term import Node
 
 from spdx_tools.spdx.datetime_conversions import datetime_to_iso_string
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.rdfschema.namespace import SPDX_NAMESPACE
 from spdx_tools.spdx.validation.spdx_id_validators import is_valid_internal_spdx_id
 
diff --git a/src/spdx_tools/spdx/writer/tagvalue/annotation_writer.py b/src/spdx_tools/spdx/writer/tagvalue/annotation_writer.py
index 7828b903f..0be7663c4 100644
--- a/src/spdx_tools/spdx/writer/tagvalue/annotation_writer.py
+++ b/src/spdx_tools/spdx/writer/tagvalue/annotation_writer.py
@@ -11,7 +11,7 @@
 from typing import TextIO
 
 from spdx_tools.spdx.datetime_conversions import datetime_to_iso_string
-from spdx_tools.spdx.model.annotation import Annotation
+from spdx_tools.spdx.model import Annotation
 from spdx_tools.spdx.writer.tagvalue.tagvalue_writer_helper_functions import write_text_value, write_value
 
 
diff --git a/src/spdx_tools/spdx/writer/tagvalue/checksum_writer.py b/src/spdx_tools/spdx/writer/tagvalue/checksum_writer.py
index 91d89dd8a..b641c0f53 100644
--- a/src/spdx_tools/spdx/writer/tagvalue/checksum_writer.py
+++ b/src/spdx_tools/spdx/writer/tagvalue/checksum_writer.py
@@ -8,7 +8,7 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm
 
 
 def write_checksum_to_tag_value(checksum: Checksum) -> str:
diff --git a/src/spdx_tools/spdx/writer/tagvalue/creation_info_writer.py b/src/spdx_tools/spdx/writer/tagvalue/creation_info_writer.py
index fca4d0bc3..9e87b0925 100644
--- a/src/spdx_tools/spdx/writer/tagvalue/creation_info_writer.py
+++ b/src/spdx_tools/spdx/writer/tagvalue/creation_info_writer.py
@@ -11,7 +11,7 @@
 from typing import TextIO
 
 from spdx_tools.spdx.datetime_conversions import datetime_to_iso_string
-from spdx_tools.spdx.model.document import CreationInfo
+from spdx_tools.spdx.model import CreationInfo
 from spdx_tools.spdx.writer.tagvalue.tagvalue_writer_helper_functions import (
     write_optional_heading,
     write_separator,
diff --git a/src/spdx_tools/spdx/writer/tagvalue/extracted_licensing_info_writer.py b/src/spdx_tools/spdx/writer/tagvalue/extracted_licensing_info_writer.py
index ee728efca..89734c8c8 100644
--- a/src/spdx_tools/spdx/writer/tagvalue/extracted_licensing_info_writer.py
+++ b/src/spdx_tools/spdx/writer/tagvalue/extracted_licensing_info_writer.py
@@ -10,7 +10,7 @@
 #  limitations under the License.
 from typing import TextIO
 
-from spdx_tools.spdx.model.extracted_licensing_info import ExtractedLicensingInfo
+from spdx_tools.spdx.model import ExtractedLicensingInfo
 from spdx_tools.spdx.writer.tagvalue.tagvalue_writer_helper_functions import write_text_value, write_value
 
 
diff --git a/src/spdx_tools/spdx/writer/tagvalue/file_writer.py b/src/spdx_tools/spdx/writer/tagvalue/file_writer.py
index 1bfc07ff2..8848d9aae 100644
--- a/src/spdx_tools/spdx/writer/tagvalue/file_writer.py
+++ b/src/spdx_tools/spdx/writer/tagvalue/file_writer.py
@@ -10,7 +10,7 @@
 #  limitations under the License.
 from typing import TextIO
 
-from spdx_tools.spdx.model.file import File
+from spdx_tools.spdx.model import File
 from spdx_tools.spdx.writer.tagvalue.checksum_writer import write_checksum_to_tag_value
 from spdx_tools.spdx.writer.tagvalue.tagvalue_writer_helper_functions import write_text_value, write_value
 
diff --git a/src/spdx_tools/spdx/writer/tagvalue/package_writer.py b/src/spdx_tools/spdx/writer/tagvalue/package_writer.py
index f70259eae..d690773e0 100644
--- a/src/spdx_tools/spdx/writer/tagvalue/package_writer.py
+++ b/src/spdx_tools/spdx/writer/tagvalue/package_writer.py
@@ -11,7 +11,7 @@
 from typing import TextIO
 
 from spdx_tools.spdx.datetime_conversions import datetime_to_iso_string
-from spdx_tools.spdx.model.package import Package, PackageVerificationCode
+from spdx_tools.spdx.model import Package, PackageVerificationCode
 from spdx_tools.spdx.writer.tagvalue.checksum_writer import write_checksum_to_tag_value
 from spdx_tools.spdx.writer.tagvalue.tagvalue_writer_helper_functions import (
     transform_enum_name_to_tv,
diff --git a/src/spdx_tools/spdx/writer/tagvalue/relationship_writer.py b/src/spdx_tools/spdx/writer/tagvalue/relationship_writer.py
index b124e81eb..a46f0c7cc 100644
--- a/src/spdx_tools/spdx/writer/tagvalue/relationship_writer.py
+++ b/src/spdx_tools/spdx/writer/tagvalue/relationship_writer.py
@@ -10,7 +10,7 @@
 #  limitations under the License.
 from typing import TextIO
 
-from spdx_tools.spdx.model.relationship import Relationship
+from spdx_tools.spdx.model import Relationship
 from spdx_tools.spdx.writer.tagvalue.tagvalue_writer_helper_functions import write_text_value, write_value
 
 
diff --git a/src/spdx_tools/spdx/writer/tagvalue/snippet_writer.py b/src/spdx_tools/spdx/writer/tagvalue/snippet_writer.py
index 2d404a17e..de8ce16d4 100644
--- a/src/spdx_tools/spdx/writer/tagvalue/snippet_writer.py
+++ b/src/spdx_tools/spdx/writer/tagvalue/snippet_writer.py
@@ -10,7 +10,7 @@
 #  limitations under the License.
 from typing import TextIO
 
-from spdx_tools.spdx.model.snippet import Snippet
+from spdx_tools.spdx.model import Snippet
 from spdx_tools.spdx.writer.tagvalue.tagvalue_writer_helper_functions import write_range, write_text_value, write_value
 
 
diff --git a/src/spdx_tools/spdx/writer/tagvalue/tagvalue_writer.py b/src/spdx_tools/spdx/writer/tagvalue/tagvalue_writer.py
index 13013d385..37a54cae3 100644
--- a/src/spdx_tools/spdx/writer/tagvalue/tagvalue_writer.py
+++ b/src/spdx_tools/spdx/writer/tagvalue/tagvalue_writer.py
@@ -11,7 +11,7 @@
 from typing import List, TextIO
 
 from spdx_tools.spdx.document_utils import create_document_without_duplicates
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 from spdx_tools.spdx.validation.document_validator import validate_full_spdx_document
 from spdx_tools.spdx.validation.validation_message import ValidationMessage
 from spdx_tools.spdx.writer.tagvalue.annotation_writer import write_annotation
diff --git a/src/spdx_tools/spdx/writer/tagvalue/tagvalue_writer_helper_functions.py b/src/spdx_tools/spdx/writer/tagvalue/tagvalue_writer_helper_functions.py
index 55acdf466..2e638f943 100644
--- a/src/spdx_tools/spdx/writer/tagvalue/tagvalue_writer_helper_functions.py
+++ b/src/spdx_tools/spdx/writer/tagvalue/tagvalue_writer_helper_functions.py
@@ -12,13 +12,16 @@
 
 from license_expression import LicenseExpression
 
-from spdx_tools.spdx.model.actor import Actor
-from spdx_tools.spdx.model.file import File
-from spdx_tools.spdx.model.package import Package
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
-from spdx_tools.spdx.model.snippet import Snippet
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import (
+    Actor,
+    File,
+    Package,
+    Relationship,
+    RelationshipType,
+    Snippet,
+    SpdxNoAssertion,
+    SpdxNone,
+)
 
 
 def write_separator(out: TextIO):
diff --git a/src/spdx_tools/spdx/writer/write_anything.py b/src/spdx_tools/spdx/writer/write_anything.py
index 26f238d74..d811b35c9 100644
--- a/src/spdx_tools/spdx/writer/write_anything.py
+++ b/src/spdx_tools/spdx/writer/write_anything.py
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 from spdx_tools.spdx.formats import FileFormat, file_name_to_format
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 from spdx_tools.spdx.writer.json import json_writer
 from spdx_tools.spdx.writer.rdf import rdf_writer
 from spdx_tools.spdx.writer.tagvalue import tagvalue_writer
diff --git a/src/spdx_tools/spdx/writer/xml/xml_writer.py b/src/spdx_tools/spdx/writer/xml/xml_writer.py
index bcef88a70..73070b123 100644
--- a/src/spdx_tools/spdx/writer/xml/xml_writer.py
+++ b/src/spdx_tools/spdx/writer/xml/xml_writer.py
@@ -7,7 +7,7 @@
 
 from spdx_tools.spdx.document_utils import create_document_without_duplicates
 from spdx_tools.spdx.jsonschema.document_converter import DocumentConverter
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 from spdx_tools.spdx.validation.document_validator import validate_full_spdx_document
 from spdx_tools.spdx.validation.validation_message import ValidationMessage
 
diff --git a/src/spdx_tools/spdx/writer/yaml/yaml_writer.py b/src/spdx_tools/spdx/writer/yaml/yaml_writer.py
index 00631b0e0..4c354a157 100644
--- a/src/spdx_tools/spdx/writer/yaml/yaml_writer.py
+++ b/src/spdx_tools/spdx/writer/yaml/yaml_writer.py
@@ -7,7 +7,7 @@
 
 from spdx_tools.spdx.document_utils import create_document_without_duplicates
 from spdx_tools.spdx.jsonschema.document_converter import DocumentConverter
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 from spdx_tools.spdx.validation.document_validator import validate_full_spdx_document
 from spdx_tools.spdx.validation.validation_message import ValidationMessage
 
diff --git a/tests/spdx/fixtures.py b/tests/spdx/fixtures.py
index 189da5a61..f0d8f14b7 100644
--- a/tests/spdx/fixtures.py
+++ b/tests/spdx/fixtures.py
@@ -6,25 +6,31 @@
 from license_expression import get_spdx_licensing
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.actor import Actor, ActorType
-from spdx_tools.spdx.model.annotation import Annotation, AnnotationType
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.document import CreationInfo, Document
-from spdx_tools.spdx.model.external_document_ref import ExternalDocumentRef
-from spdx_tools.spdx.model.extracted_licensing_info import ExtractedLicensingInfo
-from spdx_tools.spdx.model.file import File, FileType
-from spdx_tools.spdx.model.package import (
+from spdx_tools.spdx.model import (
+    Actor,
+    ActorType,
+    Annotation,
+    AnnotationType,
+    Checksum,
+    ChecksumAlgorithm,
+    CreationInfo,
+    Document,
+    ExternalDocumentRef,
     ExternalPackageRef,
     ExternalPackageRefCategory,
+    ExtractedLicensingInfo,
+    File,
+    FileType,
     Package,
     PackagePurpose,
     PackageVerificationCode,
+    Relationship,
+    RelationshipType,
+    Snippet,
+    SpdxNoAssertion,
+    SpdxNone,
+    Version,
 )
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
-from spdx_tools.spdx.model.snippet import Snippet
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
-from spdx_tools.spdx.model.version import Version
 
 # Utility methods to create data model instances. All properties have valid defaults, so they don't need to be
 # specified unless relevant for the test.
diff --git a/tests/spdx/jsonschema/test_annotation_converter.py b/tests/spdx/jsonschema/test_annotation_converter.py
index 25d776848..fdc2e6ce2 100644
--- a/tests/spdx/jsonschema/test_annotation_converter.py
+++ b/tests/spdx/jsonschema/test_annotation_converter.py
@@ -8,8 +8,7 @@
 from spdx_tools.spdx.datetime_conversions import datetime_to_iso_string
 from spdx_tools.spdx.jsonschema.annotation_converter import AnnotationConverter
 from spdx_tools.spdx.jsonschema.annotation_properties import AnnotationProperty
-from spdx_tools.spdx.model.actor import Actor, ActorType
-from spdx_tools.spdx.model.annotation import Annotation, AnnotationType
+from spdx_tools.spdx.model import Actor, ActorType, Annotation, AnnotationType
 
 
 @pytest.fixture
diff --git a/tests/spdx/jsonschema/test_checksum_converter.py b/tests/spdx/jsonschema/test_checksum_converter.py
index de960d62c..892c35f85 100644
--- a/tests/spdx/jsonschema/test_checksum_converter.py
+++ b/tests/spdx/jsonschema/test_checksum_converter.py
@@ -5,7 +5,7 @@
 
 from spdx_tools.spdx.jsonschema.checksum_converter import ChecksumConverter
 from spdx_tools.spdx.jsonschema.checksum_properties import ChecksumProperty
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm
 
 
 @pytest.fixture
diff --git a/tests/spdx/jsonschema/test_converter.py b/tests/spdx/jsonschema/test_converter.py
index c6ecfb9c1..46558d904 100644
--- a/tests/spdx/jsonschema/test_converter.py
+++ b/tests/spdx/jsonschema/test_converter.py
@@ -10,8 +10,7 @@
 from spdx_tools.common.typing.type_checks import check_types_and_set_values
 from spdx_tools.spdx.jsonschema.converter import TypedConverter
 from spdx_tools.spdx.jsonschema.json_property import JsonProperty
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm, Document
 
 
 class TestPropertyType(JsonProperty):
diff --git a/tests/spdx/jsonschema/test_creation_info_converter.py b/tests/spdx/jsonschema/test_creation_info_converter.py
index dcbc4de74..e8445f23b 100644
--- a/tests/spdx/jsonschema/test_creation_info_converter.py
+++ b/tests/spdx/jsonschema/test_creation_info_converter.py
@@ -8,9 +8,7 @@
 from spdx_tools.spdx.datetime_conversions import datetime_to_iso_string
 from spdx_tools.spdx.jsonschema.creation_info_converter import CreationInfoConverter
 from spdx_tools.spdx.jsonschema.creation_info_properties import CreationInfoProperty
-from spdx_tools.spdx.model.actor import Actor, ActorType
-from spdx_tools.spdx.model.document import CreationInfo
-from spdx_tools.spdx.model.version import Version
+from spdx_tools.spdx.model import Actor, ActorType, CreationInfo, Version
 from tests.spdx.fixtures import creation_info_fixture
 
 
diff --git a/tests/spdx/jsonschema/test_document_converter.py b/tests/spdx/jsonschema/test_document_converter.py
index 9923c4f73..e9966b87e 100644
--- a/tests/spdx/jsonschema/test_document_converter.py
+++ b/tests/spdx/jsonschema/test_document_converter.py
@@ -11,11 +11,16 @@
 from spdx_tools.spdx.jsonschema.annotation_converter import AnnotationConverter
 from spdx_tools.spdx.jsonschema.document_converter import DocumentConverter
 from spdx_tools.spdx.jsonschema.document_properties import DocumentProperty
-from spdx_tools.spdx.model.actor import Actor, ActorType
-from spdx_tools.spdx.model.annotation import Annotation, AnnotationType
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.extracted_licensing_info import ExtractedLicensingInfo
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
+from spdx_tools.spdx.model import (
+    Actor,
+    ActorType,
+    Annotation,
+    AnnotationType,
+    Document,
+    ExtractedLicensingInfo,
+    Relationship,
+    RelationshipType,
+)
 from tests.spdx.fixtures import (
     annotation_fixture,
     creation_info_fixture,
diff --git a/tests/spdx/jsonschema/test_external_document_ref_converter.py b/tests/spdx/jsonschema/test_external_document_ref_converter.py
index 4a36e2e73..fabce5939 100644
--- a/tests/spdx/jsonschema/test_external_document_ref_converter.py
+++ b/tests/spdx/jsonschema/test_external_document_ref_converter.py
@@ -8,8 +8,7 @@
 
 from spdx_tools.spdx.jsonschema.external_document_ref_converter import ExternalDocumentRefConverter
 from spdx_tools.spdx.jsonschema.external_document_ref_properties import ExternalDocumentRefProperty
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.external_document_ref import ExternalDocumentRef
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm, ExternalDocumentRef
 
 
 @pytest.fixture
diff --git a/tests/spdx/jsonschema/test_external_package_ref_converter.py b/tests/spdx/jsonschema/test_external_package_ref_converter.py
index 9a4e8f7e5..303eb375d 100644
--- a/tests/spdx/jsonschema/test_external_package_ref_converter.py
+++ b/tests/spdx/jsonschema/test_external_package_ref_converter.py
@@ -5,7 +5,7 @@
 
 from spdx_tools.spdx.jsonschema.external_package_ref_converter import ExternalPackageRefConverter
 from spdx_tools.spdx.jsonschema.external_package_ref_properties import ExternalPackageRefProperty
-from spdx_tools.spdx.model.package import ExternalPackageRef, ExternalPackageRefCategory
+from spdx_tools.spdx.model import ExternalPackageRef, ExternalPackageRefCategory
 
 
 @pytest.fixture
diff --git a/tests/spdx/jsonschema/test_extracted_licensing_info_converter.py b/tests/spdx/jsonschema/test_extracted_licensing_info_converter.py
index 596ff8fa2..ee8488f4a 100644
--- a/tests/spdx/jsonschema/test_extracted_licensing_info_converter.py
+++ b/tests/spdx/jsonschema/test_extracted_licensing_info_converter.py
@@ -5,8 +5,8 @@
 
 from spdx_tools.spdx.jsonschema.extracted_licensing_info_converter import ExtractedLicensingInfoConverter
 from spdx_tools.spdx.jsonschema.extracted_licensing_info_properties import ExtractedLicensingInfoProperty
-from spdx_tools.spdx.model.extracted_licensing_info import ExtractedLicensingInfo
-from spdx_tools.spdx.model.spdx_no_assertion import SPDX_NO_ASSERTION_STRING, SpdxNoAssertion
+from spdx_tools.spdx.model import ExtractedLicensingInfo, SpdxNoAssertion
+from spdx_tools.spdx.model.spdx_no_assertion import SPDX_NO_ASSERTION_STRING
 from tests.spdx.fixtures import extracted_licensing_info_fixture
 
 
diff --git a/tests/spdx/jsonschema/test_file_converter.py b/tests/spdx/jsonschema/test_file_converter.py
index d38106f76..8e6c14049 100644
--- a/tests/spdx/jsonschema/test_file_converter.py
+++ b/tests/spdx/jsonschema/test_file_converter.py
@@ -12,13 +12,21 @@
 from spdx_tools.spdx.jsonschema.annotation_converter import AnnotationConverter
 from spdx_tools.spdx.jsonschema.file_converter import FileConverter
 from spdx_tools.spdx.jsonschema.file_properties import FileProperty
-from spdx_tools.spdx.model.actor import Actor, ActorType
-from spdx_tools.spdx.model.annotation import Annotation, AnnotationType
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.file import File, FileType
-from spdx_tools.spdx.model.spdx_no_assertion import SPDX_NO_ASSERTION_STRING, SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SPDX_NONE_STRING, SpdxNone
+from spdx_tools.spdx.model import (
+    Actor,
+    ActorType,
+    Annotation,
+    AnnotationType,
+    Checksum,
+    ChecksumAlgorithm,
+    Document,
+    File,
+    FileType,
+    SpdxNoAssertion,
+    SpdxNone,
+)
+from spdx_tools.spdx.model.spdx_no_assertion import SPDX_NO_ASSERTION_STRING
+from spdx_tools.spdx.model.spdx_none import SPDX_NONE_STRING
 from tests.spdx.fixtures import annotation_fixture, creation_info_fixture, document_fixture, file_fixture
 from tests.spdx.mock_utils import assert_mock_method_called_with_arguments
 
diff --git a/tests/spdx/jsonschema/test_package_converter.py b/tests/spdx/jsonschema/test_package_converter.py
index 12f4e7945..9365c8214 100644
--- a/tests/spdx/jsonschema/test_package_converter.py
+++ b/tests/spdx/jsonschema/test_package_converter.py
@@ -12,13 +12,22 @@
 from spdx_tools.spdx.jsonschema.annotation_converter import AnnotationConverter
 from spdx_tools.spdx.jsonschema.package_converter import PackageConverter
 from spdx_tools.spdx.jsonschema.package_properties import PackageProperty
-from spdx_tools.spdx.model.actor import Actor, ActorType
-from spdx_tools.spdx.model.annotation import Annotation, AnnotationType
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.package import Package, PackagePurpose, PackageVerificationCode
-from spdx_tools.spdx.model.spdx_no_assertion import SPDX_NO_ASSERTION_STRING, SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SPDX_NONE_STRING, SpdxNone
+from spdx_tools.spdx.model import (
+    Actor,
+    ActorType,
+    Annotation,
+    AnnotationType,
+    Checksum,
+    ChecksumAlgorithm,
+    Document,
+    Package,
+    PackagePurpose,
+    PackageVerificationCode,
+    SpdxNoAssertion,
+    SpdxNone,
+)
+from spdx_tools.spdx.model.spdx_no_assertion import SPDX_NO_ASSERTION_STRING
+from spdx_tools.spdx.model.spdx_none import SPDX_NONE_STRING
 from tests.spdx.fixtures import (
     annotation_fixture,
     creation_info_fixture,
diff --git a/tests/spdx/jsonschema/test_package_verification_code_converter.py b/tests/spdx/jsonschema/test_package_verification_code_converter.py
index 1ffb39468..e55993dc9 100644
--- a/tests/spdx/jsonschema/test_package_verification_code_converter.py
+++ b/tests/spdx/jsonschema/test_package_verification_code_converter.py
@@ -5,7 +5,7 @@
 
 from spdx_tools.spdx.jsonschema.package_verification_code_converter import PackageVerificationCodeConverter
 from spdx_tools.spdx.jsonschema.package_verification_code_properties import PackageVerificationCodeProperty
-from spdx_tools.spdx.model.package import PackageVerificationCode
+from spdx_tools.spdx.model import PackageVerificationCode
 
 
 @pytest.fixture
diff --git a/tests/spdx/jsonschema/test_relationship_converter.py b/tests/spdx/jsonschema/test_relationship_converter.py
index 87f0c8ec6..65b2d8803 100644
--- a/tests/spdx/jsonschema/test_relationship_converter.py
+++ b/tests/spdx/jsonschema/test_relationship_converter.py
@@ -5,9 +5,9 @@
 
 from spdx_tools.spdx.jsonschema.relationship_converter import RelationshipConverter
 from spdx_tools.spdx.jsonschema.relationship_properties import RelationshipProperty
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
-from spdx_tools.spdx.model.spdx_no_assertion import SPDX_NO_ASSERTION_STRING, SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SPDX_NONE_STRING, SpdxNone
+from spdx_tools.spdx.model import Relationship, RelationshipType, SpdxNoAssertion, SpdxNone
+from spdx_tools.spdx.model.spdx_no_assertion import SPDX_NO_ASSERTION_STRING
+from spdx_tools.spdx.model.spdx_none import SPDX_NONE_STRING
 from tests.spdx.fixtures import relationship_fixture
 
 
diff --git a/tests/spdx/jsonschema/test_snippet_converter.py b/tests/spdx/jsonschema/test_snippet_converter.py
index 00b1a48a1..a677343b0 100644
--- a/tests/spdx/jsonschema/test_snippet_converter.py
+++ b/tests/spdx/jsonschema/test_snippet_converter.py
@@ -12,12 +12,18 @@
 from spdx_tools.spdx.jsonschema.annotation_converter import AnnotationConverter
 from spdx_tools.spdx.jsonschema.snippet_converter import SnippetConverter
 from spdx_tools.spdx.jsonschema.snippet_properties import SnippetProperty
-from spdx_tools.spdx.model.actor import Actor, ActorType
-from spdx_tools.spdx.model.annotation import Annotation, AnnotationType
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.snippet import Snippet
-from spdx_tools.spdx.model.spdx_no_assertion import SPDX_NO_ASSERTION_STRING, SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SPDX_NONE_STRING, SpdxNone
+from spdx_tools.spdx.model import (
+    Actor,
+    ActorType,
+    Annotation,
+    AnnotationType,
+    Document,
+    Snippet,
+    SpdxNoAssertion,
+    SpdxNone,
+)
+from spdx_tools.spdx.model.spdx_no_assertion import SPDX_NO_ASSERTION_STRING
+from spdx_tools.spdx.model.spdx_none import SPDX_NONE_STRING
 from tests.spdx.fixtures import annotation_fixture, creation_info_fixture, document_fixture, snippet_fixture
 from tests.spdx.mock_utils import assert_mock_method_called_with_arguments
 
diff --git a/tests/spdx/model/test_actor.py b/tests/spdx/model/test_actor.py
index fa0fa0baf..e41e40b4e 100644
--- a/tests/spdx/model/test_actor.py
+++ b/tests/spdx/model/test_actor.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.actor import Actor, ActorType
+from spdx_tools.spdx.model import Actor, ActorType
 
 
 def test_correct_initialization():
diff --git a/tests/spdx/model/test_annotation.py b/tests/spdx/model/test_annotation.py
index c96c94e0a..5638b0b98 100644
--- a/tests/spdx/model/test_annotation.py
+++ b/tests/spdx/model/test_annotation.py
@@ -7,10 +7,10 @@
 
 import pytest
 
-from spdx_tools.spdx.model.annotation import Annotation, AnnotationType
+from spdx_tools.spdx.model import Annotation, AnnotationType
 
 
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_correct_initialization(actor):
     annotation = Annotation("id", AnnotationType.OTHER, actor, datetime(2022, 1, 1), "comment")
     assert annotation.spdx_id == "id"
@@ -20,31 +20,31 @@ def test_correct_initialization(actor):
     assert annotation.annotation_comment == "comment"
 
 
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_wrong_type_in_spdx_id(actor):
     with pytest.raises(TypeError):
         Annotation(42, AnnotationType.OTHER, actor, datetime(2022, 1, 1), "comment")
 
 
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_wrong_type_in_annotation_type(actor):
     with pytest.raises(TypeError):
         Annotation("id", 42, actor, datetime(2022, 1, 1), "comment")
 
 
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_wrong_type_in_annotator(actor):
     with pytest.raises(TypeError):
         Annotation("id", AnnotationType.OTHER, 42, datetime(2022, 1, 1), "comment")
 
 
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_wrong_type_in_annotation_date(actor):
     with pytest.raises(TypeError):
         Annotation("id", AnnotationType.OTHER, actor, 42, "comment")
 
 
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_wrong_type_in_annotation_comment(actor):
     with pytest.raises(TypeError):
         Annotation("id", AnnotationType.OTHER, actor, datetime(2022, 1, 1), 42)
diff --git a/tests/spdx/model/test_checksum.py b/tests/spdx/model/test_checksum.py
index 3184534ac..308d95486 100644
--- a/tests/spdx/model/test_checksum.py
+++ b/tests/spdx/model/test_checksum.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm
 
 
 def test_correct_initialization():
diff --git a/tests/spdx/model/test_creation_info.py b/tests/spdx/model/test_creation_info.py
index 9166ce714..c0912005c 100644
--- a/tests/spdx/model/test_creation_info.py
+++ b/tests/spdx/model/test_creation_info.py
@@ -7,12 +7,11 @@
 
 import pytest
 
-from spdx_tools.spdx.model.document import CreationInfo
-from spdx_tools.spdx.model.version import Version
+from spdx_tools.spdx.model import CreationInfo, Version
 
 
-@mock.patch("spdx_tools.spdx.model.external_document_ref.ExternalDocumentRef", autospec=True)
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.ExternalDocumentRef", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_correct_initialization(actor, ext_ref):
     creation_info = CreationInfo(
         "version",
@@ -40,25 +39,25 @@ def test_correct_initialization(actor, ext_ref):
     assert creation_info.document_comment == "doc_comment"
 
 
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_wrong_type_in_spdx_version(actor):
     with pytest.raises(TypeError):
         CreationInfo(42, "id", "name", "namespace", [actor, actor], datetime(2022, 1, 1))
 
 
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_wrong_type_in_spdx_id(actor):
     with pytest.raises(TypeError):
         CreationInfo("version", 42, "name", "namespace", [actor, actor], datetime(2022, 1, 1))
 
 
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_wrong_type_in_name(actor):
     with pytest.raises(TypeError):
         CreationInfo("version", "id", 42, "namespace", [actor, actor], datetime(2022, 1, 1))
 
 
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_wrong_type_in_document_namespace(actor):
     with pytest.raises(TypeError):
         CreationInfo("version", "id", "name", 42, [actor, actor], datetime(2022, 1, 1))
@@ -69,13 +68,13 @@ def test_wrong_type_in_creators():
         CreationInfo("version", "id", "name", "namespace", ["person"], datetime(2022, 1, 1))
 
 
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_wrong_type_in_created(actor):
     with pytest.raises(TypeError):
         CreationInfo("version", "id", "name", "namespace", [actor, actor], "2022-01-01")
 
 
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_wrong_type_in_creator_comment(actor):
     with pytest.raises(TypeError):
         CreationInfo(
@@ -83,13 +82,13 @@ def test_wrong_type_in_creator_comment(actor):
         )
 
 
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_wrong_type_in_data_license(actor):
     with pytest.raises(TypeError):
         CreationInfo("version", "id", "name", "namespace", [actor, actor], datetime(2022, 1, 1), data_license=42)
 
 
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_wrong_type_in_external_document_refs(actor):
     with pytest.raises(TypeError):
         CreationInfo(
@@ -97,7 +96,7 @@ def test_wrong_type_in_external_document_refs(actor):
         )
 
 
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_wrong_type_in_license_list_version(actor):
     with pytest.raises(TypeError):
         CreationInfo(
@@ -105,7 +104,7 @@ def test_wrong_type_in_license_list_version(actor):
         )
 
 
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_wrong_type_in_document_comment(actor):
     with pytest.raises(TypeError):
         CreationInfo(
diff --git a/tests/spdx/model/test_document.py b/tests/spdx/model/test_document.py
index 858404ae4..9d4079cb4 100644
--- a/tests/spdx/model/test_document.py
+++ b/tests/spdx/model/test_document.py
@@ -6,16 +6,16 @@
 
 import pytest
 
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 
 
-@mock.patch("spdx_tools.spdx.model.extracted_licensing_info.ExtractedLicensingInfo", autospec=True)
-@mock.patch("spdx_tools.spdx.model.relationship.Relationship", autospec=True)
-@mock.patch("spdx_tools.spdx.model.annotation.Annotation", autospec=True)
-@mock.patch("spdx_tools.spdx.model.snippet.Snippet", autospec=True)
-@mock.patch("spdx_tools.spdx.model.file.File", autospec=True)
-@mock.patch("spdx_tools.spdx.model.package.Package", autospec=True)
-@mock.patch("spdx_tools.spdx.model.document.CreationInfo", autospec=True)
+@mock.patch("spdx_tools.spdx.model.ExtractedLicensingInfo", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Relationship", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Annotation", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Snippet", autospec=True)
+@mock.patch("spdx_tools.spdx.model.File", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Package", autospec=True)
+@mock.patch("spdx_tools.spdx.model.CreationInfo", autospec=True)
 def test_correct_initialization(creation_info, package, file, snippet, annotation, relationship, extracted_lic):
     document = Document(
         creation_info,
@@ -35,7 +35,7 @@ def test_correct_initialization(creation_info, package, file, snippet, annotatio
     assert document.extracted_licensing_info == [extracted_lic, extracted_lic]
 
 
-@mock.patch("spdx_tools.spdx.model.document.CreationInfo", autospec=True)
+@mock.patch("spdx_tools.spdx.model.CreationInfo", autospec=True)
 def test_correct_initialization_with_default_values(creation_info):
     document = Document(creation_info)
     assert document.creation_info == creation_info
@@ -52,37 +52,37 @@ def test_wrong_type_in_creation_info():
         Document("string")
 
 
-@mock.patch("spdx_tools.spdx.model.document.CreationInfo", autospec=True)
+@mock.patch("spdx_tools.spdx.model.CreationInfo", autospec=True)
 def test_wrong_type_in_packages(creation_info):
     with pytest.raises(TypeError):
         Document(creation_info, packages=["string"])
 
 
-@mock.patch("spdx_tools.spdx.model.document.CreationInfo", autospec=True)
+@mock.patch("spdx_tools.spdx.model.CreationInfo", autospec=True)
 def test_wrong_type_in_files(creation_info):
     with pytest.raises(TypeError):
         Document(creation_info, files={})
 
 
-@mock.patch("spdx_tools.spdx.model.document.CreationInfo", autospec=True)
+@mock.patch("spdx_tools.spdx.model.CreationInfo", autospec=True)
 def test_wrong_type_in_snippets(creation_info):
     with pytest.raises(TypeError):
         Document(creation_info, snippets=())
 
 
-@mock.patch("spdx_tools.spdx.model.document.CreationInfo", autospec=True)
+@mock.patch("spdx_tools.spdx.model.CreationInfo", autospec=True)
 def test_wrong_type_in_annotations(creation_info):
     with pytest.raises(TypeError):
         Document(creation_info, annotations=["string"])
 
 
-@mock.patch("spdx_tools.spdx.model.document.CreationInfo", autospec=True)
+@mock.patch("spdx_tools.spdx.model.CreationInfo", autospec=True)
 def test_wrong_type_in_relationships(creation_info):
     with pytest.raises(TypeError):
         Document(creation_info, relationships="string")
 
 
-@mock.patch("spdx_tools.spdx.model.document.CreationInfo", autospec=True)
+@mock.patch("spdx_tools.spdx.model.CreationInfo", autospec=True)
 def test_wrong_type_in_extracted_licensing_info(creation_info):
     with pytest.raises(TypeError):
         Document(creation_info, extracted_licensing_info=42)
diff --git a/tests/spdx/model/test_external_document_ref.py b/tests/spdx/model/test_external_document_ref.py
index 29e6a4824..4b32d6bf3 100644
--- a/tests/spdx/model/test_external_document_ref.py
+++ b/tests/spdx/model/test_external_document_ref.py
@@ -6,10 +6,10 @@
 
 import pytest
 
-from spdx_tools.spdx.model.external_document_ref import ExternalDocumentRef
+from spdx_tools.spdx.model import ExternalDocumentRef
 
 
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
 def test_correct_initialization(checksum):
     external_document_ref = ExternalDocumentRef("id", "uri", checksum)
     assert external_document_ref.document_ref_id == "id"
@@ -17,13 +17,13 @@ def test_correct_initialization(checksum):
     assert external_document_ref.checksum == checksum
 
 
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
 def test_wrong_type_in_spdx_id(checksum):
     with pytest.raises(TypeError):
         ExternalDocumentRef(42, "uri", checksum)
 
 
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
 def test_wrong_type_in_document_uri(checksum):
     with pytest.raises(TypeError):
         ExternalDocumentRef("id", 42, checksum)
diff --git a/tests/spdx/model/test_external_package_reference.py b/tests/spdx/model/test_external_package_reference.py
index 7ac967e2f..d81bcc221 100644
--- a/tests/spdx/model/test_external_package_reference.py
+++ b/tests/spdx/model/test_external_package_reference.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.package import ExternalPackageRef, ExternalPackageRefCategory
+from spdx_tools.spdx.model import ExternalPackageRef, ExternalPackageRefCategory
 
 
 def test_correct_initialization():
diff --git a/tests/spdx/model/test_extracted_licensing_info.py b/tests/spdx/model/test_extracted_licensing_info.py
index 1f54e9207..75dc79aab 100644
--- a/tests/spdx/model/test_extracted_licensing_info.py
+++ b/tests/spdx/model/test_extracted_licensing_info.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.extracted_licensing_info import ExtractedLicensingInfo
+from spdx_tools.spdx.model import ExtractedLicensingInfo
 
 
 def test_correct_initialization():
diff --git a/tests/spdx/model/test_file.py b/tests/spdx/model/test_file.py
index fb6d6b54e..592e8dc4f 100644
--- a/tests/spdx/model/test_file.py
+++ b/tests/spdx/model/test_file.py
@@ -6,13 +6,10 @@
 
 import pytest
 
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.file import File, FileType
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm, File, FileType, SpdxNoAssertion, SpdxNone
 
 
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
 def test_correct_initialization(checksum):
     file = File(
         "name",
@@ -42,7 +39,7 @@ def test_correct_initialization(checksum):
     assert file.attribution_texts == ["attribution"]
 
 
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
 def test_correct_initialization_with_default_values(checksum):
     file = File("name", "id", [checksum, checksum])
     assert file.name == "name"
@@ -59,13 +56,13 @@ def test_correct_initialization_with_default_values(checksum):
     assert file.attribution_texts == []
 
 
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
 def test_wrong_type_in_name(checksum):
     with pytest.raises(TypeError):
         File(42, "id", [checksum])
 
 
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
 def test_wrong_type_in_spdx_id(checksum):
     with pytest.raises(TypeError):
         File("name", 42, [checksum])
@@ -77,55 +74,55 @@ def test_wrong_type_in_checksum():
         File("name", "id", checksum)
 
 
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
 def test_wrong_type_in_file_type(checksum):
     with pytest.raises(TypeError):
         File("name", "id", [checksum], file_types=FileType.OTHER)
 
 
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
 def test_wrong_type_in_license_concluded(checksum):
     with pytest.raises(TypeError):
         File("name", "id", [checksum], license_concluded="NONE")
 
 
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
 def test_wrong_type_in_license_info_in_file(checksum):
     with pytest.raises(TypeError):
         File("name", "id", [checksum], license_info_in_file=[SpdxNone])
 
 
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
 def test_wrong_type_in_license_comment(checksum):
     with pytest.raises(TypeError):
         File("name", "id", [checksum], license_comment=42)
 
 
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
 def test_wrong_type_in_copyright_text(checksum):
     with pytest.raises(TypeError):
         File("name", "id", [checksum], copyright_text=[SpdxNone()])
 
 
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
 def test_wrong_type_in_comment(checksum):
     with pytest.raises(TypeError):
         File("name", "id", [checksum], comment=42)
 
 
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
 def test_wrong_type_in_notice(checksum):
     with pytest.raises(TypeError):
         File("name", "id", [checksum], notice=["notice"])
 
 
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
 def test_wrong_type_in_contributors(checksum):
     with pytest.raises(TypeError):
         File("name", "id", [checksum], contributors="contributor")
 
 
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
 def test_wrong_type_in_attribution_texts(checksum):
     with pytest.raises(TypeError):
         File("name", "id", [checksum], attribution_texts=["attribution", 42])
diff --git a/tests/spdx/model/test_package.py b/tests/spdx/model/test_package.py
index afb7951a9..c533b2812 100644
--- a/tests/spdx/model/test_package.py
+++ b/tests/spdx/model/test_package.py
@@ -8,16 +8,13 @@
 import pytest
 from license_expression import LicenseExpression, Licensing
 
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.package import Package, PackagePurpose
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm, Package, PackagePurpose, SpdxNoAssertion, SpdxNone
 
 
-@mock.patch("spdx_tools.spdx.model.package.ExternalPackageRef", autospec=True)
-@mock.patch("spdx_tools.spdx.model.checksum.Checksum", autospec=True)
-@mock.patch("spdx_tools.spdx.model.package.PackageVerificationCode", autospec=True)
-@mock.patch("spdx_tools.spdx.model.actor.Actor", autospec=True)
+@mock.patch("spdx_tools.spdx.model.ExternalPackageRef", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Checksum", autospec=True)
+@mock.patch("spdx_tools.spdx.model.PackageVerificationCode", autospec=True)
+@mock.patch("spdx_tools.spdx.model.Actor", autospec=True)
 def test_correct_initialization(actor, verif_code, checksum, ext_ref):
     package = Package(
         "id",
diff --git a/tests/spdx/model/test_package_verification_code.py b/tests/spdx/model/test_package_verification_code.py
index b6c0f9d1e..e1492a91d 100644
--- a/tests/spdx/model/test_package_verification_code.py
+++ b/tests/spdx/model/test_package_verification_code.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.package import PackageVerificationCode
+from spdx_tools.spdx.model import PackageVerificationCode
 
 
 def test_correct_initialization():
diff --git a/tests/spdx/model/test_relationship.py b/tests/spdx/model/test_relationship.py
index 80ba441d1..0ffb62482 100644
--- a/tests/spdx/model/test_relationship.py
+++ b/tests/spdx/model/test_relationship.py
@@ -4,8 +4,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
+from spdx_tools.spdx.model import Relationship, RelationshipType, SpdxNoAssertion
 
 
 def test_correct_initialization():
diff --git a/tests/spdx/model/test_snippet.py b/tests/spdx/model/test_snippet.py
index 373e9b37f..7fcf21581 100644
--- a/tests/spdx/model/test_snippet.py
+++ b/tests/spdx/model/test_snippet.py
@@ -4,9 +4,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.snippet import Snippet
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import Snippet, SpdxNoAssertion, SpdxNone
 
 
 def test_correct_initialization():
diff --git a/tests/spdx/model/test_version.py b/tests/spdx/model/test_version.py
index b846703b3..a10817b7e 100644
--- a/tests/spdx/model/test_version.py
+++ b/tests/spdx/model/test_version.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.version import Version
+from spdx_tools.spdx.model import Version
 
 
 @pytest.mark.parametrize("input_string,expected", [("1.2", Version(1, 2)), ("12.345", Version(12, 345))])
diff --git a/tests/spdx/parser/all_formats/test_parse_from_file.py b/tests/spdx/parser/all_formats/test_parse_from_file.py
index bb63711b7..2b9bb2b45 100644
--- a/tests/spdx/parser/all_formats/test_parse_from_file.py
+++ b/tests/spdx/parser/all_formats/test_parse_from_file.py
@@ -6,7 +6,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 from spdx_tools.spdx.parser.json import json_parser
 from spdx_tools.spdx.parser.rdf import rdf_parser
 from spdx_tools.spdx.parser.tagvalue import tagvalue_parser
diff --git a/tests/spdx/parser/jsonlikedict/test_annotation_parser.py b/tests/spdx/parser/jsonlikedict/test_annotation_parser.py
index b7a01d73e..0460598e7 100644
--- a/tests/spdx/parser/jsonlikedict/test_annotation_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_annotation_parser.py
@@ -7,8 +7,7 @@
 import pytest
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.actor import Actor, ActorType
-from spdx_tools.spdx.model.annotation import Annotation, AnnotationType
+from spdx_tools.spdx.model import Actor, ActorType, Annotation, AnnotationType
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.jsonlikedict.annotation_parser import AnnotationParser
 
diff --git a/tests/spdx/parser/jsonlikedict/test_checksum_parser.py b/tests/spdx/parser/jsonlikedict/test_checksum_parser.py
index 42efafd75..aa2bbbe8a 100644
--- a/tests/spdx/parser/jsonlikedict/test_checksum_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_checksum_parser.py
@@ -5,7 +5,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.checksum import ChecksumAlgorithm
+from spdx_tools.spdx.model import ChecksumAlgorithm
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.jsonlikedict.checksum_parser import ChecksumParser
 
diff --git a/tests/spdx/parser/jsonlikedict/test_creation_info_parser.py b/tests/spdx/parser/jsonlikedict/test_creation_info_parser.py
index ffaa0046a..86535d703 100644
--- a/tests/spdx/parser/jsonlikedict/test_creation_info_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_creation_info_parser.py
@@ -7,10 +7,7 @@
 import pytest
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.actor import Actor, ActorType
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.external_document_ref import ExternalDocumentRef
-from spdx_tools.spdx.model.version import Version
+from spdx_tools.spdx.model import Actor, ActorType, Checksum, ChecksumAlgorithm, ExternalDocumentRef, Version
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.jsonlikedict.creation_info_parser import CreationInfoParser
 
diff --git a/tests/spdx/parser/jsonlikedict/test_dict_parsing_functions.py b/tests/spdx/parser/jsonlikedict/test_dict_parsing_functions.py
index 9eb4e49cf..ce35e3611 100644
--- a/tests/spdx/parser/jsonlikedict/test_dict_parsing_functions.py
+++ b/tests/spdx/parser/jsonlikedict/test_dict_parsing_functions.py
@@ -5,8 +5,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.jsonlikedict.dict_parsing_functions import (
     json_str_to_enum_name,
diff --git a/tests/spdx/parser/jsonlikedict/test_file_parser.py b/tests/spdx/parser/jsonlikedict/test_file_parser.py
index a67d9cd69..53eec3f0e 100644
--- a/tests/spdx/parser/jsonlikedict/test_file_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_file_parser.py
@@ -6,10 +6,7 @@
 import pytest
 from license_expression import Licensing
 
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.file import FileType
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm, FileType, SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.jsonlikedict.dict_parsing_functions import parse_list_of_elements
 from spdx_tools.spdx.parser.jsonlikedict.file_parser import FileParser
diff --git a/tests/spdx/parser/jsonlikedict/test_license_expression_parser.py b/tests/spdx/parser/jsonlikedict/test_license_expression_parser.py
index 8f0e50ad6..a1364d556 100644
--- a/tests/spdx/parser/jsonlikedict/test_license_expression_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_license_expression_parser.py
@@ -6,8 +6,7 @@
 import pytest
 from license_expression import get_spdx_licensing
 
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.jsonlikedict.license_expression_parser import LicenseExpressionParser
 
diff --git a/tests/spdx/parser/jsonlikedict/test_package_parser.py b/tests/spdx/parser/jsonlikedict/test_package_parser.py
index c67ae871a..494f612b7 100644
--- a/tests/spdx/parser/jsonlikedict/test_package_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_package_parser.py
@@ -7,16 +7,18 @@
 import pytest
 from license_expression import Licensing
 
-from spdx_tools.spdx.model.actor import Actor, ActorType
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.package import (
+from spdx_tools.spdx.model import (
+    Actor,
+    ActorType,
+    Checksum,
+    ChecksumAlgorithm,
     ExternalPackageRef,
     ExternalPackageRefCategory,
     PackagePurpose,
     PackageVerificationCode,
+    SpdxNoAssertion,
+    SpdxNone,
 )
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.jsonlikedict.dict_parsing_functions import parse_list_of_elements
 from spdx_tools.spdx.parser.jsonlikedict.package_parser import PackageParser
diff --git a/tests/spdx/parser/jsonlikedict/test_relationship_parser.py b/tests/spdx/parser/jsonlikedict/test_relationship_parser.py
index 20eba29d0..f5e65fe50 100644
--- a/tests/spdx/parser/jsonlikedict/test_relationship_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_relationship_parser.py
@@ -6,8 +6,7 @@
 import pytest
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
+from spdx_tools.spdx.model import Relationship, RelationshipType, SpdxNoAssertion
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.jsonlikedict.relationship_parser import RelationshipParser
 
diff --git a/tests/spdx/parser/jsonlikedict/test_snippet_parser.py b/tests/spdx/parser/jsonlikedict/test_snippet_parser.py
index c4ccba1c2..55397af24 100644
--- a/tests/spdx/parser/jsonlikedict/test_snippet_parser.py
+++ b/tests/spdx/parser/jsonlikedict/test_snippet_parser.py
@@ -6,8 +6,7 @@
 import pytest
 from license_expression import Licensing
 
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.jsonlikedict.snippet_parser import SnippetParser
 
diff --git a/tests/spdx/parser/rdf/test_annotation_parser.py b/tests/spdx/parser/rdf/test_annotation_parser.py
index ac494381d..c0ed4b1b6 100644
--- a/tests/spdx/parser/rdf/test_annotation_parser.py
+++ b/tests/spdx/parser/rdf/test_annotation_parser.py
@@ -6,8 +6,7 @@
 
 from rdflib import BNode, Graph, URIRef
 
-from spdx_tools.spdx.model.actor import Actor, ActorType
-from spdx_tools.spdx.model.annotation import AnnotationType
+from spdx_tools.spdx.model import Actor, ActorType, AnnotationType
 from spdx_tools.spdx.parser.rdf.annotation_parser import parse_annotation
 from spdx_tools.spdx.rdfschema.namespace import SPDX_NAMESPACE
 
diff --git a/tests/spdx/parser/rdf/test_checksum_parser.py b/tests/spdx/parser/rdf/test_checksum_parser.py
index 5b5be1c21..904febb35 100644
--- a/tests/spdx/parser/rdf/test_checksum_parser.py
+++ b/tests/spdx/parser/rdf/test_checksum_parser.py
@@ -6,7 +6,7 @@
 import pytest
 from rdflib import BNode, Graph, URIRef
 
-from spdx_tools.spdx.model.checksum import ChecksumAlgorithm
+from spdx_tools.spdx.model import ChecksumAlgorithm
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.rdf.checksum_parser import convert_rdf_to_algorithm, parse_checksum
 from spdx_tools.spdx.rdfschema.namespace import SPDX_NAMESPACE
diff --git a/tests/spdx/parser/rdf/test_creation_info_parser.py b/tests/spdx/parser/rdf/test_creation_info_parser.py
index a4dcb5b0c..606a2f126 100644
--- a/tests/spdx/parser/rdf/test_creation_info_parser.py
+++ b/tests/spdx/parser/rdf/test_creation_info_parser.py
@@ -10,9 +10,7 @@
 from rdflib.term import Node
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.actor import Actor, ActorType
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.version import Version
+from spdx_tools.spdx.model import Actor, ActorType, Checksum, ChecksumAlgorithm, Version
 from spdx_tools.spdx.parser.rdf.creation_info_parser import (
     parse_creation_info,
     parse_external_document_refs,
diff --git a/tests/spdx/parser/rdf/test_file_parser.py b/tests/spdx/parser/rdf/test_file_parser.py
index d381a1567..fb24ed0da 100644
--- a/tests/spdx/parser/rdf/test_file_parser.py
+++ b/tests/spdx/parser/rdf/test_file_parser.py
@@ -7,9 +7,7 @@
 from license_expression import get_spdx_licensing
 from rdflib import RDF, Graph, URIRef
 
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.file import FileType
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm, FileType, SpdxNoAssertion
 from spdx_tools.spdx.parser.rdf.file_parser import parse_file
 from spdx_tools.spdx.rdfschema.namespace import SPDX_NAMESPACE
 
diff --git a/tests/spdx/parser/rdf/test_package_parser.py b/tests/spdx/parser/rdf/test_package_parser.py
index 6e5850cf3..f6c968073 100644
--- a/tests/spdx/parser/rdf/test_package_parser.py
+++ b/tests/spdx/parser/rdf/test_package_parser.py
@@ -8,10 +8,16 @@
 from license_expression import get_spdx_licensing
 from rdflib import RDF, BNode, Graph, Literal, URIRef
 
-from spdx_tools.spdx.model.actor import Actor, ActorType
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.package import ExternalPackageRefCategory, PackagePurpose, PackageVerificationCode
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
+from spdx_tools.spdx.model import (
+    Actor,
+    ActorType,
+    Checksum,
+    ChecksumAlgorithm,
+    ExternalPackageRefCategory,
+    PackagePurpose,
+    PackageVerificationCode,
+    SpdxNoAssertion,
+)
 from spdx_tools.spdx.parser.rdf.package_parser import parse_external_package_ref, parse_package
 from spdx_tools.spdx.rdfschema.namespace import SPDX_NAMESPACE
 
diff --git a/tests/spdx/parser/rdf/test_relationship_parser.py b/tests/spdx/parser/rdf/test_relationship_parser.py
index 5bc60ee6c..33024fad3 100644
--- a/tests/spdx/parser/rdf/test_relationship_parser.py
+++ b/tests/spdx/parser/rdf/test_relationship_parser.py
@@ -7,7 +7,7 @@
 from rdflib import RDF, Graph, URIRef
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.relationship import RelationshipType
+from spdx_tools.spdx.model import RelationshipType
 from spdx_tools.spdx.parser.rdf.relationship_parser import parse_implicit_relationship, parse_relationship
 from spdx_tools.spdx.rdfschema.namespace import SPDX_NAMESPACE
 
diff --git a/tests/spdx/parser/rdf/test_snippet_parser.py b/tests/spdx/parser/rdf/test_snippet_parser.py
index 4db77875b..1b4022827 100644
--- a/tests/spdx/parser/rdf/test_snippet_parser.py
+++ b/tests/spdx/parser/rdf/test_snippet_parser.py
@@ -8,7 +8,7 @@
 from license_expression import get_spdx_licensing
 from rdflib import RDF, BNode, Graph, Literal, URIRef
 
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
+from spdx_tools.spdx.model import SpdxNoAssertion
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.rdf.snippet_parser import parse_ranges, parse_snippet
 from spdx_tools.spdx.rdfschema.namespace import POINTER_NAMESPACE, SPDX_NAMESPACE
diff --git a/tests/spdx/parser/tagvalue/test_annotation_parser.py b/tests/spdx/parser/tagvalue/test_annotation_parser.py
index cfbd1f40f..204756187 100644
--- a/tests/spdx/parser/tagvalue/test_annotation_parser.py
+++ b/tests/spdx/parser/tagvalue/test_annotation_parser.py
@@ -6,7 +6,7 @@
 import pytest
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.annotation import AnnotationType
+from spdx_tools.spdx.model import AnnotationType
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.tagvalue.parser import Parser
 from tests.spdx.parser.tagvalue.test_creation_info_parser import DOCUMENT_STR
diff --git a/tests/spdx/parser/tagvalue/test_creation_info_parser.py b/tests/spdx/parser/tagvalue/test_creation_info_parser.py
index 7fd0d275b..45f472642 100644
--- a/tests/spdx/parser/tagvalue/test_creation_info_parser.py
+++ b/tests/spdx/parser/tagvalue/test_creation_info_parser.py
@@ -7,10 +7,7 @@
 import pytest
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.actor import Actor, ActorType
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
-from spdx_tools.spdx.model.external_document_ref import ExternalDocumentRef
-from spdx_tools.spdx.model.version import Version
+from spdx_tools.spdx.model import Actor, ActorType, Checksum, ChecksumAlgorithm, ExternalDocumentRef, Version
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.tagvalue.parser import Parser
 
diff --git a/tests/spdx/parser/tagvalue/test_file_parser.py b/tests/spdx/parser/tagvalue/test_file_parser.py
index d4e0df719..859516cbf 100644
--- a/tests/spdx/parser/tagvalue/test_file_parser.py
+++ b/tests/spdx/parser/tagvalue/test_file_parser.py
@@ -4,8 +4,7 @@
 import pytest
 from license_expression import get_spdx_licensing
 
-from spdx_tools.spdx.model.file import FileType
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
+from spdx_tools.spdx.model import FileType, SpdxNoAssertion
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.tagvalue.parser import Parser
 from tests.spdx.parser.tagvalue.test_creation_info_parser import DOCUMENT_STR
diff --git a/tests/spdx/parser/tagvalue/test_helper_methods.py b/tests/spdx/parser/tagvalue/test_helper_methods.py
index 4419902f3..8ca601828 100644
--- a/tests/spdx/parser/tagvalue/test_helper_methods.py
+++ b/tests/spdx/parser/tagvalue/test_helper_methods.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 import pytest
 
-from spdx_tools.spdx.model.checksum import ChecksumAlgorithm
+from spdx_tools.spdx.model import ChecksumAlgorithm
 from spdx_tools.spdx.parser.tagvalue.helper_methods import parse_checksum
 
 
diff --git a/tests/spdx/parser/tagvalue/test_package_parser.py b/tests/spdx/parser/tagvalue/test_package_parser.py
index 76d8ddb0a..dbbeef415 100644
--- a/tests/spdx/parser/tagvalue/test_package_parser.py
+++ b/tests/spdx/parser/tagvalue/test_package_parser.py
@@ -8,8 +8,7 @@
 from license_expression import get_spdx_licensing
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.package import ExternalPackageRef, ExternalPackageRefCategory, PackagePurpose
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import ExternalPackageRef, ExternalPackageRefCategory, PackagePurpose, SpdxNone
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.tagvalue.parser import Parser
 from tests.spdx.parser.tagvalue.test_creation_info_parser import DOCUMENT_STR
diff --git a/tests/spdx/parser/tagvalue/test_relationship_parser.py b/tests/spdx/parser/tagvalue/test_relationship_parser.py
index 59016c5a9..d351a0c06 100644
--- a/tests/spdx/parser/tagvalue/test_relationship_parser.py
+++ b/tests/spdx/parser/tagvalue/test_relationship_parser.py
@@ -4,9 +4,7 @@
 import pytest
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import Relationship, RelationshipType, SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.tagvalue.parser import Parser
 from tests.spdx.parser.tagvalue.test_creation_info_parser import DOCUMENT_STR
diff --git a/tests/spdx/parser/tagvalue/test_snippet_parser.py b/tests/spdx/parser/tagvalue/test_snippet_parser.py
index 42a170b87..8bd82595c 100644
--- a/tests/spdx/parser/tagvalue/test_snippet_parser.py
+++ b/tests/spdx/parser/tagvalue/test_snippet_parser.py
@@ -6,7 +6,7 @@
 import pytest
 from license_expression import get_spdx_licensing
 
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
+from spdx_tools.spdx.model import SpdxNoAssertion
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.tagvalue.parser import Parser
 from tests.spdx.parser.tagvalue.test_creation_info_parser import DOCUMENT_STR
diff --git a/tests/spdx/parser/tagvalue/test_tag_value_parser.py b/tests/spdx/parser/tagvalue/test_tag_value_parser.py
index dfb20fad6..cb5381489 100644
--- a/tests/spdx/parser/tagvalue/test_tag_value_parser.py
+++ b/tests/spdx/parser/tagvalue/test_tag_value_parser.py
@@ -6,7 +6,7 @@
 import pytest
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
+from spdx_tools.spdx.model import Relationship, RelationshipType
 from spdx_tools.spdx.parser.error import SPDXParsingError
 from spdx_tools.spdx.parser.tagvalue.parser import Parser
 from tests.spdx.parser.tagvalue.test_creation_info_parser import DOCUMENT_STR
diff --git a/tests/spdx/test_actor_parser.py b/tests/spdx/test_actor_parser.py
index 73eac6366..17d12a296 100644
--- a/tests/spdx/test_actor_parser.py
+++ b/tests/spdx/test_actor_parser.py
@@ -5,7 +5,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.actor import ActorType
+from spdx_tools.spdx.model import ActorType
 from spdx_tools.spdx.parser.actor_parser import ActorParser
 from spdx_tools.spdx.parser.error import SPDXParsingError
 
diff --git a/tests/spdx/test_document_utils.py b/tests/spdx/test_document_utils.py
index a49e6af1e..4e05de869 100644
--- a/tests/spdx/test_document_utils.py
+++ b/tests/spdx/test_document_utils.py
@@ -12,9 +12,7 @@
     get_contained_spdx_elements,
     get_element_from_spdx_id,
 )
-from spdx_tools.spdx.model.file import FileType
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import FileType, SpdxNoAssertion, SpdxNone
 from tests.spdx.fixtures import (
     actor_fixture,
     checksum_fixture,
diff --git a/tests/spdx/test_graph_generation.py b/tests/spdx/test_graph_generation.py
index 9961cb71f..f51d9590b 100644
--- a/tests/spdx/test_graph_generation.py
+++ b/tests/spdx/test_graph_generation.py
@@ -8,8 +8,7 @@
 import pytest
 
 from spdx_tools.spdx.graph_generation import generate_relationship_graph_from_spdx
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
+from spdx_tools.spdx.model import Document, Relationship, RelationshipType
 from spdx_tools.spdx.parser.parse_anything import parse_file
 from tests.spdx.fixtures import document_fixture, file_fixture, package_fixture
 
diff --git a/tests/spdx/validation/test_actor_validator.py b/tests/spdx/validation/test_actor_validator.py
index 14b8dc1c1..0ab122473 100644
--- a/tests/spdx/validation/test_actor_validator.py
+++ b/tests/spdx/validation/test_actor_validator.py
@@ -7,7 +7,7 @@
 import pytest
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.actor import ActorType
+from spdx_tools.spdx.model import ActorType
 from spdx_tools.spdx.validation.actor_validator import validate_actor
 from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage
 from tests.spdx.fixtures import actor_fixture
diff --git a/tests/spdx/validation/test_annotation_validator.py b/tests/spdx/validation/test_annotation_validator.py
index 86787f858..2462f9cda 100644
--- a/tests/spdx/validation/test_annotation_validator.py
+++ b/tests/spdx/validation/test_annotation_validator.py
@@ -6,8 +6,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.annotation import Annotation
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Annotation, Document
 from spdx_tools.spdx.validation.annotation_validator import validate_annotation
 from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage
 from tests.spdx.fixtures import annotation_fixture, document_fixture, file_fixture
diff --git a/tests/spdx/validation/test_checksum_validator.py b/tests/spdx/validation/test_checksum_validator.py
index e93b1d9dc..9340de5db 100644
--- a/tests/spdx/validation/test_checksum_validator.py
+++ b/tests/spdx/validation/test_checksum_validator.py
@@ -6,7 +6,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm
 from spdx_tools.spdx.validation.checksum_validator import validate_checksum
 from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage
 from tests.spdx.fixtures import checksum_fixture
diff --git a/tests/spdx/validation/test_document_validator.py b/tests/spdx/validation/test_document_validator.py
index d0c021bc7..1b1897f52 100644
--- a/tests/spdx/validation/test_document_validator.py
+++ b/tests/spdx/validation/test_document_validator.py
@@ -7,8 +7,7 @@
 import pytest
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.document import CreationInfo, Document
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
+from spdx_tools.spdx.model import CreationInfo, Document, Relationship, RelationshipType
 from spdx_tools.spdx.parser.parse_anything import parse_file
 from spdx_tools.spdx.validation.document_validator import validate_full_spdx_document
 from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage
diff --git a/tests/spdx/validation/test_external_package_ref_validator.py b/tests/spdx/validation/test_external_package_ref_validator.py
index 16d41f1ae..eafa31941 100644
--- a/tests/spdx/validation/test_external_package_ref_validator.py
+++ b/tests/spdx/validation/test_external_package_ref_validator.py
@@ -6,7 +6,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.package import ExternalPackageRef, ExternalPackageRefCategory
+from spdx_tools.spdx.model import ExternalPackageRef, ExternalPackageRefCategory
 from spdx_tools.spdx.validation.external_package_ref_validator import (
     BOWER_REGEX,
     CPE22TYPE_REGEX,
diff --git a/tests/spdx/validation/test_file_validator.py b/tests/spdx/validation/test_file_validator.py
index 2c26632a6..73f107a9f 100644
--- a/tests/spdx/validation/test_file_validator.py
+++ b/tests/spdx/validation/test_file_validator.py
@@ -7,7 +7,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.checksum import Checksum, ChecksumAlgorithm
+from spdx_tools.spdx.model import Checksum, ChecksumAlgorithm
 from spdx_tools.spdx.validation.file_validator import validate_file, validate_file_within_document
 from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage
 from tests.spdx.fixtures import document_fixture, file_fixture
diff --git a/tests/spdx/validation/test_license_expression_validator.py b/tests/spdx/validation/test_license_expression_validator.py
index 2b2dabed6..03c0eddad 100644
--- a/tests/spdx/validation/test_license_expression_validator.py
+++ b/tests/spdx/validation/test_license_expression_validator.py
@@ -8,9 +8,7 @@
 import pytest
 from license_expression import LicenseExpression, get_spdx_licensing
 
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import Document, SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.validation.license_expression_validator import (
     validate_license_expression,
     validate_license_expressions,
diff --git a/tests/spdx/validation/test_package_validator.py b/tests/spdx/validation/test_package_validator.py
index 335c744b9..c2b6640d2 100644
--- a/tests/spdx/validation/test_package_validator.py
+++ b/tests/spdx/validation/test_package_validator.py
@@ -9,9 +9,7 @@
 from license_expression import Licensing
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import Relationship, RelationshipType, SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.validation.package_validator import validate_package, validate_package_within_document
 from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage
 from tests.spdx.fixtures import document_fixture, file_fixture, package_fixture, package_verification_code_fixture
diff --git a/tests/spdx/validation/test_package_verification_code_validator.py b/tests/spdx/validation/test_package_verification_code_validator.py
index 948904ef7..020bd8dd3 100644
--- a/tests/spdx/validation/test_package_verification_code_validator.py
+++ b/tests/spdx/validation/test_package_verification_code_validator.py
@@ -4,7 +4,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.package import PackageVerificationCode
+from spdx_tools.spdx.model import PackageVerificationCode
 from spdx_tools.spdx.validation.package_verification_code_validator import validate_verification_code
 from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage
 
diff --git a/tests/spdx/validation/test_relationship_validator.py b/tests/spdx/validation/test_relationship_validator.py
index b72bc0a82..28cae9d7d 100644
--- a/tests/spdx/validation/test_relationship_validator.py
+++ b/tests/spdx/validation/test_relationship_validator.py
@@ -7,10 +7,7 @@
 import pytest
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.document import Document
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import Document, Relationship, RelationshipType, SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.validation.relationship_validator import validate_relationship
 from spdx_tools.spdx.validation.validation_message import SpdxElementType, ValidationContext, ValidationMessage
 from tests.spdx.fixtures import document_fixture, relationship_fixture
diff --git a/tests/spdx/writer/rdf/test_checksum_writer.py b/tests/spdx/writer/rdf/test_checksum_writer.py
index 28b4012be..bbfa7358a 100644
--- a/tests/spdx/writer/rdf/test_checksum_writer.py
+++ b/tests/spdx/writer/rdf/test_checksum_writer.py
@@ -4,7 +4,7 @@
 import pytest
 from rdflib import RDF, Graph, Literal, URIRef
 
-from spdx_tools.spdx.model.checksum import ChecksumAlgorithm
+from spdx_tools.spdx.model import ChecksumAlgorithm
 from spdx_tools.spdx.rdfschema.namespace import SPDX_NAMESPACE
 from spdx_tools.spdx.writer.rdf.checksum_writer import add_checksum_to_graph, algorithm_to_rdf_string
 from tests.spdx.fixtures import checksum_fixture
diff --git a/tests/spdx/writer/rdf/test_package_writer.py b/tests/spdx/writer/rdf/test_package_writer.py
index 3b5fde09b..2c0d5abbd 100644
--- a/tests/spdx/writer/rdf/test_package_writer.py
+++ b/tests/spdx/writer/rdf/test_package_writer.py
@@ -5,7 +5,7 @@
 from rdflib import DOAP, RDF, RDFS, XSD, Graph, Literal, URIRef
 
 from spdx_tools.spdx.datetime_conversions import datetime_to_iso_string
-from spdx_tools.spdx.model.package import ExternalPackageRefCategory
+from spdx_tools.spdx.model import ExternalPackageRefCategory
 from spdx_tools.spdx.rdfschema.namespace import LICENSE_NAMESPACE, SPDX_NAMESPACE
 from spdx_tools.spdx.writer.rdf.package_writer import (
     add_external_package_ref_to_graph,
diff --git a/tests/spdx/writer/rdf/test_rdf_writer.py b/tests/spdx/writer/rdf/test_rdf_writer.py
index 8b19eef0d..da6ae01bf 100644
--- a/tests/spdx/writer/rdf/test_rdf_writer.py
+++ b/tests/spdx/writer/rdf/test_rdf_writer.py
@@ -5,7 +5,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.document import Document
+from spdx_tools.spdx.model import Document
 from spdx_tools.spdx.writer.rdf.rdf_writer import write_document_to_file
 from tests.spdx.fixtures import document_fixture
 
diff --git a/tests/spdx/writer/tagvalue/test_checksum_writer.py b/tests/spdx/writer/tagvalue/test_checksum_writer.py
index 2208fc207..ddc2474e0 100644
--- a/tests/spdx/writer/tagvalue/test_checksum_writer.py
+++ b/tests/spdx/writer/tagvalue/test_checksum_writer.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 import pytest
 
-from spdx_tools.spdx.model.checksum import ChecksumAlgorithm
+from spdx_tools.spdx.model import ChecksumAlgorithm
 from spdx_tools.spdx.writer.tagvalue.checksum_writer import write_checksum_to_tag_value
 from tests.spdx.fixtures import checksum_fixture
 
diff --git a/tests/spdx/writer/tagvalue/test_creation_info_writer.py b/tests/spdx/writer/tagvalue/test_creation_info_writer.py
index a1a6a982b..133364c37 100644
--- a/tests/spdx/writer/tagvalue/test_creation_info_writer.py
+++ b/tests/spdx/writer/tagvalue/test_creation_info_writer.py
@@ -7,7 +7,7 @@
 import pytest
 
 from spdx_tools.spdx.constants import DOCUMENT_SPDX_ID
-from spdx_tools.spdx.model.document import CreationInfo
+from spdx_tools.spdx.model import CreationInfo
 from spdx_tools.spdx.writer.tagvalue.creation_info_writer import write_creation_info
 from tests.spdx.fixtures import actor_fixture, creation_info_fixture
 
diff --git a/tests/spdx/writer/tagvalue/test_relationship_writer.py b/tests/spdx/writer/tagvalue/test_relationship_writer.py
index 8ff940809..9b207c33b 100644
--- a/tests/spdx/writer/tagvalue/test_relationship_writer.py
+++ b/tests/spdx/writer/tagvalue/test_relationship_writer.py
@@ -5,8 +5,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
-from spdx_tools.spdx.model.spdx_none import SpdxNone
+from spdx_tools.spdx.model import SpdxNoAssertion, SpdxNone
 from spdx_tools.spdx.writer.tagvalue.relationship_writer import write_relationship
 from tests.spdx.fixtures import relationship_fixture
 
diff --git a/tests/spdx/writer/tagvalue/test_tagvalue_writer.py b/tests/spdx/writer/tagvalue/test_tagvalue_writer.py
index ad2ccd6ef..995687ce5 100644
--- a/tests/spdx/writer/tagvalue/test_tagvalue_writer.py
+++ b/tests/spdx/writer/tagvalue/test_tagvalue_writer.py
@@ -7,10 +7,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.file import File
-from spdx_tools.spdx.model.package import Package
-from spdx_tools.spdx.model.relationship import Relationship, RelationshipType
-from spdx_tools.spdx.model.snippet import Snippet
+from spdx_tools.spdx.model import File, Package, Relationship, RelationshipType, Snippet
 from spdx_tools.spdx.parser.tagvalue import tagvalue_parser
 from spdx_tools.spdx.writer.tagvalue.tagvalue_writer import write_document, write_document_to_file
 from tests.spdx.fixtures import checksum_fixture, document_fixture
diff --git a/tests/spdx/writer/tagvalue/test_tagvalue_writer_helper_functions.py b/tests/spdx/writer/tagvalue/test_tagvalue_writer_helper_functions.py
index b7c884dc2..d101fd37c 100644
--- a/tests/spdx/writer/tagvalue/test_tagvalue_writer_helper_functions.py
+++ b/tests/spdx/writer/tagvalue/test_tagvalue_writer_helper_functions.py
@@ -5,9 +5,7 @@
 
 import pytest
 
-from spdx_tools.spdx.model.actor import ActorType
-from spdx_tools.spdx.model.relationship import RelationshipType
-from spdx_tools.spdx.model.spdx_no_assertion import SpdxNoAssertion
+from spdx_tools.spdx.model import ActorType, RelationshipType, SpdxNoAssertion
 from spdx_tools.spdx.writer.tagvalue.tagvalue_writer_helper_functions import scan_relationships, write_actor
 from tests.spdx.fixtures import actor_fixture, file_fixture, package_fixture, relationship_fixture