diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/ADMSRoadEmissionsCalculator.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/ADMSRoadEmissionsCalculator.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/ADMSRoadEmissionsCalculator.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/ADMSRoadEmissionsCalculator.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/BaseRoadEmissionsCalculator.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/BaseRoadEmissionsCalculator.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/BaseRoadEmissionsCalculator.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/BaseRoadEmissionsCalculator.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/ColdStartEmissionFactorSupplier.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/ColdStartEmissionFactorSupplier.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/ColdStartEmissionFactorSupplier.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/ColdStartEmissionFactorSupplier.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/ColdStartEmissionsCalculator.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/ColdStartEmissionsCalculator.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/ColdStartEmissionsCalculator.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/ColdStartEmissionsCalculator.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/EmissionFactorSupplier.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/EmissionFactorSupplier.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/EmissionFactorSupplier.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/EmissionFactorSupplier.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/EmissionsCalculator.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/EmissionsCalculator.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/EmissionsCalculator.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/EmissionsCalculator.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/EmissionsUpdater.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/EmissionsUpdater.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/EmissionsUpdater.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/EmissionsUpdater.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/FarmAnimalHousingEmissionFactorSupplier.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/FarmAnimalHousingEmissionFactorSupplier.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/FarmAnimalHousingEmissionFactorSupplier.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/FarmAnimalHousingEmissionFactorSupplier.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/FarmAnimalHousingEmissionsCalculator.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/FarmAnimalHousingEmissionsCalculator.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/FarmAnimalHousingEmissionsCalculator.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/FarmAnimalHousingEmissionsCalculator.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/FarmSourceEmissionsUtil.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/FarmSourceEmissionsUtil.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/FarmSourceEmissionsUtil.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/FarmSourceEmissionsUtil.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/FarmlandEmissionFactorSupplier.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/FarmlandEmissionFactorSupplier.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/FarmlandEmissionFactorSupplier.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/FarmlandEmissionFactorSupplier.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/FarmlandEmissionsCalculator.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/FarmlandEmissionsCalculator.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/FarmlandEmissionsCalculator.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/FarmlandEmissionsCalculator.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/InlandShippingEmissionFactorSupplier.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/InlandShippingEmissionFactorSupplier.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/InlandShippingEmissionFactorSupplier.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/InlandShippingEmissionFactorSupplier.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/InlandShippingEmissionsCalculator.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/InlandShippingEmissionsCalculator.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/InlandShippingEmissionsCalculator.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/InlandShippingEmissionsCalculator.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/ManureStorageEmissionFactorSupplier.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/ManureStorageEmissionFactorSupplier.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/ManureStorageEmissionFactorSupplier.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/ManureStorageEmissionFactorSupplier.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/ManureStorageEmissionsCalculator.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/ManureStorageEmissionsCalculator.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/ManureStorageEmissionsCalculator.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/ManureStorageEmissionsCalculator.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/MaritimeShippingEmissionFactorSupplier.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/MaritimeShippingEmissionFactorSupplier.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/MaritimeShippingEmissionFactorSupplier.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/MaritimeShippingEmissionFactorSupplier.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/MaritimeShippingEmissionsCalculator.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/MaritimeShippingEmissionsCalculator.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/MaritimeShippingEmissionsCalculator.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/MaritimeShippingEmissionsCalculator.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/OffRoadMobileEmissionFactorSupplier.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/OffRoadMobileEmissionFactorSupplier.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/OffRoadMobileEmissionFactorSupplier.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/OffRoadMobileEmissionFactorSupplier.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/OffRoadMobileEmissionsCalculator.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/OffRoadMobileEmissionsCalculator.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/OffRoadMobileEmissionsCalculator.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/OffRoadMobileEmissionsCalculator.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/RoadEmissionFactorSupplier.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/RoadEmissionFactorSupplier.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/RoadEmissionFactorSupplier.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/RoadEmissionFactorSupplier.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/SRMRoadEmissionsCalculator.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/SRMRoadEmissionsCalculator.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/SRMRoadEmissionsCalculator.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/SRMRoadEmissionsCalculator.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/SubSourceEmissionsCalculator.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/SubSourceEmissionsCalculator.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/SubSourceEmissionsCalculator.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/SubSourceEmissionsCalculator.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/shipping/InlandShippingRouteEmissionPoint.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/shipping/InlandShippingRouteEmissionPoint.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/shipping/InlandShippingRouteEmissionPoint.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/shipping/InlandShippingRouteEmissionPoint.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/shipping/MaritimeShippingRouteEmissionPoint.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/shipping/MaritimeShippingRouteEmissionPoint.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/emissions/shipping/MaritimeShippingRouteEmissionPoint.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/emissions/shipping/MaritimeShippingRouteEmissionPoint.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/geometry/EmissionSourceLimits.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/geometry/EmissionSourceLimits.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/geometry/EmissionSourceLimits.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/geometry/EmissionSourceLimits.java
diff --git a/source/imaer-shared/src/main/java/nl/overheid/aerius/shared/geometry/GeometryCalculator.java b/source/imaer-util/src/main/java/nl/overheid/aerius/shared/geometry/GeometryCalculator.java
similarity index 100%
rename from source/imaer-shared/src/main/java/nl/overheid/aerius/shared/geometry/GeometryCalculator.java
rename to source/imaer-util/src/main/java/nl/overheid/aerius/shared/geometry/GeometryCalculator.java
diff --git a/source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/ADMSRoadEmissionsCalculatorTest.java b/source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/ADMSRoadEmissionsCalculatorTest.java
similarity index 100%
rename from source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/ADMSRoadEmissionsCalculatorTest.java
rename to source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/ADMSRoadEmissionsCalculatorTest.java
diff --git a/source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/ColdStartEmissionsCalculatorTest.java b/source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/ColdStartEmissionsCalculatorTest.java
similarity index 100%
rename from source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/ColdStartEmissionsCalculatorTest.java
rename to source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/ColdStartEmissionsCalculatorTest.java
diff --git a/source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/EmissionsCalculatorTest.java b/source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/EmissionsCalculatorTest.java
similarity index 100%
rename from source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/EmissionsCalculatorTest.java
rename to source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/EmissionsCalculatorTest.java
diff --git a/source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/EmissionsUpdaterTest.java b/source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/EmissionsUpdaterTest.java
similarity index 100%
rename from source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/EmissionsUpdaterTest.java
rename to source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/EmissionsUpdaterTest.java
diff --git a/source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/FarmAnimalHousingEmissionsCalculatorTest.java b/source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/FarmAnimalHousingEmissionsCalculatorTest.java
similarity index 100%
rename from source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/FarmAnimalHousingEmissionsCalculatorTest.java
rename to source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/FarmAnimalHousingEmissionsCalculatorTest.java
diff --git a/source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/FarmlandEmissionsCalculatorTest.java b/source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/FarmlandEmissionsCalculatorTest.java
similarity index 100%
rename from source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/FarmlandEmissionsCalculatorTest.java
rename to source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/FarmlandEmissionsCalculatorTest.java
diff --git a/source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/InlandShippingEmissionsCalculatorTest.java b/source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/InlandShippingEmissionsCalculatorTest.java
similarity index 100%
rename from source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/InlandShippingEmissionsCalculatorTest.java
rename to source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/InlandShippingEmissionsCalculatorTest.java
diff --git a/source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/ManureStorageEmissionsCalculatorTest.java b/source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/ManureStorageEmissionsCalculatorTest.java
similarity index 100%
rename from source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/ManureStorageEmissionsCalculatorTest.java
rename to source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/ManureStorageEmissionsCalculatorTest.java
diff --git a/source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/MaritimeShippingEmissionsCalculatorTest.java b/source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/MaritimeShippingEmissionsCalculatorTest.java
similarity index 100%
rename from source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/MaritimeShippingEmissionsCalculatorTest.java
rename to source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/MaritimeShippingEmissionsCalculatorTest.java
diff --git a/source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/OffRoadMobileEmissionsCalculatorTest.java b/source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/OffRoadMobileEmissionsCalculatorTest.java
similarity index 100%
rename from source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/OffRoadMobileEmissionsCalculatorTest.java
rename to source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/OffRoadMobileEmissionsCalculatorTest.java
diff --git a/source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/SRMRoadEmissionsCalculatorTest.java b/source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/SRMRoadEmissionsCalculatorTest.java
similarity index 100%
rename from source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/SRMRoadEmissionsCalculatorTest.java
rename to source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/SRMRoadEmissionsCalculatorTest.java
diff --git a/source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/SubSourceEmissionsCalculatorTest.java b/source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/SubSourceEmissionsCalculatorTest.java
similarity index 100%
rename from source/imaer-shared/src/test/java/nl/overheid/aerius/shared/emissions/SubSourceEmissionsCalculatorTest.java
rename to source/imaer-util/src/test/java/nl/overheid/aerius/shared/emissions/SubSourceEmissionsCalculatorTest.java
diff --git a/source/imaer-shared/src/test/java/nl/overheid/aerius/shared/geometry/EmissionSourceGeometryLimitsTest.java b/source/imaer-util/src/test/java/nl/overheid/aerius/shared/geometry/EmissionSourceGeometryLimitsTest.java
similarity index 100%
rename from source/imaer-shared/src/test/java/nl/overheid/aerius/shared/geometry/EmissionSourceGeometryLimitsTest.java
rename to source/imaer-util/src/test/java/nl/overheid/aerius/shared/geometry/EmissionSourceGeometryLimitsTest.java