diff --git a/src/main/java/org/gcube/informationsystem/impl/entity/HeaderImpl.java b/src/main/java/org/gcube/informationsystem/impl/HeaderImpl.java
similarity index 89%
rename from src/main/java/org/gcube/informationsystem/impl/entity/HeaderImpl.java
rename to src/main/java/org/gcube/informationsystem/impl/HeaderImpl.java
index 056c03b..1b4249e 100644
--- a/src/main/java/org/gcube/informationsystem/impl/entity/HeaderImpl.java
+++ b/src/main/java/org/gcube/informationsystem/impl/HeaderImpl.java
@@ -1,11 +1,11 @@
 /**
  * 
  */
-package org.gcube.informationsystem.impl.entity;
+package org.gcube.informationsystem.impl;
 
+import org.gcube.informationsystem.model.Header;
 import org.gcube.informationsystem.model.annotations.ISEmbeddedType;
 import org.gcube.informationsystem.model.annotations.ISProperty;
-import org.gcube.informationsystem.model.entity.Header;
 
 /**
  * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
diff --git a/src/main/java/org/gcube/informationsystem/impl/entity/EntityImpl.java b/src/main/java/org/gcube/informationsystem/impl/entity/EntityImpl.java
index f69fc83..af087ff 100644
--- a/src/main/java/org/gcube/informationsystem/impl/entity/EntityImpl.java
+++ b/src/main/java/org/gcube/informationsystem/impl/entity/EntityImpl.java
@@ -3,9 +3,10 @@
  */
 package org.gcube.informationsystem.impl.entity;
 
+import org.gcube.informationsystem.impl.HeaderImpl;
+import org.gcube.informationsystem.model.Header;
 import org.gcube.informationsystem.model.annotations.ISEntity;
 import org.gcube.informationsystem.model.entity.Entity;
-import org.gcube.informationsystem.model.entity.Header;
 
 /**
  * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/Header.java b/src/main/java/org/gcube/informationsystem/model/Header.java
similarity index 86%
rename from src/main/java/org/gcube/informationsystem/model/entity/Header.java
rename to src/main/java/org/gcube/informationsystem/model/Header.java
index ffcdc87..ff4b765 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/Header.java
+++ b/src/main/java/org/gcube/informationsystem/model/Header.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.gcube.informationsystem.model.entity;
+package org.gcube.informationsystem.model;
 
 
 /**
diff --git a/src/main/java/org/gcube/informationsystem/model/entity/Entity.java b/src/main/java/org/gcube/informationsystem/model/entity/Entity.java
index 0dc9f0f..cf9a263 100644
--- a/src/main/java/org/gcube/informationsystem/model/entity/Entity.java
+++ b/src/main/java/org/gcube/informationsystem/model/entity/Entity.java
@@ -3,6 +3,8 @@
  */
 package org.gcube.informationsystem.model.entity;
 
+import org.gcube.informationsystem.model.Header;
+
 
 
 
diff --git a/src/main/java/org/gcube/informationsystem/types/TypeBinder.java b/src/main/java/org/gcube/informationsystem/types/TypeBinder.java
index d1819dc..f2a2f9e 100644
--- a/src/main/java/org/gcube/informationsystem/types/TypeBinder.java
+++ b/src/main/java/org/gcube/informationsystem/types/TypeBinder.java
@@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class TypeBinder {
 
 	private static final String DEFAULT_FACET_SUPERCLASS = "Facet";
-	private static final String DEFAULT_RESOURCE_SUPERCLASS = "Entity";
+	private static final String DEFAULT_RESOURCE_SUPERCLASS = "Resource";
 	private static final String DEFAULT_ENTITY_SUPERCLASS = "Entity";
 	
 	private static Logger logger = LoggerFactory.getLogger(TypeBinder.class);
diff --git a/src/test/java/org/gcube/informationsystem/type/EntityParentParent.java b/src/test/java/org/gcube/informationsystem/type/EntityParentParent.java
index 8af2fe6..6068343 100644
--- a/src/test/java/org/gcube/informationsystem/type/EntityParentParent.java
+++ b/src/test/java/org/gcube/informationsystem/type/EntityParentParent.java
@@ -1,9 +1,9 @@
 package org.gcube.informationsystem.type;
 
+import org.gcube.informationsystem.model.Header;
 import org.gcube.informationsystem.model.annotations.ISProperty;
 import org.gcube.informationsystem.model.annotations.ISFacet;
 import org.gcube.informationsystem.model.entity.Facet;
-import org.gcube.informationsystem.model.entity.Header;
 
 @ISFacet(name="mysuperclassParent")
 public class EntityParentParent implements Facet{