diff --git a/pom.xml b/pom.xml
index f357b72..0863d69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,8 +50,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>
 		
 		<!--
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextCreator.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextCreator.java
index 457ef0d..d19d4aa 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextCreator.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextCreator.java
@@ -7,9 +7,9 @@ import java.util.UUID;
 
 import org.gcube.common.scope.impl.ScopeBean;
 import org.gcube.context.ContextElaborator;
-import org.gcube.informationsystem.impl.entity.ContextImpl;
-import org.gcube.informationsystem.impl.utils.ISMapper;
-import org.gcube.informationsystem.model.entity.Context;
+import org.gcube.informationsystem.model.impl.entity.ContextImpl;
+import org.gcube.informationsystem.model.impl.utils.ISMapper;
+import org.gcube.informationsystem.model.reference.entity.Context;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException;
diff --git a/src/test/java/org/gcube/informationsystem/model/discovery/ISMDiscoveryTest.java b/src/test/java/org/gcube/informationsystem/model/discovery/ISMDiscoveryTest.java
index e4dedbb..ad87181 100644
--- a/src/test/java/org/gcube/informationsystem/model/discovery/ISMDiscoveryTest.java
+++ b/src/test/java/org/gcube/informationsystem/model/discovery/ISMDiscoveryTest.java
@@ -1,9 +1,9 @@
 package org.gcube.informationsystem.model.discovery;
 
-import org.gcube.informationsystem.impl.utils.discovery.ISMDiscovery;
-import org.gcube.informationsystem.model.embedded.Embedded;
-import org.gcube.informationsystem.model.entity.Entity;
-import org.gcube.informationsystem.model.relation.Relation;
+import org.gcube.informationsystem.model.impl.utils.discovery.ISMDiscovery;
+import org.gcube.informationsystem.model.reference.embedded.Embedded;
+import org.gcube.informationsystem.model.reference.entity.Entity;
+import org.gcube.informationsystem.model.reference.relation.Relation;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java b/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java
index 7863142..5b01f23 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java
@@ -1,7 +1,7 @@
 package org.gcube.informationsystem.resourceregistry;
 
-import org.gcube.informationsystem.impl.utils.discovery.ISMDiscovery;
-import org.gcube.informationsystem.impl.utils.discovery.SchemaAction;
+import org.gcube.informationsystem.model.impl.utils.discovery.ISMDiscovery;
+import org.gcube.informationsystem.model.impl.utils.discovery.SchemaAction;
 import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment;
 import org.gcube.informationsystem.resourceregistry.dbinitialization.SchemaActionImpl;
 import org.junit.Test;