diff --git a/src/main/java/org/gcube/informationsystem/base/impl/properties/PropertyVariableDefinitionImpl.java b/src/main/java/org/gcube/informationsystem/model/impl/properties/PropertyVariableDefinitionImpl.java
similarity index 91%
rename from src/main/java/org/gcube/informationsystem/base/impl/properties/PropertyVariableDefinitionImpl.java
rename to src/main/java/org/gcube/informationsystem/model/impl/properties/PropertyVariableDefinitionImpl.java
index a403525..97c8f01 100644
--- a/src/main/java/org/gcube/informationsystem/base/impl/properties/PropertyVariableDefinitionImpl.java
+++ b/src/main/java/org/gcube/informationsystem/model/impl/properties/PropertyVariableDefinitionImpl.java
@@ -1,10 +1,10 @@
-package org.gcube.informationsystem.base.impl.properties;
+package org.gcube.informationsystem.model.impl.properties;
 
 import java.util.Objects;
 
 import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
-import org.gcube.informationsystem.base.reference.properties.PropertyVariable;
-import org.gcube.informationsystem.base.reference.properties.PropertyVariableDefinition;
+import org.gcube.informationsystem.model.reference.properties.PropertyVariable;
+import org.gcube.informationsystem.model.reference.properties.PropertyVariableDefinition;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/base/impl/properties/PropertyVariableImpl.java b/src/main/java/org/gcube/informationsystem/model/impl/properties/PropertyVariableImpl.java
similarity index 97%
rename from src/main/java/org/gcube/informationsystem/base/impl/properties/PropertyVariableImpl.java
rename to src/main/java/org/gcube/informationsystem/model/impl/properties/PropertyVariableImpl.java
index b640d08..138e8e4 100644
--- a/src/main/java/org/gcube/informationsystem/base/impl/properties/PropertyVariableImpl.java
+++ b/src/main/java/org/gcube/informationsystem/model/impl/properties/PropertyVariableImpl.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.base.impl.properties;
+package org.gcube.informationsystem.model.impl.properties;
 
 import java.sql.Date;
 import java.text.ParseException;
@@ -12,8 +12,9 @@ import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
 import org.gcube.com.fasterxml.jackson.annotation.JsonProperty;
 import org.gcube.com.fasterxml.jackson.annotation.JsonSetter;
 import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
+import org.gcube.informationsystem.base.impl.properties.PropertyElementImpl;
 import org.gcube.informationsystem.base.reference.Element;
-import org.gcube.informationsystem.base.reference.properties.PropertyVariable;
+import org.gcube.informationsystem.model.reference.properties.PropertyVariable;
 import org.gcube.informationsystem.types.PropertyTypeName;
 import org.gcube.informationsystem.types.PropertyTypeName.BaseType;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/gcube/informationsystem/base/reference/properties/PropertyVariable.java b/src/main/java/org/gcube/informationsystem/model/reference/properties/PropertyVariable.java
similarity index 92%
rename from src/main/java/org/gcube/informationsystem/base/reference/properties/PropertyVariable.java
rename to src/main/java/org/gcube/informationsystem/model/reference/properties/PropertyVariable.java
index 8591e2c..b7858bf 100644
--- a/src/main/java/org/gcube/informationsystem/base/reference/properties/PropertyVariable.java
+++ b/src/main/java/org/gcube/informationsystem/model/reference/properties/PropertyVariable.java
@@ -1,8 +1,9 @@
-package org.gcube.informationsystem.base.reference.properties;
+package org.gcube.informationsystem.model.reference.properties;
 
 import org.gcube.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.gcube.informationsystem.base.impl.properties.PropertyVariableImpl;
+import org.gcube.informationsystem.base.reference.properties.PropertyElement;
+import org.gcube.informationsystem.model.impl.properties.PropertyVariableImpl;
 import org.gcube.informationsystem.types.annotations.ISProperty;
 import org.gcube.informationsystem.types.reference.Change;
 import org.gcube.informationsystem.types.reference.TypeMetadata;
diff --git a/src/main/java/org/gcube/informationsystem/base/reference/properties/PropertyVariableDefinition.java b/src/main/java/org/gcube/informationsystem/model/reference/properties/PropertyVariableDefinition.java
similarity index 92%
rename from src/main/java/org/gcube/informationsystem/base/reference/properties/PropertyVariableDefinition.java
rename to src/main/java/org/gcube/informationsystem/model/reference/properties/PropertyVariableDefinition.java
index 812f313..8131a18 100644
--- a/src/main/java/org/gcube/informationsystem/base/reference/properties/PropertyVariableDefinition.java
+++ b/src/main/java/org/gcube/informationsystem/model/reference/properties/PropertyVariableDefinition.java
@@ -1,8 +1,8 @@
-package org.gcube.informationsystem.base.reference.properties;
+package org.gcube.informationsystem.model.reference.properties;
 
 import org.gcube.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.gcube.informationsystem.base.impl.properties.PropertyVariableDefinitionImpl;
+import org.gcube.informationsystem.model.impl.properties.PropertyVariableDefinitionImpl;
 import org.gcube.informationsystem.types.annotations.ISProperty;
 import org.gcube.informationsystem.types.reference.Change;
 import org.gcube.informationsystem.types.reference.TypeMetadata;
diff --git a/src/main/java/org/gcube/informationsystem/queries/templates/impl/properties/TemplateVariableImpl.java b/src/main/java/org/gcube/informationsystem/queries/templates/impl/properties/TemplateVariableImpl.java
index b27852a..f706119 100644
--- a/src/main/java/org/gcube/informationsystem/queries/templates/impl/properties/TemplateVariableImpl.java
+++ b/src/main/java/org/gcube/informationsystem/queries/templates/impl/properties/TemplateVariableImpl.java
@@ -5,7 +5,7 @@ package org.gcube.informationsystem.queries.templates.impl.properties;
 
 import org.gcube.com.fasterxml.jackson.annotation.JsonInclude;
 import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
-import org.gcube.informationsystem.base.impl.properties.PropertyVariableImpl;
+import org.gcube.informationsystem.model.impl.properties.PropertyVariableImpl;
 import org.gcube.informationsystem.queries.templates.reference.properties.TemplateVariable;
 import org.gcube.informationsystem.types.PropertyTypeName.BaseType;
 
diff --git a/src/main/java/org/gcube/informationsystem/queries/templates/reference/properties/TemplateVariable.java b/src/main/java/org/gcube/informationsystem/queries/templates/reference/properties/TemplateVariable.java
index 2b14393..1f73f04 100644
--- a/src/main/java/org/gcube/informationsystem/queries/templates/reference/properties/TemplateVariable.java
+++ b/src/main/java/org/gcube/informationsystem/queries/templates/reference/properties/TemplateVariable.java
@@ -1,7 +1,7 @@
 package org.gcube.informationsystem.queries.templates.reference.properties;
 
 import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.gcube.informationsystem.base.reference.properties.PropertyVariable;
+import org.gcube.informationsystem.model.reference.properties.PropertyVariable;
 import org.gcube.informationsystem.queries.templates.impl.properties.TemplateVariableImpl;
 import org.gcube.informationsystem.types.reference.Change;
 import org.gcube.informationsystem.types.reference.Changelog;
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 c068e58..83f83ec 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
@@ -4,9 +4,9 @@ import java.lang.reflect.Method;
 import java.util.Objects;
 
 import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
-import org.gcube.informationsystem.base.impl.properties.PropertyVariableDefinitionImpl;
-import org.gcube.informationsystem.base.impl.properties.PropertyVariableImpl;
-import org.gcube.informationsystem.base.reference.properties.PropertyVariableDefinition;
+import org.gcube.informationsystem.model.impl.properties.PropertyVariableDefinitionImpl;
+import org.gcube.informationsystem.model.impl.properties.PropertyVariableImpl;
+import org.gcube.informationsystem.model.reference.properties.PropertyVariableDefinition;
 import org.gcube.informationsystem.types.PropertyTypeName;
 import org.gcube.informationsystem.types.PropertyTypeName.BaseType;
 import org.gcube.informationsystem.types.annotations.ISProperty;
diff --git a/src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyTypeImpl.java b/src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyTypeImpl.java
index e088419..c1bf058 100644
--- a/src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyTypeImpl.java
+++ b/src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyTypeImpl.java
@@ -8,8 +8,8 @@ import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
 import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
 import org.gcube.informationsystem.base.reference.AccessType;
 import org.gcube.informationsystem.base.reference.properties.PropertyElement;
-import org.gcube.informationsystem.base.reference.properties.PropertyVariable;
-import org.gcube.informationsystem.base.reference.properties.PropertyVariableDefinition;
+import org.gcube.informationsystem.model.reference.properties.PropertyVariable;
+import org.gcube.informationsystem.model.reference.properties.PropertyVariableDefinition;
 import org.gcube.informationsystem.queries.templates.reference.properties.TemplateVariable;
 import org.gcube.informationsystem.serialization.ElementMapper;
 import org.gcube.informationsystem.types.impl.TypeImpl;
diff --git a/src/main/java/org/gcube/informationsystem/types/reference/properties/PropertyDefinition.java b/src/main/java/org/gcube/informationsystem/types/reference/properties/PropertyDefinition.java
index 5160690..b0db648 100644
--- a/src/main/java/org/gcube/informationsystem/types/reference/properties/PropertyDefinition.java
+++ b/src/main/java/org/gcube/informationsystem/types/reference/properties/PropertyDefinition.java
@@ -2,7 +2,7 @@ package org.gcube.informationsystem.types.reference.properties;
 
 import org.gcube.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.gcube.informationsystem.base.reference.properties.PropertyVariableDefinition;
+import org.gcube.informationsystem.model.reference.properties.PropertyVariableDefinition;
 import org.gcube.informationsystem.types.annotations.Final;
 import org.gcube.informationsystem.types.impl.properties.PropertyDefinitionImpl;
 import org.gcube.informationsystem.types.reference.Change;
diff --git a/src/test/java/org/gcube/informationsystem/types/SerializationTest.java b/src/test/java/org/gcube/informationsystem/types/SerializationTest.java
index e9d122c..e288991 100644
--- a/src/test/java/org/gcube/informationsystem/types/SerializationTest.java
+++ b/src/test/java/org/gcube/informationsystem/types/SerializationTest.java
@@ -6,7 +6,6 @@ import org.gcube.informationsystem.base.reference.Element;
 import org.gcube.informationsystem.base.reference.IdentifiableElement;
 import org.gcube.informationsystem.base.reference.entities.EntityElement;
 import org.gcube.informationsystem.base.reference.properties.PropertyElement;
-import org.gcube.informationsystem.base.reference.properties.PropertyVariable;
 import org.gcube.informationsystem.contexts.reference.entities.Context;
 import org.gcube.informationsystem.contexts.reference.relations.IsParentOf;
 import org.gcube.informationsystem.model.reference.entities.Entity;
@@ -16,6 +15,7 @@ import org.gcube.informationsystem.model.reference.properties.Encrypted;
 import org.gcube.informationsystem.model.reference.properties.Metadata;
 import org.gcube.informationsystem.model.reference.properties.PropagationConstraint;
 import org.gcube.informationsystem.model.reference.properties.Property;
+import org.gcube.informationsystem.model.reference.properties.PropertyVariable;
 import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
 import org.gcube.informationsystem.model.reference.relations.IsRelatedTo;
 import org.gcube.informationsystem.model.reference.relations.Relation;