diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/API.kt b/library/src/main/java/cloud/pace/sdk/api/API.kt
similarity index 100%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/API.kt
rename to library/src/main/java/cloud/pace/sdk/api/API.kt
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/DynamicFilterCache.kt b/library/src/main/java/cloud/pace/sdk/api/poi/DynamicFilterCache.kt
similarity index 83%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/DynamicFilterCache.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/DynamicFilterCache.kt
index 0bd7b192..fa454b49 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/DynamicFilterCache.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/DynamicFilterCache.kt
@@ -1,7 +1,7 @@
-package cloud.pace.sdk.poikit.poi.download
+package cloud.pace.sdk.api.poi
 
 import android.location.Location
-import cloud.pace.sdk.api.model.Categories
+import cloud.pace.sdk.api.poi.generated.model.Categories
 
 object DynamicFilterCache {
     private var cache: Categories = listOf()
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/GasStationCodes.kt b/library/src/main/java/cloud/pace/sdk/api/poi/GasStationCodes.kt
similarity index 89%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/GasStationCodes.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/GasStationCodes.kt
index 83bb542a..d830601b 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/GasStationCodes.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/GasStationCodes.kt
@@ -1,4 +1,4 @@
-package cloud.pace.sdk.poikit.poi.download
+package cloud.pace.sdk.api.poi
 
 class GasStationCodes {
     companion object {
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/AppPOIsRelationships.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/AppPOIsRelationships.kt
similarity index 90%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/AppPOIsRelationships.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/AppPOIsRelationships.kt
index 478e7253..27cc1551 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/AppPOIsRelationships.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/AppPOIsRelationships.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Categories.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Categories.kt
similarity index 86%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Categories.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Categories.kt
index 63f13a38..2e0545d7 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Categories.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Categories.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Category.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Category.kt
similarity index 90%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Category.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Category.kt
index 9a400f0d..0fad76ee 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Category.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Category.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/CommonCountryId.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/CommonCountryId.kt
similarity index 89%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/CommonCountryId.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/CommonCountryId.kt
index 65a11a9f..af0e9c52 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/CommonCountryId.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/CommonCountryId.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/CommonGeoJSONPoint.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/CommonGeoJSONPoint.kt
similarity index 89%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/CommonGeoJSONPoint.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/CommonGeoJSONPoint.kt
index cf36d312..7b7510e5 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/CommonGeoJSONPoint.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/CommonGeoJSONPoint.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/CommonGeoJSONPolygon.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/CommonGeoJSONPolygon.kt
similarity index 91%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/CommonGeoJSONPolygon.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/CommonGeoJSONPolygon.kt
index bbccd0a0..7664ef3d 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/CommonGeoJSONPolygon.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/CommonGeoJSONPolygon.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/CommonLatLong.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/CommonLatLong.kt
similarity index 88%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/CommonLatLong.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/CommonLatLong.kt
index fb1f8b53..549dca15 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/CommonLatLong.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/CommonLatLong.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/CommonOpeningHours.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/CommonOpeningHours.kt
similarity index 95%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/CommonOpeningHours.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/CommonOpeningHours.kt
index ba2128b7..b79bb1fe 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/CommonOpeningHours.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/CommonOpeningHours.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Currency.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Currency.kt
similarity index 87%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Currency.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Currency.kt
index 9fbf6bb2..36af712b 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Currency.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Currency.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/DedupeRequest.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/DedupeRequest.kt
similarity index 89%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/DedupeRequest.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/DedupeRequest.kt
index f6a4519d..493fbf27 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/DedupeRequest.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/DedupeRequest.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Errors.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Errors.kt
similarity index 98%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Errors.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Errors.kt
index fef3547c..2cce8c39 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Errors.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Errors.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Event.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Event.kt
similarity index 91%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Event.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Event.kt
index 8360742b..1ecee05a 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Event.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Event.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Events.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Events.kt
similarity index 86%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Events.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Events.kt
index 1df601b0..30c821a2 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Events.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Events.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FieldData.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FieldData.kt
similarity index 87%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FieldData.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FieldData.kt
index aae1163f..d5d94d40 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FieldData.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FieldData.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FieldMetaData.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FieldMetaData.kt
similarity index 87%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FieldMetaData.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FieldMetaData.kt
index 05e60965..af92a75d 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FieldMetaData.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FieldMetaData.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FieldName.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FieldName.kt
similarity index 92%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FieldName.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FieldName.kt
index ff42db61..8bae7249 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FieldName.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FieldName.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Fuel.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Fuel.kt
similarity index 94%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Fuel.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Fuel.kt
index ece4af65..d9ae5d92 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Fuel.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Fuel.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FuelAmountUnit.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FuelAmountUnit.kt
similarity index 87%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FuelAmountUnit.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FuelAmountUnit.kt
index 92e42e6b..de59a709 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FuelAmountUnit.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FuelAmountUnit.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FuelPrice.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FuelPrice.kt
similarity index 92%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FuelPrice.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FuelPrice.kt
index 7dfc3885..0bcec7dc 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FuelPrice.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FuelPrice.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FuelPriceResponse.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FuelPriceResponse.kt
similarity index 88%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FuelPriceResponse.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FuelPriceResponse.kt
index beb5d5a3..582e479d 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FuelPriceResponse.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FuelPriceResponse.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FuelType.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FuelType.kt
similarity index 91%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FuelType.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FuelType.kt
index 2c7960b7..4da6ae97 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/FuelType.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/FuelType.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/GasStation.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/GasStation.kt
similarity index 99%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/GasStation.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/GasStation.kt
index 7c496541..580148fb 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/GasStation.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/GasStation.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/GasStations.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/GasStations.kt
similarity index 86%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/GasStations.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/GasStations.kt
index ecd9deca..ca8a6279 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/GasStations.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/GasStations.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/LocationBasedApp.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/LocationBasedApp.kt
similarity index 97%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/LocationBasedApp.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/LocationBasedApp.kt
index 4285c6c6..6cd98833 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/LocationBasedApp.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/LocationBasedApp.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/LocationBasedAppWithRefs.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/LocationBasedAppWithRefs.kt
similarity index 97%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/LocationBasedAppWithRefs.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/LocationBasedAppWithRefs.kt
index 43bce844..54c4f441 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/LocationBasedAppWithRefs.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/LocationBasedAppWithRefs.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/LocationBasedApps.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/LocationBasedApps.kt
similarity index 87%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/LocationBasedApps.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/LocationBasedApps.kt
index 346d32f2..7a17427d 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/LocationBasedApps.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/LocationBasedApps.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/LocationBasedAppsWithRefs.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/LocationBasedAppsWithRefs.kt
similarity index 87%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/LocationBasedAppsWithRefs.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/LocationBasedAppsWithRefs.kt
index 0712f304..111ce27f 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/LocationBasedAppsWithRefs.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/LocationBasedAppsWithRefs.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/MoveRequest.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/MoveRequest.kt
similarity index 91%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/MoveRequest.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/MoveRequest.kt
index 9e0c8290..dc2031be 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/MoveRequest.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/MoveRequest.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/POI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/POI.kt
similarity index 95%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/POI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/POI.kt
index 88015cbf..e4b5c65d 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/POI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/POI.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/POIType.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/POIType.kt
similarity index 89%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/POIType.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/POIType.kt
index 77331064..462c05b9 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/POIType.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/POIType.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/POIs.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/POIs.kt
similarity index 86%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/POIs.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/POIs.kt
index 88d03fc0..02e40bc2 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/POIs.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/POIs.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Policies.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Policies.kt
similarity index 86%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Policies.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Policies.kt
index a4f12b86..f812b935 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Policies.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Policies.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Policy.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Policy.kt
similarity index 92%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Policy.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Policy.kt
index 0e37a081..c0814a0e 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Policy.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Policy.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/PolicyRule.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/PolicyRule.kt
similarity index 87%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/PolicyRule.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/PolicyRule.kt
index f7d8f035..9a8a6c91 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/PolicyRule.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/PolicyRule.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/PolicyRulePriority.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/PolicyRulePriority.kt
similarity index 88%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/PolicyRulePriority.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/PolicyRulePriority.kt
index d2e4f43c..a993380f 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/PolicyRulePriority.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/PolicyRulePriority.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/PriceHistory.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/PriceHistory.kt
similarity index 94%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/PriceHistory.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/PriceHistory.kt
index 68fc8708..16330674 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/PriceHistory.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/PriceHistory.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/ReferenceStatus.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/ReferenceStatus.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/ReferenceStatus.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/ReferenceStatus.kt
index a67dcc25..ae7e5ae4 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/ReferenceStatus.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/ReferenceStatus.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/ReferenceStatuses.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/ReferenceStatuses.kt
similarity index 87%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/ReferenceStatuses.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/ReferenceStatuses.kt
index 1fdd2d3a..687ae7a1 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/ReferenceStatuses.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/ReferenceStatuses.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/RegionalPrices.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/RegionalPrices.kt
similarity index 91%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/RegionalPrices.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/RegionalPrices.kt
index 96b42433..f5de2737 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/RegionalPrices.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/RegionalPrices.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Source.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Source.kt
similarity index 94%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Source.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Source.kt
index a9bcba70..8205b9bb 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Source.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Source.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Sources.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Sources.kt
similarity index 86%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Sources.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Sources.kt
index 9486d048..ca4a5a64 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Sources.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Sources.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Subscription.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Subscription.kt
similarity index 98%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Subscription.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Subscription.kt
index 92c597a0..4e37380a 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/model/Subscription.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/model/Subscription.kt
@@ -5,7 +5,7 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.model
+package cloud.pace.sdk.api.poi.generated.model
 
 import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.JsonApi
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/admin/DeduplicatePoiAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/DeduplicatePoiAPI.kt
similarity index 92%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/admin/DeduplicatePoiAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/DeduplicatePoiAPI.kt
index ef28d3e6..596a3098 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/admin/DeduplicatePoiAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/DeduplicatePoiAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.admin
+package cloud.pace.sdk.api.poi.generated.request.admin
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -23,7 +23,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 
 interface DeduplicatePoiService {
 
-    @PATCH("/admin/poi/dedupe")
+    @PATCH("admin/poi/dedupe")
     fun deduplicatePoi(
     ): Call<Void>
 }
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/admin/MovePoiAtPositionAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/MovePoiAtPositionAPI.kt
similarity index 92%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/admin/MovePoiAtPositionAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/MovePoiAtPositionAPI.kt
index c31d591b..1672757c 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/admin/MovePoiAtPositionAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/admin/MovePoiAtPositionAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.admin
+package cloud.pace.sdk.api.poi.generated.request.admin
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -23,7 +23,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 
 interface MovePoiAtPositionService {
 
-    @PATCH("/admin/poi/move")
+    @PATCH("admin/poi/move")
     fun movePoiAtPosition(
     ): Call<Void>
 }
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/CheckForPaceAppAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CheckForPaceAppAPI.kt
similarity index 95%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/CheckForPaceAppAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CheckForPaceAppAPI.kt
index 3aafac64..82d890e1 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/CheckForPaceAppAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CheckForPaceAppAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.apps
+package cloud.pace.sdk.api.poi.generated.request.apps
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -30,7 +30,7 @@ You can (or should) trigger this whenever:
 * Every 5 seconds if the user "left the road"
 Please note that calling this API is very cheap and can be done regularly.
  **/
-    @GET("/apps/query")
+    @GET("apps/query")
     fun checkForPaceApp(
         @Query("filter[latitude]") filterlatitude: Float,
         @Query("filter[longitude]") filterlongitude: Float,
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/CreateAppAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CreateAppAPI.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/CreateAppAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CreateAppAPI.kt
index aebbb8fd..163ada94 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/CreateAppAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/CreateAppAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.apps
+package cloud.pace.sdk.api.poi.generated.request.apps
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface CreateAppService {
 
     /** Creates a new application **/
-    @POST("/apps")
+    @POST("apps")
     fun createApp(
     ): Call<LocationBasedApp>
 }
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/DeleteAppAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/DeleteAppAPI.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/DeleteAppAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/DeleteAppAPI.kt
index 6789dd16..45d34f31 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/DeleteAppAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/DeleteAppAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.apps
+package cloud.pace.sdk.api.poi.generated.request.apps
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface DeleteAppService {
 
     /** Deletes App with specified id **/
-    @DELETE("/apps/{appID}")
+    @DELETE("apps/{appID}")
     fun deleteApp(
         @Path("appID") appID: String? = null
     ): Call<Void>
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/GetAppAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppAPI.kt
similarity index 94%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/GetAppAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppAPI.kt
index e3cc0c67..b4ae6b6a 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/GetAppAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.apps
+package cloud.pace.sdk.api.poi.generated.request.apps
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -26,7 +26,7 @@ interface GetAppService {
     /** Returns App with specified id.
 In case the query returns a `404` (`Not Found`) the app was deleted and should be deleted from any caches.
  **/
-    @GET("/apps/{appID}")
+    @GET("apps/{appID}")
     fun getApp(
         @Path("appID") appID: String? = null
     ): Call<LocationBasedApp>
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/GetAppPOIsRelationshipsAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppPOIsRelationshipsAPI.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/GetAppPOIsRelationshipsAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppPOIsRelationshipsAPI.kt
index dba6022a..1fed5035 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/GetAppPOIsRelationshipsAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppPOIsRelationshipsAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.apps
+package cloud.pace.sdk.api.poi.generated.request.apps
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface GetAppPOIsRelationshipsService {
 
     /** Returns all POI relations for specified app id **/
-    @GET("/apps/{appID}/relationships/pois")
+    @GET("apps/{appID}/relationships/pois")
     fun getAppPOIsRelationships(
         @Path("appID") appID: String? = null
     ): Call<List<AppPOIsRelationships>>
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/GetAppRedirectAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppRedirectAPI.kt
similarity index 92%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/GetAppRedirectAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppRedirectAPI.kt
index b63c339d..0b0c355d 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/GetAppRedirectAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppRedirectAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.apps
+package cloud.pace.sdk.api.poi.generated.request.apps
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -23,7 +23,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 
 interface GetAppRedirectService {
 
-    @GET("/apps/{appID}/redirect")
+    @GET("apps/{appID}/redirect")
     fun getAppRedirect(
         @Path("appID") appID: String? = null
     ): Call<Void>
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/GetAppsAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppsAPI.kt
similarity index 92%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/GetAppsAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppsAPI.kt
index edb2bb76..cfdcf4dd 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/GetAppsAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/GetAppsAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.apps
+package cloud.pace.sdk.api.poi.generated.request.apps
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -25,7 +25,7 @@ interface GetAppsService {
 
     /** Returns a paginated list of apps optionally filtered by type and/or query.
  **/
-    @GET("/apps")
+    @GET("apps")
     fun getApps(
         @Query("page[number]") pagenumber: Int? = null,
         @Query("page[size]") pagesize: Int? = null,
@@ -68,7 +68,7 @@ private val service: GetAppsService by lazy {
 }
 
 fun API.AppsAPI.getApps(pagenumber: Int? = null, pagesize: Int? = null, filterappType: String? = null, filtercache: String? = null, filtersince: Date? = null): Call<LocationBasedApps> {
-    return service.getApps(pagenumber, pagesize, filterappType, filtercache, filtersince?.toIso8601()?.dropLast(9)+'Z' )
+    return service.getApps(pagenumber, pagesize, filterappType, filtercache, filtersince?.toIso8601()?.dropLast(9)?.let { it +'Z'} )
 }
 
 
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/UpdateAppAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/UpdateAppAPI.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/UpdateAppAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/UpdateAppAPI.kt
index 30db8197..19c689c1 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/UpdateAppAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/UpdateAppAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.apps
+package cloud.pace.sdk.api.poi.generated.request.apps
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface UpdateAppService {
 
     /** Updates App with specified id **/
-    @PUT("/apps/{appID}")
+    @PUT("apps/{appID}")
     fun updateApp(
         @Path("appID") appID: String? = null
     ): Call<LocationBasedApp>
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/UpdateAppPOIsRelationshipsAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/UpdateAppPOIsRelationshipsAPI.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/UpdateAppPOIsRelationshipsAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/UpdateAppPOIsRelationshipsAPI.kt
index 31f2bb5b..360da362 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/apps/UpdateAppPOIsRelationshipsAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/apps/UpdateAppPOIsRelationshipsAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.apps
+package cloud.pace.sdk.api.poi.generated.request.apps
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface UpdateAppPOIsRelationshipsService {
 
     /** Update all POI relations for specified app id **/
-    @PATCH("/apps/{appID}/relationships/pois")
+    @PATCH("apps/{appID}/relationships/pois")
     fun updateAppPOIsRelationships(
         @Path("appID") appID: String? = null
     ): Call<List<AppPOIsRelationships>>
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/dataDumps/GetDuplicatesKMLAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/dataDumps/GetDuplicatesKMLAPI.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/dataDumps/GetDuplicatesKMLAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/dataDumps/GetDuplicatesKMLAPI.kt
index 23f2340c..93a6bacf 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/dataDumps/GetDuplicatesKMLAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/dataDumps/GetDuplicatesKMLAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.dataDumps
+package cloud.pace.sdk.api.poi.generated.request.dataDumps
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface GetDuplicatesKMLService {
 
     /** Generates a map of potential gas station duplicates (closer than 50m to eachother) for specified country. **/
-    @GET("/datadumps/duplicatemap/{countryCode}")
+    @GET("datadumps/duplicatemap/{countryCode}")
     fun getDuplicatesKML(
         @Path("countryCode") countryCode: String? = null
     ): Call<Void>
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/dataDumps/GetPoisDumpAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/dataDumps/GetPoisDumpAPI.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/dataDumps/GetPoisDumpAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/dataDumps/GetPoisDumpAPI.kt
index dfd6fbf5..41c074d6 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/dataDumps/GetPoisDumpAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/dataDumps/GetPoisDumpAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.dataDumps
+package cloud.pace.sdk.api.poi.generated.request.dataDumps
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -25,7 +25,7 @@ interface GetPoisDumpService {
 
     /** Dump all POI data in XLSX format, along with full amenities.
  **/
-    @GET("/datadumps/pois")
+    @GET("datadumps/pois")
     fun getPoisDump(
         @Query("Accept") accept: String
     ): Call<Void>
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/delivery/DeleteGasStationReferenceStatusAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/delivery/DeleteGasStationReferenceStatusAPI.kt
similarity index 91%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/delivery/DeleteGasStationReferenceStatusAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/delivery/DeleteGasStationReferenceStatusAPI.kt
index e9305270..1428a490 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/delivery/DeleteGasStationReferenceStatusAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/delivery/DeleteGasStationReferenceStatusAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.delivery
+package cloud.pace.sdk.api.poi.generated.request.delivery
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface DeleteGasStationReferenceStatusService {
 
     /** Deletes a reference status of a gas station **/
-    @DELETE("/delivery/gas-stations/{gasStationId}/reference-status/{reference}")
+    @DELETE("delivery/gas-stations/{gasStationId}/reference-status/{reference}")
     fun deleteGasStationReferenceStatus(
         @Path("gasStationId") gasStationId: String,
         @Path("reference") reference: String
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/delivery/PutGasStationReferenceStatusAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/delivery/PutGasStationReferenceStatusAPI.kt
similarity index 91%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/delivery/PutGasStationReferenceStatusAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/delivery/PutGasStationReferenceStatusAPI.kt
index c1ecc2f2..2cb615a5 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/delivery/PutGasStationReferenceStatusAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/delivery/PutGasStationReferenceStatusAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.delivery
+package cloud.pace.sdk.api.poi.generated.request.delivery
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface PutGasStationReferenceStatusService {
 
     /** Creates or updates a reference status of a gas station **/
-    @PUT("/delivery/gas-stations/{gasStationId}/reference-status/{reference}")
+    @PUT("delivery/gas-stations/{gasStationId}/reference-status/{reference}")
     fun putGasStationReferenceStatus(
         @Path("gasStationId") gasStationId: String,
         @Path("reference") reference: String
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/events/GetEventsAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/events/GetEventsAPI.kt
similarity index 94%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/events/GetEventsAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/events/GetEventsAPI.kt
index eb1ebb44..76c3a4ae 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/events/GetEventsAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/events/GetEventsAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.events
+package cloud.pace.sdk.api.poi.generated.request.events
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface GetEventsService {
 
     /** Returns a list of events optionally filtered by poi type and/or country id and/or user id **/
-    @GET("/events")
+    @GET("events")
     fun getEvents(
         @Query("page[number]") pagenumber: Int? = null,
         @Query("page[size]") pagesize: Int? = null,
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/gasStations/GetGasStationAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationAPI.kt
similarity index 95%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/gasStations/GetGasStationAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationAPI.kt
index 6fe7df52..2660e285 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/gasStations/GetGasStationAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.gasStations
+package cloud.pace.sdk.api.poi.generated.request.gasStations
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/gasStations/GetGasStationFuelTypeNameMappingAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationFuelTypeNameMappingAPI.kt
similarity index 94%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/gasStations/GetGasStationFuelTypeNameMappingAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationFuelTypeNameMappingAPI.kt
index a84856f9..8ba656d9 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/gasStations/GetGasStationFuelTypeNameMappingAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationFuelTypeNameMappingAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.gasStations
+package cloud.pace.sdk.api.poi.generated.request.gasStations
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -25,7 +25,7 @@ interface GetGasStationFuelTypeNameMappingService {
 
     /** Every gas station potential has different names for the same fuel types. This endpoint accepts the gas station's specific name and return a mapping where the specific name is mapped to a normalized version which should be globally the same across gas stations.
  **/
-    @GET("/gas-stations/{id}/fueltype")
+    @GET("gas-stations/{id}/fueltype")
     fun getGasStationFuelTypeNameMapping(
         @Path("id") id: String,
         @Query("filter[productName]") filterproductName: String
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/gasStations/GetGasStationsAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationsAPI.kt
similarity index 96%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/gasStations/GetGasStationsAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationsAPI.kt
index 76789d9f..ab1f59b7 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/gasStations/GetGasStationsAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/gasStations/GetGasStationsAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.gasStations
+package cloud.pace.sdk.api.poi.generated.request.gasStations
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -31,7 +31,7 @@ To search inside a specific radius around a given longitude and latitude provide
 To search inside a bounding box provide the following query parameter:
 * boundingBox
  **/
-    @GET("/gas-stations")
+    @GET("gas-stations")
     fun getGasStations(
         @Query("page[number]") pagenumber: Int? = null,
         @Query("page[size]") pagesize: Int? = null,
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/metadataFilters/GetMetadataFiltersAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/metadataFilters/GetMetadataFiltersAPI.kt
similarity index 95%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/metadataFilters/GetMetadataFiltersAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/metadataFilters/GetMetadataFiltersAPI.kt
index 29986176..01a8b84b 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/metadataFilters/GetMetadataFiltersAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/metadataFilters/GetMetadataFiltersAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.metadataFilters
+package cloud.pace.sdk.api.poi.generated.request.metadataFilters
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/poi/ChangePoiAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/ChangePoiAPI.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/poi/ChangePoiAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/ChangePoiAPI.kt
index b4224d50..e3556d43 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/poi/ChangePoiAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/ChangePoiAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.poi
+package cloud.pace.sdk.api.poi.generated.request.poi
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface ChangePoiService {
 
     /** Returns POI with specified id (only passed attributes will be updated) **/
-    @PATCH("/pois/{poiId}")
+    @PATCH("pois/{poiId}")
     fun changePoi(
         @Path("poiId") poiId: String? = null
     ): Call<POI>
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/poi/GetPoiAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/GetPoiAPI.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/poi/GetPoiAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/GetPoiAPI.kt
index bcdff604..37e8c1e5 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/poi/GetPoiAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/GetPoiAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.poi
+package cloud.pace.sdk.api.poi.generated.request.poi
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface GetPoiService {
 
     /** Returns POI with specified id **/
-    @GET("/pois/{poiId}")
+    @GET("pois/{poiId}")
     fun getPoi(
         @Path("poiId") poiId: String? = null
     ): Call<POI>
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/poi/GetPoisAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/GetPoisAPI.kt
similarity index 95%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/poi/GetPoisAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/GetPoisAPI.kt
index e9ff0ee6..b54f8a84 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/poi/GetPoisAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/poi/GetPoisAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.poi
+package cloud.pace.sdk.api.poi.generated.request.poi
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface GetPoisService {
 
     /** Returns a paginated list of POIs optionally filtered by type, appId and/or query **/
-    @GET("/pois")
+    @GET("pois")
     fun getPois(
         @Query("page[number]") pagenumber: Int? = null,
         @Query("page[size]") pagesize: Int? = null,
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/policies/CreatePolicyAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/CreatePolicyAPI.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/policies/CreatePolicyAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/CreatePolicyAPI.kt
index 4dd4d95c..82694099 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/policies/CreatePolicyAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/CreatePolicyAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.policies
+package cloud.pace.sdk.api.poi.generated.request.policies
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface CreatePolicyService {
 
     /** Creates a new policy **/
-    @POST("/policies")
+    @POST("policies")
     fun createPolicy(
     ): Call<Policy>
 }
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/policies/GetPoliciesAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/GetPoliciesAPI.kt
similarity index 95%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/policies/GetPoliciesAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/GetPoliciesAPI.kt
index 54055e9c..dcb46838 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/policies/GetPoliciesAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/GetPoliciesAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.policies
+package cloud.pace.sdk.api.poi.generated.request.policies
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface GetPoliciesService {
 
     /** Returns a paginated list of policies optionally filtered by poi type and/or country id and/or user id **/
-    @GET("/policies")
+    @GET("policies")
     fun getPolicies(
         @Query("page[number]") pagenumber: Int? = null,
         @Query("page[size]") pagesize: Int? = null,
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/policies/GetPolicyAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/GetPolicyAPI.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/policies/GetPolicyAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/GetPolicyAPI.kt
index 3329e350..f19f598a 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/policies/GetPolicyAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/policies/GetPolicyAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.policies
+package cloud.pace.sdk.api.poi.generated.request.policies
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface GetPolicyService {
 
     /** Returns policy with specified id **/
-    @GET("/policies/{policyId}")
+    @GET("policies/{policyId}")
     fun getPolicy(
         @Path("policyId") policyId: String? = null
     ): Call<Policy>
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/priceHistories/GetPriceHistoryAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/priceHistories/GetPriceHistoryAPI.kt
similarity index 92%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/priceHistories/GetPriceHistoryAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/priceHistories/GetPriceHistoryAPI.kt
index e221cebd..1177e15e 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/priceHistories/GetPriceHistoryAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/priceHistories/GetPriceHistoryAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.priceHistories
+package cloud.pace.sdk.api.poi.generated.request.priceHistories
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -68,7 +68,7 @@ private val service: GetPriceHistoryService by lazy {
 }
 
 fun API.PriceHistoriesAPI.getPriceHistory(id: String, fuelType: Fuel? = null, filterfrom: Date? = null, filterto: Date? = null, filtergranularity: String? = null): Call<PriceHistory> {
-    return service.getPriceHistory(id, fuelType, filterfrom?.toIso8601()?.dropLast(9)+'Z' , filterto?.toIso8601()?.dropLast(9)+'Z' , filtergranularity)
+    return service.getPriceHistory(id, fuelType, filterfrom?.toIso8601()?.dropLast(9)?.let { it +'Z'} , filterto?.toIso8601()?.dropLast(9)?.let { it +'Z'} , filtergranularity)
 }
 
 
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/prices/GetRegionalPricesAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/prices/GetRegionalPricesAPI.kt
similarity index 95%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/prices/GetRegionalPricesAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/prices/GetRegionalPricesAPI.kt
index bbdb792c..34bddea9 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/prices/GetRegionalPricesAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/prices/GetRegionalPricesAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.prices
+package cloud.pace.sdk.api.poi.generated.request.prices
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/sources/CreateSourceAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/CreateSourceAPI.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/sources/CreateSourceAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/CreateSourceAPI.kt
index 602d8832..a116487f 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/sources/CreateSourceAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/CreateSourceAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.sources
+package cloud.pace.sdk.api.poi.generated.request.sources
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface CreateSourceService {
 
     /** Creates a new source **/
-    @POST("/sources")
+    @POST("sources")
     fun createSource(
     ): Call<Source>
 }
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/sources/DeleteSourceAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/DeleteSourceAPI.kt
similarity index 92%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/sources/DeleteSourceAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/DeleteSourceAPI.kt
index 5e232f00..b5d74dd7 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/sources/DeleteSourceAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/DeleteSourceAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.sources
+package cloud.pace.sdk.api.poi.generated.request.sources
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface DeleteSourceService {
 
     /** Deletes source with specified id **/
-    @DELETE("/sources/{sourceId}")
+    @DELETE("sources/{sourceId}")
     fun deleteSource(
         @Path("sourceId") sourceId: String? = null
     ): Call<Void>
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/sources/GetSourceAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/GetSourceAPI.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/sources/GetSourceAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/GetSourceAPI.kt
index 0810c8bf..1ed53a16 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/sources/GetSourceAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/GetSourceAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.sources
+package cloud.pace.sdk.api.poi.generated.request.sources
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface GetSourceService {
 
     /** Returns source with specified id **/
-    @GET("/sources/{sourceId}")
+    @GET("sources/{sourceId}")
     fun getSource(
         @Path("sourceId") sourceId: String? = null
     ): Call<Source>
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/sources/GetSourcesAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/GetSourcesAPI.kt
similarity index 94%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/sources/GetSourcesAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/GetSourcesAPI.kt
index fca70dc0..7de52146 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/sources/GetSourcesAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/GetSourcesAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.sources
+package cloud.pace.sdk.api.poi.generated.request.sources
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface GetSourcesService {
 
     /** Returns a paginated list of sources optionally filtered by poi type and/or name **/
-    @GET("/sources")
+    @GET("sources")
     fun getSources(
         @Query("page[number]") pagenumber: Int? = null,
         @Query("page[size]") pagesize: Int? = null,
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/sources/UpdateSourceAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/UpdateSourceAPI.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/sources/UpdateSourceAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/UpdateSourceAPI.kt
index ec13871a..861578c2 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/sources/UpdateSourceAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/sources/UpdateSourceAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.sources
+package cloud.pace.sdk.api.poi.generated.request.sources
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -24,7 +24,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 interface UpdateSourceService {
 
     /** Updates source with specified id **/
-    @PUT("/sources/{sourceId}")
+    @PUT("sources/{sourceId}")
     fun updateSource(
         @Path("sourceId") sourceId: String? = null
     ): Call<Source>
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/subscriptions/DeleteSubscriptionAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/DeleteSubscriptionAPI.kt
similarity index 92%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/subscriptions/DeleteSubscriptionAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/DeleteSubscriptionAPI.kt
index 1ae25dbc..c5c82887 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/subscriptions/DeleteSubscriptionAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/DeleteSubscriptionAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.subscriptions
+package cloud.pace.sdk.api.poi.generated.request.subscriptions
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -23,7 +23,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 
 interface DeleteSubscriptionService {
 
-    @DELETE("/subscriptions/{id}")
+    @DELETE("subscriptions/{id}")
     fun deleteSubscription(
     ): Call<Void>
 }
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/subscriptions/GetSubscriptionsAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/GetSubscriptionsAPI.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/subscriptions/GetSubscriptionsAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/GetSubscriptionsAPI.kt
index d0a12f55..5c57e069 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/subscriptions/GetSubscriptionsAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/GetSubscriptionsAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.subscriptions
+package cloud.pace.sdk.api.poi.generated.request.subscriptions
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -25,7 +25,7 @@ interface GetSubscriptionsService {
 
     /** Returns a list of all current (not expired) subscriptions of the user.
  **/
-    @GET("/subscriptions")
+    @GET("subscriptions")
     fun getSubscriptions(
     ): Call<Subscription>
 }
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/subscriptions/StoreSubscriptionAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/StoreSubscriptionAPI.kt
similarity index 94%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/subscriptions/StoreSubscriptionAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/StoreSubscriptionAPI.kt
index 0ac71bed..665e11b2 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/subscriptions/StoreSubscriptionAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/subscriptions/StoreSubscriptionAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.subscriptions
+package cloud.pace.sdk.api.poi.generated.request.subscriptions
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -38,7 +38,7 @@ interface StoreSubscriptionService {
 }
 ```
  **/
-    @PUT("/subscriptions/{id}")
+    @PUT("subscriptions/{id}")
     fun storeSubscription(
     ): Call<Subscription>
 }
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/tiles/GetTilesAPI.kt b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/tiles/GetTilesAPI.kt
similarity index 93%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/tiles/GetTilesAPI.kt
rename to library/src/main/java/cloud/pace/sdk/api/poi/generated/request/tiles/GetTilesAPI.kt
index f10b3284..d95a54b6 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/download/generated/request/tiles/GetTilesAPI.kt
+++ b/library/src/main/java/cloud/pace/sdk/api/poi/generated/request/tiles/GetTilesAPI.kt
@@ -5,10 +5,10 @@
  * https://github.com/pace/SwagGen
  */
 
-package cloud.pace.sdk.api.request.tiles
+package cloud.pace.sdk.api.poi.generated.request.tiles
 
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.*
+import cloud.pace.sdk.api.poi.generated.model.*
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
 import moe.banana.jsonapi2.JsonApiConverterFactory
@@ -25,7 +25,7 @@ interface GetTilesService {
 
     /** Get a list of map tiles in the Protobuf binary wire format.
  **/
-    @POST("/v1/tiles/query")
+    @POST("v1/tiles/query")
     fun getTiles(
     ): Call<Void>
 }
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/POIKit.kt b/library/src/main/java/cloud/pace/sdk/poikit/POIKit.kt
index c3ac1e2e..2287c36c 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/POIKit.kt
+++ b/library/src/main/java/cloud/pace/sdk/poikit/POIKit.kt
@@ -6,19 +6,19 @@ import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.ProcessLifecycleOwner
 import cloud.pace.sdk.api.API
-import cloud.pace.sdk.api.model.Categories
-import cloud.pace.sdk.api.model.Fuel
-import cloud.pace.sdk.api.model.PriceHistory
-import cloud.pace.sdk.api.model.RegionalPrices
-import cloud.pace.sdk.api.request.gasStations.getGasStation
-import cloud.pace.sdk.api.request.metadataFilters.getMetadataFilters
-import cloud.pace.sdk.api.request.priceHistories.getPriceHistory
-import cloud.pace.sdk.api.request.prices.getRegionalPrices
 import cloud.pace.sdk.poikit.database.POIKitDatabase
 import cloud.pace.sdk.poikit.poi.*
-import cloud.pace.sdk.poikit.poi.download.GasStationCodes
-import cloud.pace.sdk.poikit.poi.download.GasStationMovedResponse
-import cloud.pace.sdk.poikit.poi.downloadOld.TileDownloader
+import cloud.pace.sdk.api.poi.GasStationCodes
+import cloud.pace.sdk.api.poi.GasStationMovedResponse
+import cloud.pace.sdk.api.poi.generated.model.Categories
+import cloud.pace.sdk.api.poi.generated.model.Fuel
+import cloud.pace.sdk.api.poi.generated.model.PriceHistory
+import cloud.pace.sdk.api.poi.generated.model.RegionalPrices
+import cloud.pace.sdk.api.poi.generated.request.gasStations.getGasStation
+import cloud.pace.sdk.api.poi.generated.request.metadataFilters.getMetadataFilters
+import cloud.pace.sdk.api.poi.generated.request.priceHistories.getPriceHistory
+import cloud.pace.sdk.api.poi.generated.request.prices.getRegionalPrices
+import cloud.pace.sdk.poikit.poi.download.TileDownloader
 import cloud.pace.sdk.poikit.routing.NavigationApiClient
 import cloud.pace.sdk.poikit.routing.NavigationMode
 import cloud.pace.sdk.poikit.routing.NavigationRequest
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/Geometry.kt b/library/src/main/java/cloud/pace/sdk/poikit/poi/Geometry.kt
index dd63856b..9a292c35 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/Geometry.kt
+++ b/library/src/main/java/cloud/pace/sdk/poikit/poi/Geometry.kt
@@ -1,7 +1,7 @@
 package cloud.pace.sdk.poikit.poi
 
 import android.util.Log
-import cloud.pace.sdk.poikit.poi.downloadOld.VectorTile
+import cloud.pace.sdk.poikit.poi.download.VectorTile
 
 class Geometry {
 
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/LocationPoint.kt b/library/src/main/java/cloud/pace/sdk/poikit/poi/LocationPoint.kt
index 2e841b54..803dc05f 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/LocationPoint.kt
+++ b/library/src/main/java/cloud/pace/sdk/poikit/poi/LocationPoint.kt
@@ -2,7 +2,7 @@ package cloud.pace.sdk.poikit.poi
 
 import android.location.Location
 import android.os.Parcelable
-import cloud.pace.sdk.poikit.poi.downloadOld.TileInformation
+import cloud.pace.sdk.poikit.poi.download.TileInformation
 import cloud.pace.sdk.poikit.utils.GeoMathUtils
 import cloud.pace.sdk.poikit.utils.GeoMathUtils.toDegrees
 import cloud.pace.sdk.poikit.utils.GeoMathUtils.toRadian
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/PoiKitObserverToken.kt b/library/src/main/java/cloud/pace/sdk/poikit/poi/PoiKitObserverToken.kt
index bfc02ac1..a439d93d 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/PoiKitObserverToken.kt
+++ b/library/src/main/java/cloud/pace/sdk/poikit/poi/PoiKitObserverToken.kt
@@ -5,8 +5,8 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import cloud.pace.sdk.poikit.POIKit
 import cloud.pace.sdk.poikit.database.GasStationDAO
-import cloud.pace.sdk.poikit.poi.downloadOld.TileDownloader
-import cloud.pace.sdk.poikit.poi.downloadOld.TileQueryRequestOuterClass.TileQueryRequest.*
+import cloud.pace.sdk.poikit.poi.download.TileDownloader
+import cloud.pace.sdk.poikit.poi.download.TileQueryRequestOuterClass.TileQueryRequest.*
 import cloud.pace.sdk.poikit.utils.POIKitConfig
 import cloud.pace.sdk.poikit.utils.ZoomException
 import cloud.pace.sdk.poikit.utils.diameter
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/TileDownloader.kt b/library/src/main/java/cloud/pace/sdk/poikit/poi/download/TileDownloader.kt
similarity index 99%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/TileDownloader.kt
rename to library/src/main/java/cloud/pace/sdk/poikit/poi/download/TileDownloader.kt
index 780dc93c..9ba7fed3 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/TileDownloader.kt
+++ b/library/src/main/java/cloud/pace/sdk/poikit/poi/download/TileDownloader.kt
@@ -1,4 +1,4 @@
-package cloud.pace.sdk.poikit.poi.downloadOld
+package cloud.pace.sdk.poikit.poi.download
 
 import android.util.Log
 import cloud.pace.sdk.poikit.poi.GasStation
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/TileInformation.kt b/library/src/main/java/cloud/pace/sdk/poikit/poi/download/TileInformation.kt
similarity index 97%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/TileInformation.kt
rename to library/src/main/java/cloud/pace/sdk/poikit/poi/download/TileInformation.kt
index af583905..562170ea 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/TileInformation.kt
+++ b/library/src/main/java/cloud/pace/sdk/poikit/poi/download/TileInformation.kt
@@ -1,4 +1,4 @@
-package cloud.pace.sdk.poikit.poi.downloadOld
+package cloud.pace.sdk.poikit.poi.download
 
 import android.os.Parcelable
 import cloud.pace.sdk.poikit.poi.LocationPoint
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/TileQueryRequestOuterClass.java b/library/src/main/java/cloud/pace/sdk/poikit/poi/download/TileQueryRequestOuterClass.java
similarity index 99%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/TileQueryRequestOuterClass.java
rename to library/src/main/java/cloud/pace/sdk/poikit/poi/download/TileQueryRequestOuterClass.java
index d01e4646..2d47fc36 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/TileQueryRequestOuterClass.java
+++ b/library/src/main/java/cloud/pace/sdk/poikit/poi/download/TileQueryRequestOuterClass.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: tile_query_request.proto
 
-package cloud.pace.sdk.poikit.poi.downloadOld;
+package cloud.pace.sdk.poikit.poi.download;
 
 public final class TileQueryRequestOuterClass {
     private TileQueryRequestOuterClass() {
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/TileQueryResponseOuterClass.java b/library/src/main/java/cloud/pace/sdk/poikit/poi/download/TileQueryResponseOuterClass.java
similarity index 99%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/TileQueryResponseOuterClass.java
rename to library/src/main/java/cloud/pace/sdk/poikit/poi/download/TileQueryResponseOuterClass.java
index 9095a2da..50774478 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/TileQueryResponseOuterClass.java
+++ b/library/src/main/java/cloud/pace/sdk/poikit/poi/download/TileQueryResponseOuterClass.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: tile_query_response.proto
 
-package cloud.pace.sdk.poikit.poi.downloadOld;
+package cloud.pace.sdk.poikit.poi.download;
 
 public final class TileQueryResponseOuterClass {
     private TileQueryResponseOuterClass() {
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/VectorTile.java b/library/src/main/java/cloud/pace/sdk/poikit/poi/download/VectorTile.java
similarity index 99%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/VectorTile.java
rename to library/src/main/java/cloud/pace/sdk/poikit/poi/download/VectorTile.java
index f222b44c..d14d8b45 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/VectorTile.java
+++ b/library/src/main/java/cloud/pace/sdk/poikit/poi/download/VectorTile.java
@@ -1,4 +1,4 @@
-package cloud.pace.sdk.poikit.poi.downloadOld;
+package cloud.pace.sdk.poikit.poi.download;
 
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: proto
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/tile_query_request.proto b/library/src/main/java/cloud/pace/sdk/poikit/poi/download/tile_query_request.proto
similarity index 100%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/tile_query_request.proto
rename to library/src/main/java/cloud/pace/sdk/poikit/poi/download/tile_query_request.proto
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/tile_query_response.proto b/library/src/main/java/cloud/pace/sdk/poikit/poi/download/tile_query_response.proto
similarity index 100%
rename from library/src/main/java/cloud/pace/sdk/poikit/poi/downloadOld/tile_query_response.proto
rename to library/src/main/java/cloud/pace/sdk/poikit/poi/download/tile_query_response.proto
diff --git a/library/src/main/java/cloud/pace/sdk/poikit/utils/GeoMathUtils.kt b/library/src/main/java/cloud/pace/sdk/poikit/utils/GeoMathUtils.kt
index f80d81fe..7a4e16e5 100644
--- a/library/src/main/java/cloud/pace/sdk/poikit/utils/GeoMathUtils.kt
+++ b/library/src/main/java/cloud/pace/sdk/poikit/utils/GeoMathUtils.kt
@@ -1,8 +1,8 @@
 package cloud.pace.sdk.poikit.utils
 
 import cloud.pace.sdk.poikit.poi.LocationPoint
-import cloud.pace.sdk.poikit.poi.downloadOld.TileInformation
-import cloud.pace.sdk.poikit.poi.downloadOld.VectorTile
+import cloud.pace.sdk.poikit.poi.download.TileInformation
+import cloud.pace.sdk.poikit.poi.download.VectorTile
 import com.google.android.gms.maps.model.LatLng
 import java.lang.Math.*
 import java.util.*