diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClient.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ResourceRegistryContextClient.java
similarity index 92%
rename from src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClient.java
rename to src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ResourceRegistryContextClient.java
index 6a5205a..8340a04 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClient.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ResourceRegistryContextClient.java
@@ -1,9 +1,9 @@
-package org.gcube.informationsystem.resourceregistry.context;
+package org.gcube.informationsystem.resourceregistry.contexts;
 
 import java.util.List;
 import java.util.UUID;
 
-import org.gcube.informationsystem.context.reference.entities.Context;
+import org.gcube.informationsystem.contexts.reference.entities.Context;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextAlreadyPresentException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException;
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientFactory.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ResourceRegistryContextClientFactory.java
similarity index 98%
rename from src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientFactory.java
rename to src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ResourceRegistryContextClientFactory.java
index 053315b..eeeeb7e 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientFactory.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ResourceRegistryContextClientFactory.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.resourceregistry.context;
+package org.gcube.informationsystem.resourceregistry.contexts;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ResourceRegistryContextClientImpl.java
similarity index 98%
rename from src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java
rename to src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ResourceRegistryContextClientImpl.java
index 2bfcf8c..1a63620 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/contexts/ResourceRegistryContextClientImpl.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.resourceregistry.context;
+package org.gcube.informationsystem.resourceregistry.contexts;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
@@ -8,7 +8,7 @@ import java.util.UUID;
 import org.gcube.com.fasterxml.jackson.core.JsonProcessingException;
 import org.gcube.common.gxhttp.reference.GXConnection;
 import org.gcube.common.gxhttp.request.GXHTTPStringRequest;
-import org.gcube.informationsystem.context.reference.entities.Context;
+import org.gcube.informationsystem.contexts.reference.entities.Context;
 import org.gcube.informationsystem.model.impl.properties.HeaderImpl;
 import org.gcube.informationsystem.model.reference.properties.Header;
 import org.gcube.informationsystem.resourceregistry.api.contexts.ContextCache;
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ContextTest.java
similarity index 98%
rename from src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextTest.java
rename to src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ContextTest.java
index 4fc6512..828ad69 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ContextTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ContextTest.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.gcube.informationsystem.resourceregistry.context;
+package org.gcube.informationsystem.resourceregistry.contexts;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ResourceRegistryContextClientTest.java
similarity index 98%
rename from src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java
rename to src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ResourceRegistryContextClientTest.java
index 2229368..2776df5 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/contexts/ResourceRegistryContextClientTest.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.resourceregistry.context;
+package org.gcube.informationsystem.resourceregistry.contexts;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -12,9 +12,9 @@ import org.gcube.common.authorization.library.AuthorizationEntry;
 import org.gcube.common.authorization.library.provider.ClientInfo;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.informationsystem.base.reference.IdentifiableElement;
-import org.gcube.informationsystem.context.impl.entities.ContextImpl;
-import org.gcube.informationsystem.context.reference.entities.Context;
-import org.gcube.informationsystem.context.reference.relations.IsParentOf;
+import org.gcube.informationsystem.contexts.impl.entities.ContextImpl;
+import org.gcube.informationsystem.contexts.reference.entities.Context;
+import org.gcube.informationsystem.contexts.reference.relations.IsParentOf;
 import org.gcube.informationsystem.model.reference.properties.Header;
 import org.gcube.informationsystem.resourceregistry.api.contexts.ContextCache;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;