diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ExceptionMapper.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ExceptionMapper.java
index dabb5ce..f2b0e20 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ExceptionMapper.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ExceptionMapper.java
@@ -7,7 +7,7 @@ import java.io.Reader;
 import java.io.Writer;
 import java.util.List;
 
-import org.gcube.informationsystem.model.impl.utils.discovery.ReflectionUtility;
+import org.gcube.informationsystem.model.utils.discovery.ReflectionUtility;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/httputils/HTTPUtility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/httputils/HTTPUtility.java
index 31b97da..cfda55b 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/httputils/HTTPUtility.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/httputils/HTTPUtility.java
@@ -7,11 +7,11 @@ import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 
 import org.gcube.common.gxhttp.reference.GXConnection.HTTPMETHOD;
-import org.gcube.informationsystem.model.impl.utils.ISMapper;
 import org.gcube.informationsystem.model.reference.ISManageable;
-import org.gcube.informationsystem.model.reference.entity.Facet;
-import org.gcube.informationsystem.model.reference.entity.Resource;
-import org.gcube.informationsystem.model.reference.relation.Relation;
+import org.gcube.informationsystem.model.reference.entities.Facet;
+import org.gcube.informationsystem.model.reference.entities.Resource;
+import org.gcube.informationsystem.model.reference.relations.Relation;
+import org.gcube.informationsystem.model.utils.ISMapper;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ExceptionMapper;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException;
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/utils/Utility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/utils/Utility.java
index 48a6b33..4822007 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/utils/Utility.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/utils/Utility.java
@@ -3,9 +3,9 @@ package org.gcube.informationsystem.resourceregistry.api.utils;
 import java.io.IOException;
 import java.util.UUID;
 
-import org.gcube.informationsystem.model.impl.utils.ISMapper;
 import org.gcube.informationsystem.model.reference.ER;
 import org.gcube.informationsystem.model.reference.ISManageable;
+import org.gcube.informationsystem.model.utils.ISMapper;
 import org.gcube.informationsystem.types.TypeBinder;
 
 import com.fasterxml.jackson.annotation.JsonTypeName;
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ExceptionSerialization.java b/src/test/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ExceptionSerialization.java
index 6aaeb84..e2058cd 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ExceptionSerialization.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ExceptionSerialization.java
@@ -3,7 +3,7 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions;
 import java.lang.reflect.Constructor;
 import java.util.List;
 
-import org.gcube.informationsystem.model.impl.utils.discovery.ReflectionUtility;
+import org.gcube.informationsystem.model.utils.discovery.ReflectionUtility;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;