diff --git a/pom.xml b/pom.xml
index f62f147..f2dc871 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,8 +79,8 @@
test
- org.gcube.information-system
- gcube-resources
+ org.gcube.resource-management
+ gcube-model
test
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClient.java b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClient.java
index 190d6a5..aaa1dfb 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClient.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClient.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.resourceregistry.schema;
import java.util.List;
-import org.gcube.informationsystem.model.ISManageable;
+import org.gcube.informationsystem.model.reference.ISManageable;
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaException;
import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException;
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientImpl.java
index 0a2f6b9..45ab6e4 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientImpl.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientImpl.java
@@ -6,8 +6,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.gcube.informationsystem.model.AccessType;
-import org.gcube.informationsystem.model.ISManageable;
+import org.gcube.informationsystem.model.reference.AccessType;
+import org.gcube.informationsystem.model.reference.ISManageable;
import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextAlreadyPresentException;
import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException;
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientTest.java
index 088068b..de7b930 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientTest.java
@@ -2,8 +2,8 @@ package org.gcube.informationsystem.resourceregistry.schema;
import java.util.List;
-import org.gcube.informationsystem.model.annotations.Abstract;
-import org.gcube.informationsystem.model.entity.Facet;
+import org.gcube.informationsystem.model.reference.annotations.Abstract;
+import org.gcube.informationsystem.model.reference.entity.Facet;
import org.gcube.informationsystem.types.TypeBinder;
import org.gcube.informationsystem.types.TypeBinder.TypeDefinition;
import org.junit.Assert;