eclipse-esmf · atextor · Sep 30, 2025 · Aug 28, 2025
diff --git a/.gitignore b/.gitignore
@@ -70,4 +70,4 @@ dmypy.json
 # SAMM
 core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/samm_aspect_meta_model/samm/
 /core/esmf-aspect-meta-model-python/samm-cli/
-/core/esmf-aspect-meta-model-python/tests/integration/java_models/resources/
+/core/esmf-aspect-meta-model-python/tests/integration/aspect_model_loader/java_models/resources/
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -3,6 +3,7 @@
 The following people have contributed to this repository:
 
 * [Hanna Shalamitskaya](https://github.com/Hanna-Shalamitskaya-EPAM), external.Hanna.Shalamitskaya@de.bosch.com
+* [Oleksandr Muzyka](https://github.com/o-muzyka), external.Oleksandr.Muzyka@bosch.com
 * [Andreas Textor](https://github.com/atextor), Robert Bosch GmbH, andreas.textor@de.bosch.com
 * Georg Schmidt-Dumont, Robert Bosch GmbH, georg.schmidt-dumont@de.bosch.com
 * [Michele Santoro](https://github.com/michelu89), Robert Bosch GmbH, michele.santoro@de.bosch.com

diff --git a/core/esmf-aspect-meta-model-python/README.md b/core/esmf-aspect-meta-model-python/README.md
@@ -144,7 +144,7 @@ Python Aspect Model Loader provide a wrapper class to be able to call SAMM CLI f
 For instance, validation of a model can be done with the following code snippet:
 
 ```python
-from esmf_aspect_meta_model_python.samm_cli_functions import SammCli
+from esmf_aspect_meta_model_python.samm_cli import SammCli
 
 samm_cli = SammCli()
 model_path = "Paht_to_the_model/Model.ttl"
@@ -154,12 +154,25 @@ samm_cli.validate(model_path)
 
 List of SAMMCLI functions:
 - validate
+- prettyprint
+- usage
 - to_openapi
 - to_schema
 - to_json
 - to_html
 - to_png
 - to_svg
+- to_java
+- to_asyncapi
+- to_jsonld
+- to_sql
+- to_aas
+- edit_move
+- edit_newversion
+- aas_to_aspect
+- aas_list
+- package_import
+- package_export
 
 # Scripts
 

diff --git a/core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/samm_cli/__init__.py b/core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/samm_cli/__init__.py
@@ -0,0 +1 @@
+from .base import SammCli
diff --git a/core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/samm_cli/base.py b/core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/samm_cli/base.py
diff --git a/core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/samm_cli/constants.py b/core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/samm_cli/constants.py
@@ -0,0 +1,44 @@
+#  Copyright (c) 2023 Robert Bosch Manufacturing Solutions GmbH
+#
+#  See the AUTHORS file(s) distributed with this work for additional
+#  information regarding authorship.
+#
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#
+#   SPDX-License-Identifier: MPL-2.0
+"""Constants for SAMM CLI commands and types."""
+
+
+class SAMMCLICommands:
+    """SAMM CLI command names."""
+
+    VALIDATE = "validate"
+    TO_OPENAPI = "to openapi"
+    TO_SCHEMA = "to schema"
+    TO_JSON = "to json"
+    TO_HTML = "to html"
+    TO_PNG = "to png"
+    TO_SVG = "to svg"
+    PRETTYPRINT = "prettyprint"
+    TO_JAVA = "to java"
+    TO_ASYNCAPI = "to asyncapi"
+    TO_JSONLD = "to jsonld"
+    TO_SQL = "to sql"
+    TO_AAS = "to aas"
+    EDIT_MOVE = "edit move"
+    EDIT_NEWVERSION = "edit newversion"
+    USAGE = "usage"
+    AAS_TO_ASPECT = "to aspect"
+    AAS_LIST = "list"
+    PACKAGE_IMPORT = "import"
+    PACKAGE_EXPORT = "export"
+
+
+class SAMMCLICommandTypes:
+    """SAMM CLI command types."""
+
+    ASPECT = "aspect"
+    AAS = "aas"
+    PACKAGE = "package"
diff --git a/core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/samm_cli_functions.py b/core/esmf-aspect-meta-model-python/esmf_aspect_meta_model_python/samm_cli_functions.py
diff --git a/core/esmf-aspect-meta-model-python/scripts/constants.py b/core/esmf-aspect-meta-model-python/scripts/constants.py
@@ -34,4 +34,4 @@ class TestModelConstants:
         "esmf-test-aspect-models-$version_number.jar"
     )
     SAMM_VERSION = SAMM_VERSION
-    TEST_MODELS_PATH = join("tests", "integration", "java_models", "resources")
+    TEST_MODELS_PATH = join("tests", "integration", "aspect_model_loader", "java_models", "resources")
diff --git a/...tests/integration/java_models/__init__.py → ...tegration/aspect_model_loader/__init__.py b/...tests/integration/java_models/__init__.py → ...tegration/aspect_model_loader/__init__.py
diff --git a/...mf-aspect-meta-model-python/tests/integration/aspect_model_loader/java_models/__init__.py b/...mf-aspect-meta-model-python/tests/integration/aspect_model_loader/java_models/__init__.py
diff --git a/...ation/java_models/test_loading_aspects.py → ...oader/java_models/test_loading_aspects.py b/...ation/java_models/test_loading_aspects.py → ...oader/java_models/test_loading_aspects.py
@@ -18,7 +18,7 @@
 
 def get_resources_folder_path() -> str:
     """Get a path for storing test models."""
-    base_path = Path(__file__).parents[3].absolute()
+    base_path = Path(__file__).parents[4].absolute()
     models_path = join(base_path, TestModelConstants.TEST_MODELS_PATH)
 
     return models_path

diff --git a/...acteristics/2.1.0/AspectWithBlankNode.ttl → ...acteristics/2.1.0/AspectWithBlankNode.ttl b/...acteristics/2.1.0/AspectWithBlankNode.ttl → ...acteristics/2.1.0/AspectWithBlankNode.ttl
diff --git a/....characteristics/2.1.0/AspectWithCode.ttl → ....characteristics/2.1.0/AspectWithCode.ttl b/....characteristics/2.1.0/AspectWithCode.ttl → ....characteristics/2.1.0/AspectWithCode.ttl
diff --git a/...cteristics/2.1.0/AspectWithCollection.ttl → ...cteristics/2.1.0/AspectWithCollection.ttl b/...cteristics/2.1.0/AspectWithCollection.ttl → ...cteristics/2.1.0/AspectWithCollection.ttl
diff --git a/...thCollectionWithElementCharacteristic.ttl → ...thCollectionWithElementCharacteristic.ttl b/...thCollectionWithElementCharacteristic.ttl → ...thCollectionWithElementCharacteristic.ttl
diff --git a/...racteristics/2.1.0/AspectWithDuration.ttl → ...racteristics/2.1.0/AspectWithDuration.ttl b/...racteristics/2.1.0/AspectWithDuration.ttl → ...racteristics/2.1.0/AspectWithDuration.ttl
diff --git a/....characteristics/2.1.0/AspectWithList.ttl → ....characteristics/2.1.0/AspectWithList.ttl b/....characteristics/2.1.0/AspectWithList.ttl → ....characteristics/2.1.0/AspectWithList.ttl
diff --git a/...teristics/2.1.0/AspectWithMeasurement.ttl → ...teristics/2.1.0/AspectWithMeasurement.ttl b/...teristics/2.1.0/AspectWithMeasurement.ttl → ...teristics/2.1.0/AspectWithMeasurement.ttl
diff --git a/...s/2.1.0/AspectWithQuantifiableAndUnit.ttl → ...s/2.1.0/AspectWithQuantifiableAndUnit.ttl b/...s/2.1.0/AspectWithQuantifiableAndUnit.ttl → ...s/2.1.0/AspectWithQuantifiableAndUnit.ttl
diff --git a/...t.characteristics/2.1.0/AspectWithSet.ttl → ...t.characteristics/2.1.0/AspectWithSet.ttl b/...t.characteristics/2.1.0/AspectWithSet.ttl → ...t.characteristics/2.1.0/AspectWithSet.ttl
diff --git a/...cteristics/2.1.0/AspectWithSimpleEnum.ttl → ...cteristics/2.1.0/AspectWithSimpleEnum.ttl b/...cteristics/2.1.0/AspectWithSimpleEnum.ttl → ...cteristics/2.1.0/AspectWithSimpleEnum.ttl
diff --git a/...acteristics/2.1.0/AspectWithSortedSet.ttl → ...acteristics/2.1.0/AspectWithSortedSet.ttl b/...acteristics/2.1.0/AspectWithSortedSet.ttl → ...acteristics/2.1.0/AspectWithSortedSet.ttl
diff --git a/...characteristics/2.1.0/AspectWithState.ttl → ...characteristics/2.1.0/AspectWithState.ttl b/...characteristics/2.1.0/AspectWithState.ttl → ...characteristics/2.1.0/AspectWithState.ttl
diff --git a/...stics/2.1.0/AspectWithStructuredValue.ttl → ...stics/2.1.0/AspectWithStructuredValue.ttl b/...stics/2.1.0/AspectWithStructuredValue.ttl → ...stics/2.1.0/AspectWithStructuredValue.ttl
diff --git a/...2.1.0/AspectWithConstrainedCollection.ttl → ...2.1.0/AspectWithConstrainedCollection.ttl b/...2.1.0/AspectWithConstrainedCollection.ttl → ...2.1.0/AspectWithConstrainedCollection.ttl
diff --git a/...ts/2.1.0/AspectWithEncodingConstraint.ttl → ...ts/2.1.0/AspectWithEncodingConstraint.ttl b/...ts/2.1.0/AspectWithEncodingConstraint.ttl → ...ts/2.1.0/AspectWithEncodingConstraint.ttl
diff --git a/...onstraints/2.1.0/AspectWithFixedPoint.ttl → ...onstraints/2.1.0/AspectWithFixedPoint.ttl b/...onstraints/2.1.0/AspectWithFixedPoint.ttl → ...onstraints/2.1.0/AspectWithFixedPoint.ttl
diff --git a/...ts/2.1.0/AspectWithLanguageConstraint.ttl → ...ts/2.1.0/AspectWithLanguageConstraint.ttl b/...ts/2.1.0/AspectWithLanguageConstraint.ttl → ...ts/2.1.0/AspectWithLanguageConstraint.ttl
diff --git a/...ints/2.1.0/AspectWithLengthConstraint.ttl → ...ints/2.1.0/AspectWithLengthConstraint.ttl b/...ints/2.1.0/AspectWithLengthConstraint.ttl → ...ints/2.1.0/AspectWithLengthConstraint.ttl
diff --git a/...ints/2.1.0/AspectWithLocaleConstraint.ttl → ...ints/2.1.0/AspectWithLocaleConstraint.ttl b/...ints/2.1.0/AspectWithLocaleConstraint.ttl → ...ints/2.1.0/AspectWithLocaleConstraint.ttl
diff --git a/...s/2.1.0/AspectWithMultipleConstraints.ttl → ...s/2.1.0/AspectWithMultipleConstraints.ttl b/...s/2.1.0/AspectWithMultipleConstraints.ttl → ...s/2.1.0/AspectWithMultipleConstraints.ttl
diff --git a/...AspectWithMultipleOneValueConstraints.ttl → ...AspectWithMultipleOneValueConstraints.ttl b/...AspectWithMultipleOneValueConstraints.ttl → ...AspectWithMultipleOneValueConstraints.ttl
diff --git a/...aints/2.1.0/AspectWithRangeConstraint.ttl → ...aints/2.1.0/AspectWithRangeConstraint.ttl b/...aints/2.1.0/AspectWithRangeConstraint.ttl → ...aints/2.1.0/AspectWithRangeConstraint.ttl
diff --git a/...nstraintInclBoundDefinitionProperties.ttl → ...nstraintInclBoundDefinitionProperties.ttl b/...nstraintInclBoundDefinitionProperties.ttl → ...nstraintInclBoundDefinitionProperties.ttl
diff --git a/...AspectWithRegularExpressionConstraint.ttl → ...AspectWithRegularExpressionConstraint.ttl b/...AspectWithRegularExpressionConstraint.ttl → ...AspectWithRegularExpressionConstraint.ttl
diff --git a/...entity/2.1.0/AspectWithAbstractEntity.ttl → ...entity/2.1.0/AspectWithAbstractEntity.ttl b/...entity/2.1.0/AspectWithAbstractEntity.ttl → ...entity/2.1.0/AspectWithAbstractEntity.ttl
diff --git a/...tWithAbstractEntityMultipleAttributes.ttl → ...tWithAbstractEntityMultipleAttributes.ttl b/...tWithAbstractEntityMultipleAttributes.ttl → ...tWithAbstractEntityMultipleAttributes.ttl
diff --git a/...0/AspectWithAbstractPropertyBlankNode.ttl → ...0/AspectWithAbstractPropertyBlankNode.ttl b/...0/AspectWithAbstractPropertyBlankNode.ttl → ...0/AspectWithAbstractPropertyBlankNode.ttl
diff --git a/...tractPropertyMultipleAbstractEntities.ttl → ...tractPropertyMultipleAbstractEntities.ttl b/...tractPropertyMultipleAbstractEntities.ttl → ...tractPropertyMultipleAbstractEntities.ttl
diff --git a/...ithAbstractPropertyMultipleAttributes.ttl → ...ithAbstractPropertyMultipleAttributes.ttl b/...ithAbstractPropertyMultipleAttributes.ttl → ...ithAbstractPropertyMultipleAttributes.ttl
diff --git a/...mf.test.entity/2.1.0/AspectWithEntity.ttl → ...mf.test.entity/2.1.0/AspectWithEntity.ttl b/...mf.test.entity/2.1.0/AspectWithEntity.ttl → ...mf.test.entity/2.1.0/AspectWithEntity.ttl
diff --git a/...est.entity/2.1.0/AspectWithEntityEnum.ttl → ...est.entity/2.1.0/AspectWithEntityEnum.ttl b/...est.entity/2.1.0/AspectWithEntityEnum.ttl → ...est.entity/2.1.0/AspectWithEntityEnum.ttl
diff --git a/...AspectWithEntityExtendingFileResource.ttl → ...AspectWithEntityExtendingFileResource.ttl b/...AspectWithEntityExtendingFileResource.ttl → ...AspectWithEntityExtendingFileResource.ttl
diff --git a/...ty/2.1.0/AspectWithFileResourceEntity.ttl → ...ty/2.1.0/AspectWithFileResourceEntity.ttl b/...ty/2.1.0/AspectWithFileResourceEntity.ttl → ...ty/2.1.0/AspectWithFileResourceEntity.ttl
diff --git a/...pleAbstractEntitiesMultipleAttributes.ttl → ...pleAbstractEntitiesMultipleAttributes.ttl b/...pleAbstractEntitiesMultipleAttributes.ttl → ...pleAbstractEntitiesMultipleAttributes.ttl
diff --git a/.../AspectWithMultipleEntitiesSameExtend.ttl → .../AspectWithMultipleEntitiesSameExtend.ttl b/.../AspectWithMultipleEntitiesSameExtend.ttl → .../AspectWithMultipleEntitiesSameExtend.ttl
diff --git a/...spectWithMultiplePropertiesSameExtend.ttl → ...spectWithMultiplePropertiesSameExtend.ttl b/...spectWithMultiplePropertiesSameExtend.ttl → ...spectWithMultiplePropertiesSameExtend.ttl
diff --git a/...f.test.entity/2.1.0/AspectWithPoint3d.ttl → ...f.test.entity/2.1.0/AspectWithPoint3d.ttl b/...f.test.entity/2.1.0/AspectWithPoint3d.ttl → ...f.test.entity/2.1.0/AspectWithPoint3d.ttl
diff --git a/...est.entity/2.1.0/AspectWithTimeSeries.ttl → ...est.entity/2.1.0/AspectWithTimeSeries.ttl b/...est.entity/2.1.0/AspectWithTimeSeries.ttl → ...est.entity/2.1.0/AspectWithTimeSeries.ttl
diff --git a/...0/AspectWithTimeSeriesWithComplexType.ttl → ...0/AspectWithTimeSeriesWithComplexType.ttl b/...0/AspectWithTimeSeriesWithComplexType.ttl → ...0/AspectWithTimeSeriesWithComplexType.ttl
diff --git a/...2.1.0/AspectWithUnusedExtendingEntity.ttl → ...2.1.0/AspectWithUnusedExtendingEntity.ttl b/...2.1.0/AspectWithUnusedExtendingEntity.ttl → ...2.1.0/AspectWithUnusedExtendingEntity.ttl
diff --git a/...mf.test.event/2.1.0/aspect_with_event.ttl → ...mf.test.event/2.1.0/aspect_with_event.ttl b/...mf.test.event/2.1.0/aspect_with_event.ttl → ...mf.test.event/2.1.0/aspect_with_event.ttl
diff --git a/...1.0/aspect_with_event_with_parameters.ttl → ...1.0/aspect_with_event_with_parameters.ttl b/...1.0/aspect_with_event_with_parameters.ttl → ...1.0/aspect_with_event_with_parameters.ttl
diff --git a/...vent/2.1.0/aspect_with_multiple_event.ttl → ...vent/2.1.0/aspect_with_multiple_event.ttl b/...vent/2.1.0/aspect_with_multiple_event.ttl → ...vent/2.1.0/aspect_with_multiple_event.ttl
diff --git a/...clipse.esmf.test.general/2.1.0/Aspect.ttl → ...clipse.esmf.test.general/2.1.0/Aspect.ttl b/...clipse.esmf.test.general/2.1.0/Aspect.ttl → ...clipse.esmf.test.general/2.1.0/Aspect.ttl
diff --git a/...catePropertyWithDifferentPayloadNames.ttl → ...catePropertyWithDifferentPayloadNames.ttl b/...catePropertyWithDifferentPayloadNames.ttl → ...catePropertyWithDifferentPayloadNames.ttl
diff --git a/...tWithDuplicatePropertyWithPayloadName.ttl → ...tWithDuplicatePropertyWithPayloadName.ttl b/...tWithDuplicatePropertyWithPayloadName.ttl → ...tWithDuplicatePropertyWithPayloadName.ttl
diff --git a/...f.test.general/2.1.0/AspectWithEither.ttl → ...f.test.general/2.1.0/AspectWithEither.ttl b/...f.test.general/2.1.0/AspectWithEither.ttl → ...f.test.general/2.1.0/AspectWithEither.ttl
diff --git a/...tWithExtendingPropertyWithPayloadName.ttl → ...tWithExtendingPropertyWithPayloadName.ttl b/...tWithExtendingPropertyWithPayloadName.ttl → ...tWithExtendingPropertyWithPayloadName.ttl
diff --git a/...al/2.1.0/AspectWithMultipleAttributes.ttl → ...al/2.1.0/AspectWithMultipleAttributes.ttl b/...al/2.1.0/AspectWithMultipleAttributes.ttl → ...al/2.1.0/AspectWithMultipleAttributes.ttl
diff --git a/...est.general/2.1.0/AspectWithOperation.ttl → ...est.general/2.1.0/AspectWithOperation.ttl b/...est.general/2.1.0/AspectWithOperation.ttl → ...est.general/2.1.0/AspectWithOperation.ttl
diff --git a/...ral/2.1.0/AspectWithOperationNoOutput.ttl → ...ral/2.1.0/AspectWithOperationNoOutput.ttl b/...ral/2.1.0/AspectWithOperationNoOutput.ttl → ...ral/2.1.0/AspectWithOperationNoOutput.ttl
diff --git a/...ctWithOptionalPropertyWithPayloadName.ttl → ...ctWithOptionalPropertyWithPayloadName.ttl b/...ctWithOptionalPropertyWithPayloadName.ttl → ...ctWithOptionalPropertyWithPayloadName.ttl
diff --git a/...st.general/2.1.0/AspectWithProperties.ttl → ...st.general/2.1.0/AspectWithProperties.ttl b/...st.general/2.1.0/AspectWithProperties.ttl → ...st.general/2.1.0/AspectWithProperties.ttl
diff --git a/...test.general/2.1.0/AspectWithProperty.ttl → ...test.general/2.1.0/AspectWithProperty.ttl b/...test.general/2.1.0/AspectWithProperty.ttl → ...test.general/2.1.0/AspectWithProperty.ttl
diff --git a/.../AspectWithPropertyMultipleReferences.ttl → .../AspectWithPropertyMultipleReferences.ttl b/.../AspectWithPropertyMultipleReferences.ttl → .../AspectWithPropertyMultipleReferences.ttl
diff --git a/...pectWithPropertyWithAllBaseAttributes.ttl → ...pectWithPropertyWithAllBaseAttributes.ttl b/...pectWithPropertyWithAllBaseAttributes.ttl → ...pectWithPropertyWithAllBaseAttributes.ttl
diff --git a/...1.0/AspectWithPropertyWithPayloadName.ttl → ...1.0/AspectWithPropertyWithPayloadName.ttl b/...1.0/AspectWithPropertyWithPayloadName.ttl → ...1.0/AspectWithPropertyWithPayloadName.ttl
diff --git a/...ipse.esmf.test.general/2.1.0/Movement.ttl → ...ipse.esmf.test.general/2.1.0/Movement.ttl b/...ipse.esmf.test.general/2.1.0/Movement.ttl → ...ipse.esmf.test.general/2.1.0/Movement.ttl
diff --git a/...test.general/2.1.0/ProductType_shared.ttl → ...test.general/2.1.0/ProductType_shared.ttl b/...test.general/2.1.0/ProductType_shared.ttl → ...test.general/2.1.0/ProductType_shared.ttl
diff --git a/....esmf.test.general/2.1.0/ProductTypes.ttl → ....esmf.test.general/2.1.0/ProductTypes.ttl b/....esmf.test.general/2.1.0/ProductTypes.ttl → ....esmf.test.general/2.1.0/ProductTypes.ttl
diff --git a/...references/2.1.0/AspectWithReferences.ttl → ...references/2.1.0/AspectWithReferences.ttl b/...references/2.1.0/AspectWithReferences.ttl → ...references/2.1.0/AspectWithReferences.ttl
diff --git a/...ral_with_references/2.1.0/Part_shared.ttl → ...ral_with_references/2.1.0/Part_shared.ttl b/...ral_with_references/2.1.0/Part_shared.ttl → ...ral_with_references/2.1.0/Part_shared.ttl
diff --git a/...pse.esmf.test.types/2.1.0/type_shared.ttl → ...pse.esmf.test.types/2.1.0/type_shared.ttl b/...pse.esmf.test.types/2.1.0/type_shared.ttl → ...pse.esmf.test.types/2.1.0/type_shared.ttl
diff --git a/.../integration/test_aspect_functionality.py → ...model_loader/test_aspect_functionality.py b/.../integration/test_aspect_functionality.py → ...model_loader/test_aspect_functionality.py
@@ -14,7 +14,7 @@
 
 from esmf_aspect_meta_model_python import BaseImpl, SAMMGraph
 
-RESOURCE_PATH = getcwd() / Path("tests/integration/resources/org.eclipse.esmf.test.general/2.1.0")
+RESOURCE_PATH = getcwd() / Path("tests/integration/aspect_model_loader/resources/org.eclipse.esmf.test.general/2.1.0")
 
 
 def test_get_access_path():

diff --git a/...tests/integration/test_characteristics.py → ...pect_model_loader/test_characteristics.py b/...tests/integration/test_characteristics.py → ...pect_model_loader/test_characteristics.py
@@ -25,7 +25,9 @@
     StructuredValue,
 )
 
-RESOURCE_PATH = getcwd() / Path("tests/integration/resources/org.eclipse.esmf.test.characteristics/2.1.0")
+RESOURCE_PATH = getcwd() / Path(
+    "tests/integration/aspect_model_loader/resources/org.eclipse.esmf.test.characteristics/2.1.0"
+)
 
 
 def test_loading_aspect_with_collection():

diff --git a/...hon/tests/integration/test_constraints.py → ...n/aspect_model_loader/test_constraints.py b/...hon/tests/integration/test_constraints.py → ...n/aspect_model_loader/test_constraints.py
@@ -27,7 +27,9 @@
     Trait,
 )
 
-RESOURCE_PATH = getcwd() / Path("tests/integration/resources/org.eclipse.esmf.test.constraints/2.1.0")
+RESOURCE_PATH = getcwd() / Path(
+    "tests/integration/aspect_model_loader/resources/org.eclipse.esmf.test.constraints/2.1.0"
+)
 
 
 def test_loading_aspect_with_constrained_collection():

diff --git a/...python/tests/integration/test_entities.py → ...tion/aspect_model_loader/test_entities.py b/...python/tests/integration/test_entities.py → ...tion/aspect_model_loader/test_entities.py
@@ -14,7 +14,7 @@
 
 from esmf_aspect_meta_model_python import AbstractEntity, ComplexType, Enumeration, Quantifiable, SAMMGraph
 
-RESOURCE_PATH = getcwd() / Path("tests/integration/resources/org.eclipse.esmf.test.entity/2.1.0")
+RESOURCE_PATH = getcwd() / Path("tests/integration/aspect_model_loader/resources/org.eclipse.esmf.test.entity/2.1.0")
 
 
 def test_loading_aspect_with_entity_enum():

diff --git a/...el-python/tests/integration/test_event.py → ...gration/aspect_model_loader/test_event.py b/...el-python/tests/integration/test_event.py → ...gration/aspect_model_loader/test_event.py
@@ -14,7 +14,7 @@
 
 from esmf_aspect_meta_model_python import Event, SAMMGraph
 
-RESOURCE_PATH = getcwd() / Path("tests/integration/resources/org.eclipse.esmf.test.event/2.1.0")
+RESOURCE_PATH = getcwd() / Path("tests/integration/aspect_model_loader/resources/org.eclipse.esmf.test.event/2.1.0")
 
 
 def test_loading_aspect_with_event() -> None:

diff --git a/...-python/tests/integration/test_general.py → ...ation/aspect_model_loader/test_general.py b/...-python/tests/integration/test_general.py → ...ation/aspect_model_loader/test_general.py
@@ -14,7 +14,7 @@
 
 from esmf_aspect_meta_model_python import BaseImpl, ComplexType, Either, SAMMGraph
 
-RESOURCE_PATH = getcwd() / Path("tests/integration/resources/org.eclipse.esmf.test.general/2.1.0")
+RESOURCE_PATH = getcwd() / Path("tests/integration/aspect_model_loader/resources/org.eclipse.esmf.test.general/2.1.0")
 
 
 def test_aspect_with_multiple_attributes():

diff --git a/...tion/test_resolve_elements_referencies.py → ...ader/test_resolve_elements_referencies.py b/...tion/test_resolve_elements_referencies.py → ...ader/test_resolve_elements_referencies.py
@@ -14,7 +14,9 @@
 
 from esmf_aspect_meta_model_python import SAMMGraph
 
-RESOURCE_PATH = getcwd() / Path("tests/integration/resources/org.eclipse.esmf.test.general_with_references/2.1.0")
+RESOURCE_PATH = getcwd() / Path(
+    "tests/integration/aspect_model_loader/resources/org.eclipse.esmf.test.general_with_references/2.1.0"
+)
 
 
 def test_resolve_elements_references():

diff --git a/...thon/tests/integration/test_subclasses.py → ...on/aspect_model_loader/test_subclasses.py b/...thon/tests/integration/test_subclasses.py → ...on/aspect_model_loader/test_subclasses.py
diff --git a/...thon/tests/integration/test_vocabulary.py → ...on/aspect_model_loader/test_vocabulary.py b/...thon/tests/integration/test_vocabulary.py → ...on/aspect_model_loader/test_vocabulary.py