diff --git a/pom.xml b/pom.xml
index 044cfc01e5a3c0ad4f1367dcf7fc7b76240f2b8b..ca6ca6ed092f9fa321d971631c3154840f293f7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,7 +190,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>
 		<dependency>
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/api/CustomerApiController.java b/src/main/java/org/etsi/osl/tmf/cm629/api/CustomerApiController.java
index 04d4886acd74ac1deebd3a19fdc2fdf0a48bb1e7..a50e73000db8fecada0cdca0a903f296db256274 100644
--- a/src/main/java/org/etsi/osl/tmf/cm629/api/CustomerApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/cm629/api/CustomerApiController.java
@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import org.etsi.osl.model.UserRoleType;
+import org.etsi.osl.model.nfv.UserRoleType;
 import io.swagger.v3.oas.annotations.Parameter;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/api/IndividualApiController.java b/src/main/java/org/etsi/osl/tmf/pm632/api/IndividualApiController.java
index 1e8d006766e0aad62f96d9e4e122f57fed721661..4946fe2154075d5467b43c9756e5bccf8115fb3e 100644
--- a/src/main/java/org/etsi/osl/tmf/pm632/api/IndividualApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/pm632/api/IndividualApiController.java
@@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import org.etsi.osl.model.UserRoleType;
+import org.etsi.osl.model.nfv.UserRoleType;
 import io.swagger.v3.oas.annotations.Parameter;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/api/ResourceApiController.java b/src/main/java/org/etsi/osl/tmf/ri639/api/ResourceApiController.java
index cf639f17aac50c6bae00ae4aabdc1e7dfb8fc1fd..81c07b5e9488097a7628596fd374b3a6961848ba 100644
--- a/src/main/java/org/etsi/osl/tmf/ri639/api/ResourceApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/ri639/api/ResourceApiController.java
@@ -21,7 +21,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import org.etsi.osl.model.UserRoleType;
+import org.etsi.osl.model.nfv.UserRoleType;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 @jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/api/ServiceSpecificationApiRouteBuilderNSD.java b/src/main/java/org/etsi/osl/tmf/scm633/api/ServiceSpecificationApiRouteBuilderNSD.java
index 565a3651a6bcd9fb569af82a0a67241f2e3882d6..92bfb908ce3a65d0b1d26827027fef208aaa689f 100644
--- a/src/main/java/org/etsi/osl/tmf/scm633/api/ServiceSpecificationApiRouteBuilderNSD.java
+++ b/src/main/java/org/etsi/osl/tmf/scm633/api/ServiceSpecificationApiRouteBuilderNSD.java
@@ -33,7 +33,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 
-import org.etsi.osl.model.NetworkServiceDescriptor;
+import org.etsi.osl.model.nfv.NetworkServiceDescriptor;
 
 @Configuration
 //@RefreshScope
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/reposervices/ServiceSpecificationRepoService.java b/src/main/java/org/etsi/osl/tmf/scm633/reposervices/ServiceSpecificationRepoService.java
index 1a3c00c005f38c0667ddcc6d12060e3290a4c9e8..23a8645c629f5b0107ca410fc312b95d4a9e375d 100644
--- a/src/main/java/org/etsi/osl/tmf/scm633/reposervices/ServiceSpecificationRepoService.java
+++ b/src/main/java/org/etsi/osl/tmf/scm633/reposervices/ServiceSpecificationRepoService.java
@@ -86,9 +86,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import org.etsi.osl.model.ConstituentVxF;
-import org.etsi.osl.model.ExperimentOnBoardDescriptor;
-import org.etsi.osl.model.NetworkServiceDescriptor;
+import org.etsi.osl.model.nfv.ConstituentVxF;
+import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;
+import org.etsi.osl.model.nfv.NetworkServiceDescriptor;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.validation.Valid;
 
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiController.java b/src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiController.java
index 445318a51bc39d7949bf7b811aee4ab9146a5bd5..ac5ee19bc3ab6b14baff64f96a69a4369a84ff56 100644
--- a/src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiController.java
@@ -42,7 +42,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import org.etsi.osl.model.UserRoleType;
+import org.etsi.osl.model.nfv.UserRoleType;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiRouteBuilder.java b/src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiRouteBuilder.java
index c589795cb1cfde6fc6ff4504869803f4479f2a52..b9e7e4a5915cfaba49f69269754d2c90c78c9bf4 100644
--- a/src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiRouteBuilder.java
+++ b/src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiRouteBuilder.java
@@ -42,7 +42,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 
-import org.etsi.osl.model.DeploymentDescriptor;
+import org.etsi.osl.model.nfv.DeploymentDescriptor;
 
 @Configuration
 //@RefreshScope
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java b/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
index cf763f5316954fd1807afaf0a630968f8f053ba9..47d419d5a68dd7c813301febf65239463317e137 100644
--- a/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
+++ b/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
@@ -69,8 +69,8 @@ import org.hibernate.Transaction;
 import org.hibernate.transform.ResultTransformer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.etsi.osl.model.DeploymentDescriptor;
-import org.etsi.osl.model.DeploymentDescriptorVxFInstanceInfo;
+import org.etsi.osl.model.nfv.DeploymentDescriptor;
+import org.etsi.osl.model.nfv.DeploymentDescriptorVxFInstanceInfo;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.validation.Valid;
 
diff --git a/src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiController.java b/src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiController.java
index 7f1c2e8794ec567c719e952237c61f5ed403e619..746597822ff7c915da2337bf58d52cd52a92e340 100644
--- a/src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiController.java
@@ -51,7 +51,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import org.etsi.osl.model.UserRoleType;
+import org.etsi.osl.model.nfv.UserRoleType;
 import io.swagger.v3.oas.annotations.Parameter;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
diff --git a/src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiRouteBuilder.java b/src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiRouteBuilder.java
index f0a02d8c3270e6746fca461dff72b61fc2151fe1..04bec431a529799829035102dcc13f60cfb93c42 100644
--- a/src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiRouteBuilder.java
+++ b/src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiRouteBuilder.java
@@ -39,7 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
-import org.etsi.osl.model.PortalUser;
+import org.etsi.osl.model.nfv.PortalUser;
 
 @Configuration
 //@RefreshScope