diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SecurityContext.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/SecurityContext.java
similarity index 97%
rename from src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SecurityContext.java
rename to src/main/java/org/gcube/informationsystem/resourceregistry/context/SecurityContext.java
index 43c2f32..6d7980a 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SecurityContext.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/SecurityContext.java
@@ -1,10 +1,11 @@
 /**
  * 
  */
-package org.gcube.informationsystem.resourceregistry.dbinitialization;
+package org.gcube.informationsystem.resourceregistry.context;
 
 import java.util.Iterator;
 
+import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SecurityContextMapper.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/SecurityContextMapper.java
similarity index 93%
rename from src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SecurityContextMapper.java
rename to src/main/java/org/gcube/informationsystem/resourceregistry/context/SecurityContextMapper.java
index 20ceae8..6d4d3c4 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SecurityContextMapper.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/SecurityContextMapper.java
@@ -1,11 +1,13 @@
 /**
  * 
  */
-package org.gcube.informationsystem.resourceregistry.dbinitialization;
+package org.gcube.informationsystem.resourceregistry.context;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment;
+import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseIntializator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java
index 7008dc7..c731716 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java
@@ -8,7 +8,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import org.gcube.informationsystem.resourceregistry.dbinitialization.SecurityContextMapper.PermissionMode;
+import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper;
+import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper.PermissionMode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseIntializator.java b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseIntializator.java
index 80e1b7a..5adac7d 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseIntializator.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseIntializator.java
@@ -7,7 +7,7 @@ import org.gcube.informationsystem.impl.utils.discovery.ERDiscovery;
 import org.gcube.informationsystem.model.embedded.Embedded;
 import org.gcube.informationsystem.model.entity.Entity;
 import org.gcube.informationsystem.model.relation.Relation;
-import org.gcube.informationsystem.resourceregistry.dbinitialization.SecurityContextMapper.PermissionMode;
+import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper.PermissionMode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/ContextManagementImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/ContextManagementImpl.java
index 11482eb..4cdd89e 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/ContextManagementImpl.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/ContextManagementImpl.java
@@ -15,9 +15,9 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextCreationException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException;
-import org.gcube.informationsystem.resourceregistry.dbinitialization.SecurityContext;
-import org.gcube.informationsystem.resourceregistry.dbinitialization.SecurityContextMapper;
-import org.gcube.informationsystem.resourceregistry.dbinitialization.SecurityContextMapper.PermissionMode;
+import org.gcube.informationsystem.resourceregistry.context.SecurityContext;
+import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper;
+import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper.PermissionMode;
 import org.gcube.informationsystem.resourceregistry.resources.utils.HeaderUtility;
 import org.gcube.informationsystem.resourceregistry.resources.utils.Utility;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/EntityManagementImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/EntityManagementImpl.java
index d2b03b8..35ad8a0 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/EntityManagementImpl.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/EntityManagementImpl.java
@@ -30,7 +30,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis
 import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.FacetNotFoundException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.ResourceNotFoundException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException;
-import org.gcube.informationsystem.resourceregistry.dbinitialization.SecurityContextMapper.PermissionMode;
+import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper.PermissionMode;
 import org.gcube.informationsystem.resourceregistry.resources.utils.ContextUtility;
 import org.gcube.informationsystem.resourceregistry.resources.utils.HeaderUtility;
 import org.gcube.informationsystem.resourceregistry.resources.utils.Utility;
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/QueryImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/QueryImpl.java
index c39b1d9..19d3097 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/QueryImpl.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/QueryImpl.java
@@ -12,9 +12,9 @@ import java.net.URLEncoder;
 import org.gcube.informationsystem.resourceregistry.api.Query;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.InvalidQueryException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException;
-import org.gcube.informationsystem.resourceregistry.dbinitialization.SecurityContextMapper;
+import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper;
+import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper.PermissionMode;
 import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment;
-import org.gcube.informationsystem.resourceregistry.dbinitialization.SecurityContextMapper.PermissionMode;
 import org.gcube.informationsystem.resourceregistry.resources.utils.ContextUtility;
 import org.glassfish.jersey.internal.util.Base64;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/SchemaManagementImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/SchemaManagementImpl.java
index 6aac2aa..5bd70e2 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/SchemaManagementImpl.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/SchemaManagementImpl.java
@@ -16,8 +16,8 @@ import org.gcube.informationsystem.model.relation.Relation;
 import org.gcube.informationsystem.resourceregistry.api.SchemaManagement;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.SchemaNotFoundException;
-import org.gcube.informationsystem.resourceregistry.dbinitialization.SecurityContextMapper;
-import org.gcube.informationsystem.resourceregistry.dbinitialization.SecurityContextMapper.PermissionMode;
+import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper;
+import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper.PermissionMode;
 import org.gcube.informationsystem.types.TypeBinder.Property;
 import org.gcube.informationsystem.types.TypeBinder.TypeDefinition;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/resources/utils/ContextUtility.java b/src/main/java/org/gcube/informationsystem/resourceregistry/resources/utils/ContextUtility.java
index f2b695c..1416681 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/resources/utils/ContextUtility.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/resources/utils/ContextUtility.java
@@ -12,9 +12,9 @@ import org.gcube.informationsystem.model.orientdb.impl.entity.Entity;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException;
-import org.gcube.informationsystem.resourceregistry.dbinitialization.SecurityContext;
-import org.gcube.informationsystem.resourceregistry.dbinitialization.SecurityContextMapper;
-import org.gcube.informationsystem.resourceregistry.dbinitialization.SecurityContextMapper.PermissionMode;
+import org.gcube.informationsystem.resourceregistry.context.SecurityContext;
+import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper;
+import org.gcube.informationsystem.resourceregistry.context.SecurityContextMapper.PermissionMode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;