diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index acd457302d..06e619a970 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -4,7 +4,7 @@ * @equinor/ecalc-ops-team # eCalc Lib -/src/ecalc/ @equinor/ecalc-core-library-team +/src/ @equinor/ecalc-core-library-team # Examples /examples/ @equinor/ecalc-core-library-team diff --git a/.github/workflows/docs-ci.yml b/.github/workflows/docs-ci.yml index 6e4e50fd2a..a2c2548b78 100644 --- a/.github/workflows/docs-ci.yml +++ b/.github/workflows/docs-ci.yml @@ -31,8 +31,8 @@ jobs: - name: Generate CLI reference run: | - cd src/ecalc/cli - poetry run python generate_docs.py > ../../../docs/docs/about/references/cli_reference.md + cd src + poetry run python generate_docs.py > ../docs/docs/about/references/cli_reference.md - name: Setup node uses: actions/setup-node@v3 diff --git a/.github/workflows/docs-publish.yml b/.github/workflows/docs-publish.yml index 9c55fda498..051f29a879 100644 --- a/.github/workflows/docs-publish.yml +++ b/.github/workflows/docs-publish.yml @@ -34,8 +34,8 @@ jobs: - name: Generate CLI reference run: | - cd src/ecalc/cli - poetry run python generate_docs.py > ../../../docs/docs/about/references/cli_reference.md + cd src + poetry run python generate_docs.py > ../docs/docs/about/references/cli_reference.md - name: Setup node uses: actions/setup-node@v3 diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 44bd015e58..2cba9af617 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -42,7 +42,7 @@ jobs: changelog-types: '[{ "type": "feat", "section": "Features", "hidden": false },{ "type": "feature", "section": "Features", "hidden": false },{ "type": "fix", "section": "Bug Fixes", "hidden": false },{ "type": "perf", "section": "Performance Improvements", "hidden": false },{ "type": "revert", "section": "Reverts", "hidden": false },{ "type": "docs", "section": "Documentation", "hidden": false },{ "type": "style", "section": "Styles", "hidden": false },{ "type": "chore", "section": "Miscellaneous Chores", "hidden": false },{ "type": "refactor", "section": "Code Refactoring", "hidden": false },{ "type": "test", "section": "Tests", "hidden": false },{ "type": "build", "section": "Build System", "hidden": false },{ "type": "ci", "section": "Continuous Integration", "hidden": false }]' extra-files: | pyproject.toml - src/ecalc/libraries/libecalc/common/libecalc/version.py + src/libecalc/common/version.py - uses: actions/checkout@v2 - name: Create vX.Y release branch (for simpler patching) - if normal release (not patching) if: ${{ steps.release.outputs.release_created && env.VERSIONING_STRATEGY != 'always-bump-patch' }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 609ad370ba..672699cb68 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -28,7 +28,7 @@ repos: rev: v1.4.1 hooks: - id: mypy - files: ^(src/ecalc/) + files: ^(src/) exclude: tests|conftest.py args: ['--config-file=./pyproject.toml'] additional_dependencies: diff --git a/Dockerfile b/Dockerfile index b447401acc..25b956465c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ FROM dev AS build COPY . . RUN python3 -m venv $VIRTUAL_ENV && poetry install -WORKDIR /project/libecalc/src/ecalc/ +WORKDIR /project/libecalc/src/ FROM dev as dist diff --git a/docs/README.md b/docs/README.md index 3690de524e..ab24679b42 100644 --- a/docs/README.md +++ b/docs/README.md @@ -114,10 +114,10 @@ $ npm run serve ``` ### Generate CLI reference documentation -In order to generate the CLI reference documentation, use the following (from `src/ecalc/cli`): +In order to generate the CLI reference documentation, use the following (from `src`): ``` -$ cd src/ecalc/cli -$ poetry run python generate_docs.py > ../../../docs/docs/about/references/cli_reference.md +$ cd src +$ poetry run python generate_docs.py > ../docs/docs/about/references/cli_reference.md ``` Then build the documentation: diff --git a/pyproject.toml b/pyproject.toml index c3e6aac42d..340bc87225 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,12 +29,6 @@ classifiers=[ "Natural Language :: English", "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", ] -packages = [ - { include = "cli", from = "src/ecalc/cli" }, - { include = "neqsim_ecalc_wrapper", from = "src/ecalc/libraries/neqsim" }, - { include = "libecalc", from = "src/ecalc/libraries/libecalc/common" }, - { include = "libecalc", from = "src/ecalc/libraries/libecalc/fixtures" }, -] [tool.poetry.scripts] ecalc = 'cli.main:main' diff --git a/src/ecalc/cli/cli/commands/__init__.py b/src/cli/commands/__init__.py similarity index 100% rename from src/ecalc/cli/cli/commands/__init__.py rename to src/cli/commands/__init__.py diff --git a/src/ecalc/cli/cli/commands/run.py b/src/cli/commands/run.py similarity index 100% rename from src/ecalc/cli/cli/commands/run.py rename to src/cli/commands/run.py diff --git a/src/ecalc/cli/cli/commands/selftest.py b/src/cli/commands/selftest.py similarity index 97% rename from src/ecalc/cli/cli/commands/selftest.py rename to src/cli/commands/selftest.py index d424baf42e..287dea0a49 100644 --- a/src/ecalc/cli/cli/commands/selftest.py +++ b/src/cli/commands/selftest.py @@ -1,4 +1,3 @@ -import libecalc.common.time_utils import libecalc.version from cli.logger import logger from neqsim_ecalc_wrapper import start_server diff --git a/src/ecalc/cli/cli/commands/show.py b/src/cli/commands/show.py similarity index 100% rename from src/ecalc/cli/cli/commands/show.py rename to src/cli/commands/show.py diff --git a/src/ecalc/cli/cli/errors.py b/src/cli/errors.py similarity index 100% rename from src/ecalc/cli/cli/errors.py rename to src/cli/errors.py diff --git a/src/ecalc/cli/cli/io/__init__.py b/src/cli/io/__init__.py similarity index 100% rename from src/ecalc/cli/cli/io/__init__.py rename to src/cli/io/__init__.py diff --git a/src/ecalc/cli/cli/io/cache.py b/src/cli/io/cache.py similarity index 100% rename from src/ecalc/cli/cli/io/cache.py rename to src/cli/io/cache.py diff --git a/src/ecalc/cli/cli/io/output.py b/src/cli/io/output.py similarity index 100% rename from src/ecalc/cli/cli/io/output.py rename to src/cli/io/output.py diff --git a/src/ecalc/cli/cli/logger.py b/src/cli/logger.py similarity index 100% rename from src/ecalc/cli/cli/logger.py rename to src/cli/logger.py diff --git a/src/ecalc/cli/cli/main.py b/src/cli/main.py similarity index 100% rename from src/ecalc/cli/cli/main.py rename to src/cli/main.py diff --git a/src/ecalc/cli/cli/types.py b/src/cli/types.py similarity index 100% rename from src/ecalc/cli/cli/types.py rename to src/cli/types.py diff --git a/src/ecalc/libraries/neqsim/tests/__init__.py b/src/ecalc/libraries/neqsim/tests/__init__.py deleted file mode 100644 index c22e376825..0000000000 --- a/src/ecalc/libraries/neqsim/tests/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .conftest import heavy_fluid, light_fluid, medium_fluid diff --git a/src/ecalc/cli/generate_docs.py b/src/generate_docs.py similarity index 100% rename from src/ecalc/cli/generate_docs.py rename to src/generate_docs.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/__init__.py b/src/libecalc/common/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/__init__.py rename to src/libecalc/common/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/capturer.py b/src/libecalc/common/capturer.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/capturer.py rename to src/libecalc/common/capturer.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/component_info/__init__.py b/src/libecalc/common/component_info/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/component_info/__init__.py rename to src/libecalc/common/component_info/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/component_info/component_level.py b/src/libecalc/common/component_info/component_level.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/component_info/component_level.py rename to src/libecalc/common/component_info/component_level.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/component_info/compressor.py b/src/libecalc/common/component_info/compressor.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/component_info/compressor.py rename to src/libecalc/common/component_info/compressor.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/exceptions.py b/src/libecalc/common/exceptions.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/exceptions.py rename to src/libecalc/common/exceptions.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/feature_flags.py b/src/libecalc/common/feature_flags.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/feature_flags.py rename to src/libecalc/common/feature_flags.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/io/__init__.py b/src/libecalc/common/io/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/io/__init__.py rename to src/libecalc/common/io/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/io/utils.py b/src/libecalc/common/io/utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/io/utils.py rename to src/libecalc/common/io/utils.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/list_utils.py b/src/libecalc/common/list_utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/list_utils.py rename to src/libecalc/common/list_utils.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/logger.py b/src/libecalc/common/logger.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/logger.py rename to src/libecalc/common/logger.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/numbers.py b/src/libecalc/common/numbers.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/numbers.py rename to src/libecalc/common/numbers.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/run_info.py b/src/libecalc/common/run_info.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/run_info.py rename to src/libecalc/common/run_info.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/string_utils.py b/src/libecalc/common/string_utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/string_utils.py rename to src/libecalc/common/string_utils.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/temporal_model.py b/src/libecalc/common/temporal_model.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/temporal_model.py rename to src/libecalc/common/temporal_model.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/time_utils.py b/src/libecalc/common/time_utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/time_utils.py rename to src/libecalc/common/time_utils.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/units.py b/src/libecalc/common/units.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/units.py rename to src/libecalc/common/units.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/utils/adjustment.py b/src/libecalc/common/utils/adjustment.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/utils/adjustment.py rename to src/libecalc/common/utils/adjustment.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/utils/calculate_emission_intensity.py b/src/libecalc/common/utils/calculate_emission_intensity.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/utils/calculate_emission_intensity.py rename to src/libecalc/common/utils/calculate_emission_intensity.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/utils/math_utils.py b/src/libecalc/common/utils/math_utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/utils/math_utils.py rename to src/libecalc/common/utils/math_utils.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/utils/rates.py b/src/libecalc/common/utils/rates.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/utils/rates.py rename to src/libecalc/common/utils/rates.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/version.py b/src/libecalc/common/version.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/common/version.py rename to src/libecalc/common/version.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/__init__.py b/src/libecalc/core/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/__init__.py rename to src/libecalc/core/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/__init__.py b/src/libecalc/core/consumers/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/__init__.py rename to src/libecalc/core/consumers/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/base/__init__.py b/src/libecalc/core/consumers/base/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/base/__init__.py rename to src/libecalc/core/consumers/base/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/base/component.py b/src/libecalc/core/consumers/base/component.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/base/component.py rename to src/libecalc/core/consumers/base/component.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/compressor/__init__.py b/src/libecalc/core/consumers/compressor/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/compressor/__init__.py rename to src/libecalc/core/consumers/compressor/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/compressor/component.py b/src/libecalc/core/consumers/compressor/component.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/compressor/component.py rename to src/libecalc/core/consumers/compressor/component.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/consumer_system.py b/src/libecalc/core/consumers/consumer_system.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/consumer_system.py rename to src/libecalc/core/consumers/consumer_system.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/direct_emitter.py b/src/libecalc/core/consumers/direct_emitter.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/direct_emitter.py rename to src/libecalc/core/consumers/direct_emitter.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/factory.py b/src/libecalc/core/consumers/factory.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/factory.py rename to src/libecalc/core/consumers/factory.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/generator_set.py b/src/libecalc/core/consumers/generator_set.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/generator_set.py rename to src/libecalc/core/consumers/generator_set.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/__init__.py b/src/libecalc/core/consumers/legacy_consumer/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/__init__.py rename to src/libecalc/core/consumers/legacy_consumer/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/component.py b/src/libecalc/core/consumers/legacy_consumer/component.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/component.py rename to src/libecalc/core/consumers/legacy_consumer/component.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/__init__.py b/src/libecalc/core/consumers/legacy_consumer/consumer_function/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/__init__.py rename to src/libecalc/core/consumers/legacy_consumer/consumer_function/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/compressor_consumer_function.py b/src/libecalc/core/consumers/legacy_consumer/consumer_function/compressor_consumer_function.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/compressor_consumer_function.py rename to src/libecalc/core/consumers/legacy_consumer/consumer_function/compressor_consumer_function.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/consumer_function.py b/src/libecalc/core/consumers/legacy_consumer/consumer_function/consumer_function.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/consumer_function.py rename to src/libecalc/core/consumers/legacy_consumer/consumer_function/consumer_function.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/consumer_tabular_energy_function.py b/src/libecalc/core/consumers/legacy_consumer/consumer_function/consumer_tabular_energy_function.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/consumer_tabular_energy_function.py rename to src/libecalc/core/consumers/legacy_consumer/consumer_function/consumer_tabular_energy_function.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/direct_expression_consumer_function.py b/src/libecalc/core/consumers/legacy_consumer/consumer_function/direct_expression_consumer_function.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/direct_expression_consumer_function.py rename to src/libecalc/core/consumers/legacy_consumer/consumer_function/direct_expression_consumer_function.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/pump_consumer_function.py b/src/libecalc/core/consumers/legacy_consumer/consumer_function/pump_consumer_function.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/pump_consumer_function.py rename to src/libecalc/core/consumers/legacy_consumer/consumer_function/pump_consumer_function.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/results.py b/src/libecalc/core/consumers/legacy_consumer/consumer_function/results.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/results.py rename to src/libecalc/core/consumers/legacy_consumer/consumer_function/results.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/types.py b/src/libecalc/core/consumers/legacy_consumer/consumer_function/types.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/types.py rename to src/libecalc/core/consumers/legacy_consumer/consumer_function/types.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/utils.py b/src/libecalc/core/consumers/legacy_consumer/consumer_function/utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function/utils.py rename to src/libecalc/core/consumers/legacy_consumer/consumer_function/utils.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/__init__.py b/src/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/__init__.py rename to src/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/compressor_consumer_function.py b/src/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/compressor_consumer_function.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/compressor_consumer_function.py rename to src/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/compressor_consumer_function.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/compressor_system_consumer_function.py b/src/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/compressor_system_consumer_function.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/compressor_system_consumer_function.py rename to src/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/compressor_system_consumer_function.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/direct_consumer_function.py b/src/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/direct_consumer_function.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/direct_consumer_function.py rename to src/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/direct_consumer_function.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/pump_consumer_function.py b/src/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/pump_consumer_function.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/pump_consumer_function.py rename to src/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/pump_consumer_function.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/pump_system_consumer_function.py b/src/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/pump_system_consumer_function.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/pump_system_consumer_function.py rename to src/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/pump_system_consumer_function.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/tabulated.py b/src/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/tabulated.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/tabulated.py rename to src/libecalc/core/consumers/legacy_consumer/consumer_function_mapper/tabulated.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/result_mapper.py b/src/libecalc/core/consumers/legacy_consumer/result_mapper.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/result_mapper.py rename to src/libecalc/core/consumers/legacy_consumer/result_mapper.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/system/__init__.py b/src/libecalc/core/consumers/legacy_consumer/system/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/system/__init__.py rename to src/libecalc/core/consumers/legacy_consumer/system/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/system/consumer_function.py b/src/libecalc/core/consumers/legacy_consumer/system/consumer_function.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/system/consumer_function.py rename to src/libecalc/core/consumers/legacy_consumer/system/consumer_function.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/system/operational_setting.py b/src/libecalc/core/consumers/legacy_consumer/system/operational_setting.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/system/operational_setting.py rename to src/libecalc/core/consumers/legacy_consumer/system/operational_setting.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/system/results.py b/src/libecalc/core/consumers/legacy_consumer/system/results.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/system/results.py rename to src/libecalc/core/consumers/legacy_consumer/system/results.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/system/types.py b/src/libecalc/core/consumers/legacy_consumer/system/types.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/system/types.py rename to src/libecalc/core/consumers/legacy_consumer/system/types.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/system/utils.py b/src/libecalc/core/consumers/legacy_consumer/system/utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/legacy_consumer/system/utils.py rename to src/libecalc/core/consumers/legacy_consumer/system/utils.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/pump/__init__.py b/src/libecalc/core/consumers/pump/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/pump/__init__.py rename to src/libecalc/core/consumers/pump/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/pump/component.py b/src/libecalc/core/consumers/pump/component.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/consumers/pump/component.py rename to src/libecalc/core/consumers/pump/component.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/ecalc.py b/src/libecalc/core/ecalc.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/ecalc.py rename to src/libecalc/core/ecalc.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/graph_result.py b/src/libecalc/core/graph_result.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/graph_result.py rename to src/libecalc/core/graph_result.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/__init__.py b/src/libecalc/core/models/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/__init__.py rename to src/libecalc/core/models/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/base.py b/src/libecalc/core/models/base.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/base.py rename to src/libecalc/core/models/base.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/chart/__init__.py b/src/libecalc/core/models/chart/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/chart/__init__.py rename to src/libecalc/core/models/chart/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/chart/base.py b/src/libecalc/core/models/chart/base.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/chart/base.py rename to src/libecalc/core/models/chart/base.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/chart/single_speed_chart.py b/src/libecalc/core/models/chart/single_speed_chart.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/chart/single_speed_chart.py rename to src/libecalc/core/models/chart/single_speed_chart.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/chart/variable_speed_chart.py b/src/libecalc/core/models/chart/variable_speed_chart.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/chart/variable_speed_chart.py rename to src/libecalc/core/models/chart/variable_speed_chart.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/__init__.py b/src/libecalc/core/models/compressor/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/__init__.py rename to src/libecalc/core/models/compressor/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/base.py b/src/libecalc/core/models/compressor/base.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/base.py rename to src/libecalc/core/models/compressor/base.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/factory.py b/src/libecalc/core/models/compressor/factory.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/factory.py rename to src/libecalc/core/models/compressor/factory.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/results.py b/src/libecalc/core/models/compressor/results.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/results.py rename to src/libecalc/core/models/compressor/results.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/sampled/__init__.py b/src/libecalc/core/models/compressor/sampled/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/sampled/__init__.py rename to src/libecalc/core/models/compressor/sampled/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/sampled/compressor_model_sampled.py b/src/libecalc/core/models/compressor/sampled/compressor_model_sampled.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/sampled/compressor_model_sampled.py rename to src/libecalc/core/models/compressor/sampled/compressor_model_sampled.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/sampled/compressor_model_sampled_1d.py b/src/libecalc/core/models/compressor/sampled/compressor_model_sampled_1d.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/sampled/compressor_model_sampled_1d.py rename to src/libecalc/core/models/compressor/sampled/compressor_model_sampled_1d.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/sampled/compressor_model_sampled_2d.py b/src/libecalc/core/models/compressor/sampled/compressor_model_sampled_2d.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/sampled/compressor_model_sampled_2d.py rename to src/libecalc/core/models/compressor/sampled/compressor_model_sampled_2d.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/sampled/compressor_model_sampled_3d.py b/src/libecalc/core/models/compressor/sampled/compressor_model_sampled_3d.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/sampled/compressor_model_sampled_3d.py rename to src/libecalc/core/models/compressor/sampled/compressor_model_sampled_3d.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/sampled/constants.py b/src/libecalc/core/models/compressor/sampled/constants.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/sampled/constants.py rename to src/libecalc/core/models/compressor/sampled/constants.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/sampled/convex_hull_common.py b/src/libecalc/core/models/compressor/sampled/convex_hull_common.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/sampled/convex_hull_common.py rename to src/libecalc/core/models/compressor/sampled/convex_hull_common.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/__init__.py b/src/libecalc/core/models/compressor/train/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/__init__.py rename to src/libecalc/core/models/compressor/train/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/base.py b/src/libecalc/core/models/compressor/train/base.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/base.py rename to src/libecalc/core/models/compressor/train/base.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/chart/__init__.py b/src/libecalc/core/models/compressor/train/chart/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/chart/__init__.py rename to src/libecalc/core/models/compressor/train/chart/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/chart/chart_creator.py b/src/libecalc/core/models/compressor/train/chart/chart_creator.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/chart/chart_creator.py rename to src/libecalc/core/models/compressor/train/chart/chart_creator.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/chart/generic_chart_data.py b/src/libecalc/core/models/compressor/train/chart/generic_chart_data.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/chart/generic_chart_data.py rename to src/libecalc/core/models/compressor/train/chart/generic_chart_data.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/chart/single_speed_compressor_chart.py b/src/libecalc/core/models/compressor/train/chart/single_speed_compressor_chart.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/chart/single_speed_compressor_chart.py rename to src/libecalc/core/models/compressor/train/chart/single_speed_compressor_chart.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/chart/types.py b/src/libecalc/core/models/compressor/train/chart/types.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/chart/types.py rename to src/libecalc/core/models/compressor/train/chart/types.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/chart/variable_speed_compressor_chart.py b/src/libecalc/core/models/compressor/train/chart/variable_speed_compressor_chart.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/chart/variable_speed_compressor_chart.py rename to src/libecalc/core/models/compressor/train/chart/variable_speed_compressor_chart.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/fluid.py b/src/libecalc/core/models/compressor/train/fluid.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/fluid.py rename to src/libecalc/core/models/compressor/train/fluid.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/simplified_train.py b/src/libecalc/core/models/compressor/train/simplified_train.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/simplified_train.py rename to src/libecalc/core/models/compressor/train/simplified_train.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/single_speed_compressor_train_common_shaft.py b/src/libecalc/core/models/compressor/train/single_speed_compressor_train_common_shaft.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/single_speed_compressor_train_common_shaft.py rename to src/libecalc/core/models/compressor/train/single_speed_compressor_train_common_shaft.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/stage.py b/src/libecalc/core/models/compressor/train/stage.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/stage.py rename to src/libecalc/core/models/compressor/train/stage.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/types.py b/src/libecalc/core/models/compressor/train/types.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/types.py rename to src/libecalc/core/models/compressor/train/types.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/utils/__init__.py b/src/libecalc/core/models/compressor/train/utils/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/utils/__init__.py rename to src/libecalc/core/models/compressor/train/utils/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/utils/common.py b/src/libecalc/core/models/compressor/train/utils/common.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/utils/common.py rename to src/libecalc/core/models/compressor/train/utils/common.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/utils/enthalpy_calculations.py b/src/libecalc/core/models/compressor/train/utils/enthalpy_calculations.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/utils/enthalpy_calculations.py rename to src/libecalc/core/models/compressor/train/utils/enthalpy_calculations.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/utils/numeric_methods.py b/src/libecalc/core/models/compressor/train/utils/numeric_methods.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/utils/numeric_methods.py rename to src/libecalc/core/models/compressor/train/utils/numeric_methods.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/utils/variable_speed_compressor_train_common_shaft.py b/src/libecalc/core/models/compressor/train/utils/variable_speed_compressor_train_common_shaft.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/utils/variable_speed_compressor_train_common_shaft.py rename to src/libecalc/core/models/compressor/train/utils/variable_speed_compressor_train_common_shaft.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/variable_speed_compressor_train_common_shaft.py b/src/libecalc/core/models/compressor/train/variable_speed_compressor_train_common_shaft.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/variable_speed_compressor_train_common_shaft.py rename to src/libecalc/core/models/compressor/train/variable_speed_compressor_train_common_shaft.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/variable_speed_compressor_train_common_shaft_multiple_streams_and_pressures.py b/src/libecalc/core/models/compressor/train/variable_speed_compressor_train_common_shaft_multiple_streams_and_pressures.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/train/variable_speed_compressor_train_common_shaft_multiple_streams_and_pressures.py rename to src/libecalc/core/models/compressor/train/variable_speed_compressor_train_common_shaft_multiple_streams_and_pressures.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/utils.py b/src/libecalc/core/models/compressor/utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/compressor/utils.py rename to src/libecalc/core/models/compressor/utils.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/fuel.py b/src/libecalc/core/models/fuel.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/fuel.py rename to src/libecalc/core/models/fuel.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/generator.py b/src/libecalc/core/models/generator.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/generator.py rename to src/libecalc/core/models/generator.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/pump/__init__.py b/src/libecalc/core/models/pump/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/pump/__init__.py rename to src/libecalc/core/models/pump/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/pump/factory.py b/src/libecalc/core/models/pump/factory.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/pump/factory.py rename to src/libecalc/core/models/pump/factory.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/pump/pump.py b/src/libecalc/core/models/pump/pump.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/pump/pump.py rename to src/libecalc/core/models/pump/pump.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/results/__init__.py b/src/libecalc/core/models/results/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/results/__init__.py rename to src/libecalc/core/models/results/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/results/base.py b/src/libecalc/core/models/results/base.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/results/base.py rename to src/libecalc/core/models/results/base.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/results/compressor.py b/src/libecalc/core/models/results/compressor.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/results/compressor.py rename to src/libecalc/core/models/results/compressor.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/results/generic.py b/src/libecalc/core/models/results/generic.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/results/generic.py rename to src/libecalc/core/models/results/generic.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/results/pump.py b/src/libecalc/core/models/results/pump.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/results/pump.py rename to src/libecalc/core/models/results/pump.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/results/turbine.py b/src/libecalc/core/models/results/turbine.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/results/turbine.py rename to src/libecalc/core/models/results/turbine.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/tabulated.py b/src/libecalc/core/models/tabulated.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/tabulated.py rename to src/libecalc/core/models/tabulated.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/models/turbine.py b/src/libecalc/core/models/turbine.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/models/turbine.py rename to src/libecalc/core/models/turbine.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/result/__init__.py b/src/libecalc/core/result/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/result/__init__.py rename to src/libecalc/core/result/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/result/base.py b/src/libecalc/core/result/base.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/result/base.py rename to src/libecalc/core/result/base.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/result/emission.py b/src/libecalc/core/result/emission.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/result/emission.py rename to src/libecalc/core/result/emission.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/result/results.py b/src/libecalc/core/result/results.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/core/result/results.py rename to src/libecalc/core/result/results.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/__init__.py b/src/libecalc/dto/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/__init__.py rename to src/libecalc/dto/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/base.py b/src/libecalc/dto/base.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/base.py rename to src/libecalc/dto/base.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/components.py b/src/libecalc/dto/components.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/components.py rename to src/libecalc/dto/components.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/__init__.py b/src/libecalc/dto/core_specs/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/__init__.py rename to src/libecalc/dto/core_specs/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/base/__init__.py b/src/libecalc/dto/core_specs/base/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/base/__init__.py rename to src/libecalc/dto/core_specs/base/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/base/operational_settings.py b/src/libecalc/dto/core_specs/base/operational_settings.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/base/operational_settings.py rename to src/libecalc/dto/core_specs/base/operational_settings.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/compressor/__init__.py b/src/libecalc/dto/core_specs/compressor/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/compressor/__init__.py rename to src/libecalc/dto/core_specs/compressor/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/compressor/operational_settings.py b/src/libecalc/dto/core_specs/compressor/operational_settings.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/compressor/operational_settings.py rename to src/libecalc/dto/core_specs/compressor/operational_settings.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/pump/__init__.py b/src/libecalc/dto/core_specs/pump/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/pump/__init__.py rename to src/libecalc/dto/core_specs/pump/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/pump/operational_settings.py b/src/libecalc/dto/core_specs/pump/operational_settings.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/pump/operational_settings.py rename to src/libecalc/dto/core_specs/pump/operational_settings.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/system/__init__.py b/src/libecalc/dto/core_specs/system/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/system/__init__.py rename to src/libecalc/dto/core_specs/system/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/system/operational_settings.py b/src/libecalc/dto/core_specs/system/operational_settings.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/core_specs/system/operational_settings.py rename to src/libecalc/dto/core_specs/system/operational_settings.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/ecalc_model.py b/src/libecalc/dto/ecalc_model.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/ecalc_model.py rename to src/libecalc/dto/ecalc_model.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/emission.py b/src/libecalc/dto/emission.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/emission.py rename to src/libecalc/dto/emission.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/graph.py b/src/libecalc/dto/graph.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/graph.py rename to src/libecalc/dto/graph.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/__init__.py b/src/libecalc/dto/models/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/__init__.py rename to src/libecalc/dto/models/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/base.py b/src/libecalc/dto/models/base.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/base.py rename to src/libecalc/dto/models/base.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/chart.py b/src/libecalc/dto/models/chart.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/chart.py rename to src/libecalc/dto/models/chart.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/compressor/__init__.py b/src/libecalc/dto/models/compressor/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/compressor/__init__.py rename to src/libecalc/dto/models/compressor/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/compressor/base.py b/src/libecalc/dto/models/compressor/base.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/compressor/base.py rename to src/libecalc/dto/models/compressor/base.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/compressor/chart.py b/src/libecalc/dto/models/compressor/chart.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/compressor/chart.py rename to src/libecalc/dto/models/compressor/chart.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/compressor/fluid.py b/src/libecalc/dto/models/compressor/fluid.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/compressor/fluid.py rename to src/libecalc/dto/models/compressor/fluid.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/compressor/sampled.py b/src/libecalc/dto/models/compressor/sampled.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/compressor/sampled.py rename to src/libecalc/dto/models/compressor/sampled.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/compressor/stage.py b/src/libecalc/dto/models/compressor/stage.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/compressor/stage.py rename to src/libecalc/dto/models/compressor/stage.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/compressor/train.py b/src/libecalc/dto/models/compressor/train.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/compressor/train.py rename to src/libecalc/dto/models/compressor/train.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/consumer_system.py b/src/libecalc/dto/models/consumer_system.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/consumer_system.py rename to src/libecalc/dto/models/consumer_system.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/direct.py b/src/libecalc/dto/models/direct.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/direct.py rename to src/libecalc/dto/models/direct.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/generator_set.py b/src/libecalc/dto/models/generator_set.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/generator_set.py rename to src/libecalc/dto/models/generator_set.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/pump.py b/src/libecalc/dto/models/pump.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/pump.py rename to src/libecalc/dto/models/pump.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/sampled.py b/src/libecalc/dto/models/sampled.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/sampled.py rename to src/libecalc/dto/models/sampled.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/tabulated.py b/src/libecalc/dto/models/tabulated.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/tabulated.py rename to src/libecalc/dto/models/tabulated.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/models/turbine.py b/src/libecalc/dto/models/turbine.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/models/turbine.py rename to src/libecalc/dto/models/turbine.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/node_info.py b/src/libecalc/dto/node_info.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/node_info.py rename to src/libecalc/dto/node_info.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/result/__init__.py b/src/libecalc/dto/result/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/result/__init__.py rename to src/libecalc/dto/result/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/result/base.py b/src/libecalc/dto/result/base.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/result/base.py rename to src/libecalc/dto/result/base.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/result/emission.py b/src/libecalc/dto/result/emission.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/result/emission.py rename to src/libecalc/dto/result/emission.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/result/results.py b/src/libecalc/dto/result/results.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/result/results.py rename to src/libecalc/dto/result/results.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/result/simple.py b/src/libecalc/dto/result/simple.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/result/simple.py rename to src/libecalc/dto/result/simple.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/result/tabular_time_series.py b/src/libecalc/dto/result/tabular_time_series.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/result/tabular_time_series.py rename to src/libecalc/dto/result/tabular_time_series.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/result/types.py b/src/libecalc/dto/result/types.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/result/types.py rename to src/libecalc/dto/result/types.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/result_options.py b/src/libecalc/dto/result_options.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/result_options.py rename to src/libecalc/dto/result_options.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/types.py b/src/libecalc/dto/types.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/types.py rename to src/libecalc/dto/types.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/utils/__init__.py b/src/libecalc/dto/utils/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/utils/__init__.py rename to src/libecalc/dto/utils/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/utils/aggregators.py b/src/libecalc/dto/utils/aggregators.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/utils/aggregators.py rename to src/libecalc/dto/utils/aggregators.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/utils/validators.py b/src/libecalc/dto/utils/validators.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/utils/validators.py rename to src/libecalc/dto/utils/validators.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/dto/variables.py b/src/libecalc/dto/variables.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/dto/variables.py rename to src/libecalc/dto/variables.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/__init__.py b/src/libecalc/examples/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/__init__.py rename to src/libecalc/examples/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/advanced/__init__.py b/src/libecalc/examples/advanced/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/advanced/__init__.py rename to src/libecalc/examples/advanced/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/advanced/base_profile.csv b/src/libecalc/examples/advanced/base_profile.csv similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/advanced/base_profile.csv rename to src/libecalc/examples/advanced/base_profile.csv diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/advanced/compressor_chart.csv b/src/libecalc/examples/advanced/compressor_chart.csv similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/advanced/compressor_chart.csv rename to src/libecalc/examples/advanced/compressor_chart.csv diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/advanced/compressor_sampled.csv b/src/libecalc/examples/advanced/compressor_sampled.csv similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/advanced/compressor_sampled.csv rename to src/libecalc/examples/advanced/compressor_sampled.csv diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/advanced/genset.csv b/src/libecalc/examples/advanced/genset.csv similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/advanced/genset.csv rename to src/libecalc/examples/advanced/genset.csv diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/advanced/model.yaml b/src/libecalc/examples/advanced/model.yaml similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/advanced/model.yaml rename to src/libecalc/examples/advanced/model.yaml diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/advanced/pump_chart.csv b/src/libecalc/examples/advanced/pump_chart.csv similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/advanced/pump_chart.csv rename to src/libecalc/examples/advanced/pump_chart.csv diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/simple/__init__.py b/src/libecalc/examples/simple/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/simple/__init__.py rename to src/libecalc/examples/simple/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/simple/compressor_sampled.csv b/src/libecalc/examples/simple/compressor_sampled.csv similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/simple/compressor_sampled.csv rename to src/libecalc/examples/simple/compressor_sampled.csv diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/simple/compressor_sampled_with_turbine.csv b/src/libecalc/examples/simple/compressor_sampled_with_turbine.csv similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/simple/compressor_sampled_with_turbine.csv rename to src/libecalc/examples/simple/compressor_sampled_with_turbine.csv diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/simple/genset.csv b/src/libecalc/examples/simple/genset.csv similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/simple/genset.csv rename to src/libecalc/examples/simple/genset.csv diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/simple/model.yaml b/src/libecalc/examples/simple/model.yaml similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/simple/model.yaml rename to src/libecalc/examples/simple/model.yaml diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/simple/model_duplicate_emissions_in_fuel.yaml b/src/libecalc/examples/simple/model_duplicate_emissions_in_fuel.yaml similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/simple/model_duplicate_emissions_in_fuel.yaml rename to src/libecalc/examples/simple/model_duplicate_emissions_in_fuel.yaml diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/simple/model_duplicate_names.yaml b/src/libecalc/examples/simple/model_duplicate_names.yaml similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/simple/model_duplicate_names.yaml rename to src/libecalc/examples/simple/model_duplicate_names.yaml diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/simple/model_multiple_energy_models_one_consumer.yaml b/src/libecalc/examples/simple/model_multiple_energy_models_one_consumer.yaml similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/simple/model_multiple_energy_models_one_consumer.yaml rename to src/libecalc/examples/simple/model_multiple_energy_models_one_consumer.yaml diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/simple/model_temporal.yaml b/src/libecalc/examples/simple/model_temporal.yaml similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/simple/model_temporal.yaml rename to src/libecalc/examples/simple/model_temporal.yaml diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/simple/production_data.csv b/src/libecalc/examples/simple/production_data.csv similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/simple/production_data.csv rename to src/libecalc/examples/simple/production_data.csv diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/simple/pump_chart.csv b/src/libecalc/examples/simple/pump_chart.csv similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/simple/pump_chart.csv rename to src/libecalc/examples/simple/pump_chart.csv diff --git a/src/ecalc/libraries/libecalc/common/libecalc/examples/simple/pump_sampled.csv b/src/libecalc/examples/simple/pump_sampled.csv similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/examples/simple/pump_sampled.csv rename to src/libecalc/examples/simple/pump_sampled.csv diff --git a/src/ecalc/libraries/libecalc/common/libecalc/expression/__init__.py b/src/libecalc/expression/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/expression/__init__.py rename to src/libecalc/expression/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/expression/expression.py b/src/libecalc/expression/expression.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/expression/expression.py rename to src/libecalc/expression/expression.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/expression/expression_evaluator.py b/src/libecalc/expression/expression_evaluator.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/expression/expression_evaluator.py rename to src/libecalc/expression/expression_evaluator.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/.gitignore b/src/libecalc/fixtures/.gitignore similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/.gitignore rename to src/libecalc/fixtures/.gitignore diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/__init__.py b/src/libecalc/fixtures/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/__init__.py rename to src/libecalc/fixtures/__init__.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/case_types.py b/src/libecalc/fixtures/case_types.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/case_types.py rename to src/libecalc/fixtures/case_types.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/case_utils.py b/src/libecalc/fixtures/case_utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/case_utils.py rename to src/libecalc/fixtures/case_utils.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/__init__.py b/src/libecalc/fixtures/cases/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/__init__.py rename to src/libecalc/fixtures/cases/__init__.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/__init__.py b/src/libecalc/fixtures/cases/all_energy_usage_models/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/__init__.py rename to src/libecalc/fixtures/cases/all_energy_usage_models/__init__.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/all_models_dto.py b/src/libecalc/fixtures/cases/all_energy_usage_models/all_models_dto.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/all_models_dto.py rename to src/libecalc/fixtures/cases/all_energy_usage_models/all_models_dto.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/conftest.py b/src/libecalc/fixtures/cases/all_energy_usage_models/conftest.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/conftest.py rename to src/libecalc/fixtures/cases/all_energy_usage_models/conftest.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/Archive.zip b/src/libecalc/fixtures/cases/all_energy_usage_models/data/Archive.zip similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/Archive.zip rename to src/libecalc/fixtures/cases/all_energy_usage_models/data/Archive.zip diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/all_energy_usage_models.yaml b/src/libecalc/fixtures/cases/all_energy_usage_models/data/all_energy_usage_models.yaml similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/all_energy_usage_models.yaml rename to src/libecalc/fixtures/cases/all_energy_usage_models/data/all_energy_usage_models.yaml diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/einput/compressor_sampled_1d.csv b/src/libecalc/fixtures/cases/all_energy_usage_models/data/einput/compressor_sampled_1d.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/einput/compressor_sampled_1d.csv rename to src/libecalc/fixtures/cases/all_energy_usage_models/data/einput/compressor_sampled_1d.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/einput/genset.csv b/src/libecalc/fixtures/cases/all_energy_usage_models/data/einput/genset.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/einput/genset.csv rename to src/libecalc/fixtures/cases/all_energy_usage_models/data/einput/genset.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/einput/predefined_compressor_chart_curves.csv b/src/libecalc/fixtures/cases/all_energy_usage_models/data/einput/predefined_compressor_chart_curves.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/einput/predefined_compressor_chart_curves.csv rename to src/libecalc/fixtures/cases/all_energy_usage_models/data/einput/predefined_compressor_chart_curves.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/einput/pump_tabular.csv b/src/libecalc/fixtures/cases/all_energy_usage_models/data/einput/pump_tabular.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/einput/pump_tabular.csv rename to src/libecalc/fixtures/cases/all_energy_usage_models/data/einput/pump_tabular.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/einput/pumpchart.csv b/src/libecalc/fixtures/cases/all_energy_usage_models/data/einput/pumpchart.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/einput/pumpchart.csv rename to src/libecalc/fixtures/cases/all_energy_usage_models/data/einput/pumpchart.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/einput/pumpchart_variable_speed.csv b/src/libecalc/fixtures/cases/all_energy_usage_models/data/einput/pumpchart_variable_speed.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/einput/pumpchart_variable_speed.csv rename to src/libecalc/fixtures/cases/all_energy_usage_models/data/einput/pumpchart_variable_speed.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/einput/tabular.csv b/src/libecalc/fixtures/cases/all_energy_usage_models/data/einput/tabular.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/einput/tabular.csv rename to src/libecalc/fixtures/cases/all_energy_usage_models/data/einput/tabular.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/sim/base_profile.csv b/src/libecalc/fixtures/cases/all_energy_usage_models/data/sim/base_profile.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/sim/base_profile.csv rename to src/libecalc/fixtures/cases/all_energy_usage_models/data/sim/base_profile.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/sim/flare.csv b/src/libecalc/fixtures/cases/all_energy_usage_models/data/sim/flare.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/all_energy_usage_models/data/sim/flare.csv rename to src/libecalc/fixtures/cases/all_energy_usage_models/data/sim/flare.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/consumer_system_v2/__init__.py b/src/libecalc/fixtures/cases/consumer_system_v2/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/consumer_system_v2/__init__.py rename to src/libecalc/fixtures/cases/consumer_system_v2/__init__.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/consumer_system_v2/consumer_system_v2_dto.py b/src/libecalc/fixtures/cases/consumer_system_v2/consumer_system_v2_dto.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/consumer_system_v2/consumer_system_v2_dto.py rename to src/libecalc/fixtures/cases/consumer_system_v2/consumer_system_v2_dto.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/consumer_system_v2/data/compressor1.csv b/src/libecalc/fixtures/cases/consumer_system_v2/data/compressor1.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/consumer_system_v2/data/compressor1.csv rename to src/libecalc/fixtures/cases/consumer_system_v2/data/compressor1.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/consumer_system_v2/data/compressor_sampled_1d.csv b/src/libecalc/fixtures/cases/consumer_system_v2/data/compressor_sampled_1d.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/consumer_system_v2/data/compressor_sampled_1d.csv rename to src/libecalc/fixtures/cases/consumer_system_v2/data/compressor_sampled_1d.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/consumer_system_v2/data/consumer_system_v2.yaml b/src/libecalc/fixtures/cases/consumer_system_v2/data/consumer_system_v2.yaml similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/consumer_system_v2/data/consumer_system_v2.yaml rename to src/libecalc/fixtures/cases/consumer_system_v2/data/consumer_system_v2.yaml diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/consumer_system_v2/data/genset.csv b/src/libecalc/fixtures/cases/consumer_system_v2/data/genset.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/consumer_system_v2/data/genset.csv rename to src/libecalc/fixtures/cases/consumer_system_v2/data/genset.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/consumer_system_v2/data/pumpchart.csv b/src/libecalc/fixtures/cases/consumer_system_v2/data/pumpchart.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/consumer_system_v2/data/pumpchart.csv rename to src/libecalc/fixtures/cases/consumer_system_v2/data/pumpchart.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/consumer_with_time_slots_models.py b/src/libecalc/fixtures/cases/consumer_with_time_slots_models.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/consumer_with_time_slots_models.py rename to src/libecalc/fixtures/cases/consumer_with_time_slots_models.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/__init__.py b/src/libecalc/fixtures/cases/ltp_export/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/__init__.py rename to src/libecalc/fixtures/cases/ltp_export/__init__.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/.gitignore b/src/libecalc/fixtures/cases/ltp_export/data/.gitignore similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/.gitignore rename to src/libecalc/fixtures/cases/ltp_export/data/.gitignore diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/einput/gascompression.csv b/src/libecalc/fixtures/cases/ltp_export/data/einput/gascompression.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/einput/gascompression.csv rename to src/libecalc/fixtures/cases/ltp_export/data/einput/gascompression.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/einput/gascompression_zero_power.csv b/src/libecalc/fixtures/cases/ltp_export/data/einput/gascompression_zero_power.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/einput/gascompression_zero_power.csv rename to src/libecalc/fixtures/cases/ltp_export/data/einput/gascompression_zero_power.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/einput/genset_17MW.csv b/src/libecalc/fixtures/cases/ltp_export/data/einput/genset_17MW.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/einput/genset_17MW.csv rename to src/libecalc/fixtures/cases/ltp_export/data/einput/genset_17MW.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/einput/onshore_power.csv b/src/libecalc/fixtures/cases/ltp_export/data/einput/onshore_power.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/einput/onshore_power.csv rename to src/libecalc/fixtures/cases/ltp_export/data/einput/onshore_power.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/einput/prices_co2.csv b/src/libecalc/fixtures/cases/ltp_export/data/einput/prices_co2.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/einput/prices_co2.csv rename to src/libecalc/fixtures/cases/ltp_export/data/einput/prices_co2.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/einput/prices_fuel.csv b/src/libecalc/fixtures/cases/ltp_export/data/einput/prices_fuel.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/einput/prices_fuel.csv rename to src/libecalc/fixtures/cases/ltp_export/data/einput/prices_fuel.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/einput/pumpchart_water_inj.csv b/src/libecalc/fixtures/cases/ltp_export/data/einput/pumpchart_water_inj.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/einput/pumpchart_water_inj.csv rename to src/libecalc/fixtures/cases/ltp_export/data/einput/pumpchart_water_inj.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/ltp_export.yaml b/src/libecalc/fixtures/cases/ltp_export/data/ltp_export.yaml similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/ltp_export.yaml rename to src/libecalc/fixtures/cases/ltp_export/data/ltp_export.yaml diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/sim/flare_diesel_cold_venting_fugitives.csv b/src/libecalc/fixtures/cases/ltp_export/data/sim/flare_diesel_cold_venting_fugitives.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/sim/flare_diesel_cold_venting_fugitives.csv rename to src/libecalc/fixtures/cases/ltp_export/data/sim/flare_diesel_cold_venting_fugitives.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/sim/mobile_installations_host_field.csv b/src/libecalc/fixtures/cases/ltp_export/data/sim/mobile_installations_host_field.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/sim/mobile_installations_host_field.csv rename to src/libecalc/fixtures/cases/ltp_export/data/sim/mobile_installations_host_field.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/sim/mobile_installations_satellite_A.csv b/src/libecalc/fixtures/cases/ltp_export/data/sim/mobile_installations_satellite_A.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/sim/mobile_installations_satellite_A.csv rename to src/libecalc/fixtures/cases/ltp_export/data/sim/mobile_installations_satellite_A.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/sim/mobile_installations_satellite_B.csv b/src/libecalc/fixtures/cases/ltp_export/data/sim/mobile_installations_satellite_B.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/sim/mobile_installations_satellite_B.csv rename to src/libecalc/fixtures/cases/ltp_export/data/sim/mobile_installations_satellite_B.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/sim/prod_inj_forecast.csv b/src/libecalc/fixtures/cases/ltp_export/data/sim/prod_inj_forecast.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/sim/prod_inj_forecast.csv rename to src/libecalc/fixtures/cases/ltp_export/data/sim/prod_inj_forecast.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/sim/steamgen.csv b/src/libecalc/fixtures/cases/ltp_export/data/sim/steamgen.csv similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/data/sim/steamgen.csv rename to src/libecalc/fixtures/cases/ltp_export/data/sim/steamgen.csv diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/installation_setup.py b/src/libecalc/fixtures/cases/ltp_export/installation_setup.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/ltp_export/installation_setup.py rename to src/libecalc/fixtures/cases/ltp_export/installation_setup.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/minimal/__init__.py b/src/libecalc/fixtures/cases/minimal/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/minimal/__init__.py rename to src/libecalc/fixtures/cases/minimal/__init__.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/minimal/minimal_dto.py b/src/libecalc/fixtures/cases/minimal/minimal_dto.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/minimal/minimal_dto.py rename to src/libecalc/fixtures/cases/minimal/minimal_dto.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/minimal/minimal_yaml.py b/src/libecalc/fixtures/cases/minimal/minimal_yaml.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/minimal/minimal_yaml.py rename to src/libecalc/fixtures/cases/minimal/minimal_yaml.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/compressor_process_simulations/compressor_process_simulations.py b/src/libecalc/fixtures/compressor_process_simulations/compressor_process_simulations.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/compressor_process_simulations/compressor_process_simulations.py rename to src/libecalc/fixtures/compressor_process_simulations/compressor_process_simulations.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/conftest.py b/src/libecalc/fixtures/conftest.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/conftest.py rename to src/libecalc/fixtures/conftest.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/__init__.py b/src/libecalc/input/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/__init__.py rename to src/libecalc/input/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/file_io.py b/src/libecalc/input/file_io.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/file_io.py rename to src/libecalc/input/file_io.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/mappers/__init__.py b/src/libecalc/input/mappers/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/mappers/__init__.py rename to src/libecalc/input/mappers/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/mappers/component_mapper.py b/src/libecalc/input/mappers/component_mapper.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/mappers/component_mapper.py rename to src/libecalc/input/mappers/component_mapper.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/mappers/consumer_function_mapper.py b/src/libecalc/input/mappers/consumer_function_mapper.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/mappers/consumer_function_mapper.py rename to src/libecalc/input/mappers/consumer_function_mapper.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/mappers/create_references.py b/src/libecalc/input/mappers/create_references.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/mappers/create_references.py rename to src/libecalc/input/mappers/create_references.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/mappers/facility_input.py b/src/libecalc/input/mappers/facility_input.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/mappers/facility_input.py rename to src/libecalc/input/mappers/facility_input.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/mappers/fluid_mapper.py b/src/libecalc/input/mappers/fluid_mapper.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/mappers/fluid_mapper.py rename to src/libecalc/input/mappers/fluid_mapper.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/mappers/fuel_and_emission_mapper.py b/src/libecalc/input/mappers/fuel_and_emission_mapper.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/mappers/fuel_and_emission_mapper.py rename to src/libecalc/input/mappers/fuel_and_emission_mapper.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/mappers/model.py b/src/libecalc/input/mappers/model.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/mappers/model.py rename to src/libecalc/input/mappers/model.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/mappers/utils.py b/src/libecalc/input/mappers/utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/mappers/utils.py rename to src/libecalc/input/mappers/utils.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/mappers/variables_mapper/__init__.py b/src/libecalc/input/mappers/variables_mapper/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/mappers/variables_mapper/__init__.py rename to src/libecalc/input/mappers/variables_mapper/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/mappers/variables_mapper/time_series.py b/src/libecalc/input/mappers/variables_mapper/time_series.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/mappers/variables_mapper/time_series.py rename to src/libecalc/input/mappers/variables_mapper/time_series.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/mappers/variables_mapper/time_series_collection.py b/src/libecalc/input/mappers/variables_mapper/time_series_collection.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/mappers/variables_mapper/time_series_collection.py rename to src/libecalc/input/mappers/variables_mapper/time_series_collection.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/mappers/variables_mapper/time_series_collection_mapper.py b/src/libecalc/input/mappers/variables_mapper/time_series_collection_mapper.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/mappers/variables_mapper/time_series_collection_mapper.py rename to src/libecalc/input/mappers/variables_mapper/time_series_collection_mapper.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/mappers/variables_mapper/timeseries_utils.py b/src/libecalc/input/mappers/variables_mapper/timeseries_utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/mappers/variables_mapper/timeseries_utils.py rename to src/libecalc/input/mappers/variables_mapper/timeseries_utils.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/mappers/variables_mapper/variables_mapper.py b/src/libecalc/input/mappers/variables_mapper/variables_mapper.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/mappers/variables_mapper/variables_mapper.py rename to src/libecalc/input/mappers/variables_mapper/variables_mapper.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/model.py b/src/libecalc/input/model.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/model.py rename to src/libecalc/input/model.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/parse_input.py b/src/libecalc/input/parse_input.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/parse_input.py rename to src/libecalc/input/parse_input.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/__init__.py b/src/libecalc/input/validation/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/__init__.py rename to src/libecalc/input/validation/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/generate_json_schema.py b/src/libecalc/input/validation/generate_json_schema.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/generate_json_schema.py rename to src/libecalc/input/validation/generate_json_schema.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/__init__.py b/src/libecalc/input/validation/json_schemas/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/__init__.py rename to src/libecalc/input/validation/json_schemas/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/definitions.json b/src/libecalc/input/validation/json_schemas/definitions.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/definitions.json rename to src/libecalc/input/validation/json_schemas/definitions.json diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/energy-usage-model-common.json b/src/libecalc/input/validation/json_schemas/energy-usage-model-common.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/energy-usage-model-common.json rename to src/libecalc/input/validation/json_schemas/energy-usage-model-common.json diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/energy-usage-model-compressor-pump-tabulated.json b/src/libecalc/input/validation/json_schemas/energy-usage-model-compressor-pump-tabulated.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/energy-usage-model-compressor-pump-tabulated.json rename to src/libecalc/input/validation/json_schemas/energy-usage-model-compressor-pump-tabulated.json diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/energy-usage-model-consumer-systems.json b/src/libecalc/input/validation/json_schemas/energy-usage-model-consumer-systems.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/energy-usage-model-consumer-systems.json rename to src/libecalc/input/validation/json_schemas/energy-usage-model-consumer-systems.json diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/energy-usage-model-direct.json b/src/libecalc/input/validation/json_schemas/energy-usage-model-direct.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/energy-usage-model-direct.json rename to src/libecalc/input/validation/json_schemas/energy-usage-model-direct.json diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/energy-usage-model.json b/src/libecalc/input/validation/json_schemas/energy-usage-model.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/energy-usage-model.json rename to src/libecalc/input/validation/json_schemas/energy-usage-model.json diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models-compressor-chart.json b/src/libecalc/input/validation/json_schemas/models-compressor-chart.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models-compressor-chart.json rename to src/libecalc/input/validation/json_schemas/models-compressor-chart.json diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models-compressor-train-simplified.json b/src/libecalc/input/validation/json_schemas/models-compressor-train-simplified.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models-compressor-train-simplified.json rename to src/libecalc/input/validation/json_schemas/models-compressor-train-simplified.json diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models-compressor-with-turbine.json b/src/libecalc/input/validation/json_schemas/models-compressor-with-turbine.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models-compressor-with-turbine.json rename to src/libecalc/input/validation/json_schemas/models-compressor-with-turbine.json diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models-fluid.json b/src/libecalc/input/validation/json_schemas/models-fluid.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models-fluid.json rename to src/libecalc/input/validation/json_schemas/models-fluid.json diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models-single-speed-compressor-train.json b/src/libecalc/input/validation/json_schemas/models-single-speed-compressor-train.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models-single-speed-compressor-train.json rename to src/libecalc/input/validation/json_schemas/models-single-speed-compressor-train.json diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models-turbine.json b/src/libecalc/input/validation/json_schemas/models-turbine.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models-turbine.json rename to src/libecalc/input/validation/json_schemas/models-turbine.json diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models-variable-speed-compressor-train-multiple-streams-and-pressures.json b/src/libecalc/input/validation/json_schemas/models-variable-speed-compressor-train-multiple-streams-and-pressures.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models-variable-speed-compressor-train-multiple-streams-and-pressures.json rename to src/libecalc/input/validation/json_schemas/models-variable-speed-compressor-train-multiple-streams-and-pressures.json diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models-variable-speed-compressor-train.json b/src/libecalc/input/validation/json_schemas/models-variable-speed-compressor-train.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models-variable-speed-compressor-train.json rename to src/libecalc/input/validation/json_schemas/models-variable-speed-compressor-train.json diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models.json b/src/libecalc/input/validation/json_schemas/models.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation/json_schemas/models.json rename to src/libecalc/input/validation/json_schemas/models.json diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/validation_errors.py b/src/libecalc/input/validation_errors.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/validation_errors.py rename to src/libecalc/input/validation_errors.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml/yaml_models/pyyaml_yaml_model.py b/src/libecalc/input/yaml/yaml_models/pyyaml_yaml_model.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml/yaml_models/pyyaml_yaml_model.py rename to src/libecalc/input/yaml/yaml_models/pyyaml_yaml_model.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml/yaml_models/ruamel_yaml_model.py b/src/libecalc/input/yaml/yaml_models/ruamel_yaml_model.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml/yaml_models/ruamel_yaml_model.py rename to src/libecalc/input/yaml/yaml_models/ruamel_yaml_model.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml/yaml_models/yaml_model.py b/src/libecalc/input/yaml/yaml_models/yaml_model.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml/yaml_models/yaml_model.py rename to src/libecalc/input/yaml/yaml_models/yaml_model.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_entities.py b/src/libecalc/input/yaml_entities.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_entities.py rename to src/libecalc/input/yaml_entities.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_keywords.py b/src/libecalc/input/yaml_keywords.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_keywords.py rename to src/libecalc/input/yaml_keywords.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/__init__.py b/src/libecalc/input/yaml_types/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/__init__.py rename to src/libecalc/input/yaml_types/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/output/__init__.py b/src/libecalc/input/yaml_types/components/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/output/__init__.py rename to src/libecalc/input/yaml_types/components/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/legacy/yaml_electricity_consumer.py b/src/libecalc/input/yaml_types/components/legacy/yaml_electricity_consumer.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/legacy/yaml_electricity_consumer.py rename to src/libecalc/input/yaml_types/components/legacy/yaml_electricity_consumer.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/legacy/yaml_fuel_consumer.py b/src/libecalc/input/yaml_types/components/legacy/yaml_fuel_consumer.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/legacy/yaml_fuel_consumer.py rename to src/libecalc/input/yaml_types/components/legacy/yaml_fuel_consumer.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_asset.py b/src/libecalc/input/yaml_types/components/yaml_asset.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_asset.py rename to src/libecalc/input/yaml_types/components/yaml_asset.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_base.py b/src/libecalc/input/yaml_types/components/yaml_base.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_base.py rename to src/libecalc/input/yaml_types/components/yaml_base.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_category_field.py b/src/libecalc/input/yaml_types/components/yaml_category_field.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_category_field.py rename to src/libecalc/input/yaml_types/components/yaml_category_field.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_compressor.py b/src/libecalc/input/yaml_types/components/yaml_compressor.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_compressor.py rename to src/libecalc/input/yaml_types/components/yaml_compressor.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_compressor_system.py b/src/libecalc/input/yaml_types/components/yaml_compressor_system.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_compressor_system.py rename to src/libecalc/input/yaml_types/components/yaml_compressor_system.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_generator_set.py b/src/libecalc/input/yaml_types/components/yaml_generator_set.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_generator_set.py rename to src/libecalc/input/yaml_types/components/yaml_generator_set.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_installation.py b/src/libecalc/input/yaml_types/components/yaml_installation.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_installation.py rename to src/libecalc/input/yaml_types/components/yaml_installation.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_pump.py b/src/libecalc/input/yaml_types/components/yaml_pump.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_pump.py rename to src/libecalc/input/yaml_types/components/yaml_pump.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_pump_system.py b/src/libecalc/input/yaml_types/components/yaml_pump_system.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/components/yaml_pump_system.py rename to src/libecalc/input/yaml_types/components/yaml_pump_system.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/emitters/yaml_direct_emitter.py b/src/libecalc/input/yaml_types/emitters/yaml_direct_emitter.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/emitters/yaml_direct_emitter.py rename to src/libecalc/input/yaml_types/emitters/yaml_direct_emitter.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/facility_type/yaml_facility_type.py b/src/libecalc/input/yaml_types/facility_type/yaml_facility_type.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/facility_type/yaml_facility_type.py rename to src/libecalc/input/yaml_types/facility_type/yaml_facility_type.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/fuel_type/yaml_emission.py b/src/libecalc/input/yaml_types/fuel_type/yaml_emission.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/fuel_type/yaml_emission.py rename to src/libecalc/input/yaml_types/fuel_type/yaml_emission.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/fuel_type/yaml_fuel_type.py b/src/libecalc/input/yaml_types/fuel_type/yaml_fuel_type.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/fuel_type/yaml_fuel_type.py rename to src/libecalc/input/yaml_types/fuel_type/yaml_fuel_type.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/models/__init__.py b/src/libecalc/input/yaml_types/models/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/models/__init__.py rename to src/libecalc/input/yaml_types/models/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/models/yaml_compressor_chart.py b/src/libecalc/input/yaml_types/models/yaml_compressor_chart.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/models/yaml_compressor_chart.py rename to src/libecalc/input/yaml_types/models/yaml_compressor_chart.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/models/yaml_compressor_with_turbine.py b/src/libecalc/input/yaml_types/models/yaml_compressor_with_turbine.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/models/yaml_compressor_with_turbine.py rename to src/libecalc/input/yaml_types/models/yaml_compressor_with_turbine.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/models/yaml_enums.py b/src/libecalc/input/yaml_types/models/yaml_enums.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/models/yaml_enums.py rename to src/libecalc/input/yaml_types/models/yaml_enums.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/models/yaml_fluid.py b/src/libecalc/input/yaml_types/models/yaml_fluid.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/models/yaml_fluid.py rename to src/libecalc/input/yaml_types/models/yaml_fluid.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/models/yaml_turbine.py b/src/libecalc/input/yaml_types/models/yaml_turbine.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/models/yaml_turbine.py rename to src/libecalc/input/yaml_types/models/yaml_turbine.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/time_series/yaml_time_series.py b/src/libecalc/input/yaml_types/time_series/yaml_time_series.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/time_series/yaml_time_series.py rename to src/libecalc/input/yaml_types/time_series/yaml_time_series.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/yaml_placeholder_type.py b/src/libecalc/input/yaml_types/yaml_placeholder_type.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/yaml_placeholder_type.py rename to src/libecalc/input/yaml_types/yaml_placeholder_type.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/yaml_schema_helpers.py b/src/libecalc/input/yaml_types/yaml_schema_helpers.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/yaml_schema_helpers.py rename to src/libecalc/input/yaml_types/yaml_schema_helpers.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/yaml_temporal_model.py b/src/libecalc/input/yaml_types/yaml_temporal_model.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/yaml_temporal_model.py rename to src/libecalc/input/yaml_types/yaml_temporal_model.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/yaml_variable.py b/src/libecalc/input/yaml_types/yaml_variable.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/input/yaml_types/yaml_variable.py rename to src/libecalc/input/yaml_types/yaml_variable.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/output/flow_diagram/__init__.py b/src/libecalc/output/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/output/flow_diagram/__init__.py rename to src/libecalc/output/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/output/flow_diagram/EcalcModelMapper.py b/src/libecalc/output/flow_diagram/EcalcModelMapper.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/output/flow_diagram/EcalcModelMapper.py rename to src/libecalc/output/flow_diagram/EcalcModelMapper.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/output/utils/__init__.py b/src/libecalc/output/flow_diagram/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/output/utils/__init__.py rename to src/libecalc/output/flow_diagram/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/output/flow_diagram/fde_models.py b/src/libecalc/output/flow_diagram/fde_models.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/output/flow_diagram/fde_models.py rename to src/libecalc/output/flow_diagram/fde_models.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/output/results/aggregators.py b/src/libecalc/output/results/aggregators.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/output/results/aggregators.py rename to src/libecalc/output/results/aggregators.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/output/results/appliers.py b/src/libecalc/output/results/appliers.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/output/results/appliers.py rename to src/libecalc/output/results/appliers.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/output/results/configs/configs.py b/src/libecalc/output/results/configs/configs.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/output/results/configs/configs.py rename to src/libecalc/output/results/configs/configs.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/output/results/dto/dtos.py b/src/libecalc/output/results/dto/dtos.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/output/results/dto/dtos.py rename to src/libecalc/output/results/dto/dtos.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/output/results/exporter.py b/src/libecalc/output/results/exporter.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/output/results/exporter.py rename to src/libecalc/output/results/exporter.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/output/results/filters.py b/src/libecalc/output/results/filters.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/output/results/filters.py rename to src/libecalc/output/results/filters.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/output/results/formatters/formatter.py b/src/libecalc/output/results/formatters/formatter.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/output/results/formatters/formatter.py rename to src/libecalc/output/results/formatters/formatter.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/output/results/generators.py b/src/libecalc/output/results/generators.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/output/results/generators.py rename to src/libecalc/output/results/generators.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/output/results/handlers/handler.py b/src/libecalc/output/results/handlers/handler.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/output/results/handlers/handler.py rename to src/libecalc/output/results/handlers/handler.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/output/results/queries.py b/src/libecalc/output/results/queries.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/output/results/queries.py rename to src/libecalc/output/results/queries.py diff --git a/src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/__init__.py b/src/libecalc/output/utils/__init__.py similarity index 100% rename from src/ecalc/libraries/libecalc/fixtures/libecalc/fixtures/cases/__init__.py rename to src/libecalc/output/utils/__init__.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/output/utils/file_utils.py b/src/libecalc/output/utils/file_utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/output/utils/file_utils.py rename to src/libecalc/output/utils/file_utils.py diff --git a/src/ecalc/libraries/libecalc/common/libecalc/version.py b/src/libecalc/version.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/libecalc/version.py rename to src/libecalc/version.py diff --git a/src/ecalc/libraries/neqsim/neqsim_ecalc_wrapper/__init__.py b/src/neqsim_ecalc_wrapper/__init__.py similarity index 100% rename from src/ecalc/libraries/neqsim/neqsim_ecalc_wrapper/__init__.py rename to src/neqsim_ecalc_wrapper/__init__.py diff --git a/src/ecalc/libraries/neqsim/neqsim_ecalc_wrapper/components.py b/src/neqsim_ecalc_wrapper/components.py similarity index 100% rename from src/ecalc/libraries/neqsim/neqsim_ecalc_wrapper/components.py rename to src/neqsim_ecalc_wrapper/components.py diff --git a/src/ecalc/libraries/neqsim/neqsim_ecalc_wrapper/exceptions.py b/src/neqsim_ecalc_wrapper/exceptions.py similarity index 100% rename from src/ecalc/libraries/neqsim/neqsim_ecalc_wrapper/exceptions.py rename to src/neqsim_ecalc_wrapper/exceptions.py diff --git a/src/ecalc/libraries/neqsim/neqsim_ecalc_wrapper/java_service.py b/src/neqsim_ecalc_wrapper/java_service.py similarity index 100% rename from src/ecalc/libraries/neqsim/neqsim_ecalc_wrapper/java_service.py rename to src/neqsim_ecalc_wrapper/java_service.py diff --git a/src/ecalc/libraries/neqsim/neqsim_ecalc_wrapper/lib/NeqSim.jar b/src/neqsim_ecalc_wrapper/lib/NeqSim.jar similarity index 100% rename from src/ecalc/libraries/neqsim/neqsim_ecalc_wrapper/lib/NeqSim.jar rename to src/neqsim_ecalc_wrapper/lib/NeqSim.jar diff --git a/src/ecalc/libraries/neqsim/neqsim_ecalc_wrapper/lib/neqsim_version_info.md b/src/neqsim_ecalc_wrapper/lib/neqsim_version_info.md similarity index 100% rename from src/ecalc/libraries/neqsim/neqsim_ecalc_wrapper/lib/neqsim_version_info.md rename to src/neqsim_ecalc_wrapper/lib/neqsim_version_info.md diff --git a/src/ecalc/libraries/neqsim/neqsim_ecalc_wrapper/mappings.py b/src/neqsim_ecalc_wrapper/mappings.py similarity index 100% rename from src/ecalc/libraries/neqsim/neqsim_ecalc_wrapper/mappings.py rename to src/neqsim_ecalc_wrapper/mappings.py diff --git a/src/ecalc/libraries/neqsim/neqsim_ecalc_wrapper/thermo.py b/src/neqsim_ecalc_wrapper/thermo.py similarity index 100% rename from src/ecalc/libraries/neqsim/neqsim_ecalc_wrapper/thermo.py rename to src/neqsim_ecalc_wrapper/thermo.py diff --git a/src/ecalc/cli/tests/conftest.py b/src/tests/cli/conftest.py similarity index 100% rename from src/ecalc/cli/tests/conftest.py rename to src/tests/cli/conftest.py diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_component_name_csv/waterinj.csv b/src/tests/cli/snapshots/test_app/test_component_name_csv/waterinj.csv similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_component_name_csv/waterinj.csv rename to src/tests/cli/snapshots/test_app/test_component_name_csv/waterinj.csv diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_component_name_json/waterinj.json b/src/tests/cli/snapshots/test_app/test_component_name_json/waterinj.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_component_name_json/waterinj.json rename to src/tests/cli/snapshots/test_app/test_component_name_json/waterinj.json diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_component_name_json_stdout/waterinj.json b/src/tests/cli/snapshots/test_app/test_component_name_json_stdout/waterinj.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_component_name_json_stdout/waterinj.json rename to src/tests/cli/snapshots/test_app/test_component_name_json_stdout/waterinj.json diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_csv_default/test.csv b/src/tests/cli/snapshots/test_app/test_csv_default/test.csv similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_csv_default/test.csv rename to src/tests/cli/snapshots/test_app/test_csv_default/test.csv diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_csv_resampled/results_resampled.csv b/src/tests/cli/snapshots/test_app/test_csv_resampled/results_resampled.csv similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_csv_resampled/results_resampled.csv rename to src/tests/cli/snapshots/test_app/test_csv_resampled/results_resampled.csv diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_csv_temporal_default/test.csv b/src/tests/cli/snapshots/test_app/test_csv_temporal_default/test.csv similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_csv_temporal_default/test.csv rename to src/tests/cli/snapshots/test_app/test_csv_temporal_default/test.csv diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_csv_temporal_default/test_temporal.csv b/src/tests/cli/snapshots/test_app/test_csv_temporal_default/test_temporal.csv similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_csv_temporal_default/test_temporal.csv rename to src/tests/cli/snapshots/test_app/test_csv_temporal_default/test_temporal.csv diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_full_csv/results.csv b/src/tests/cli/snapshots/test_app/test_full_csv/results.csv similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_full_csv/results.csv rename to src/tests/cli/snapshots/test_app/test_full_csv/results.csv diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_full_simplified_json/results.json b/src/tests/cli/snapshots/test_app/test_full_simplified_json/results.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_full_simplified_json/results.json rename to src/tests/cli/snapshots/test_app/test_full_simplified_json/results.json diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_json_resampled/results_resampled.json b/src/tests/cli/snapshots/test_app/test_json_resampled/results_resampled.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_json_resampled/results_resampled.json rename to src/tests/cli/snapshots/test_app/test_json_resampled/results_resampled.json diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_json_true/test_v3.json b/src/tests/cli/snapshots/test_app/test_json_true/test_v3.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_json_true/test_v3.json rename to src/tests/cli/snapshots/test_app/test_json_true/test_v3.json diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_json_true_detailed_output/test_full_json_v3.json b/src/tests/cli/snapshots/test_app/test_json_true_detailed_output/test_full_json_v3.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_json_true_detailed_output/test_full_json_v3.json rename to src/tests/cli/snapshots/test_app/test_json_true_detailed_output/test_full_json_v3.json diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.INST_A.ltp.tsv b/src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.INST_A.ltp.tsv similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.INST_A.ltp.tsv rename to src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.INST_A.ltp.tsv diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.INST_A.ltp.tsv.json b/src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.INST_A.ltp.tsv.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.INST_A.ltp.tsv.json rename to src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.INST_A.ltp.tsv.json diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_HOST_FIELD.ltp.tsv b/src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_HOST_FIELD.ltp.tsv similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_HOST_FIELD.ltp.tsv rename to src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_HOST_FIELD.ltp.tsv diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_HOST_FIELD.ltp.tsv.json b/src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_HOST_FIELD.ltp.tsv.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_HOST_FIELD.ltp.tsv.json rename to src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_HOST_FIELD.ltp.tsv.json diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_SATELLITE_A.ltp.tsv b/src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_SATELLITE_A.ltp.tsv similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_SATELLITE_A.ltp.tsv rename to src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_SATELLITE_A.ltp.tsv diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_SATELLITE_A.ltp.tsv.json b/src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_SATELLITE_A.ltp.tsv.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_SATELLITE_A.ltp.tsv.json rename to src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_SATELLITE_A.ltp.tsv.json diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_SATELLITE_B.ltp.tsv b/src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_SATELLITE_B.ltp.tsv similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_SATELLITE_B.ltp.tsv rename to src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_SATELLITE_B.ltp.tsv diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_SATELLITE_B.ltp.tsv.json b/src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_SATELLITE_B.ltp.tsv.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_SATELLITE_B.ltp.tsv.json rename to src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.MOBILE_SATELLITE_B.ltp.tsv.json diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.POWER_FROM_SHORE_EVENT.ltp.tsv b/src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.POWER_FROM_SHORE_EVENT.ltp.tsv similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.POWER_FROM_SHORE_EVENT.ltp.tsv rename to src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.POWER_FROM_SHORE_EVENT.ltp.tsv diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.POWER_FROM_SHORE_EVENT.ltp.tsv.json b/src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.POWER_FROM_SHORE_EVENT.ltp.tsv.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_ltp_export_properly/test.POWER_FROM_SHORE_EVENT.ltp.tsv.json rename to src/tests/cli/snapshots/test_app/test_new_ltp_export_properly/test.POWER_FROM_SHORE_EVENT.ltp.tsv.json diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.INST_A.stp.tsv b/src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.INST_A.stp.tsv similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.INST_A.stp.tsv rename to src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.INST_A.stp.tsv diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.INST_A.stp.tsv.json b/src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.INST_A.stp.tsv.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.INST_A.stp.tsv.json rename to src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.INST_A.stp.tsv.json diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_HOST_FIELD.stp.tsv b/src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_HOST_FIELD.stp.tsv similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_HOST_FIELD.stp.tsv rename to src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_HOST_FIELD.stp.tsv diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_HOST_FIELD.stp.tsv.json b/src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_HOST_FIELD.stp.tsv.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_HOST_FIELD.stp.tsv.json rename to src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_HOST_FIELD.stp.tsv.json diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_SATELLITE_A.stp.tsv b/src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_SATELLITE_A.stp.tsv similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_SATELLITE_A.stp.tsv rename to src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_SATELLITE_A.stp.tsv diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_SATELLITE_A.stp.tsv.json b/src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_SATELLITE_A.stp.tsv.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_SATELLITE_A.stp.tsv.json rename to src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_SATELLITE_A.stp.tsv.json diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_SATELLITE_B.stp.tsv b/src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_SATELLITE_B.stp.tsv similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_SATELLITE_B.stp.tsv rename to src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_SATELLITE_B.stp.tsv diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_SATELLITE_B.stp.tsv.json b/src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_SATELLITE_B.stp.tsv.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_SATELLITE_B.stp.tsv.json rename to src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.MOBILE_SATELLITE_B.stp.tsv.json diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.POWER_FROM_SHORE_EVENT.stp.tsv b/src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.POWER_FROM_SHORE_EVENT.stp.tsv similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.POWER_FROM_SHORE_EVENT.stp.tsv rename to src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.POWER_FROM_SHORE_EVENT.stp.tsv diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.POWER_FROM_SHORE_EVENT.stp.tsv.json b/src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.POWER_FROM_SHORE_EVENT.stp.tsv.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_new_stp_export_properly/test.POWER_FROM_SHORE_EVENT.stp.tsv.json rename to src/tests/cli/snapshots/test_app/test_new_stp_export_properly/test.POWER_FROM_SHORE_EVENT.stp.tsv.json diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_valid/flow-diagram.json b/src/tests/cli/snapshots/test_app/test_valid/flow-diagram.json similarity index 100% rename from src/ecalc/cli/tests/snapshots/test_app/test_valid/flow-diagram.json rename to src/tests/cli/snapshots/test_app/test_valid/flow-diagram.json diff --git a/src/ecalc/cli/tests/test_app.py b/src/tests/cli/test_app.py similarity index 100% rename from src/ecalc/cli/tests/test_app.py rename to src/tests/cli/test_app.py diff --git a/src/ecalc/libraries/libecalc/common/conftest.py b/src/tests/conftest.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/conftest.py rename to src/tests/conftest.py diff --git a/src/ecalc/libraries/libecalc/common/tests/common/test_constants.py b/src/tests/libecalc/common/test_constants.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/common/test_constants.py rename to src/tests/libecalc/common/test_constants.py diff --git a/src/ecalc/libraries/libecalc/common/tests/common/test_dangerous.py b/src/tests/libecalc/common/test_dangerous.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/common/test_dangerous.py rename to src/tests/libecalc/common/test_dangerous.py diff --git a/src/ecalc/libraries/libecalc/common/tests/common/test_list_utils.py b/src/tests/libecalc/common/test_list_utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/common/test_list_utils.py rename to src/tests/libecalc/common/test_list_utils.py diff --git a/src/ecalc/libraries/libecalc/common/tests/common/test_numbers.py b/src/tests/libecalc/common/test_numbers.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/common/test_numbers.py rename to src/tests/libecalc/common/test_numbers.py diff --git a/src/ecalc/libraries/libecalc/common/tests/common/test_string_utils.py b/src/tests/libecalc/common/test_string_utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/common/test_string_utils.py rename to src/tests/libecalc/common/test_string_utils.py diff --git a/src/ecalc/libraries/libecalc/common/tests/common/test_temporal_model.py b/src/tests/libecalc/common/test_temporal_model.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/common/test_temporal_model.py rename to src/tests/libecalc/common/test_temporal_model.py diff --git a/src/ecalc/libraries/libecalc/common/tests/common/test_time_utils.py b/src/tests/libecalc/common/test_time_utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/common/test_time_utils.py rename to src/tests/libecalc/common/test_time_utils.py diff --git a/src/ecalc/libraries/libecalc/common/tests/common/test_unit.py b/src/tests/libecalc/common/test_unit.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/common/test_unit.py rename to src/tests/libecalc/common/test_unit.py diff --git a/src/ecalc/libraries/libecalc/common/tests/common/test_version.py b/src/tests/libecalc/common/test_version.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/common/test_version.py rename to src/tests/libecalc/common/test_version.py diff --git a/src/ecalc/libraries/libecalc/common/tests/common/utils/test_adjustment.py b/src/tests/libecalc/common/utils/test_adjustment.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/common/utils/test_adjustment.py rename to src/tests/libecalc/common/utils/test_adjustment.py diff --git a/src/ecalc/libraries/libecalc/common/tests/common/utils/test_compute_emission_intensity_yearly.py b/src/tests/libecalc/common/utils/test_compute_emission_intensity_yearly.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/common/utils/test_compute_emission_intensity_yearly.py rename to src/tests/libecalc/common/utils/test_compute_emission_intensity_yearly.py diff --git a/src/ecalc/libraries/libecalc/common/tests/common/utils/test_math_utils.py b/src/tests/libecalc/common/utils/test_math_utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/common/utils/test_math_utils.py rename to src/tests/libecalc/common/utils/test_math_utils.py diff --git a/src/ecalc/libraries/libecalc/common/tests/common/utils/test_rates.py b/src/tests/libecalc/common/utils/test_rates.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/common/utils/test_rates.py rename to src/tests/libecalc/common/utils/test_rates.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/conftest.py b/src/tests/libecalc/core/conftest.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/conftest.py rename to src/tests/libecalc/core/conftest.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/consumers/conftest.py b/src/tests/libecalc/core/consumers/conftest.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/consumers/conftest.py rename to src/tests/libecalc/core/consumers/conftest.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/consumers/consumer_function/test_consumer_function.py b/src/tests/libecalc/core/consumers/consumer_function/test_consumer_function.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/consumers/consumer_function/test_consumer_function.py rename to src/tests/libecalc/core/consumers/consumer_function/test_consumer_function.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/consumers/consumer_function/test_direct_expression_consumer_function.py b/src/tests/libecalc/core/consumers/consumer_function/test_direct_expression_consumer_function.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/consumers/consumer_function/test_direct_expression_consumer_function.py rename to src/tests/libecalc/core/consumers/consumer_function/test_direct_expression_consumer_function.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/consumers/system/conftest.py b/src/tests/libecalc/core/consumers/system/conftest.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/consumers/system/conftest.py rename to src/tests/libecalc/core/consumers/system/conftest.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/consumers/system/test_consumer_system.py b/src/tests/libecalc/core/consumers/system/test_consumer_system.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/consumers/system/test_consumer_system.py rename to src/tests/libecalc/core/consumers/system/test_consumer_system.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/consumers/system/test_operational_setting.py b/src/tests/libecalc/core/consumers/system/test_operational_setting.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/consumers/system/test_operational_setting.py rename to src/tests/libecalc/core/consumers/system/test_operational_setting.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/consumers/system/test_system_results.py b/src/tests/libecalc/core/consumers/system/test_system_results.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/consumers/system/test_system_results.py rename to src/tests/libecalc/core/consumers/system/test_system_results.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/consumers/system/test_system_utils.py b/src/tests/libecalc/core/consumers/system/test_system_utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/consumers/system/test_system_utils.py rename to src/tests/libecalc/core/consumers/system/test_system_utils.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/consumers/test_consumer_utils.py b/src/tests/libecalc/core/consumers/test_consumer_utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/consumers/test_consumer_utils.py rename to src/tests/libecalc/core/consumers/test_consumer_utils.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/consumers/test_crossover.py b/src/tests/libecalc/core/consumers/test_crossover.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/consumers/test_crossover.py rename to src/tests/libecalc/core/consumers/test_crossover.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/consumers/test_direct_emitter.py b/src/tests/libecalc/core/consumers/test_direct_emitter.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/consumers/test_direct_emitter.py rename to src/tests/libecalc/core/consumers/test_direct_emitter.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/consumers/test_genset.py b/src/tests/libecalc/core/consumers/test_genset.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/consumers/test_genset.py rename to src/tests/libecalc/core/consumers/test_genset.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/consumers/test_legacy_consumer.py b/src/tests/libecalc/core/consumers/test_legacy_consumer.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/consumers/test_legacy_consumer.py rename to src/tests/libecalc/core/consumers/test_legacy_consumer.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/chart/test_chart_curve.py b/src/tests/libecalc/core/models/chart/test_chart_curve.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/chart/test_chart_curve.py rename to src/tests/libecalc/core/models/chart/test_chart_curve.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/chart/test_single_speed_chart.py b/src/tests/libecalc/core/models/chart/test_single_speed_chart.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/chart/test_single_speed_chart.py rename to src/tests/libecalc/core/models/chart/test_single_speed_chart.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/chart/test_variable_speed_chart.py b/src/tests/libecalc/core/models/chart/test_variable_speed_chart.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/chart/test_variable_speed_chart.py rename to src/tests/libecalc/core/models/chart/test_variable_speed_chart.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/conftest.py b/src/tests/libecalc/core/models/compressor_modelling/conftest.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/conftest.py rename to src/tests/libecalc/core/models/compressor_modelling/conftest.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/sampled/input/compressor_sampled_3d_testdata3.csv b/src/tests/libecalc/core/models/compressor_modelling/sampled/input/compressor_sampled_3d_testdata3.csv similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/sampled/input/compressor_sampled_3d_testdata3.csv rename to src/tests/libecalc/core/models/compressor_modelling/sampled/input/compressor_sampled_3d_testdata3.csv diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/sampled/input/compressor_sampled_3d_vsd_testdata.csv b/src/tests/libecalc/core/models/compressor_modelling/sampled/input/compressor_sampled_3d_vsd_testdata.csv similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/sampled/input/compressor_sampled_3d_vsd_testdata.csv rename to src/tests/libecalc/core/models/compressor_modelling/sampled/input/compressor_sampled_3d_vsd_testdata.csv diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/sampled/input/compressor_sampled_3d_vsd_testdata2.csv b/src/tests/libecalc/core/models/compressor_modelling/sampled/input/compressor_sampled_3d_vsd_testdata2.csv similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/sampled/input/compressor_sampled_3d_vsd_testdata2.csv rename to src/tests/libecalc/core/models/compressor_modelling/sampled/input/compressor_sampled_3d_vsd_testdata2.csv diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/sampled/test_compressor_sampled.py b/src/tests/libecalc/core/models/compressor_modelling/sampled/test_compressor_sampled.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/sampled/test_compressor_sampled.py rename to src/tests/libecalc/core/models/compressor_modelling/sampled/test_compressor_sampled.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/sampled/test_compressor_sampled_1d.py b/src/tests/libecalc/core/models/compressor_modelling/sampled/test_compressor_sampled_1d.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/sampled/test_compressor_sampled_1d.py rename to src/tests/libecalc/core/models/compressor_modelling/sampled/test_compressor_sampled_1d.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/sampled/test_compressor_sampled_2d.py b/src/tests/libecalc/core/models/compressor_modelling/sampled/test_compressor_sampled_2d.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/sampled/test_compressor_sampled_2d.py rename to src/tests/libecalc/core/models/compressor_modelling/sampled/test_compressor_sampled_2d.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/sampled/test_compressor_sampled_3d.py b/src/tests/libecalc/core/models/compressor_modelling/sampled/test_compressor_sampled_3d.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/sampled/test_compressor_sampled_3d.py rename to src/tests/libecalc/core/models/compressor_modelling/sampled/test_compressor_sampled_3d.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/sampled/test_convex_hull_common.py b/src/tests/libecalc/core/models/compressor_modelling/sampled/test_convex_hull_common.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/sampled/test_convex_hull_common.py rename to src/tests/libecalc/core/models/compressor_modelling/sampled/test_convex_hull_common.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_compressor_chart.py b/src/tests/libecalc/core/models/compressor_modelling/test_compressor_chart.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_compressor_chart.py rename to src/tests/libecalc/core/models/compressor_modelling/test_compressor_chart.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_compressor_chart_generator.py b/src/tests/libecalc/core/models/compressor_modelling/test_compressor_chart_generator.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_compressor_chart_generator.py rename to src/tests/libecalc/core/models/compressor_modelling/test_compressor_chart_generator.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_compressor_model_vs_unisim.py b/src/tests/libecalc/core/models/compressor_modelling/test_compressor_model_vs_unisim.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_compressor_model_vs_unisim.py rename to src/tests/libecalc/core/models/compressor_modelling/test_compressor_model_vs_unisim.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_compressor_train_base.py b/src/tests/libecalc/core/models/compressor_modelling/test_compressor_train_base.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_compressor_train_base.py rename to src/tests/libecalc/core/models/compressor_modelling/test_compressor_train_base.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_compressor_train_common_shaft_utils.py b/src/tests/libecalc/core/models/compressor_modelling/test_compressor_train_common_shaft_utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_compressor_train_common_shaft_utils.py rename to src/tests/libecalc/core/models/compressor_modelling/test_compressor_train_common_shaft_utils.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_compressor_with_turbine.py b/src/tests/libecalc/core/models/compressor_modelling/test_compressor_with_turbine.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_compressor_with_turbine.py rename to src/tests/libecalc/core/models/compressor_modelling/test_compressor_with_turbine.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_fluid.py b/src/tests/libecalc/core/models/compressor_modelling/test_fluid.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_fluid.py rename to src/tests/libecalc/core/models/compressor_modelling/test_fluid.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_numeric_methods.py b/src/tests/libecalc/core/models/compressor_modelling/test_numeric_methods.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_numeric_methods.py rename to src/tests/libecalc/core/models/compressor_modelling/test_numeric_methods.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_simplified_compressor_train.py b/src/tests/libecalc/core/models/compressor_modelling/test_simplified_compressor_train.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_simplified_compressor_train.py rename to src/tests/libecalc/core/models/compressor_modelling/test_simplified_compressor_train.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_single_speed_compressor_train_common_shaft.py b/src/tests/libecalc/core/models/compressor_modelling/test_single_speed_compressor_train_common_shaft.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_single_speed_compressor_train_common_shaft.py rename to src/tests/libecalc/core/models/compressor_modelling/test_single_speed_compressor_train_common_shaft.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_variable_speed_compressor_train_common_shaft.py b/src/tests/libecalc/core/models/compressor_modelling/test_variable_speed_compressor_train_common_shaft.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_variable_speed_compressor_train_common_shaft.py rename to src/tests/libecalc/core/models/compressor_modelling/test_variable_speed_compressor_train_common_shaft.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_variable_speed_compressor_train_multiple_streams.py b/src/tests/libecalc/core/models/compressor_modelling/test_variable_speed_compressor_train_multiple_streams.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/compressor_modelling/test_variable_speed_compressor_train_multiple_streams.py rename to src/tests/libecalc/core/models/compressor_modelling/test_variable_speed_compressor_train_multiple_streams.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/test_consumer_tabular_energy_function.py b/src/tests/libecalc/core/models/test_consumer_tabular_energy_function.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/test_consumer_tabular_energy_function.py rename to src/tests/libecalc/core/models/test_consumer_tabular_energy_function.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/test_energy_function_results.py b/src/tests/libecalc/core/models/test_energy_function_results.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/test_energy_function_results.py rename to src/tests/libecalc/core/models/test_energy_function_results.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/test_fuel_model.py b/src/tests/libecalc/core/models/test_fuel_model.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/test_fuel_model.py rename to src/tests/libecalc/core/models/test_fuel_model.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/test_generator_model.py b/src/tests/libecalc/core/models/test_generator_model.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/test_generator_model.py rename to src/tests/libecalc/core/models/test_generator_model.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/test_pump.py b/src/tests/libecalc/core/models/test_pump.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/test_pump.py rename to src/tests/libecalc/core/models/test_pump.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/models/test_turbine.py b/src/tests/libecalc/core/models/test_turbine.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/models/test_turbine.py rename to src/tests/libecalc/core/models/test_turbine.py diff --git a/src/ecalc/libraries/libecalc/common/tests/core/result/test_results.py b/src/tests/libecalc/core/result/test_results.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/core/result/test_results.py rename to src/tests/libecalc/core/result/test_results.py diff --git a/src/ecalc/libraries/libecalc/common/tests/dto/results/model/test_extend.py b/src/tests/libecalc/dto/results/model/test_extend.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/dto/results/model/test_extend.py rename to src/tests/libecalc/dto/results/model/test_extend.py diff --git a/src/ecalc/libraries/libecalc/common/tests/dto/results/test_simple.py b/src/tests/libecalc/dto/results/test_simple.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/dto/results/test_simple.py rename to src/tests/libecalc/dto/results/test_simple.py diff --git a/src/ecalc/libraries/libecalc/common/tests/dto/test_asset_serialization.py b/src/tests/libecalc/dto/test_asset_serialization.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/dto/test_asset_serialization.py rename to src/tests/libecalc/dto/test_asset_serialization.py diff --git a/src/ecalc/libraries/libecalc/common/tests/dto/test_categories.py b/src/tests/libecalc/dto/test_categories.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/dto/test_categories.py rename to src/tests/libecalc/dto/test_categories.py diff --git a/src/ecalc/libraries/libecalc/common/tests/dto/test_composition.py b/src/tests/libecalc/dto/test_composition.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/dto/test_composition.py rename to src/tests/libecalc/dto/test_composition.py diff --git a/src/ecalc/libraries/libecalc/common/tests/dto/test_electricity_consumer.py b/src/tests/libecalc/dto/test_electricity_consumer.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/dto/test_electricity_consumer.py rename to src/tests/libecalc/dto/test_electricity_consumer.py diff --git a/src/ecalc/libraries/libecalc/common/tests/dto/test_energy_model.py b/src/tests/libecalc/dto/test_energy_model.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/dto/test_energy_model.py rename to src/tests/libecalc/dto/test_energy_model.py diff --git a/src/ecalc/libraries/libecalc/common/tests/dto/test_fuel_consumer.py b/src/tests/libecalc/dto/test_fuel_consumer.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/dto/test_fuel_consumer.py rename to src/tests/libecalc/dto/test_fuel_consumer.py diff --git a/src/ecalc/libraries/libecalc/common/tests/dto/test_generator_set.py b/src/tests/libecalc/dto/test_generator_set.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/dto/test_generator_set.py rename to src/tests/libecalc/dto/test_generator_set.py diff --git a/src/ecalc/libraries/libecalc/common/tests/dto/test_installation.py b/src/tests/libecalc/dto/test_installation.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/dto/test_installation.py rename to src/tests/libecalc/dto/test_installation.py diff --git a/src/ecalc/libraries/libecalc/common/tests/dto/utils/test_aggregators.py b/src/tests/libecalc/dto/utils/test_aggregators.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/dto/utils/test_aggregators.py rename to src/tests/libecalc/dto/utils/test_aggregators.py diff --git a/src/ecalc/libraries/libecalc/common/tests/dto/utils/test_validators.py b/src/tests/libecalc/dto/utils/test_validators.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/dto/utils/test_validators.py rename to src/tests/libecalc/dto/utils/test_validators.py diff --git a/src/ecalc/libraries/libecalc/common/tests/expression/test_expression.py b/src/tests/libecalc/expression/test_expression.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/expression/test_expression.py rename to src/tests/libecalc/expression/test_expression.py diff --git a/src/ecalc/libraries/libecalc/common/tests/expression/test_expression_evaluator.py b/src/tests/libecalc/expression/test_expression_evaluator.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/expression/test_expression_evaluator.py rename to src/tests/libecalc/expression/test_expression_evaluator.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/mappers/test_consumer_chart.py b/src/tests/libecalc/input/mappers/test_consumer_chart.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/mappers/test_consumer_chart.py rename to src/tests/libecalc/input/mappers/test_consumer_chart.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/mappers/test_energy_usage_model.py b/src/tests/libecalc/input/mappers/test_energy_usage_model.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/mappers/test_energy_usage_model.py rename to src/tests/libecalc/input/mappers/test_energy_usage_model.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/mappers/test_facility_input.py b/src/tests/libecalc/input/mappers/test_facility_input.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/mappers/test_facility_input.py rename to src/tests/libecalc/input/mappers/test_facility_input.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/mappers/test_fueltype_mapper.py b/src/tests/libecalc/input/mappers/test_fueltype_mapper.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/mappers/test_fueltype_mapper.py rename to src/tests/libecalc/input/mappers/test_fueltype_mapper.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/mappers/test_model_mapper.py b/src/tests/libecalc/input/mappers/test_model_mapper.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/mappers/test_model_mapper.py rename to src/tests/libecalc/input/mappers/test_model_mapper.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/mappers/test_resolve_fuel.py b/src/tests/libecalc/input/mappers/test_resolve_fuel.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/mappers/test_resolve_fuel.py rename to src/tests/libecalc/input/mappers/test_resolve_fuel.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/mappers/test_utils.py b/src/tests/libecalc/input/mappers/test_utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/mappers/test_utils.py rename to src/tests/libecalc/input/mappers/test_utils.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/mappers/variables_mapper/test_timeseries.py b/src/tests/libecalc/input/mappers/variables_mapper/test_timeseries.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/mappers/variables_mapper/test_timeseries.py rename to src/tests/libecalc/input/mappers/variables_mapper/test_timeseries.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/mappers/variables_mapper/test_timeseries_utils.py b/src/tests/libecalc/input/mappers/variables_mapper/test_timeseries_utils.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/mappers/variables_mapper/test_timeseries_utils.py rename to src/tests/libecalc/input/mappers/variables_mapper/test_timeseries_utils.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/mappers/variables_mapper/test_variables_mapper.py b/src/tests/libecalc/input/mappers/variables_mapper/test_variables_mapper.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/mappers/variables_mapper/test_variables_mapper.py rename to src/tests/libecalc/input/mappers/variables_mapper/test_variables_mapper.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/test_create_references.py b/src/tests/libecalc/input/test_create_references.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/test_create_references.py rename to src/tests/libecalc/input/test_create_references.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/test_file_io.py b/src/tests/libecalc/input/test_file_io.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/test_file_io.py rename to src/tests/libecalc/input/test_file_io.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/test_model.py b/src/tests/libecalc/input/test_model.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/test_model.py rename to src/tests/libecalc/input/test_model.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/test_parse_input.py b/src/tests/libecalc/input/test_parse_input.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/test_parse_input.py rename to src/tests/libecalc/input/test_parse_input.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/test_validation_errors.py b/src/tests/libecalc/input/test_validation_errors.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/test_validation_errors.py rename to src/tests/libecalc/input/test_validation_errors.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/test_yaml_configuration.py b/src/tests/libecalc/input/test_yaml_configuration.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/test_yaml_configuration.py rename to src/tests/libecalc/input/test_yaml_configuration.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/validation/snapshots/test_validation_json_schemas/test_json_schema_changed/schemas.json b/src/tests/libecalc/input/validation/snapshots/test_validation_json_schemas/test_json_schema_changed/schemas.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/validation/snapshots/test_validation_json_schemas/test_json_schema_changed/schemas.json rename to src/tests/libecalc/input/validation/snapshots/test_validation_json_schemas/test_json_schema_changed/schemas.json diff --git a/src/ecalc/libraries/libecalc/common/tests/input/validation/test_validation_json_schemas.py b/src/tests/libecalc/input/validation/test_validation_json_schemas.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/validation/test_validation_json_schemas.py rename to src/tests/libecalc/input/validation/test_validation_json_schemas.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/yaml_types/test_yaml_temporal_model.py b/src/tests/libecalc/input/yaml_types/test_yaml_temporal_model.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/yaml_types/test_yaml_temporal_model.py rename to src/tests/libecalc/input/yaml_types/test_yaml_temporal_model.py diff --git a/src/ecalc/libraries/libecalc/common/tests/input/yaml_types/test_yaml_variable.py b/src/tests/libecalc/input/yaml_types/test_yaml_variable.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/input/yaml_types/test_yaml_variable.py rename to src/tests/libecalc/input/yaml_types/test_yaml_variable.py diff --git a/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_all_consumer_with_time_slots_models/test_all_consumer_with_time_slots_models_results/all_consumer_with_time_slots_models_v3.json b/src/tests/libecalc/integration/snapshots/test_all_consumer_with_time_slots_models/test_all_consumer_with_time_slots_models_results/all_consumer_with_time_slots_models_v3.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_all_consumer_with_time_slots_models/test_all_consumer_with_time_slots_models_results/all_consumer_with_time_slots_models_v3.json rename to src/tests/libecalc/integration/snapshots/test_all_consumer_with_time_slots_models/test_all_consumer_with_time_slots_models_results/all_consumer_with_time_slots_models_v3.json diff --git a/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_all_energy_usage_models/test_all_results/all_energy_usage_models_v3.json b/src/tests/libecalc/integration/snapshots/test_all_energy_usage_models/test_all_results/all_energy_usage_models_v3.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_all_energy_usage_models/test_all_results/all_energy_usage_models_v3.json rename to src/tests/libecalc/integration/snapshots/test_all_energy_usage_models/test_all_results/all_energy_usage_models_v3.json diff --git a/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2-consumer_system_v20/consumer_system_v2.json b/src/tests/libecalc/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2-consumer_system_v20/consumer_system_v2.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2-consumer_system_v20/consumer_system_v2.json rename to src/tests/libecalc/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2-consumer_system_v20/consumer_system_v2.json diff --git a/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2_dto_temporal_operational_settings_and_temporal_compressor_models-consumer_system_v22/consumer_system_v2_dto_temporal_operational_settings_and_temporal_compressor_models.json b/src/tests/libecalc/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2_dto_temporal_operational_settings_and_temporal_compressor_models-consumer_system_v22/consumer_system_v2_dto_temporal_operational_settings_and_temporal_compressor_models.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2_dto_temporal_operational_settings_and_temporal_compressor_models-consumer_system_v22/consumer_system_v2_dto_temporal_operational_settings_and_temporal_compressor_models.json rename to src/tests/libecalc/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2_dto_temporal_operational_settings_and_temporal_compressor_models-consumer_system_v22/consumer_system_v2_dto_temporal_operational_settings_and_temporal_compressor_models.json diff --git a/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2_dto_with_overlapping_temporal_operational_settings_and_temporal_compressor_models-consumer_system_v23/consumer_system_v2_dto_with_overlapping_temporal_operational_settings_and_temporal_compressor_models.json b/src/tests/libecalc/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2_dto_with_overlapping_temporal_operational_settings_and_temporal_compressor_models-consumer_system_v23/consumer_system_v2_dto_with_overlapping_temporal_operational_settings_and_temporal_compressor_models.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2_dto_with_overlapping_temporal_operational_settings_and_temporal_compressor_models-consumer_system_v23/consumer_system_v2_dto_with_overlapping_temporal_operational_settings_and_temporal_compressor_models.json rename to src/tests/libecalc/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2_dto_with_overlapping_temporal_operational_settings_and_temporal_compressor_models-consumer_system_v23/consumer_system_v2_dto_with_overlapping_temporal_operational_settings_and_temporal_compressor_models.json diff --git a/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2_with_temporal_operational_settings-consumer_system_v21/consumer_system_v2_with_temporal_operational_settings.json b/src/tests/libecalc/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2_with_temporal_operational_settings-consumer_system_v21/consumer_system_v2_with_temporal_operational_settings.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2_with_temporal_operational_settings-consumer_system_v21/consumer_system_v2_with_temporal_operational_settings.json rename to src/tests/libecalc/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2_with_temporal_operational_settings-consumer_system_v21/consumer_system_v2_with_temporal_operational_settings.json diff --git a/src/ecalc/libraries/libecalc/common/tests/integration/test_all_consumer_with_time_slots_models.py b/src/tests/libecalc/integration/test_all_consumer_with_time_slots_models.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/integration/test_all_consumer_with_time_slots_models.py rename to src/tests/libecalc/integration/test_all_consumer_with_time_slots_models.py diff --git a/src/ecalc/libraries/libecalc/common/tests/integration/test_all_energy_usage_models.py b/src/tests/libecalc/integration/test_all_energy_usage_models.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/integration/test_all_energy_usage_models.py rename to src/tests/libecalc/integration/test_all_energy_usage_models.py diff --git a/src/ecalc/libraries/libecalc/common/tests/integration/test_consumer_system_v2.py b/src/tests/libecalc/integration/test_consumer_system_v2.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/integration/test_consumer_system_v2.py rename to src/tests/libecalc/integration/test_consumer_system_v2.py diff --git a/src/ecalc/libraries/libecalc/common/tests/integration/test_multiple_installations.py b/src/tests/libecalc/integration/test_multiple_installations.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/integration/test_multiple_installations.py rename to src/tests/libecalc/integration/test_multiple_installations.py diff --git a/src/ecalc/libraries/libecalc/common/tests/output/flow_diagram/conftest.py b/src/tests/libecalc/output/flow_diagram/conftest.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/output/flow_diagram/conftest.py rename to src/tests/libecalc/output/flow_diagram/conftest.py diff --git a/src/ecalc/libraries/libecalc/common/tests/output/flow_diagram/snapshots/test_ecalc_model_mapper/test_all_energy_usage_models/all_energy_usage_models_fde.json b/src/tests/libecalc/output/flow_diagram/snapshots/test_ecalc_model_mapper/test_all_energy_usage_models/all_energy_usage_models_fde.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/output/flow_diagram/snapshots/test_ecalc_model_mapper/test_all_energy_usage_models/all_energy_usage_models_fde.json rename to src/tests/libecalc/output/flow_diagram/snapshots/test_ecalc_model_mapper/test_all_energy_usage_models/all_energy_usage_models_fde.json diff --git a/src/ecalc/libraries/libecalc/common/tests/output/flow_diagram/snapshots/test_ecalc_model_mapper/test_case_with_dates/actual_fde.json b/src/tests/libecalc/output/flow_diagram/snapshots/test_ecalc_model_mapper/test_case_with_dates/actual_fde.json similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/output/flow_diagram/snapshots/test_ecalc_model_mapper/test_case_with_dates/actual_fde.json rename to src/tests/libecalc/output/flow_diagram/snapshots/test_ecalc_model_mapper/test_case_with_dates/actual_fde.json diff --git a/src/ecalc/libraries/libecalc/common/tests/output/flow_diagram/test_ecalc_model_mapper.py b/src/tests/libecalc/output/flow_diagram/test_ecalc_model_mapper.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/output/flow_diagram/test_ecalc_model_mapper.py rename to src/tests/libecalc/output/flow_diagram/test_ecalc_model_mapper.py diff --git a/src/ecalc/libraries/libecalc/common/tests/output/results/handlers/test_handlers.py b/src/tests/libecalc/output/results/handlers/test_handlers.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/output/results/handlers/test_handlers.py rename to src/tests/libecalc/output/results/handlers/test_handlers.py diff --git a/src/ecalc/libraries/libecalc/common/tests/output/results/test_dtos.py b/src/tests/libecalc/output/results/test_dtos.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/output/results/test_dtos.py rename to src/tests/libecalc/output/results/test_dtos.py diff --git a/src/ecalc/libraries/libecalc/common/tests/output/results/test_ltp.py b/src/tests/libecalc/output/results/test_ltp.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/output/results/test_ltp.py rename to src/tests/libecalc/output/results/test_ltp.py diff --git a/src/ecalc/libraries/libecalc/common/tests/output/test_frequencies.py b/src/tests/libecalc/output/test_frequencies.py similarity index 100% rename from src/ecalc/libraries/libecalc/common/tests/output/test_frequencies.py rename to src/tests/libecalc/output/test_frequencies.py diff --git a/src/ecalc/libraries/neqsim/tests/conftest.py b/src/tests/neqsim_ecalc_wrapper/conftest.py similarity index 100% rename from src/ecalc/libraries/neqsim/tests/conftest.py rename to src/tests/neqsim_ecalc_wrapper/conftest.py diff --git a/src/ecalc/libraries/neqsim/tests/integration_tests/test_gerg_fluid.py b/src/tests/neqsim_ecalc_wrapper/integration_tests/test_gerg_fluid.py similarity index 100% rename from src/ecalc/libraries/neqsim/tests/integration_tests/test_gerg_fluid.py rename to src/tests/neqsim_ecalc_wrapper/integration_tests/test_gerg_fluid.py diff --git a/src/ecalc/libraries/neqsim/tests/integration_tests/test_not_threadsafe.py b/src/tests/neqsim_ecalc_wrapper/integration_tests/test_not_threadsafe.py similarity index 100% rename from src/ecalc/libraries/neqsim/tests/integration_tests/test_not_threadsafe.py rename to src/tests/neqsim_ecalc_wrapper/integration_tests/test_not_threadsafe.py diff --git a/src/ecalc/libraries/neqsim/tests/integration_tests/test_remove_liquid.py b/src/tests/neqsim_ecalc_wrapper/integration_tests/test_remove_liquid.py similarity index 100% rename from src/ecalc/libraries/neqsim/tests/integration_tests/test_remove_liquid.py rename to src/tests/neqsim_ecalc_wrapper/integration_tests/test_remove_liquid.py diff --git a/src/ecalc/libraries/neqsim/tests/unit_tests/test_java_service.py b/src/tests/neqsim_ecalc_wrapper/unit_tests/test_java_service.py similarity index 100% rename from src/ecalc/libraries/neqsim/tests/unit_tests/test_java_service.py rename to src/tests/neqsim_ecalc_wrapper/unit_tests/test_java_service.py diff --git a/src/ecalc/libraries/neqsim/tests/unit_tests/test_neqsim_fluid.py b/src/tests/neqsim_ecalc_wrapper/unit_tests/test_neqsim_fluid.py similarity index 100% rename from src/ecalc/libraries/neqsim/tests/unit_tests/test_neqsim_fluid.py rename to src/tests/neqsim_ecalc_wrapper/unit_tests/test_neqsim_fluid.py diff --git a/src/ecalc/cli/typer_cli_stub.py b/src/typer_cli_stub.py similarity index 100% rename from src/ecalc/cli/typer_cli_stub.py rename to src/typer_cli_stub.py