diff --git a/sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/CatalogDescriptor.java b/sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/CatalogDescriptor.java
similarity index 100%
rename from sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/CatalogDescriptor.java
rename to sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/CatalogDescriptor.java
diff --git a/sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/ScopeConfiguration.java b/sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/ScopeConfiguration.java
index 6020589..d9473ad 100644
--- a/sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/ScopeConfiguration.java
+++ b/sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/ScopeConfiguration.java
@@ -6,9 +6,9 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.gcube.spatial.data.sdi.model.services.GeoNetworkServiceDefinition;
-import org.gcube.spatial.data.sdi.model.services.GeoServerDefinition;
-import org.gcube.spatial.data.sdi.model.services.ThreddsDefinition;
+import org.gcube.spatial.data.sdi.model.service.GeoNetworkDescriptor;
+import org.gcube.spatial.data.sdi.model.service.GeoServerDescriptor;
+import org.gcube.spatial.data.sdi.model.service.ThreddsDescriptor;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -32,10 +32,10 @@ public class ScopeConfiguration {
 	private String contextName;
 	
 	@NonNull
-	private List<GeoNetworkServiceDefinition> geonetworkConfiguration;
+	private List<GeoNetworkDescriptor> geonetworkConfiguration;
 	@NonNull
-	private List<GeoServerDefinition> geoserverClusterConfiguration;
+	private List<GeoServerDescriptor> geoserverClusterConfiguration;
 	@NonNull
-	private List<ThreddsDefinition> threddsConfiguration;	
+	private List<ThreddsDescriptor> threddsConfiguration;	
 	
 }
diff --git a/sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoNetworkDescriptor.java b/sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoNetworkDescriptor.java
similarity index 100%
rename from sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoNetworkDescriptor.java
rename to sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoNetworkDescriptor.java
diff --git a/sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoServerDescriptor.java b/sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoServerDescriptor.java
similarity index 100%
rename from sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoServerDescriptor.java
rename to sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoServerDescriptor.java
diff --git a/sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoServiceDescriptor.java b/sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoServiceDescriptor.java
similarity index 100%
rename from sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoServiceDescriptor.java
rename to sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/service/GeoServiceDescriptor.java
diff --git a/sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/service/ThreddsDescriptor.java b/sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/service/ThreddsDescriptor.java
similarity index 100%
rename from sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/service/ThreddsDescriptor.java
rename to sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/service/ThreddsDescriptor.java
diff --git a/sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/service/Version.java b/sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/service/Version.java
similarity index 100%
rename from sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/service/Version.java
rename to sdi-interface/src/main/java/org/gcube/spatial/data/sdi/model/service/Version.java
diff --git a/sdi-library/src/test/java/org/gcube/spatial/data/sdi/BasicScopedTests.java b/sdi-library/src/test/java/org/gcube/spatial/data/sdi/BasicScopedTests.java
index a3ee972..0046f8a 100644
--- a/sdi-library/src/test/java/org/gcube/spatial/data/sdi/BasicScopedTests.java
+++ b/sdi-library/src/test/java/org/gcube/spatial/data/sdi/BasicScopedTests.java
@@ -4,14 +4,14 @@ import org.junit.BeforeClass;
 
 public class BasicScopedTests {
 
-	String sdiHostname="sdi-t.pre.d4science.org";
-	String scope ="/pred4s/preprod/preVRE";
+	static String sdiHostname="sdi-t.pre.d4science.org";
+	static String scope ="/pred4s/preprod/preVRE";
 //	
 //	String sdiHostname="sdi-d-d4s.d4science.org";
 //	String scope = "/gcube/devsec/devVRE";		
 			
 	@BeforeClass
-	public void setScope(){
+	public static void setScope(){
 		TokenSetter.set(scope);
 	}
 	
diff --git a/sdi-library/src/test/java/org/gcube/spatial/data/sdi/SDITests.java b/sdi-library/src/test/java/org/gcube/spatial/data/sdi/SDITests.java
index 05b5a98..b16b43b 100644
--- a/sdi-library/src/test/java/org/gcube/spatial/data/sdi/SDITests.java
+++ b/sdi-library/src/test/java/org/gcube/spatial/data/sdi/SDITests.java
@@ -14,4 +14,10 @@ public class SDITests extends BasicScopedTests{
 	}
 	
 	
+	@Test
+	public void getScopeHealth() throws RemoteException {
+		SDIManagement sdi=SDIAbstractPlugin.management().build();
+		System.out.println(sdi.getReport());
+	}
+	
 }
diff --git a/sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/ScopeConfiguration.java b/sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/ScopeConfiguration.java
deleted file mode 100644
index d9473ad..0000000
--- a/sdi-service/src/main/java/org/gcube/spatial/data/sdi/model/ScopeConfiguration.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.gcube.spatial.data.sdi.model;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.gcube.spatial.data.sdi.model.service.GeoNetworkDescriptor;
-import org.gcube.spatial.data.sdi.model.service.GeoServerDescriptor;
-import org.gcube.spatial.data.sdi.model.service.ThreddsDescriptor;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-
-@Getter
-@Setter
-@ToString
-@NoArgsConstructor
-@RequiredArgsConstructor
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ScopeConfiguration {
-	
-	
-	
-	@NonNull
-	private String contextName;
-	
-	@NonNull
-	private List<GeoNetworkDescriptor> geonetworkConfiguration;
-	@NonNull
-	private List<GeoServerDescriptor> geoserverClusterConfiguration;
-	@NonNull
-	private List<ThreddsDescriptor> threddsConfiguration;	
-	
-}