diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextCreator.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/context/ContextCreator.java
similarity index 91%
rename from src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextCreator.java
rename to src/main/java/org/gcube/informationsystem/resourceregistry/instances/context/ContextCreator.java
index 69c2ddc..1e90597 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ContextCreator.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/context/ContextCreator.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.resourceregistry.context;
+package org.gcube.informationsystem.resourceregistry.instances.context;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -12,7 +12,8 @@ import org.gcube.informationsystem.context.reference.entities.Context;
 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.instances.context.ContextUtility;
+import org.gcube.informationsystem.resourceregistry.instances.context.entities.ContextManagement;
 import org.gcube.informationsystem.utils.ISMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java b/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java
index c295f9c..3e10259 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/DataBaseCreator.java
@@ -5,8 +5,8 @@ import java.io.IOException;
 import org.gcube.informationsystem.context.impl.entities.ContextImpl;
 import org.gcube.informationsystem.context.reference.entities.Context;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
-import org.gcube.informationsystem.resourceregistry.context.ContextManagement;
 import org.gcube.informationsystem.resourceregistry.dbinitialization.DatabaseEnvironment;
+import org.gcube.informationsystem.resourceregistry.instances.context.entities.ContextManagement;
 import org.gcube.informationsystem.utils.ISMapper;
 import org.gcube.informationsystem.utils.discovery.ISMDiscovery;
 import org.junit.Test;
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java
index 4ff7782..f5cd31f 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextManagementTest.java
@@ -1,6 +1,7 @@
 package org.gcube.informationsystem.resourceregistry.context;
 
 import org.gcube.informationsystem.resourceregistry.ContextTest;
+import org.gcube.informationsystem.resourceregistry.instances.context.ContextCreator;
 import org.junit.Test;
 
 public class ContextManagementTest extends ContextTest {