diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextAlreadyPresentException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/contexts/ContextAlreadyPresentException.java
similarity index 97%
rename from src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextAlreadyPresentException.java
rename to src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/contexts/ContextAlreadyPresentException.java
index baa247f..2436624 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextAlreadyPresentException.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/contexts/ContextAlreadyPresentException.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.resourceregistry.api.exceptions.context;
+package org.gcube.informationsystem.resourceregistry.api.exceptions.contexts;
 
 import org.gcube.informationsystem.resourceregistry.api.exceptions.AlreadyPresentException;
 
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextCreationException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/contexts/ContextCreationException.java
similarity index 97%
rename from src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextCreationException.java
rename to src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/contexts/ContextCreationException.java
index 8ff38af..1de2e4a 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextCreationException.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/contexts/ContextCreationException.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.gcube.informationsystem.resourceregistry.api.exceptions.context;
+package org.gcube.informationsystem.resourceregistry.api.exceptions.contexts;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/contexts/ContextException.java
similarity index 97%
rename from src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextException.java
rename to src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/contexts/ContextException.java
index 0765f70..8d3f178 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextException.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/contexts/ContextException.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.resourceregistry.api.exceptions.context;
+package org.gcube.informationsystem.resourceregistry.api.exceptions.contexts;
 
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextMoveException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/contexts/ContextMoveException.java
similarity index 97%
rename from src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextMoveException.java
rename to src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/contexts/ContextMoveException.java
index a8af9bc..4d88859 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextMoveException.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/contexts/ContextMoveException.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.resourceregistry.api.exceptions.context;
+package org.gcube.informationsystem.resourceregistry.api.exceptions.contexts;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextNotFoundException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/contexts/ContextNotFoundException.java
similarity index 97%
rename from src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextNotFoundException.java
rename to src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/contexts/ContextNotFoundException.java
index 63df47c..c7bcdc0 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextNotFoundException.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/contexts/ContextNotFoundException.java
@@ -1,4 +1,4 @@
-package org.gcube.informationsystem.resourceregistry.api.exceptions.context;
+package org.gcube.informationsystem.resourceregistry.api.exceptions.contexts;
 
 import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFoundException;