diff --git a/src/main/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporter.java b/src/main/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporter.java
index ed81a2a..dd1e5ca 100644
--- a/src/main/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporter.java
+++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporter.java
@@ -6,10 +6,10 @@ import java.util.UUID;
 
 import org.gcube.common.resources.gcore.GenericResource;
 import org.gcube.common.resources.gcore.GenericResource.Profile;
-import org.gcube.informationsystem.base.impl.properties.HeaderImpl;
-import org.gcube.informationsystem.base.reference.properties.Header;
+import org.gcube.informationsystem.model.impl.properties.HeaderImpl;
 import org.gcube.informationsystem.model.reference.entities.Facet;
 import org.gcube.informationsystem.model.reference.entities.Resource;
+import org.gcube.informationsystem.model.reference.properties.Header;
 import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException;
diff --git a/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java b/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java
index 29bf195..222c8ca 100644
--- a/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java
+++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java
@@ -11,13 +11,13 @@ import org.gcube.common.resources.gcore.ServiceEndpoint.Property;
 import org.gcube.common.resources.gcore.ServiceEndpoint.Runtime;
 import org.gcube.common.resources.gcore.common.Platform;
 import org.gcube.common.resources.gcore.utils.Group;
-import org.gcube.informationsystem.base.impl.properties.HeaderImpl;
-import org.gcube.informationsystem.base.reference.properties.Header;
 import org.gcube.informationsystem.model.impl.properties.EncryptedImpl;
+import org.gcube.informationsystem.model.impl.properties.HeaderImpl;
 import org.gcube.informationsystem.model.impl.relations.ConsistsOfImpl;
 import org.gcube.informationsystem.model.reference.entities.Facet;
 import org.gcube.informationsystem.model.reference.entities.Resource;
 import org.gcube.informationsystem.model.reference.properties.Encrypted;
+import org.gcube.informationsystem.model.reference.properties.Header;
 import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContextException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException;