diff --git a/.classpath b/.classpath
index 8e795b1..fae1a2b 100644
--- a/.classpath
+++ b/.classpath
@@ -22,7 +22,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 4ede96d..714351a 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,2 +1,5 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClient.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClient.java
index 3826f51..e490b99 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClient.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClient.java
@@ -3,7 +3,7 @@ package org.gcube.informationsystem.resourceregistry.context;
 import java.util.List;
 import java.util.UUID;
 
-import org.gcube.informationsystem.model.reference.entities.Context;
+import org.gcube.informationsystem.context.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/ResourceRegistryContextClientImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java
index 3827c50..1d9569a 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java
@@ -6,9 +6,9 @@ import java.util.UUID;
 
 import org.gcube.common.gxhttp.reference.GXConnection;
 import org.gcube.common.gxhttp.request.GXHTTPStringRequest;
-import org.gcube.informationsystem.model.impl.properties.HeaderImpl;
-import org.gcube.informationsystem.model.reference.entities.Context;
-import org.gcube.informationsystem.model.reference.properties.Header;
+import org.gcube.informationsystem.base.impl.properties.HeaderImpl;
+import org.gcube.informationsystem.base.reference.properties.Header;
+import org.gcube.informationsystem.context.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/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java
index b79acdb..ac94b34 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java
@@ -10,9 +10,10 @@ import org.gcube.common.authorization.client.Constants;
 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.model.impl.entities.ContextImpl;
-import org.gcube.informationsystem.model.reference.ER;
-import org.gcube.informationsystem.model.reference.entities.Context;
+import org.gcube.informationsystem.base.reference.ER;
+import org.gcube.informationsystem.base.reference.properties.Header;
+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.api.exceptions.context.ContextAlreadyPresentException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException;
@@ -40,7 +41,7 @@ public class ResourceRegistryContextClientTest extends ContextTest {
 	public static final String CTX_NAME_C = "C";
 	
 	public static String getUser() {
-		String user = org.gcube.informationsystem.model.reference.properties.Header.UNKNOWN_USER;
+		String user = Header.UNKNOWN_USER;
 		try {
 			String token = SecurityTokenProvider.instance.get();
 			if(token != null) {