diff --git a/pom.xml b/pom.xml
index 343c6c1d2fae7e80dd74c2f464ed18c730cf2a16..ca48b0fe149796b8ccaec24fe1c2d6e3824638a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
 		
 		<dependency>
 			<groupId>org.etsi.osl</groupId>
-			<artifactId>org.etsi.osl.model</artifactId>
+			<artifactId>org.etsi.osl.model.nfv</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		
diff --git a/src/main/java/org/etsi/osl/osom/OsomSpringBoot.java b/src/main/java/org/etsi/osl/osom/OsomSpringBoot.java
index 423aa634d55a3d286598beac3122df00ab11b054..e2830e64d6be262bab35bc7d4b615ed1dda5a238 100644
--- a/src/main/java/org/etsi/osl/osom/OsomSpringBoot.java
+++ b/src/main/java/org/etsi/osl/osom/OsomSpringBoot.java
@@ -26,16 +26,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.ExitCodeGenerator;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 //import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 //import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.ComponentScan.Filter;
-import org.springframework.context.annotation.FilterType;
 
 /**
  * @author ctranoris
diff --git a/src/main/java/org/etsi/osl/osom/configuration/ActiveMQComponentConfig.java b/src/main/java/org/etsi/osl/osom/configuration/ActiveMQComponentConfig.java
index a49908f2cc863701e0716cba86a3739a15795432..c7cdebd51deda1ca18a69da44f319a08d6e979e0 100644
--- a/src/main/java/org/etsi/osl/osom/configuration/ActiveMQComponentConfig.java
+++ b/src/main/java/org/etsi/osl/osom/configuration/ActiveMQComponentConfig.java
@@ -22,7 +22,6 @@ package org.etsi.osl.osom.configuration;
 import org.apache.camel.component.activemq.ActiveMQComponent;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-
 import jakarta.jms.ConnectionFactory;
 
 /**
diff --git a/src/main/java/org/etsi/osl/osom/configuration/OSOMRouteBuilder.java b/src/main/java/org/etsi/osl/osom/configuration/OSOMRouteBuilder.java
index e4ac7e7470a3601bcd9a00546a16646d59464c1c..61d3e4030b2751ac7a9616cd3fb0e608df30fb74 100644
--- a/src/main/java/org/etsi/osl/osom/configuration/OSOMRouteBuilder.java
+++ b/src/main/java/org/etsi/osl/osom/configuration/OSOMRouteBuilder.java
@@ -25,21 +25,16 @@ import org.apache.camel.Exchange;
 import org.apache.camel.LoggingLevel;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.model.dataformat.JsonLibrary;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.etsi.osl.osom.management.ServiceOrderManager;
-import org.etsi.osl.osom.serviceactions.ServiceActionCheck;
+import org.etsi.osl.model.nfv.ExperimentMetadata;
+import org.etsi.osl.model.nfv.Product;
+import org.etsi.osl.model.nfv.ValidationJob;
+import org.etsi.osl.model.nfv.ValidationStatus;
+import org.etsi.osl.model.nfv.VxFMetadata;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
-import org.etsi.osl.model.ExperimentMetadata;
-import org.etsi.osl.model.Product;
-import org.etsi.osl.model.ValidationJob;
-import org.etsi.osl.model.ValidationStatus;
-import org.etsi.osl.model.VxFMetadata;
-import org.etsi.osl.tmf.am642.model.AlarmCreate;
-import org.etsi.osl.tmf.so641.model.ServiceOrder;
 
 @Configuration
 //@RefreshScope
diff --git a/src/main/java/org/etsi/osl/osom/lcm/LCMRulesController.java b/src/main/java/org/etsi/osl/osom/lcm/LCMRulesController.java
index 760874b7dd85a46912889432174c6c69dfd10617..46cc5474358abae03c5ca777f61d029232f2bc82 100644
--- a/src/main/java/org/etsi/osl/osom/lcm/LCMRulesController.java
+++ b/src/main/java/org/etsi/osl/osom/lcm/LCMRulesController.java
@@ -4,20 +4,18 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.camel.ProducerTemplate;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.management.ServiceOrderManager;
+import org.etsi.osl.tmf.lcm.model.ELCMRulePhase;
+import org.etsi.osl.tmf.lcm.model.LCMRuleSpecification;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.etsi.osl.tmf.lcm.model.ELCMRulePhase;
-import org.etsi.osl.tmf.lcm.model.LCMRuleSpecification;
 
 /**
  * @author ctranoris
diff --git a/src/main/java/org/etsi/osl/osom/lcm/LCMRulesExecutor.java b/src/main/java/org/etsi/osl/osom/lcm/LCMRulesExecutor.java
index 3a77c8ef553c605e684600de4420d367a792ec1f..3edcb15c3a602515067810b796cf0f28c7bf30d1 100644
--- a/src/main/java/org/etsi/osl/osom/lcm/LCMRulesExecutor.java
+++ b/src/main/java/org/etsi/osl/osom/lcm/LCMRulesExecutor.java
@@ -12,17 +12,14 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import javax.tools.Diagnostic;
 import javax.tools.DiagnosticCollector;
 import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
 import javax.tools.StandardJavaFileManager;
 import javax.tools.ToolProvider;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.etsi.osl.tmf.lcm.model.LCMRuleSpecification;
 
 /**
diff --git a/src/main/java/org/etsi/osl/osom/lcm/LcmBaseExecutor.java b/src/main/java/org/etsi/osl/osom/lcm/LcmBaseExecutor.java
index fa11e710c598766c7a7d524a178731823f1707aa..585b5d0a700ead4d8cfbac1ff79b362658083150 100644
--- a/src/main/java/org/etsi/osl/osom/lcm/LcmBaseExecutor.java
+++ b/src/main/java/org/etsi/osl/osom/lcm/LcmBaseExecutor.java
@@ -5,9 +5,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
-
 import javax.net.ssl.SSLException;
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -17,15 +15,9 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.Option;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.partnerservices.GenericClient;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.HttpStatusCode;
-import org.springframework.web.reactive.function.client.WebClient;
 import org.etsi.osl.tmf.common.model.Any;
 import org.etsi.osl.tmf.common.model.EValueType;
 import org.etsi.osl.tmf.common.model.service.Characteristic;
@@ -39,6 +31,10 @@ import org.etsi.osl.tmf.so641.model.ServiceOrder;
 import org.etsi.osl.tmf.so641.model.ServiceOrderCreate;
 import org.etsi.osl.tmf.so641.model.ServiceOrderItemRelationship;
 import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.web.reactive.function.client.WebClient;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import reactor.core.publisher.Mono;
diff --git a/src/main/java/org/etsi/osl/osom/management/AlarmsService.java b/src/main/java/org/etsi/osl/osom/management/AlarmsService.java
index ec21c95c2864d7b286fcd56ecbd88bc4d7d89a74..879e6a266d4d06848c698b8d6d9ae845b8d4cb13 100644
--- a/src/main/java/org/etsi/osl/osom/management/AlarmsService.java
+++ b/src/main/java/org/etsi/osl/osom/management/AlarmsService.java
@@ -3,22 +3,19 @@ package org.etsi.osl.osom.management;
 import java.io.IOException;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
 import org.etsi.osl.tmf.am642.model.AlarmCreate;
 import org.etsi.osl.tmf.am642.model.AlarmStateType;
 import org.etsi.osl.tmf.am642.model.AlarmUpdate;
 import org.etsi.osl.tmf.am642.model.Comment;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
 
 @Service
 public class AlarmsService {
diff --git a/src/main/java/org/etsi/osl/osom/management/AutomationCheck.java b/src/main/java/org/etsi/osl/osom/management/AutomationCheck.java
index 1e8fc763c03c5e9fb14acfc21d0f5eb44c0380eb..d8aef5d75a29dd9ea47ed4ce1dbe2387f9579b1e 100644
--- a/src/main/java/org/etsi/osl/osom/management/AutomationCheck.java
+++ b/src/main/java/org/etsi/osl/osom/management/AutomationCheck.java
@@ -22,16 +22,16 @@ package org.etsi.osl.osom.management;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.lcm.LCMRulesController;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import org.etsi.osl.tmf.common.model.UserPartRoleType;
 import org.etsi.osl.tmf.prm669.model.RelatedParty;
 import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
 import org.etsi.osl.tmf.sim638.model.EServiceStartMode;
 import org.etsi.osl.tmf.sim638.model.Service;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 /**
  * @author ctranoris
diff --git a/src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java b/src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java
index 364aa98b0f0bc1dcdb68b53893b0c56c5673b801..d13ff592a4b3c45519b668525c8432fc5f6acf1e 100644
--- a/src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java
+++ b/src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java
@@ -21,22 +21,15 @@ package org.etsi.osl.osom.management;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import org.etsi.osl.model.DeploymentDescriptor;
-import org.etsi.osl.model.DeploymentDescriptorStatus;
-import org.etsi.osl.model.DeploymentDescriptorVxFInstanceInfo;
-import org.etsi.osl.tmf.common.model.Any;
-import org.etsi.osl.tmf.common.model.service.Characteristic;
 import org.etsi.osl.tmf.common.model.service.ResourceRef;
 import org.etsi.osl.tmf.common.model.service.ServiceStateType;
 import org.etsi.osl.tmf.ri639.model.Resource;
-import org.etsi.osl.tmf.ri639.model.ResourceStatusType;
 import org.etsi.osl.tmf.sim638.model.Service;
 import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import jakarta.validation.Valid;
 
 
diff --git a/src/main/java/org/etsi/osl/osom/management/CROrchestrationService.java b/src/main/java/org/etsi/osl/osom/management/CROrchestrationService.java
index 866593b1f417a64ebaaba38989de81d6aa579e76..83889fa43133f256c22a5684bf569ff2f3444323 100644
--- a/src/main/java/org/etsi/osl/osom/management/CROrchestrationService.java
+++ b/src/main/java/org/etsi/osl/osom/management/CROrchestrationService.java
@@ -23,16 +23,8 @@ import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import org.etsi.osl.model.DeploymentDescriptor;
 import org.etsi.osl.tmf.common.model.service.Characteristic;
 import org.etsi.osl.tmf.common.model.service.Note;
 import org.etsi.osl.tmf.common.model.service.ResourceRef;
@@ -45,6 +37,11 @@ import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
 import org.etsi.osl.tmf.sim638.model.Service;
 import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
 import org.etsi.osl.tmf.so641.model.ServiceOrder;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 
 @Component(value = "crOrchestrationService") // bean name
diff --git a/src/main/java/org/etsi/osl/osom/management/CheckServiceTestDeployment.java b/src/main/java/org/etsi/osl/osom/management/CheckServiceTestDeployment.java
index 84a2b71af47596f472d91599cd5dc2225ee0c41b..c21c634a8b0b7ed5b676c47f83ed474fc19f323c 100644
--- a/src/main/java/org/etsi/osl/osom/management/CheckServiceTestDeployment.java
+++ b/src/main/java/org/etsi/osl/osom/management/CheckServiceTestDeployment.java
@@ -2,15 +2,8 @@ package org.etsi.osl.osom.management;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
 import org.etsi.osl.tmf.common.model.Any;
 import org.etsi.osl.tmf.common.model.EValueType;
 import org.etsi.osl.tmf.common.model.service.Characteristic;
@@ -27,6 +20,11 @@ import org.etsi.osl.tmf.stm653.model.ServiceTest;
 import org.etsi.osl.tmf.stm653.model.ServiceTestCreate;
 import org.etsi.osl.tmf.stm653.model.ServiceTestSpecification;
 import org.etsi.osl.tmf.stm653.model.ServiceTestSpecificationRef;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 import jakarta.validation.Valid;
 
 @Component(value = "checkServiceTestDeployment") //bean name
diff --git a/src/main/java/org/etsi/osl/osom/management/CreateReservedService.java b/src/main/java/org/etsi/osl/osom/management/CreateReservedService.java
index 042353e75033d59219b789325eabc1e0d01ac021..9feeb411350468f2d3d123cffa66373089b81cc6 100644
--- a/src/main/java/org/etsi/osl/osom/management/CreateReservedService.java
+++ b/src/main/java/org/etsi/osl/osom/management/CreateReservedService.java
@@ -4,16 +4,10 @@ import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.lcm.LCMRulesController;
 import org.etsi.osl.osom.lcm.LCMRulesExecutorVariables;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import org.etsi.osl.tmf.common.model.Any;
 import org.etsi.osl.tmf.common.model.EValueType;
 import org.etsi.osl.tmf.common.model.UserPartRoleType;
@@ -37,6 +31,11 @@ import org.etsi.osl.tmf.so641.model.ServiceOrder;
 import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
 import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;
 import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 import jakarta.validation.Valid;
 
 @Component(value = "createReservedService") // bean name
diff --git a/src/main/java/org/etsi/osl/osom/management/DependencyRulesSolver.java b/src/main/java/org/etsi/osl/osom/management/DependencyRulesSolver.java
index 9902fb1253501d07f20a5b921bf9618602236bc2..8ccef5a110a14dc54ef848e2792ed57f2ee73e40 100644
--- a/src/main/java/org/etsi/osl/osom/management/DependencyRulesSolver.java
+++ b/src/main/java/org/etsi/osl/osom/management/DependencyRulesSolver.java
@@ -21,17 +21,15 @@ package org.etsi.osl.osom.management;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.flowable.dmn.engine.DmnEngine;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import org.etsi.osl.tmf.common.model.service.Characteristic;
 import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
 import org.etsi.osl.tmf.so641.model.ServiceOrder;
 import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
+import org.flowable.dmn.engine.DmnEngine;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * @author ctranoris
diff --git a/src/main/java/org/etsi/osl/osom/management/ExternalPartnerCheckDeploymentService.java b/src/main/java/org/etsi/osl/osom/management/ExternalPartnerCheckDeploymentService.java
index a7550e93dd387e3d70ae488525ee2545b5ea3938..df4226f9912c6d6435074ac89ed0cbbd5a97e7d3 100644
--- a/src/main/java/org/etsi/osl/osom/management/ExternalPartnerCheckDeploymentService.java
+++ b/src/main/java/org/etsi/osl/osom/management/ExternalPartnerCheckDeploymentService.java
@@ -22,15 +22,9 @@ package org.etsi.osl.osom.management;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.util.List;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.partnerservices.PartnerOrganizationServicesManager;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import org.etsi.osl.tmf.common.model.Any;
 import org.etsi.osl.tmf.common.model.UserPartRoleType;
 import org.etsi.osl.tmf.common.model.service.Characteristic;
@@ -49,6 +43,11 @@ import org.etsi.osl.tmf.so641.model.ServiceOrder;
 import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
 import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;
 import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 @Component(value = "externalPartnerCheckDeploymentService") //bean name
 public class ExternalPartnerCheckDeploymentService  implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/management/ExternalPartnerSubmitOrderService.java b/src/main/java/org/etsi/osl/osom/management/ExternalPartnerSubmitOrderService.java
index 7b6ee4bf850c5216c41f7edcda01fd6631d5b5ee..6e42233a19d89bac859940807aed835995e5c531 100644
--- a/src/main/java/org/etsi/osl/osom/management/ExternalPartnerSubmitOrderService.java
+++ b/src/main/java/org/etsi/osl/osom/management/ExternalPartnerSubmitOrderService.java
@@ -21,15 +21,9 @@ package org.etsi.osl.osom.management;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.partnerservices.PartnerOrganizationServicesManager;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import org.etsi.osl.tmf.common.model.Any;
 import org.etsi.osl.tmf.common.model.UserPartRoleType;
 import org.etsi.osl.tmf.common.model.service.Characteristic;
@@ -46,6 +40,11 @@ import org.etsi.osl.tmf.so641.model.ServiceOrderCreate;
 import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
 import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;
 import org.etsi.osl.tmf.so641.model.ServiceRestriction;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 @Component(value = "externalPartnerSubmitOrderService") //bean name
 public class ExternalPartnerSubmitOrderService  implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/management/FetchAcknowledgedOrders.java b/src/main/java/org/etsi/osl/osom/management/FetchAcknowledgedOrders.java
index 0deac3079bb5dd1bda548843ab8cfb2ff2ae2dcd..82686ffca977d613e1456b46e04bf7855a07cfd1 100644
--- a/src/main/java/org/etsi/osl/osom/management/FetchAcknowledgedOrders.java
+++ b/src/main/java/org/etsi/osl/osom/management/FetchAcknowledgedOrders.java
@@ -22,9 +22,10 @@ package org.etsi.osl.osom.management;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.etsi.osl.tmf.so641.model.ServiceOrder;
+import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;
 import org.flowable.engine.TaskService;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
@@ -32,9 +33,6 @@ import org.flowable.task.api.Task;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import org.etsi.osl.tmf.so641.model.ServiceOrder;
-import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;
-
 @Component(value = "fetchAcknowledgedOrders") // bean name
 public class FetchAcknowledgedOrders implements JavaDelegate {
 
diff --git a/src/main/java/org/etsi/osl/osom/management/FetchInProgressOrders.java b/src/main/java/org/etsi/osl/osom/management/FetchInProgressOrders.java
index 0f6a3f5b6b2bf59cf5179c191708d300db59edda..baef2577d3a14cdbee359ce7376c25621a60cff3 100644
--- a/src/main/java/org/etsi/osl/osom/management/FetchInProgressOrders.java
+++ b/src/main/java/org/etsi/osl/osom/management/FetchInProgressOrders.java
@@ -21,17 +21,15 @@ package org.etsi.osl.osom.management;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;
 import org.flowable.engine.TaskService;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;
-
 @Component(value = "fetchInProgressOrders") // bean name
 public class FetchInProgressOrders implements JavaDelegate {
 
diff --git a/src/main/java/org/etsi/osl/osom/management/FindOrderItems.java b/src/main/java/org/etsi/osl/osom/management/FindOrderItems.java
index a80bd82b11e0a24ea1b19702f760f38708b5e281..41bb9fe06507e9d21d0a7719ff303785ae8140c8 100644
--- a/src/main/java/org/etsi/osl/osom/management/FindOrderItems.java
+++ b/src/main/java/org/etsi/osl/osom/management/FindOrderItems.java
@@ -2,17 +2,15 @@ package org.etsi.osl.osom.management;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.etsi.osl.tmf.so641.model.ServiceOrder;
+import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import org.etsi.osl.tmf.so641.model.ServiceOrder;
-import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
-
 @Component(value = "findOrderItems") // bean name
 public class FindOrderItems  implements JavaDelegate {
 
diff --git a/src/main/java/org/etsi/osl/osom/management/InitializeProcessOrders.java b/src/main/java/org/etsi/osl/osom/management/InitializeProcessOrders.java
index 3b2a331fd4724358cea29e6a1146c07fd30f2c66..2d81c485d9aa703073599ac1b39242b83164e0a7 100644
--- a/src/main/java/org/etsi/osl/osom/management/InitializeProcessOrders.java
+++ b/src/main/java/org/etsi/osl/osom/management/InitializeProcessOrders.java
@@ -21,18 +21,16 @@ package org.etsi.osl.osom.management;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;
+import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;
-import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate;
-
 @Component(value = "initializeProcessOrders") // bean name
 public class InitializeProcessOrders implements JavaDelegate {
 
diff --git a/src/main/java/org/etsi/osl/osom/management/LocalSOCheckDeployment.java b/src/main/java/org/etsi/osl/osom/management/LocalSOCheckDeployment.java
index 29c6d4df304226a5b76842a10c5bb9cf5ffeb8b3..c2626f4f87a749dadcc6b7c57dea7f8a00e4f5c9 100644
--- a/src/main/java/org/etsi/osl/osom/management/LocalSOCheckDeployment.java
+++ b/src/main/java/org/etsi/osl/osom/management/LocalSOCheckDeployment.java
@@ -21,15 +21,9 @@ package org.etsi.osl.osom.management;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.partnerservices.PartnerOrganizationServicesManager;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import org.etsi.osl.tmf.common.model.service.Note;
 import org.etsi.osl.tmf.common.model.service.ServiceRef;
 import org.etsi.osl.tmf.common.model.service.ServiceStateType;
@@ -38,6 +32,11 @@ import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
 import org.etsi.osl.tmf.sim638.model.Service;
 import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
 import org.etsi.osl.tmf.so641.model.ServiceOrder;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 
 @Component(value = "localSoCheckDeployment") //bean name
diff --git a/src/main/java/org/etsi/osl/osom/management/LocalSOInitialize.java b/src/main/java/org/etsi/osl/osom/management/LocalSOInitialize.java
index b8276f77742f9803dc49eb07a1de2dd965b00f1c..411c0518f740ea0a5920bf606c553763bb2025fc 100644
--- a/src/main/java/org/etsi/osl/osom/management/LocalSOInitialize.java
+++ b/src/main/java/org/etsi/osl/osom/management/LocalSOInitialize.java
@@ -21,16 +21,15 @@ package org.etsi.osl.osom.management;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.etsi.osl.tmf.sim638.model.Service;
+import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
+import org.etsi.osl.tmf.so641.model.ServiceOrder;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import org.etsi.osl.tmf.sim638.model.Service;
-import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
-import org.etsi.osl.tmf.so641.model.ServiceOrder;
-
 @Component(value = "localSoInitialize") //bean name
 public class LocalSOInitialize implements JavaDelegate {
 
diff --git a/src/main/java/org/etsi/osl/osom/management/NFVOrchestrationCheckDeploymentService.java b/src/main/java/org/etsi/osl/osom/management/NFVOrchestrationCheckDeploymentService.java
index 740a8fdc78d74c04a5abe83b6661da9539872153..e81aab1f84dcc4fd1097f291f4200717c9f038b7 100644
--- a/src/main/java/org/etsi/osl/osom/management/NFVOrchestrationCheckDeploymentService.java
+++ b/src/main/java/org/etsi/osl/osom/management/NFVOrchestrationCheckDeploymentService.java
@@ -21,19 +21,18 @@ package org.etsi.osl.osom.management;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import org.etsi.osl.model.DeploymentDescriptor;
-import org.etsi.osl.model.DeploymentDescriptorStatus;
-import org.etsi.osl.model.DeploymentDescriptorVxFInstanceInfo;
+import org.etsi.osl.model.nfv.DeploymentDescriptor;
+import org.etsi.osl.model.nfv.DeploymentDescriptorStatus;
+import org.etsi.osl.model.nfv.DeploymentDescriptorVxFInstanceInfo;
 import org.etsi.osl.tmf.common.model.Any;
 import org.etsi.osl.tmf.common.model.service.Characteristic;
 import org.etsi.osl.tmf.common.model.service.ServiceStateType;
 import org.etsi.osl.tmf.sim638.model.Service;
 import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 
 @Component(value = "nfvOrchestrationCheckDeploymentService") //bean name
diff --git a/src/main/java/org/etsi/osl/osom/management/NFVOrchestrationService.java b/src/main/java/org/etsi/osl/osom/management/NFVOrchestrationService.java
index d4ef027189900c820b4126db9535ca97ac9bd066..b92d3e3c842c69343daf30e7bc68a760069351c5 100644
--- a/src/main/java/org/etsi/osl/osom/management/NFVOrchestrationService.java
+++ b/src/main/java/org/etsi/osl/osom/management/NFVOrchestrationService.java
@@ -24,20 +24,13 @@ import java.time.ZoneOffset;
 import java.util.Date;
 import java.util.Map;
 import java.util.regex.Pattern;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import org.etsi.osl.model.DeploymentDescriptor;
-import org.etsi.osl.model.DeploymentDescriptorStatus;
-import org.etsi.osl.model.ExperimentMetadata;
-import org.etsi.osl.model.ExperimentOnBoardDescriptor;
-import org.etsi.osl.model.NetworkServiceDescriptor;
+import org.etsi.osl.model.nfv.DeploymentDescriptor;
+import org.etsi.osl.model.nfv.DeploymentDescriptorStatus;
+import org.etsi.osl.model.nfv.ExperimentMetadata;
+import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;
+import org.etsi.osl.model.nfv.NetworkServiceDescriptor;
 import org.etsi.osl.tmf.common.model.Any;
 import org.etsi.osl.tmf.common.model.service.Characteristic;
 import org.etsi.osl.tmf.common.model.service.Note;
@@ -47,6 +40,11 @@ import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
 import org.etsi.osl.tmf.sim638.model.Service;
 import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
 import org.etsi.osl.tmf.so641.model.ServiceOrder;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 
 @Component(value = "nfvOrchestrationService") //bean name
diff --git a/src/main/java/org/etsi/osl/osom/management/OrderCompleteService.java b/src/main/java/org/etsi/osl/osom/management/OrderCompleteService.java
index fa592d492b14bebcf75176ba25d7462f71e439e2..7b37307d9d07513c41dbb67c9b207e9dd6c611f2 100644
--- a/src/main/java/org/etsi/osl/osom/management/OrderCompleteService.java
+++ b/src/main/java/org/etsi/osl/osom/management/OrderCompleteService.java
@@ -21,15 +21,8 @@ package org.etsi.osl.osom.management;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
 import org.etsi.osl.tmf.common.model.service.Note;
 import org.etsi.osl.tmf.common.model.service.ResourceRef;
 import org.etsi.osl.tmf.common.model.service.ServiceRef;
@@ -39,6 +32,11 @@ import org.etsi.osl.tmf.so641.model.ServiceOrder;
 import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
 import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;
 import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 import jakarta.validation.Valid;
 
 
diff --git a/src/main/java/org/etsi/osl/osom/management/ProcessCreateServiceRules.java b/src/main/java/org/etsi/osl/osom/management/ProcessCreateServiceRules.java
index e21df96f23280348276a440401ac3204576c38b0..872cf39e394606e3455aa4b8142c26cbbd29d082 100644
--- a/src/main/java/org/etsi/osl/osom/management/ProcessCreateServiceRules.java
+++ b/src/main/java/org/etsi/osl/osom/management/ProcessCreateServiceRules.java
@@ -4,16 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.lcm.LCMRulesController;
 import org.etsi.osl.osom.lcm.LCMRulesExecutorVariables;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import org.etsi.osl.tmf.common.model.service.ServiceRef;
 import org.etsi.osl.tmf.common.model.service.ServiceStateType;
 import org.etsi.osl.tmf.lcm.model.ELCMRulePhase;
@@ -23,6 +17,11 @@ import org.etsi.osl.tmf.sim638.model.Service;
 import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
 import org.etsi.osl.tmf.so641.model.ServiceOrder;
 import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 @Component(value = "processCreateServiceRules") 
 public class ProcessCreateServiceRules implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionAdd.java b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionAdd.java
index 9eda1bcd822a9b64f64522039d5815718e30c1f0..caa5b90ebcfcc141229a0fb538c1b5fc39d088f6 100644
--- a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionAdd.java
+++ b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionAdd.java
@@ -3,14 +3,14 @@ package org.etsi.osl.osom.management;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.lcm.LCMRulesController;
+import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
+import org.etsi.osl.tmf.so641.model.ServiceOrder;
+import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
-import org.etsi.osl.tmf.so641.model.ServiceOrder;
-import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
 
 @Component(value = "processOrderItemActionAdd") // bean name
 public class ProcessOrderItemActionAdd implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionCheck.java b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionCheck.java
index 9b5c1233ca435816568e152c09d1f7a59aa91e29..d724da8a1f017ddd62fcb1b89f82633a4b804677 100644
--- a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionCheck.java
+++ b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionCheck.java
@@ -3,14 +3,14 @@ package org.etsi.osl.osom.management;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.lcm.LCMRulesController;
+import org.etsi.osl.tmf.so641.model.ServiceOrder;
+import org.etsi.osl.tmf.so641.model.ServiceOrderActionType;
+import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.etsi.osl.tmf.so641.model.ServiceOrder;
-import org.etsi.osl.tmf.so641.model.ServiceOrderActionType;
-import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
 
 @Component(value = "processOrderItemActionCheck") // bean name
 public class ProcessOrderItemActionCheck implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionDelete.java b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionDelete.java
index cf6d2c7f20de19c3c5ea952bda4861766e238f50..d1bfd1520a205ae4166849fafdca58e46bbc9026 100644
--- a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionDelete.java
+++ b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionDelete.java
@@ -3,11 +3,6 @@ package org.etsi.osl.osom.management;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.lcm.LCMRulesController;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import org.etsi.osl.tmf.common.model.service.ServiceRef;
 import org.etsi.osl.tmf.common.model.service.ServiceStateType;
 import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
@@ -17,6 +12,11 @@ import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
 import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;
 import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate;
 import org.etsi.osl.tmf.so641.model.ServiceRestriction;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 @Component(value = "processOrderItemActionDelete") // bean name
 public class ProcessOrderItemActionDelete implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionModify.java b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionModify.java
index ed7d7b2c317fe1a5479b89ca2405bb800a682476..8c2f95082af631350de55447225691ce2ddffb88 100644
--- a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionModify.java
+++ b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionModify.java
@@ -3,11 +3,6 @@ package org.etsi.osl.osom.management;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.lcm.LCMRulesController;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import org.etsi.osl.tmf.common.model.service.Characteristic;
 import org.etsi.osl.tmf.common.model.service.ServiceRef;
 import org.etsi.osl.tmf.common.model.service.ServiceStateType;
@@ -19,6 +14,11 @@ import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
 import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;
 import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate;
 import org.etsi.osl.tmf.so641.model.ServiceRestriction;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 @Component(value = "processOrderItemActionModify") // bean name
 public class ProcessOrderItemActionModify implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/management/ServiceOrderManager.java b/src/main/java/org/etsi/osl/osom/management/ServiceOrderManager.java
index e745d3032b7784a7087cc0290884d3851ecde2d6..0a09c5f367d8d52263f8a81dbae4fb0777712448 100644
--- a/src/main/java/org/etsi/osl/osom/management/ServiceOrderManager.java
+++ b/src/main/java/org/etsi/osl/osom/management/ServiceOrderManager.java
@@ -26,28 +26,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.camel.ProducerTemplate;
-import org.apache.camel.model.dataformat.JsonLibrary;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.etsi.osl.model.nfv.DeploymentDescriptor;
+import org.etsi.osl.model.nfv.NetworkServiceDescriptor;
+import org.etsi.osl.model.nfv.ScaleDescriptor;
 import org.etsi.osl.osom.serviceactions.NSActionRequestPayload;
-import org.flowable.engine.RuntimeService;
-import org.flowable.engine.TaskService;
-import org.flowable.task.api.Task;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import org.etsi.osl.model.DeploymentDescriptor;
-import org.etsi.osl.model.NetworkServiceDescriptor;
-import org.etsi.osl.model.ScaleDescriptor;
 import org.etsi.osl.tmf.pm632.model.Organization;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecification;
 import org.etsi.osl.tmf.ri639.model.LogicalResource;
 import org.etsi.osl.tmf.ri639.model.PhysicalResource;
 import org.etsi.osl.tmf.ri639.model.Resource;
@@ -64,6 +52,13 @@ import org.etsi.osl.tmf.stm653.model.ServiceTest;
 import org.etsi.osl.tmf.stm653.model.ServiceTestCreate;
 import org.etsi.osl.tmf.stm653.model.ServiceTestSpecification;
 import org.etsi.osl.tmf.stm653.model.ServiceTestUpdate;
+import org.flowable.engine.RuntimeService;
+import org.flowable.engine.TaskService;
+import org.flowable.task.api.Task;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import jakarta.validation.constraints.NotNull;
 
 /**
diff --git a/src/main/java/org/etsi/osl/osom/management/UserOrderCompleteService.java b/src/main/java/org/etsi/osl/osom/management/UserOrderCompleteService.java
index 3cd49cc0211398954ef1b86f55a8e8c9d6d6a1d2..d9ec9f2a470ff1f4f3b2f62af667ad9e2eeb9220 100644
--- a/src/main/java/org/etsi/osl/osom/management/UserOrderCompleteService.java
+++ b/src/main/java/org/etsi/osl/osom/management/UserOrderCompleteService.java
@@ -21,15 +21,14 @@ package org.etsi.osl.osom.management;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.etsi.osl.tmf.common.model.service.ServiceStateType;
+import org.etsi.osl.tmf.sim638.model.Service;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import org.etsi.osl.tmf.common.model.service.ServiceStateType;
-import org.etsi.osl.tmf.sim638.model.Service;
-
 
 @Component(value = "userOrderCompleteService") //bean name
 public class UserOrderCompleteService implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/partnerservices/FetchPartnerOrganizations.java b/src/main/java/org/etsi/osl/osom/partnerservices/FetchPartnerOrganizations.java
index 26539751c8d1b5c9ea60dc92af0b5832b98039eb..e2f7a14f022cc236b80aca78f7c9779a917d4f5b 100644
--- a/src/main/java/org/etsi/osl/osom/partnerservices/FetchPartnerOrganizations.java
+++ b/src/main/java/org/etsi/osl/osom/partnerservices/FetchPartnerOrganizations.java
@@ -21,20 +21,17 @@ package org.etsi.osl.osom.partnerservices;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.etsi.osl.tmf.pm632.model.Organization;
 import org.flowable.engine.TaskService;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import org.etsi.osl.tmf.pm632.model.Organization;
-
 @Component(value = "fetchPartnerOrganizations") // bean name
 public class FetchPartnerOrganizations implements JavaDelegate {
 
diff --git a/src/main/java/org/etsi/osl/osom/partnerservices/FetchUpdateExternalPartnerServices.java b/src/main/java/org/etsi/osl/osom/partnerservices/FetchUpdateExternalPartnerServices.java
index 343f6f4b0ee0396bab5c18540ed1f17951902a1a..fb12205974441b595233846191470c7e9b94769b 100644
--- a/src/main/java/org/etsi/osl/osom/partnerservices/FetchUpdateExternalPartnerServices.java
+++ b/src/main/java/org/etsi/osl/osom/partnerservices/FetchUpdateExternalPartnerServices.java
@@ -20,20 +20,17 @@
 package org.etsi.osl.osom.partnerservices;
 
 import java.util.List;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import org.etsi.osl.tmf.common.model.Any;
 import org.etsi.osl.tmf.pm632.model.Characteristic;
 import org.etsi.osl.tmf.pm632.model.Organization;
 import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 @Component(value = "fetchUpdateExternalPartnerServices") // bean name
 public class FetchUpdateExternalPartnerServices  implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/partnerservices/FlowOneServiceOrder.java b/src/main/java/org/etsi/osl/osom/partnerservices/FlowOneServiceOrder.java
index 38c31de114ede847228b314383fbdfa415d51373..2a6c3b0d313a35cea4e1a9ebdc7910b249fd48db 100644
--- a/src/main/java/org/etsi/osl/osom/partnerservices/FlowOneServiceOrder.java
+++ b/src/main/java/org/etsi/osl/osom/partnerservices/FlowOneServiceOrder.java
@@ -21,7 +21,6 @@ package org.etsi.osl.osom.partnerservices;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
 
 @JsonIgnoreProperties(ignoreUnknown=true)
diff --git a/src/main/java/org/etsi/osl/osom/partnerservices/GenericClient.java b/src/main/java/org/etsi/osl/osom/partnerservices/GenericClient.java
index 5cf2042cad001b40b649f48fabe9f44213bd1eea..2aa4f91939c61579685bc011a9b3907eecb55bb1 100644
--- a/src/main/java/org/etsi/osl/osom/partnerservices/GenericClient.java
+++ b/src/main/java/org/etsi/osl/osom/partnerservices/GenericClient.java
@@ -23,9 +23,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
-
 import javax.net.ssl.SSLException;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.http.HttpHeaders;
@@ -49,7 +47,6 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
 import org.springframework.web.reactive.function.client.ExchangeStrategies;
 import org.springframework.web.reactive.function.client.WebClient;
-
 import io.netty.channel.ChannelOption;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
diff --git a/src/main/java/org/etsi/osl/osom/partnerservices/PartnerOrganizationServicesManager.java b/src/main/java/org/etsi/osl/osom/partnerservices/PartnerOrganizationServicesManager.java
index 71132f9186218667a094ad3189df906fd3f32548..366f400200f6ac3ad2667f9c7bea70b4e275766a 100644
--- a/src/main/java/org/etsi/osl/osom/partnerservices/PartnerOrganizationServicesManager.java
+++ b/src/main/java/org/etsi/osl/osom/partnerservices/PartnerOrganizationServicesManager.java
@@ -26,23 +26,13 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.net.ssl.SSLException;
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
-
 import org.apache.camel.ProducerTemplate;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpStatusCode;
-import org.springframework.stereotype.Service;
-import org.springframework.web.reactive.function.client.WebClient;
-
 import org.etsi.osl.tmf.common.model.Any;
 import org.etsi.osl.tmf.pm632.model.Characteristic;
 import org.etsi.osl.tmf.pm632.model.Organization;
@@ -55,6 +45,12 @@ import org.etsi.osl.tmf.so641.model.ServiceOrder;
 import org.etsi.osl.tmf.so641.model.ServiceOrderCreate;
 import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;
 import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClient;
 import jakarta.validation.constraints.NotNull;
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/org/etsi/osl/osom/partnerservices/SimpleIDSpec.java b/src/main/java/org/etsi/osl/osom/partnerservices/SimpleIDSpec.java
index 395c1c708249fe723ddd8f2e37f3e6f1f3392c94..ce2d93e72b4ce95573f2a7b0ff4545899ac41f51 100644
--- a/src/main/java/org/etsi/osl/osom/partnerservices/SimpleIDSpec.java
+++ b/src/main/java/org/etsi/osl/osom/partnerservices/SimpleIDSpec.java
@@ -22,7 +22,6 @@ package org.etsi.osl.osom.partnerservices;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
 
 
diff --git a/src/main/java/org/etsi/osl/osom/partnerservices/SyncPartnerServiceInventory.java b/src/main/java/org/etsi/osl/osom/partnerservices/SyncPartnerServiceInventory.java
index e150fb78863717bfb634ad5bf1a3014f99e0464a..b75adbc233f9b251cab1944babd045a59ac031d9 100644
--- a/src/main/java/org/etsi/osl/osom/partnerservices/SyncPartnerServiceInventory.java
+++ b/src/main/java/org/etsi/osl/osom/partnerservices/SyncPartnerServiceInventory.java
@@ -1,19 +1,18 @@
 package org.etsi.osl.osom.partnerservices;
 
 import java.util.List;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.management.ServiceOrderManager;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.etsi.osl.tmf.common.model.service.Characteristic;
 import org.etsi.osl.tmf.pm632.model.Organization;
 import org.etsi.osl.tmf.prm669.model.RelatedParty;
 import org.etsi.osl.tmf.sim638.model.Service;
 import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 @Component(value = "SyncPartnerServiceInventory") // bean name
 public class SyncPartnerServiceInventory implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/AutomaticallyHandleAction.java b/src/main/java/org/etsi/osl/osom/serviceactions/AutomaticallyHandleAction.java
index de5215ea46efe2abc094867227930121259ca5f1..6bc7ce47c582184d1a9e7161655637b1df52461c 100644
--- a/src/main/java/org/etsi/osl/osom/serviceactions/AutomaticallyHandleAction.java
+++ b/src/main/java/org/etsi/osl/osom/serviceactions/AutomaticallyHandleAction.java
@@ -2,23 +2,21 @@ package org.etsi.osl.osom.serviceactions;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.management.ServiceOrderManager;
+import org.etsi.osl.tmf.common.model.service.Note;
+import org.etsi.osl.tmf.sim638.model.Service;
+import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem;
+import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.etsi.osl.tmf.common.model.service.Note;
-import org.etsi.osl.tmf.sim638.model.Service;
-import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem;
-import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
 
 @Component(value = "AutomaticallyHandleAction") //bean name
 public class AutomaticallyHandleAction  implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/CRPatchTask.java b/src/main/java/org/etsi/osl/osom/serviceactions/CRPatchTask.java
index e0eb2510636e38f2bde524f3310ccfe38aeec792..2e8c65a6bd0391e3d06d40a19fdeb44059632c8a 100644
--- a/src/main/java/org/etsi/osl/osom/serviceactions/CRPatchTask.java
+++ b/src/main/java/org/etsi/osl/osom/serviceactions/CRPatchTask.java
@@ -3,32 +3,23 @@ package org.etsi.osl.osom.serviceactions;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.management.AlarmsService;
 import org.etsi.osl.osom.management.ServiceOrderManager;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import org.etsi.osl.model.ScaleDescriptor;
-import org.etsi.osl.tmf.common.model.Any;
-import org.etsi.osl.tmf.common.model.EValueType;
 import org.etsi.osl.tmf.common.model.service.Characteristic;
 import org.etsi.osl.tmf.common.model.service.Note;
 import org.etsi.osl.tmf.sim638.model.Service;
 import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem;
 import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 @Component(value = "CRPatchTask") // bean name
 public class CRPatchTask implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/CRTerminateTask.java b/src/main/java/org/etsi/osl/osom/serviceactions/CRTerminateTask.java
index f544d3e423389161853c2194f7ed802843f1f7ea..264804754548cbc51ea339c19e5e43d93ae56a92 100644
--- a/src/main/java/org/etsi/osl/osom/serviceactions/CRTerminateTask.java
+++ b/src/main/java/org/etsi/osl/osom/serviceactions/CRTerminateTask.java
@@ -2,29 +2,24 @@ package org.etsi.osl.osom.serviceactions;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.management.ServiceOrderManager;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import org.etsi.osl.model.DeploymentDescriptor;
 import org.etsi.osl.tmf.common.model.service.Note;
 import org.etsi.osl.tmf.common.model.service.ResourceRef;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef;
 import org.etsi.osl.tmf.sim638.model.Service;
 import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem;
 import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 @Component(value = "CRTerminateTask") //bean name
 public class CRTerminateTask  implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/ExternalProviderServiceAction.java b/src/main/java/org/etsi/osl/osom/serviceactions/ExternalProviderServiceAction.java
index fd0616c5ef2e19265f7dfaef93ca5e0ecf2ac699..a19f1f97f9d8f8bfc74df49feba393de4d9d2be1 100644
--- a/src/main/java/org/etsi/osl/osom/serviceactions/ExternalProviderServiceAction.java
+++ b/src/main/java/org/etsi/osl/osom/serviceactions/ExternalProviderServiceAction.java
@@ -2,20 +2,13 @@ package org.etsi.osl.osom.serviceactions;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.management.ServiceOrderManager;
 import org.etsi.osl.osom.partnerservices.PartnerOrganizationServicesManager;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import org.etsi.osl.tmf.common.model.service.Characteristic;
 import org.etsi.osl.tmf.common.model.service.Note;
 import org.etsi.osl.tmf.common.model.service.ServiceStateType;
@@ -28,6 +21,11 @@ import org.etsi.osl.tmf.so641.model.ServiceOrder;
 import org.etsi.osl.tmf.so641.model.ServiceOrderActionType;
 import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
 import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 @Component(value = "ExternalProviderServiceAction") //bean name
 public class ExternalProviderServiceAction  implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/FetchServiceQueueItems.java b/src/main/java/org/etsi/osl/osom/serviceactions/FetchServiceQueueItems.java
index 9ce3cb3dbe84331726d36d04ebd1f10ca6b2e1b5..e78a9b1efbc3e07c2a69e42421d68350a77cd6a6 100644
--- a/src/main/java/org/etsi/osl/osom/serviceactions/FetchServiceQueueItems.java
+++ b/src/main/java/org/etsi/osl/osom/serviceactions/FetchServiceQueueItems.java
@@ -2,18 +2,16 @@ package org.etsi.osl.osom.serviceactions;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.management.ServiceOrderManager;
+import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem;
 
 @Component(value = "fetchServiceQueueItems") // bean name
 public class FetchServiceQueueItems implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/HandleManuallyAction.java b/src/main/java/org/etsi/osl/osom/serviceactions/HandleManuallyAction.java
index 7e8137577e9ab8c577479cf5003291525d47f9ed..54d90bcb00a91268184d14b51eed9088edf3e66d 100644
--- a/src/main/java/org/etsi/osl/osom/serviceactions/HandleManuallyAction.java
+++ b/src/main/java/org/etsi/osl/osom/serviceactions/HandleManuallyAction.java
@@ -2,23 +2,21 @@ package org.etsi.osl.osom.serviceactions;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.management.ServiceOrderManager;
+import org.etsi.osl.tmf.common.model.service.Note;
+import org.etsi.osl.tmf.sim638.model.Service;
+import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem;
+import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.etsi.osl.tmf.common.model.service.Note;
-import org.etsi.osl.tmf.sim638.model.Service;
-import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem;
-import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
 
 @Component(value = "HandleManuallyAction") //bean name
 public class HandleManuallyAction  implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/NFVODAY2config.java b/src/main/java/org/etsi/osl/osom/serviceactions/NFVODAY2config.java
index feee282977ed95bf745bf34b0ee76b574f9e9d88..6267c9289f3d875f5456e4413deed104bb5858db 100644
--- a/src/main/java/org/etsi/osl/osom/serviceactions/NFVODAY2config.java
+++ b/src/main/java/org/etsi/osl/osom/serviceactions/NFVODAY2config.java
@@ -6,22 +6,14 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.etsi.osl.model.nfv.ScaleDescriptor;
 import org.etsi.osl.osom.management.AlarmsService;
 import org.etsi.osl.osom.management.ServiceOrderManager;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import org.etsi.osl.model.ScaleDescriptor;
 import org.etsi.osl.tmf.common.model.Any;
 import org.etsi.osl.tmf.common.model.EValueType;
 import org.etsi.osl.tmf.common.model.service.Characteristic;
@@ -29,6 +21,11 @@ import org.etsi.osl.tmf.common.model.service.Note;
 import org.etsi.osl.tmf.sim638.model.Service;
 import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem;
 import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 @Component(value = "NFVODAY2config") //bean name
 public class NFVODAY2config implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/NFVONSTerminateTask.java b/src/main/java/org/etsi/osl/osom/serviceactions/NFVONSTerminateTask.java
index 439101f1f0043c3c1d6145be140f4b7a96fc4f13..6a73fcc754b35e02fd004b50f48b071394b70321 100644
--- a/src/main/java/org/etsi/osl/osom/serviceactions/NFVONSTerminateTask.java
+++ b/src/main/java/org/etsi/osl/osom/serviceactions/NFVONSTerminateTask.java
@@ -3,26 +3,23 @@ package org.etsi.osl.osom.serviceactions;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.util.Date;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.etsi.osl.model.nfv.DeploymentDescriptor;
 import org.etsi.osl.osom.management.ServiceOrderManager;
+import org.etsi.osl.tmf.common.model.service.Note;
+import org.etsi.osl.tmf.sim638.model.Service;
+import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem;
+import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import org.etsi.osl.model.DeploymentDescriptor;
-import org.etsi.osl.tmf.common.model.service.Note;
-import org.etsi.osl.tmf.sim638.model.Service;
-import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem;
-import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
-
 @Component(value = "NFVONSTerminateTask") //bean name
 public class NFVONSTerminateTask  implements JavaDelegate {
 
diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/NSActionRequestPayload.java b/src/main/java/org/etsi/osl/osom/serviceactions/NSActionRequestPayload.java
index eb58af78aeee9d769f237bcdbb1d693a3ae8577a..0119c9fb52657e0d033d4772d74c55831da71d81 100644
--- a/src/main/java/org/etsi/osl/osom/serviceactions/NSActionRequestPayload.java
+++ b/src/main/java/org/etsi/osl/osom/serviceactions/NSActionRequestPayload.java
@@ -23,7 +23,6 @@ package org.etsi.osl.osom.serviceactions;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/ServiceActionCheck.java b/src/main/java/org/etsi/osl/osom/serviceactions/ServiceActionCheck.java
index 68e1ab20f74c6784da45eaf985df596ce506b412..c375e3766d304a751411e8391b8c9e57c55b1959 100644
--- a/src/main/java/org/etsi/osl/osom/serviceactions/ServiceActionCheck.java
+++ b/src/main/java/org/etsi/osl/osom/serviceactions/ServiceActionCheck.java
@@ -3,15 +3,9 @@ package org.etsi.osl.osom.serviceactions;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.management.ServiceOrderManager;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import org.etsi.osl.tmf.common.model.UserPartRoleType;
 import org.etsi.osl.tmf.common.model.service.ResourceRef;
 import org.etsi.osl.tmf.common.model.service.ServiceRef;
@@ -19,6 +13,11 @@ import org.etsi.osl.tmf.prm669.model.RelatedParty;
 import org.etsi.osl.tmf.sim638.model.Service;
 import org.etsi.osl.tmf.sim638.model.ServiceActionQueueAction;
 import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 @Component(value = "serviceActionCheck") //bean name
 public class ServiceActionCheck implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/ServiceActivationAction.java b/src/main/java/org/etsi/osl/osom/serviceactions/ServiceActivationAction.java
index dc2fa17a7992c036ea9d9cc9450429341b622dce..9bad34bfbeee443f09bc3cadef41b94456c4da9a 100644
--- a/src/main/java/org/etsi/osl/osom/serviceactions/ServiceActivationAction.java
+++ b/src/main/java/org/etsi/osl/osom/serviceactions/ServiceActivationAction.java
@@ -2,21 +2,14 @@ package org.etsi.osl.osom.serviceactions;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.lcm.LCMRulesController;
 import org.etsi.osl.osom.lcm.LCMRulesExecutorVariables;
 import org.etsi.osl.osom.management.ServiceOrderManager;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import org.etsi.osl.tmf.common.model.service.Note;
 import org.etsi.osl.tmf.lcm.model.ELCMRulePhase;
 import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
@@ -25,6 +18,11 @@ import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem;
 import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
 import org.etsi.osl.tmf.so641.model.ServiceOrder;
 import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 @Component(value = "ServiceActivationAction") //bean name
 public class ServiceActivationAction  implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/ServiceEvaluateAction.java b/src/main/java/org/etsi/osl/osom/serviceactions/ServiceEvaluateAction.java
index 8679313e67115ad735eafac05368e351d2f0cf75..c95463c0fa338ab8e924a711475448fd9f0bf6f9 100644
--- a/src/main/java/org/etsi/osl/osom/serviceactions/ServiceEvaluateAction.java
+++ b/src/main/java/org/etsi/osl/osom/serviceactions/ServiceEvaluateAction.java
@@ -2,21 +2,14 @@ package org.etsi.osl.osom.serviceactions;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.lcm.LCMRulesController;
 import org.etsi.osl.osom.lcm.LCMRulesExecutorVariables;
 import org.etsi.osl.osom.management.ServiceOrderManager;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import org.etsi.osl.tmf.common.model.Any;
 import org.etsi.osl.tmf.common.model.service.Characteristic;
 import org.etsi.osl.tmf.common.model.service.Note;
@@ -29,6 +22,11 @@ import org.etsi.osl.tmf.so641.model.ServiceOrder;
 import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
 import org.etsi.osl.tmf.stm653.model.ServiceTest;
 import org.etsi.osl.tmf.stm653.model.ServiceTestUpdate;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 @Component(value = "ServiceEvaluateAction") //bean name
 public class ServiceEvaluateAction  implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/ServiceInactiveAction.java b/src/main/java/org/etsi/osl/osom/serviceactions/ServiceInactiveAction.java
index 1fad4f5237843156f408b6caf512729503f9091a..8dba93d3fe909a4d8e1f727adcb25e56179387d8 100644
--- a/src/main/java/org/etsi/osl/osom/serviceactions/ServiceInactiveAction.java
+++ b/src/main/java/org/etsi/osl/osom/serviceactions/ServiceInactiveAction.java
@@ -2,21 +2,14 @@ package org.etsi.osl.osom.serviceactions;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.lcm.LCMRulesController;
 import org.etsi.osl.osom.lcm.LCMRulesExecutorVariables;
 import org.etsi.osl.osom.management.ServiceOrderManager;
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import org.etsi.osl.tmf.common.model.service.Note;
 import org.etsi.osl.tmf.lcm.model.ELCMRulePhase;
 import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
@@ -25,6 +18,11 @@ import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem;
 import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
 import org.etsi.osl.tmf.so641.model.ServiceOrder;
 import org.etsi.osl.tmf.so641.model.ServiceOrderItem;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 @Component(value = "ServiceInactiveAction") //bean name
 public class ServiceInactiveAction  implements JavaDelegate {
diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/fetchAndTerminateScheduledServices.java b/src/main/java/org/etsi/osl/osom/serviceactions/fetchAndTerminateScheduledServices.java
index b28385ba58e90c28dd2d084d891252beda8bf18d..312276dbb026ce9bb221c656703ac9fd347592e8 100644
--- a/src/main/java/org/etsi/osl/osom/serviceactions/fetchAndTerminateScheduledServices.java
+++ b/src/main/java/org/etsi/osl/osom/serviceactions/fetchAndTerminateScheduledServices.java
@@ -1,16 +1,15 @@
 package org.etsi.osl.osom.serviceactions;
 
 import java.util.List;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.etsi.osl.osom.management.ServiceOrderManager;
+import org.etsi.osl.tmf.common.model.service.ServiceStateType;
+import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.JavaDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.etsi.osl.tmf.common.model.service.ServiceStateType;
-import org.etsi.osl.tmf.sim638.model.ServiceUpdate;
 
 @Component(value = "fetchAndTerminateScheduledServices") // bean name
 public class fetchAndTerminateScheduledServices implements JavaDelegate {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6f930df9c4a8ad41d40998004d5e6bc7bde5d0c1..fd9ed495e9e7ac6aac458ce40f605294166ee911 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 13100
+  port: 13689
     
 spring:
   application:
diff --git a/src/test/java/org/etsi/osl/osom/SCMocked.java b/src/test/java/org/etsi/osl/osom/SCMocked.java
index f114c8bbb7c14775f06e71a202c713ce91d6e4ac..d048d8841828be3f2f2eea12578b86ad884b429b 100644
--- a/src/test/java/org/etsi/osl/osom/SCMocked.java
+++ b/src/test/java/org/etsi/osl/osom/SCMocked.java
@@ -34,9 +34,9 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.etsi.osl.model.DeploymentDescriptor;
-import org.etsi.osl.model.DeploymentDescriptorStatus;
-import org.etsi.osl.model.NetworkServiceDescriptor;
+import org.etsi.osl.model.nfv.DeploymentDescriptor;
+import org.etsi.osl.model.nfv.DeploymentDescriptorStatus;
+import org.etsi.osl.model.nfv.NetworkServiceDescriptor;
 import org.etsi.osl.tmf.lcm.model.LCMRuleSpecification;
 import org.etsi.osl.tmf.so641.model.ServiceOrder;
 import jakarta.validation.Valid;
diff --git a/src/test/java/org/etsi/osl/osom/SPMocked.java b/src/test/java/org/etsi/osl/osom/SPMocked.java
index 0220ebab835a24e8b5c24e3142eb29d52ee0964f..3b2597974637451c67b9f46e95e0951d8ca26e7e 100644
--- a/src/test/java/org/etsi/osl/osom/SPMocked.java
+++ b/src/test/java/org/etsi/osl/osom/SPMocked.java
@@ -36,8 +36,8 @@ import org.apache.commons.logging.LogFactory;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.etsi.osl.model.DeploymentDescriptor;
-import org.etsi.osl.model.DeploymentDescriptorStatus;
+import org.etsi.osl.model.nfv.DeploymentDescriptor;
+import org.etsi.osl.model.nfv.DeploymentDescriptorStatus;
 import org.etsi.osl.tmf.common.model.Any;
 import org.etsi.osl.tmf.pm632.model.Characteristic;
 import org.etsi.osl.tmf.pm632.model.ContactMedium;