diff --git a/pom.xml b/pom.xml
index 48e1cae..26241ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,8 +47,8 @@
 			<artifactId>information-system-model</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.gcube.information-system</groupId>
-			<artifactId>gcube-resources</artifactId>
+			<groupId>org.gcube.resource-management</groupId>
+			<artifactId>gcube-model</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/facet/cidoc/E51_Contact_Point.java b/src/main/java/org/gcube/informationsystem/model/entity/facet/cidoc/E51_Contact_Point.java
index d2aae5b..17917c6 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/facet/cidoc/E51_Contact_Point.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/facet/cidoc/E51_Contact_Point.java
@@ -1,6 +1,6 @@
 package org.gcube.informationsystem.model.entity.facet.cidoc;
 
-import org.gcube.informationsystem.model.entity.Facet;
+import org.gcube.informationsystem.model.reference.entity.Facet;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/E30_Right.java b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/E30_Right.java
index 4720f7b..14473a5 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/E30_Right.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/E30_Right.java
@@ -1,7 +1,7 @@
 package org.gcube.informationsystem.model.entity.facet.parthenos;
 
-import org.gcube.informationsystem.model.annotations.ISProperty;
-import org.gcube.informationsystem.model.entity.Facet;
+import org.gcube.informationsystem.model.reference.annotations.ISProperty;
+import org.gcube.informationsystem.model.reference.entity.Facet;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE29_Access_Point.java b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE29_Access_Point.java
index 12c6091..18e9294 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE29_Access_Point.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE29_Access_Point.java
@@ -1,7 +1,7 @@
 package org.gcube.informationsystem.model.entity.facet.parthenos;
 
-import org.gcube.informationsystem.model.entity.facet.AccessPointFacet;
 import org.gcube.informationsystem.model.entity.facet.cidoc.E51_Contact_Point;
+import org.gcube.resourcemanagement.model.reference.entity.facet.AccessPointFacet;
 
 /**
  * @author Luca Frosini (ISTI - CNR) 
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Basic_Info_Facet.java b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Basic_Info_Facet.java
index 914a02e..3668cdf 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Basic_Info_Facet.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Basic_Info_Facet.java
@@ -1,7 +1,7 @@
 package org.gcube.informationsystem.model.entity.facet.parthenos;
 
-import org.gcube.informationsystem.model.annotations.ISProperty;
-import org.gcube.informationsystem.model.entity.Facet;
+import org.gcube.informationsystem.model.reference.annotations.ISProperty;
+import org.gcube.informationsystem.model.reference.entity.Facet;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Contact_Reference_Facet.java b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Contact_Reference_Facet.java
index 4841615..90cd2c0 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Contact_Reference_Facet.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Contact_Reference_Facet.java
@@ -1,8 +1,8 @@
 package org.gcube.informationsystem.model.entity.facet.parthenos;
 
-import org.gcube.informationsystem.model.annotations.ISProperty;
-import org.gcube.informationsystem.model.entity.facet.ContactFacet;
-import org.gcube.informationsystem.model.entity.facet.ContactReferenceFacet;
+import org.gcube.informationsystem.model.reference.annotations.ISProperty;
+import org.gcube.resourcemanagement.model.reference.entity.facet.ContactFacet;
+import org.gcube.resourcemanagement.model.reference.entity.facet.ContactReferenceFacet;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Info_Facet.java b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Info_Facet.java
index 9062892..63ae22e 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Info_Facet.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/facet/parthenos/PE_Info_Facet.java
@@ -1,7 +1,7 @@
 package org.gcube.informationsystem.model.entity.facet.parthenos;
 
-import org.gcube.informationsystem.model.annotations.ISProperty;
-import org.gcube.informationsystem.model.embedded.ValueSchema;
+import org.gcube.informationsystem.model.reference.annotations.ISProperty;
+import org.gcube.informationsystem.model.reference.embedded.ValueSchema;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/D14_Software.java b/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/D14_Software.java
index 9327073..faefacf 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/D14_Software.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/D14_Software.java
@@ -1,6 +1,6 @@
 package org.gcube.informationsystem.model.entity.resource.cidoc;
 
-import org.gcube.informationsystem.model.entity.resource.Software;
+import org.gcube.resourcemanagement.model.reference.entity.resource.Software;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E1_CRM_Entity.java b/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E1_CRM_Entity.java
index 98ff020..dae0f65 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E1_CRM_Entity.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E1_CRM_Entity.java
@@ -1,6 +1,6 @@
 package org.gcube.informationsystem.model.entity.resource.cidoc;
 
-import org.gcube.informationsystem.model.entity.Resource;
+import org.gcube.informationsystem.model.reference.entity.Resource;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E21_Person.java b/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E21_Person.java
index c5f93d0..f47707c 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E21_Person.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E21_Person.java
@@ -1,6 +1,6 @@
 package org.gcube.informationsystem.model.entity.resource.cidoc;
 
-import org.gcube.informationsystem.model.entity.resource.Person;
+import org.gcube.resourcemanagement.model.reference.entity.resource.Person;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E39_Actor.java b/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E39_Actor.java
index 1dbd6ca..80dc9d0 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E39_Actor.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E39_Actor.java
@@ -1,6 +1,8 @@
 package org.gcube.informationsystem.model.entity.resource.cidoc;
 
-import org.gcube.informationsystem.model.entity.resource.Actor;
+import org.gcube.informationsystem.model.entity.facet.parthenos.PE_Contact_Reference_Facet;
+import org.gcube.resourcemanagement.model.reference.entity.facet.IdentifierFacet;
+import org.gcube.resourcemanagement.model.reference.entity.resource.Actor;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E40_Legal_Body.java b/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E40_Legal_Body.java
index 237b14c..3b5a515 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E40_Legal_Body.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/resource/cidoc/E40_Legal_Body.java
@@ -1,6 +1,6 @@
 package org.gcube.informationsystem.model.entity.resource.cidoc;
 
-import org.gcube.informationsystem.model.entity.resource.LegalBody;
+import org.gcube.resourcemanagement.model.reference.entity.resource.LegalBody;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE18_Dataset.java b/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE18_Dataset.java
index 933b5c5..c0bf578 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE18_Dataset.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE18_Dataset.java
@@ -1,7 +1,7 @@
 package org.gcube.informationsystem.model.entity.resource.parthenos;
 
-import org.gcube.informationsystem.model.entity.resource.Dataset;
 import org.gcube.informationsystem.model.entity.resource.cidoc.D1_Digital_Object;
+import org.gcube.resourcemanagement.model.reference.entity.resource.Dataset;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE1_Service.java b/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE1_Service.java
index 9ccb3db..de78007 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE1_Service.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE1_Service.java
@@ -1,11 +1,12 @@
 package org.gcube.informationsystem.model.entity.resource.parthenos;
 
-import org.gcube.informationsystem.model.annotations.Abstract;
-import org.gcube.informationsystem.model.entity.facet.EventFacet;
-import org.gcube.informationsystem.model.entity.facet.IdentifierFacet;
 import org.gcube.informationsystem.model.entity.facet.parthenos.E30_Right;
-import org.gcube.informationsystem.model.entity.resource.Service;
+import org.gcube.informationsystem.model.entity.facet.parthenos.PE_Info_Facet;
 import org.gcube.informationsystem.model.entity.resource.cidoc.E7_Activity;
+import org.gcube.informationsystem.model.reference.annotations.Abstract;
+import org.gcube.resourcemanagement.model.reference.entity.facet.EventFacet;
+import org.gcube.resourcemanagement.model.reference.entity.facet.IdentifierFacet;
+import org.gcube.resourcemanagement.model.reference.entity.resource.Service;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE2_Hosting_Service.java b/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE2_Hosting_Service.java
index 4417df6..40e98cd 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE2_Hosting_Service.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE2_Hosting_Service.java
@@ -1,6 +1,6 @@
 package org.gcube.informationsystem.model.entity.resource.parthenos;
 
-import org.gcube.informationsystem.model.entity.resource.HostingNode;
+import org.gcube.resourcemanagement.model.reference.entity.resource.HostingNode;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE8_EService.java b/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE8_EService.java
index dbbd6cb..50acf69 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE8_EService.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/resource/parthenos/PE8_EService.java
@@ -1,6 +1,6 @@
 package org.gcube.informationsystem.model.entity.resource.parthenos;
 
-import org.gcube.informationsystem.model.entity.resource.EService;
+import org.gcube.resourcemanagement.model.reference.entity.resource.EService;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/consistsof/cidoc/P147_curated.java b/src/main/java/org/gcube/informationsystem/model/relation/consistsof/cidoc/P147_curated.java
index e8e5091..08d9862 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/consistsof/cidoc/P147_curated.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/consistsof/cidoc/P147_curated.java
@@ -4,6 +4,7 @@ import org.gcube.informationsystem.model.entity.resource.parthenos.PE32_Curated_
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE3_Curating_Service;
 import org.gcube.informationsystem.model.relation.isrelatedto.parthenos.PP32_curates;
 
-public interface P147_curated<Out extends PE3_Curating_Service, In extends PE32_Curated_Thing> extends PP32_curates<Out,In> {
-
+public interface P147_curated<Out extends PE3_Curating_Service, In extends PE32_Curated_Thing>
+		extends PP32_curates<Out,In> {
+	
 }
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/consistsof/cidoc/P1_is_identified_by.java b/src/main/java/org/gcube/informationsystem/model/relation/consistsof/cidoc/P1_is_identified_by.java
index 896873c..f3de509 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/consistsof/cidoc/P1_is_identified_by.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/consistsof/cidoc/P1_is_identified_by.java
@@ -1,8 +1,8 @@
 package org.gcube.informationsystem.model.relation.consistsof.cidoc;
 
-import org.gcube.informationsystem.model.entity.Facet;
-import org.gcube.informationsystem.model.entity.Resource;
-import org.gcube.informationsystem.model.relation.IsIdentifiedBy;
+import org.gcube.informationsystem.model.reference.entity.Facet;
+import org.gcube.informationsystem.model.reference.entity.Resource;
+import org.gcube.informationsystem.model.reference.relation.IsIdentifiedBy;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/consistsof/parthenos/PP42_has_declarative_time.java b/src/main/java/org/gcube/informationsystem/model/relation/consistsof/parthenos/PP42_has_declarative_time.java
index 948ceb4..195d5bf 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/consistsof/parthenos/PP42_has_declarative_time.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/consistsof/parthenos/PP42_has_declarative_time.java
@@ -1,8 +1,8 @@
 package org.gcube.informationsystem.model.relation.consistsof.parthenos;
 
-import org.gcube.informationsystem.model.entity.facet.EventFacet;
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE1_Service;
-import org.gcube.informationsystem.model.relation.ConsistsOf;
+import org.gcube.informationsystem.model.reference.relation.ConsistsOf;
+import org.gcube.resourcemanagement.model.reference.entity.facet.EventFacet;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/consistsof/parthenos/PP49_provides_access_point.java b/src/main/java/org/gcube/informationsystem/model/relation/consistsof/parthenos/PP49_provides_access_point.java
index 6391a13..04da617 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/consistsof/parthenos/PP49_provides_access_point.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/consistsof/parthenos/PP49_provides_access_point.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.model.relation.consistsof.parthenos;
 
 import org.gcube.informationsystem.model.entity.facet.parthenos.PE29_Access_Point;
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE8_EService;
-import org.gcube.informationsystem.model.relation.ConsistsOf;
+import org.gcube.informationsystem.model.reference.relation.ConsistsOf;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/consistsof/parthenos/PP50_accessible_at.java b/src/main/java/org/gcube/informationsystem/model/relation/consistsof/parthenos/PP50_accessible_at.java
index 6e88fb8..d0348b2 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/consistsof/parthenos/PP50_accessible_at.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/consistsof/parthenos/PP50_accessible_at.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.model.relation.consistsof.parthenos;
 
 import org.gcube.informationsystem.model.entity.facet.parthenos.PE29_Access_Point;
 import org.gcube.informationsystem.model.entity.resource.cidoc.D1_Digital_Object;
-import org.gcube.informationsystem.model.relation.ConsistsOf;
+import org.gcube.informationsystem.model.reference.relation.ConsistsOf;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P106_is_composed_of.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P106_is_composed_of.java
index 7baa154..e63b2ac 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P106_is_composed_of.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P106_is_composed_of.java
@@ -1,7 +1,7 @@
 package org.gcube.informationsystem.model.relation.isrelatedto.cidoc;
 
-import org.gcube.informationsystem.model.entity.Resource;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.entity.Resource;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P125_used_object_of_type.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P125_used_object_of_type.java
index e06eaef..fd5d5c6 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P125_used_object_of_type.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P125_used_object_of_type.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.model.relation.isrelatedto.cidoc;
 
 import org.gcube.informationsystem.model.entity.resource.cidoc.E55_Type;
 import org.gcube.informationsystem.model.entity.resource.cidoc.E7_Activity;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P129_is_about.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P129_is_about.java
index dc9abe1..59f0192 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P129_is_about.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P129_is_about.java
@@ -1,7 +1,7 @@
 package org.gcube.informationsystem.model.relation.isrelatedto.cidoc;
 
-import org.gcube.informationsystem.model.entity.Resource;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.entity.Resource;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P130_shows_features_of.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P130_shows_features_of.java
index f330cea..665561c 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P130_shows_features_of.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P130_shows_features_of.java
@@ -1,7 +1,7 @@
 package org.gcube.informationsystem.model.relation.isrelatedto.cidoc;
 
 import org.gcube.informationsystem.model.entity.resource.cidoc.E70_Thing;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 
 /**
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P14_carried_out_by.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P14_carried_out_by.java
index ba77535..703e01b 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P14_carried_out_by.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P14_carried_out_by.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.model.relation.isrelatedto.cidoc;
 
 import org.gcube.informationsystem.model.entity.resource.cidoc.E39_Actor;
 import org.gcube.informationsystem.model.entity.resource.cidoc.E7_Activity;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR) 
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P15_was_influenced_by.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P15_was_influenced_by.java
index 1ee8dad..7a2af4b 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P15_was_influenced_by.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P15_was_influenced_by.java
@@ -1,8 +1,8 @@
 package org.gcube.informationsystem.model.relation.isrelatedto.cidoc;
 
-import org.gcube.informationsystem.model.entity.Resource;
 import org.gcube.informationsystem.model.entity.resource.cidoc.E7_Activity;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.entity.Resource;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P16_used_specific_object.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P16_used_specific_object.java
index 66cccbb..fd626a5 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P16_used_specific_object.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P16_used_specific_object.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.model.relation.isrelatedto.cidoc;
 
 import org.gcube.informationsystem.model.entity.resource.cidoc.E70_Thing;
 import org.gcube.informationsystem.model.entity.resource.cidoc.E7_Activity;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P17_was_motivated_by.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P17_was_motivated_by.java
index 15921b7..01f8e51 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P17_was_motivated_by.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P17_was_motivated_by.java
@@ -1,8 +1,8 @@
 package org.gcube.informationsystem.model.relation.isrelatedto.cidoc;
 
-import org.gcube.informationsystem.model.entity.Resource;
 import org.gcube.informationsystem.model.entity.resource.cidoc.E7_Activity;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.entity.Resource;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P21_had_general_purpose.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P21_had_general_purpose.java
index ea22863..7394cd8 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P21_had_general_purpose.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P21_had_general_purpose.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.model.relation.isrelatedto.cidoc;
 
 import org.gcube.informationsystem.model.entity.resource.cidoc.E55_Type;
 import org.gcube.informationsystem.model.entity.resource.cidoc.E7_Activity;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P2_has_type.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P2_has_type.java
index f271f66..b7ad29c 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P2_has_type.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P2_has_type.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.model.relation.isrelatedto.cidoc;
 
 import org.gcube.informationsystem.model.entity.resource.cidoc.E1_CRM_Entity;
 import org.gcube.informationsystem.model.entity.resource.cidoc.E55_Type;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P33_used_specific_technique.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P33_used_specific_technique.java
index a0282f5..385f2d0 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P33_used_specific_technique.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P33_used_specific_technique.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.model.relation.isrelatedto.cidoc;
 
 import org.gcube.informationsystem.model.entity.resource.cidoc.E29_Design_or_Procedure;
 import org.gcube.informationsystem.model.entity.resource.cidoc.E7_Activity;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P9_consists_of.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P9_consists_of.java
index 5598862..1c78f34 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P9_consists_of.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/cidoc/P9_consists_of.java
@@ -1,7 +1,7 @@
 package org.gcube.informationsystem.model.relation.isrelatedto.cidoc;
 
-import org.gcube.informationsystem.model.entity.Resource;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.entity.Resource;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP32_curates.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP32_curates.java
index 10be609..105b261 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP32_curates.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP32_curates.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.model.relation.isrelatedto.parthenos;
 
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE32_Curated_Thing;
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE3_Curating_Service;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP41_is_index_of.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP41_is_index_of.java
index fb80c55..143efda 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP41_is_index_of.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP41_is_index_of.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.model.relation.isrelatedto.parthenos;
 
 import org.gcube.informationsystem.model.entity.resource.cidoc.D1_Digital_Object;
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE24_Volatile_Dataset;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP46_brokers_access_to.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP46_brokers_access_to.java
index 18cb37c..f56526e 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP46_brokers_access_to.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP46_brokers_access_to.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.model.relation.isrelatedto.parthenos;
 
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE33_EAccess_Brokering_Service;
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE8_EService;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP51_has_availability.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP51_has_availability.java
index 02f00ae..5654f27 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP51_has_availability.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP51_has_availability.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.model.relation.isrelatedto.parthenos;
 
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE1_Service;
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE39_Availability_Type;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP52_is_programmed_with.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP52_is_programmed_with.java
index e5401ab..c62b64a 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP52_is_programmed_with.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP52_is_programmed_with.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.model.relation.isrelatedto.parthenos;
 
 import org.gcube.informationsystem.model.entity.resource.cidoc.D14_Software;
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE40_Programing_Language;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP57_provided_funding_amount.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP57_provided_funding_amount.java
index 2d815a5..f2defc9 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP57_provided_funding_amount.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP57_provided_funding_amount.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.model.relation.isrelatedto.parthenos;
 
 import org.gcube.informationsystem.model.entity.resource.cidoc.E97_Monetary_Amount;
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE42_Funding_Activity;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP60_had_intended_geographic_scope.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP60_had_intended_geographic_scope.java
index db01e3c..bc3c1d7 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP60_had_intended_geographic_scope.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP60_had_intended_geographic_scope.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.model.relation.isrelatedto.parthenos;
 
 import org.gcube.informationsystem.model.entity.resource.cidoc.E53_Place;
 import org.gcube.informationsystem.model.entity.resource.cidoc.E7_Activity;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
+import org.gcube.informationsystem.model.reference.relation.IsRelatedTo;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP8_hosts_dataset.java b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP8_hosts_dataset.java
index b97d4eb..e70273c 100644
--- a/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP8_hosts_dataset.java
+++ b/src/main/java/org/gcube/informationsystem/model/relation/isrelatedto/parthenos/PP8_hosts_dataset.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.model.relation.isrelatedto.parthenos;
 
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE18_Dataset;
 import org.gcube.informationsystem.model.entity.resource.parthenos.PE7_Data_Hosting_Service;
-import org.gcube.informationsystem.model.relation.isrelatedto.Manages;
+import org.gcube.resourcemanagement.model.reference.relation.isrelatedto.Manages;
 
 /**
  * @author Luca Frosini (ISTI - CNR)