diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/OpenApiGeneratorApplication.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/OpenApiGeneratorApplication.java
index 97252a8a94029fb487b049017ccfa6b194d142ab..30aa5276982959c08070bcb05db5cdd89e4f66d3 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/OpenApiGeneratorApplication.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/OpenApiGeneratorApplication.java
@@ -1,4 +1,4 @@
-package org.openapitools;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools;
 
 import com.fasterxml.jackson.databind.Module;
 import org.openapitools.jackson.nullable.JsonNullableModule;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/RFC3339DateFormat.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/RFC3339DateFormat.java
index bcd3936d8b343ef7553782b552e9798b69bc5a02..90dc86ccbf03a54e736ed8907a34b2a8b0d4ca95 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/RFC3339DateFormat.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/RFC3339DateFormat.java
@@ -1,4 +1,4 @@
-package org.openapitools;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools;
 
 import com.fasterxml.jackson.databind.util.StdDateFormat;
 
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/ApiUtil.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/ApiUtil.java
index 1245b1dd0ccf3cae51824d69fe4074d9acb576df..259a49fe69fe159f6a1a2873e7d3070c005af93b 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/ApiUtil.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/ApiUtil.java
@@ -1,4 +1,4 @@
-package org.openapitools.api;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
 
 import org.springframework.web.context.request.NativeWebRequest;
 
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/DataAccessEndpointApi.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/DataAccessEndpointApi.java
index e18e73940dfaf2d753ab38cbf2c34f48d8716b40..65e2fb87998e42bd53c5340d2b7775b103236261 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/DataAccessEndpointApi.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/DataAccessEndpointApi.java
@@ -3,10 +3,10 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package org.openapitools.api;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
 
-import org.openapitools.model.DataAccessEndpoint;
-import org.openapitools.model.Error;
+import org.etsi.osl.tmf.pm628.model.DataAccessEndpoint;
+import org.etsi.osl.tmf.pm628.model.Error;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/DataAccessEndpointApiController.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/DataAccessEndpointApiController.java
index 5f85e90457656f807ad04a8f5f0f5bb4370129c0..267c204afe838107784d5ad9b8020a4dfa7277a3 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/DataAccessEndpointApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/DataAccessEndpointApiController.java
@@ -1,7 +1,7 @@
-package org.openapitools.api;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
 
-import org.openapitools.model.DataAccessEndpoint;
-import org.openapitools.model.Error;
+import org.etsi.osl.tmf.pm628.model.DataAccessEndpoint;
+import org.etsi.osl.tmf.pm628.model.Error;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/HubApi.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/HubApi.java
index cc06b10eab40876556a41668086b0c8f69007902..4de01ecf46b1d24177ada5c5bd0d47c90acf3214 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/HubApi.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/HubApi.java
@@ -3,11 +3,11 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package org.openapitools.api;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
 
-import org.openapitools.model.Error;
-import org.openapitools.model.Hub;
-import org.openapitools.model.HubFVO;
+import org.etsi.osl.tmf.pm628.model.Error;
+import org.etsi.osl.tmf.pm628.model.Hub;
+import org.etsi.osl.tmf.pm628.model.HubFVO;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/HubApiController.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/HubApiController.java
index e912e1c1832f14f9fb5c807d11e68782f3c958b8..40fd2ed188c640bbacdca32628cdfe56ae3d7a7a 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/HubApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/HubApiController.java
@@ -1,8 +1,8 @@
-package org.openapitools.api;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
 
-import org.openapitools.model.Error;
-import org.openapitools.model.Hub;
-import org.openapitools.model.HubFVO;
+import org.etsi.osl.tmf.pm628.model.Error;
+import org.etsi.osl.tmf.pm628.model.Hub;
+import org.etsi.osl.tmf.pm628.model.HubFVO;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/ListenerApi.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/ListenerApi.java
index b107f3bb633977df852b17eb066c00237b04f063..7e2cd5ae2e6da974143cdfd35076ce0f1b0e7519 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/ListenerApi.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/ListenerApi.java
@@ -3,17 +3,17 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package org.openapitools.api;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
 
-import org.openapitools.model.Error;
-import org.openapitools.model.MeasurementCollectionJobAttributeValueChangeEvent;
-import org.openapitools.model.MeasurementCollectionJobCreateEvent;
-import org.openapitools.model.MeasurementCollectionJobDeleteEvent;
-import org.openapitools.model.MeasurementCollectionJobExecutionStateChangeEvent;
-import org.openapitools.model.MeasurementCollectionJobFilesPreparationErrorEvent;
-import org.openapitools.model.MeasurementCollectionJobFilesReadyEvent;
-import org.openapitools.model.PerformanceMeasurementCollectionReadyEvent;
-import org.openapitools.model.PerformanceMeasurementCreateEvent;
+import org.etsi.osl.tmf.pm628.model.Error;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobAttributeValueChangeEvent;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobCreateEvent;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobDeleteEvent;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobExecutionStateChangeEvent;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobFilesPreparationErrorEvent;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobFilesReadyEvent;
+import org.etsi.osl.tmf.pm628.model.PerformanceMeasurementCollectionReadyEvent;
+import org.etsi.osl.tmf.pm628.model.PerformanceMeasurementCreateEvent;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/ListenerApiController.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/ListenerApiController.java
index a87cf5112ee78eba681615bc4766d0f0d9696877..0409b797d1a509e1b60d6d256b23e117769e49a9 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/ListenerApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/ListenerApiController.java
@@ -1,14 +1,14 @@
-package org.openapitools.api;
-
-import org.openapitools.model.Error;
-import org.openapitools.model.MeasurementCollectionJobAttributeValueChangeEvent;
-import org.openapitools.model.MeasurementCollectionJobCreateEvent;
-import org.openapitools.model.MeasurementCollectionJobDeleteEvent;
-import org.openapitools.model.MeasurementCollectionJobExecutionStateChangeEvent;
-import org.openapitools.model.MeasurementCollectionJobFilesPreparationErrorEvent;
-import org.openapitools.model.MeasurementCollectionJobFilesReadyEvent;
-import org.openapitools.model.PerformanceMeasurementCollectionReadyEvent;
-import org.openapitools.model.PerformanceMeasurementCreateEvent;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
+
+import org.etsi.osl.tmf.pm628.model.Error;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobAttributeValueChangeEvent;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobCreateEvent;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobDeleteEvent;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobExecutionStateChangeEvent;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobFilesPreparationErrorEvent;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobFilesReadyEvent;
+import org.etsi.osl.tmf.pm628.model.PerformanceMeasurementCollectionReadyEvent;
+import org.etsi.osl.tmf.pm628.model.PerformanceMeasurementCreateEvent;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/MeasurementCollectionJobApi.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/MeasurementCollectionJobApi.java
index ea1d386141350be1f08655884e74a236ab9fc6e5..cd0b23e59b6b42e7c6c9d233d63f8f46ee1c3246 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/MeasurementCollectionJobApi.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/MeasurementCollectionJobApi.java
@@ -3,14 +3,14 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package org.openapitools.api;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
 
-import org.openapitools.model.Error;
-import org.openapitools.model.JsonPatch;
-import org.openapitools.model.MeasurementCollectionJob;
-import org.openapitools.model.MeasurementCollectionJobFVO;
-import org.openapitools.model.MeasurementCollectionJobMVO;
-import org.openapitools.model.PatchMeasurementCollectionJob200Response;
+import org.etsi.osl.tmf.pm628.model.Error;
+import org.etsi.osl.tmf.pm628.model.JsonPatch;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJob;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobFVO;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobMVO;
+import org.etsi.osl.tmf.pm628.model.PatchMeasurementCollectionJob200Response;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/MeasurementCollectionJobApiController.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/MeasurementCollectionJobApiController.java
index ca72d0f8488ebda96f248ee84538908b0ca0c0fb..b7774d56fb418d3ec4e26d2b6362cebbdcafe0c4 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/MeasurementCollectionJobApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/MeasurementCollectionJobApiController.java
@@ -1,11 +1,11 @@
-package org.openapitools.api;
-
-import org.openapitools.model.Error;
-import org.openapitools.model.JsonPatch;
-import org.openapitools.model.MeasurementCollectionJob;
-import org.openapitools.model.MeasurementCollectionJobFVO;
-import org.openapitools.model.MeasurementCollectionJobMVO;
-import org.openapitools.model.PatchMeasurementCollectionJob200Response;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
+
+import org.etsi.osl.tmf.pm628.model.Error;
+import org.etsi.osl.tmf.pm628.model.JsonPatch;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJob;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobFVO;
+import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobMVO;
+import org.etsi.osl.tmf.pm628.model.PatchMeasurementCollectionJob200Response;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceIndicatorGroupSpecificationApi.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceIndicatorGroupSpecificationApi.java
index 94d43152174790518e6338773dfcfd4ee44c74d2..a033f8adabca2844e636af16f3312a3daed61db1 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceIndicatorGroupSpecificationApi.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceIndicatorGroupSpecificationApi.java
@@ -3,14 +3,14 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package org.openapitools.api;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
 
-import org.openapitools.model.Error;
-import org.openapitools.model.JsonPatch;
-import org.openapitools.model.PatchPerformanceIndicatorGroupSpecification200Response;
-import org.openapitools.model.PerformanceIndicatorGroupSpecification;
-import org.openapitools.model.PerformanceIndicatorGroupSpecificationFVO;
-import org.openapitools.model.PerformanceIndicatorGroupSpecificationMVO;
+import org.etsi.osl.tmf.pm628.model.Error;
+import org.etsi.osl.tmf.pm628.model.JsonPatch;
+import org.etsi.osl.tmf.pm628.model.PatchPerformanceIndicatorGroupSpecification200Response;
+import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorGroupSpecification;
+import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorGroupSpecificationFVO;
+import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorGroupSpecificationMVO;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceIndicatorGroupSpecificationApiController.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceIndicatorGroupSpecificationApiController.java
index 7c72252fd3ed498f2e5a6380201aec16b9d54171..1e22fca86336ddde806f457e040842dcb5cd609f 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceIndicatorGroupSpecificationApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceIndicatorGroupSpecificationApiController.java
@@ -1,11 +1,11 @@
-package org.openapitools.api;
-
-import org.openapitools.model.Error;
-import org.openapitools.model.JsonPatch;
-import org.openapitools.model.PatchPerformanceIndicatorGroupSpecification200Response;
-import org.openapitools.model.PerformanceIndicatorGroupSpecification;
-import org.openapitools.model.PerformanceIndicatorGroupSpecificationFVO;
-import org.openapitools.model.PerformanceIndicatorGroupSpecificationMVO;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
+
+import org.etsi.osl.tmf.pm628.model.Error;
+import org.etsi.osl.tmf.pm628.model.JsonPatch;
+import org.etsi.osl.tmf.pm628.model.PatchPerformanceIndicatorGroupSpecification200Response;
+import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorGroupSpecification;
+import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorGroupSpecificationFVO;
+import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorGroupSpecificationMVO;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceIndicatorSpecificationApi.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceIndicatorSpecificationApi.java
index 9d22b0fa206d04568f34289da4172d3d0a574fec..c46925aa0ad00285e80878d8e8c2c8ddf0921224 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceIndicatorSpecificationApi.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceIndicatorSpecificationApi.java
@@ -3,14 +3,14 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package org.openapitools.api;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
 
-import org.openapitools.model.Error;
-import org.openapitools.model.JsonPatch;
-import org.openapitools.model.PatchPerformanceIndicatorSpecification200Response;
-import org.openapitools.model.PerformanceIndicatorSpecification;
-import org.openapitools.model.PerformanceIndicatorSpecificationFVO;
-import org.openapitools.model.PerformanceIndicatorSpecificationMVO;
+import org.etsi.osl.tmf.pm628.model.Error;
+import org.etsi.osl.tmf.pm628.model.JsonPatch;
+import org.etsi.osl.tmf.pm628.model.PatchPerformanceIndicatorSpecification200Response;
+import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorSpecification;
+import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorSpecificationFVO;
+import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorSpecificationMVO;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceIndicatorSpecificationApiController.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceIndicatorSpecificationApiController.java
index 223d61326cf28675d926dc60408ffca9e1db1c7c..c056c5ac2e3abef06de90b6152a6d9137ad7c2c4 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceIndicatorSpecificationApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceIndicatorSpecificationApiController.java
@@ -1,11 +1,11 @@
-package org.openapitools.api;
-
-import org.openapitools.model.Error;
-import org.openapitools.model.JsonPatch;
-import org.openapitools.model.PatchPerformanceIndicatorSpecification200Response;
-import org.openapitools.model.PerformanceIndicatorSpecification;
-import org.openapitools.model.PerformanceIndicatorSpecificationFVO;
-import org.openapitools.model.PerformanceIndicatorSpecificationMVO;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
+
+import org.etsi.osl.tmf.pm628.model.Error;
+import org.etsi.osl.tmf.pm628.model.JsonPatch;
+import org.etsi.osl.tmf.pm628.model.PatchPerformanceIndicatorSpecification200Response;
+import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorSpecification;
+import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorSpecificationFVO;
+import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorSpecificationMVO;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceMeasurementApi.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceMeasurementApi.java
index 2c0f90870f2218c54f3f3c5cb19a43ce755332aa..48a6498cf4e5e5256af3119cb55418d55ca6266a 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceMeasurementApi.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceMeasurementApi.java
@@ -3,10 +3,10 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package org.openapitools.api;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
 
-import org.openapitools.model.Error;
-import org.openapitools.model.PerformanceMeasurement;
+import org.etsi.osl.tmf.pm628.model.Error;
+import org.etsi.osl.tmf.pm628.model.PerformanceMeasurement;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceMeasurementApiController.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceMeasurementApiController.java
index 9faaf477e0a6f0ff3e27f8e11699796ebe8d33d9..9650d43219948266987d5f9ac2458253c1510678 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceMeasurementApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/PerformanceMeasurementApiController.java
@@ -1,7 +1,7 @@
-package org.openapitools.api;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
 
-import org.openapitools.model.Error;
-import org.openapitools.model.PerformanceMeasurement;
+import org.etsi.osl.tmf.pm628.model.Error;
+import org.etsi.osl.tmf.pm628.model.PerformanceMeasurement;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/TrackingRecordApi.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/TrackingRecordApi.java
index db38a0ac6876cf3e92dd18944a375bbcf6213510..5bd393a3464cd3da7e8c387413cd9919c09f1466 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/TrackingRecordApi.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/TrackingRecordApi.java
@@ -3,10 +3,10 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package org.openapitools.api;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
 
-import org.openapitools.model.Error;
-import org.openapitools.model.TrackingRecord;
+import org.etsi.osl.tmf.pm628.model.Error;
+import org.etsi.osl.tmf.pm628.model.TrackingRecord;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/TrackingRecordApiController.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/TrackingRecordApiController.java
index 628aecab0e12b0a1272a98777d6b8cb42fa8e4ff..6f10c2460299d51ab9d4fc311bd925c641defde7 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/TrackingRecordApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/api/TrackingRecordApiController.java
@@ -1,7 +1,7 @@
-package org.openapitools.api;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.api;
 
-import org.openapitools.model.Error;
-import org.openapitools.model.TrackingRecord;
+import org.etsi.osl.tmf.pm628.model.Error;
+import org.etsi.osl.tmf.pm628.model.TrackingRecord;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java
index 77d3ae45f85a1318a33df172ad456f49675add7e..f081dfc02e61f78161522752c1e25e4d87a60984 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java
@@ -1,18 +1,18 @@
-package org.openapitools.configuration;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.configuration;
 
-import org.openapitools.model.AdministrativeState;
-import org.openapitools.model.CollectionType;
-import org.openapitools.model.CompressionEnumType;
-import org.openapitools.model.ExecutionStateType;
-import org.openapitools.model.Granularity;
-import org.openapitools.model.IndicatorType;
-import org.openapitools.model.OrderItemActionType;
-import org.openapitools.model.PackingEnumType;
-import org.openapitools.model.ReportingPeriod;
-import org.openapitools.model.ResourceAdministrativeStateType;
-import org.openapitools.model.ResourceOperationalStateType;
-import org.openapitools.model.ResourceStatusType;
-import org.openapitools.model.ResourceUsageStateType;
+import org.etsi.osl.tmf.pm628.model.AdministrativeState;
+import org.etsi.osl.tmf.pm628.model.CollectionType;
+import org.etsi.osl.tmf.pm628.model.CompressionEnumType;
+import org.etsi.osl.tmf.pm628.model.ExecutionStateType;
+import org.etsi.osl.tmf.pm628.model.Granularity;
+import org.etsi.osl.tmf.pm628.model.IndicatorType;
+import org.etsi.osl.tmf.pm628.model.OrderItemActionType;
+import org.etsi.osl.tmf.pm628.model.PackingEnumType;
+import org.etsi.osl.tmf.pm628.model.ReportingPeriod;
+import org.etsi.osl.tmf.pm628.model.ResourceAdministrativeStateType;
+import org.etsi.osl.tmf.pm628.model.ResourceOperationalStateType;
+import org.etsi.osl.tmf.pm628.model.ResourceStatusType;
+import org.etsi.osl.tmf.pm628.model.ResourceUsageStateType;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/configuration/HomeController.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/configuration/HomeController.java
index 9aa29284ab5f1a6705e4b27924585086b6d92c83..899e5363a28548052290e96569950242ea181e6a 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/configuration/HomeController.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/configuration/HomeController.java
@@ -1,4 +1,4 @@
-package org.openapitools.configuration;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/configuration/SpringDocConfiguration.java b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/configuration/SpringDocConfiguration.java
index f9ca387ccc90b62b0a3dd1377ace00509fb8d82c..c283c008bf722fcf26ca6c12a804db56017ccfb3 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/configuration/SpringDocConfiguration.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/src/main/java/org/openapitools/configuration/SpringDocConfiguration.java
@@ -1,4 +1,4 @@
-package org.openapitools.configuration;
+package org.etsi.osl.tmf.pm628.src.main.java.org.openapitools.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java b/src/main/java/org/etsi/osl/tmf/pm628/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java
deleted file mode 100644
index 3681f67e7705be26253e4689330ea5a8be8a8e0a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm628/src/test/java/org/openapitools/OpenApiGeneratorApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.openapitools;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class OpenApiGeneratorApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}
\ No newline at end of file