diff --git a/source/electrical_heating/electrical_heating/entry_points/job_args/__init__.py b/source/electrical_heating/__init__.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/entry_points/job_args/__init__.py
rename to source/electrical_heating/__init__.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/__init__.py b/source/electrical_heating/src/__init__.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/__init__.py
rename to source/electrical_heating/src/__init__.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/electricity_market/data_values/__init__.py b/source/electrical_heating/src/contracts/__init__.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/electricity_market/data_values/__init__.py
rename to source/electrical_heating/src/contracts/__init__.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/electricity_market/schemas/__init__.py b/source/electrical_heating/src/contracts/electrical_heating_internal/__init__.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/electricity_market/schemas/__init__.py
rename to source/electrical_heating/src/contracts/electrical_heating_internal/__init__.py
diff --git a/source/electrical_heating/contracts/electrical_heating_internal/calculations.py b/source/electrical_heating/src/contracts/electrical_heating_internal/calculations.py
similarity index 100%
rename from source/electrical_heating/contracts/electrical_heating_internal/calculations.py
rename to source/electrical_heating/src/contracts/electrical_heating_internal/calculations.py
diff --git a/source/electrical_heating/contracts/parameters-reference.txt b/source/electrical_heating/src/contracts/parameters-reference.txt
similarity index 100%
rename from source/electrical_heating/contracts/parameters-reference.txt
rename to source/electrical_heating/src/contracts/parameters-reference.txt
diff --git a/source/electrical_heating/electrical_heating/__init__.py b/source/electrical_heating/src/electrical_heating/__init__.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/__init__.py
rename to source/electrical_heating/src/electrical_heating/__init__.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/data_values/__init__.py b/source/electrical_heating/src/electrical_heating/domain/__init__.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/data_values/__init__.py
rename to source/electrical_heating/src/electrical_heating/domain/__init__.py
diff --git a/source/electrical_heating/electrical_heating/domain/calculation.py b/source/electrical_heating/src/electrical_heating/domain/calculation.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/domain/calculation.py
rename to source/electrical_heating/src/electrical_heating/domain/calculation.py
diff --git a/source/electrical_heating/electrical_heating/domain/pyspark_functions.py b/source/electrical_heating/src/electrical_heating/domain/pyspark_functions.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/domain/pyspark_functions.py
rename to source/electrical_heating/src/electrical_heating/domain/pyspark_functions.py
diff --git a/source/electrical_heating/electrical_heating/entry_points/__init__.py b/source/electrical_heating/src/electrical_heating/entry_points/__init__.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/entry_points/__init__.py
rename to source/electrical_heating/src/electrical_heating/entry_points/__init__.py
diff --git a/source/electrical_heating/electrical_heating/entry_points/entry_point.py b/source/electrical_heating/src/electrical_heating/entry_points/entry_point.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/entry_points/entry_point.py
rename to source/electrical_heating/src/electrical_heating/entry_points/entry_point.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/schemas/__init__.py b/source/electrical_heating/src/electrical_heating/entry_points/job_args/__init__.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/schemas/__init__.py
rename to source/electrical_heating/src/electrical_heating/entry_points/job_args/__init__.py
diff --git a/source/electrical_heating/electrical_heating/entry_points/job_args/electrical_heating_args.py b/source/electrical_heating/src/electrical_heating/entry_points/job_args/electrical_heating_args.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/entry_points/job_args/electrical_heating_args.py
rename to source/electrical_heating/src/electrical_heating/entry_points/job_args/electrical_heating_args.py
diff --git a/source/electrical_heating/electrical_heating/entry_points/job_args/electrical_heating_job_args.py b/source/electrical_heating/src/electrical_heating/entry_points/job_args/electrical_heating_job_args.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/entry_points/job_args/electrical_heating_job_args.py
rename to source/electrical_heating/src/electrical_heating/entry_points/job_args/electrical_heating_job_args.py
diff --git a/source/electrical_heating/electrical_heating/entry_points/job_args/environment_variables.py b/source/electrical_heating/src/electrical_heating/entry_points/job_args/environment_variables.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/entry_points/job_args/environment_variables.py
rename to source/electrical_heating/src/electrical_heating/entry_points/job_args/environment_variables.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_gold/data_values/__init__.py b/source/electrical_heating/src/electrical_heating/infrastructure/__init__.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_gold/data_values/__init__.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/__init__.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/electricity_market/__init__.py b/source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/__init__.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/electricity_market/__init__.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/__init__.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/electricity_market/column_names.py b/source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/column_names.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/electricity_market/column_names.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/column_names.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_gold/schemas/__init__.py b/source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/data_values/__init__.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_gold/schemas/__init__.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/data_values/__init__.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/electricity_market/data_values/metering_point_sub_type.py b/source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/data_values/metering_point_sub_type.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/electricity_market/data_values/metering_point_sub_type.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/data_values/metering_point_sub_type.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/electricity_market/data_values/metering_point_type.py b/source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/data_values/metering_point_type.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/electricity_market/data_values/metering_point_type.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/data_values/metering_point_type.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/electricity_market/data_values/resolution.py b/source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/data_values/resolution.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/electricity_market/data_values/resolution.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/data_values/resolution.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/electricity_market/database_definitions.py b/source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/database_definitions.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/electricity_market/database_definitions.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/database_definitions.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/electricity_market/repository.py b/source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/repository.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/electricity_market/repository.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/repository.py
diff --git a/source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/schemas/__init__.py b/source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/schemas/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/source/electrical_heating/electrical_heating/infrastructure/electricity_market/schemas/child_metering_point_periods_v1.py b/source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/schemas/child_metering_point_periods_v1.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/electricity_market/schemas/child_metering_point_periods_v1.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/schemas/child_metering_point_periods_v1.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/electricity_market/schemas/consumption_metering_point_periods_v1.py b/source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/schemas/consumption_metering_point_periods_v1.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/electricity_market/schemas/consumption_metering_point_periods_v1.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/electricity_market/schemas/consumption_metering_point_periods_v1.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/__init__.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/__init__.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/__init__.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/__init__.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/column_names.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/column_names.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/column_names.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/column_names.py
diff --git a/source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/data_values/__init__.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/data_values/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/data_values/metering_point_type.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/data_values/metering_point_type.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/data_values/metering_point_type.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/data_values/metering_point_type.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/data_values/orchestration_type.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/data_values/orchestration_type.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/data_values/orchestration_type.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/data_values/orchestration_type.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/data_values/product.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/data_values/product.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/data_values/product.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/data_values/product.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/data_values/quality.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/data_values/quality.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/data_values/quality.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/data_values/quality.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/data_values/resolution.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/data_values/resolution.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/data_values/resolution.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/data_values/resolution.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/data_values/unit.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/data_values/unit.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/data_values/unit.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/data_values/unit.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/database_definitions.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/database_definitions.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/database_definitions.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/database_definitions.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/repository.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/repository.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/repository.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/repository.py
diff --git a/source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/schemas/__init__.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/schemas/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/schemas/measurements_bronze_v1.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/schemas/measurements_bronze_v1.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_bronze/schemas/measurements_bronze_v1.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_bronze/schemas/measurements_bronze_v1.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_gold/__init__.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/__init__.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_gold/__init__.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/__init__.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_gold/column_names.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/column_names.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_gold/column_names.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/column_names.py
diff --git a/source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/data_values/__init__.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/data_values/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_gold/data_values/metering_point_type.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/data_values/metering_point_type.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_gold/data_values/metering_point_type.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/data_values/metering_point_type.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_gold/database_definitions.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/database_definitions.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_gold/database_definitions.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/database_definitions.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_gold/repository.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/repository.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_gold/repository.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/repository.py
diff --git a/source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/schemas/__init__.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/schemas/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/source/electrical_heating/electrical_heating/infrastructure/measurements_gold/schemas/time_series_points_v1.py b/source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/schemas/time_series_points_v1.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/measurements_gold/schemas/time_series_points_v1.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/measurements_gold/schemas/time_series_points_v1.py
diff --git a/source/electrical_heating/electrical_heating/infrastructure/spark_initializor.py b/source/electrical_heating/src/electrical_heating/infrastructure/spark_initializor.py
similarity index 100%
rename from source/electrical_heating/electrical_heating/infrastructure/spark_initializor.py
rename to source/electrical_heating/src/electrical_heating/infrastructure/spark_initializor.py
diff --git a/source/electrical_heating/setup.py b/source/electrical_heating/src/setup.py
similarity index 100%
rename from source/electrical_heating/setup.py
rename to source/electrical_heating/src/setup.py