diff --git a/src/main/java/org/gcube/informationsystem/types/TypeBinder.java b/src/main/java/org/gcube/informationsystem/types/TypeBinder.java
index acaf3fb..f13cf90 100644
--- a/src/main/java/org/gcube/informationsystem/types/TypeBinder.java
+++ b/src/main/java/org/gcube/informationsystem/types/TypeBinder.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.gcube.informationsystem.base.reference.ISManageable;
+import org.gcube.informationsystem.types.impl.TypeDefinitionImpl;
 import org.gcube.informationsystem.types.reference.TypeDefinition;
 
 import com.fasterxml.jackson.databind.JavaType;
diff --git a/src/main/java/org/gcube/informationsystem/types/TypeDefinitionImpl.java b/src/main/java/org/gcube/informationsystem/types/impl/TypeDefinitionImpl.java
similarity index 97%
rename from src/main/java/org/gcube/informationsystem/types/TypeDefinitionImpl.java
rename to src/main/java/org/gcube/informationsystem/types/impl/TypeDefinitionImpl.java
index 0330b65..747d6c6 100644
--- a/src/main/java/org/gcube/informationsystem/types/TypeDefinitionImpl.java
+++ b/src/main/java/org/gcube/informationsystem/types/impl/TypeDefinitionImpl.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.types;
+package org.gcube.informationsystem.types.impl;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.TypeVariable;
@@ -11,6 +11,7 @@ import org.gcube.informationsystem.base.reference.entities.BaseEntity;
 import org.gcube.informationsystem.base.reference.properties.BaseProperty;
 import org.gcube.informationsystem.base.reference.relations.BaseRelation;
 import org.gcube.informationsystem.model.reference.entities.Resource;
+import org.gcube.informationsystem.types.TypeBinder;
 import org.gcube.informationsystem.types.annotations.Abstract;
 import org.gcube.informationsystem.types.annotations.ISProperty;
 import org.gcube.informationsystem.types.impl.entities.EntityTypeDefinitionImpl;
diff --git a/src/main/java/org/gcube/informationsystem/types/impl/entities/EntityTypeDefinitionImpl.java b/src/main/java/org/gcube/informationsystem/types/impl/entities/EntityTypeDefinitionImpl.java
index d56a583..c0757bf 100644
--- a/src/main/java/org/gcube/informationsystem/types/impl/entities/EntityTypeDefinitionImpl.java
+++ b/src/main/java/org/gcube/informationsystem/types/impl/entities/EntityTypeDefinitionImpl.java
@@ -4,7 +4,7 @@ import org.gcube.informationsystem.base.reference.entities.BaseEntity;
 import org.gcube.informationsystem.model.reference.entities.Entity;
 import org.gcube.informationsystem.model.reference.entities.Facet;
 import org.gcube.informationsystem.model.reference.entities.Resource;
-import org.gcube.informationsystem.types.TypeDefinitionImpl;
+import org.gcube.informationsystem.types.impl.TypeDefinitionImpl;
 import org.gcube.informationsystem.types.reference.entities.EntityDefinition;
 
 public class EntityTypeDefinitionImpl<E extends BaseEntity> extends TypeDefinitionImpl<E> implements EntityDefinition<E> {
diff --git a/src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyDefinitionImpl.java b/src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyDefinitionImpl.java
index 26f6b6a..1b0b07a 100644
--- a/src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyDefinitionImpl.java
+++ b/src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyDefinitionImpl.java
@@ -11,8 +11,8 @@ import org.gcube.informationsystem.model.reference.properties.Property;
 import org.gcube.informationsystem.types.Type;
 import org.gcube.informationsystem.types.Type.OType;
 import org.gcube.informationsystem.types.TypeBinder;
-import org.gcube.informationsystem.types.TypeDefinitionImpl;
 import org.gcube.informationsystem.types.annotations.ISProperty;
+import org.gcube.informationsystem.types.impl.TypeDefinitionImpl;
 import org.gcube.informationsystem.types.reference.properties.PropertyDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyTypeDefinitionImpl.java b/src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyTypeDefinitionImpl.java
index 38c9bcc..450dc93 100644
--- a/src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyTypeDefinitionImpl.java
+++ b/src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyTypeDefinitionImpl.java
@@ -1,7 +1,7 @@
 package org.gcube.informationsystem.types.impl.properties;
 
 import org.gcube.informationsystem.base.reference.properties.BaseProperty;
-import org.gcube.informationsystem.types.TypeDefinitionImpl;
+import org.gcube.informationsystem.types.impl.TypeDefinitionImpl;
 import org.gcube.informationsystem.types.reference.properties.PropertyTypeDefiniton;
 
 public class PropertyTypeDefinitionImpl<P extends BaseProperty> extends TypeDefinitionImpl<P> implements PropertyTypeDefiniton<P> {
diff --git a/src/main/java/org/gcube/informationsystem/types/impl/relations/RelationTypeDefinitionImpl.java b/src/main/java/org/gcube/informationsystem/types/impl/relations/RelationTypeDefinitionImpl.java
index 19da0f2..d1a0f9b 100644
--- a/src/main/java/org/gcube/informationsystem/types/impl/relations/RelationTypeDefinitionImpl.java
+++ b/src/main/java/org/gcube/informationsystem/types/impl/relations/RelationTypeDefinitionImpl.java
@@ -6,7 +6,7 @@ import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
 import org.gcube.informationsystem.model.reference.relations.IsRelatedTo;
 import org.gcube.informationsystem.model.reference.relations.Relation;
 import org.gcube.informationsystem.types.TypeBinder;
-import org.gcube.informationsystem.types.TypeDefinitionImpl;
+import org.gcube.informationsystem.types.impl.TypeDefinitionImpl;
 import org.gcube.informationsystem.types.reference.entities.EntityDefinition;
 import org.gcube.informationsystem.types.reference.relations.RelationDefinition;