diff --git a/src/main/java/org/gcube/gcat/configuration/CatalogueConfigurationFactory.java b/src/main/java/org/gcube/gcat/configuration/CatalogueConfigurationFactory.java
index e92d5d5..66803e4 100644
--- a/src/main/java/org/gcube/gcat/configuration/CatalogueConfigurationFactory.java
+++ b/src/main/java/org/gcube/gcat/configuration/CatalogueConfigurationFactory.java
@@ -4,6 +4,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
+import org.gcube.gcat.configuration.isproxies.GCoreISConfigurationProxy;
+import org.gcube.gcat.configuration.service.ServiceCatalogueConfiguration;
 import org.gcube.gcat.persistence.ckan.CKANUserCache;
 
 /**
diff --git a/src/main/java/org/gcube/gcat/configuration/GCoreISConfigurationProxy.java b/src/main/java/org/gcube/gcat/configuration/isproxies/GCoreISConfigurationProxy.java
similarity index 99%
rename from src/main/java/org/gcube/gcat/configuration/GCoreISConfigurationProxy.java
rename to src/main/java/org/gcube/gcat/configuration/isproxies/GCoreISConfigurationProxy.java
index b5eda12..7a6265e 100644
--- a/src/main/java/org/gcube/gcat/configuration/GCoreISConfigurationProxy.java
+++ b/src/main/java/org/gcube/gcat/configuration/isproxies/GCoreISConfigurationProxy.java
@@ -1,4 +1,4 @@
-package org.gcube.gcat.configuration;
+package org.gcube.gcat.configuration.isproxies;
 
 import static org.gcube.resources.discovery.icclient.ICFactory.clientFor;
 import static org.gcube.resources.discovery.icclient.ICFactory.queryFor;
@@ -32,6 +32,9 @@ import org.gcube.common.resources.gcore.common.Platform;
 import org.gcube.common.resources.gcore.utils.Group;
 import org.gcube.gcat.api.GCatConstants;
 import org.gcube.gcat.api.configuration.CatalogueConfiguration;
+import org.gcube.gcat.configuration.Version;
+import org.gcube.gcat.configuration.service.ServiceCKANDB;
+import org.gcube.gcat.configuration.service.ServiceCatalogueConfiguration;
 import org.gcube.informationsystem.publisher.RegistryPublisher;
 import org.gcube.informationsystem.publisher.RegistryPublisherFactory;
 import org.gcube.resources.discovery.client.api.DiscoveryClient;
diff --git a/src/main/java/org/gcube/gcat/configuration/ISConfigurationProxy.java b/src/main/java/org/gcube/gcat/configuration/isproxies/ISConfigurationProxy.java
similarity index 92%
rename from src/main/java/org/gcube/gcat/configuration/ISConfigurationProxy.java
rename to src/main/java/org/gcube/gcat/configuration/isproxies/ISConfigurationProxy.java
index 7c1c4cf..683491a 100644
--- a/src/main/java/org/gcube/gcat/configuration/ISConfigurationProxy.java
+++ b/src/main/java/org/gcube/gcat/configuration/isproxies/ISConfigurationProxy.java
@@ -1,7 +1,9 @@
-package org.gcube.gcat.configuration;
+package org.gcube.gcat.configuration.isproxies;
 
 import javax.ws.rs.WebApplicationException;
 
+import org.gcube.gcat.configuration.Version;
+import org.gcube.gcat.configuration.service.ServiceCatalogueConfiguration;
 import org.gcube.smartgears.ContextProvider;
 import org.gcube.smartgears.configuration.application.ApplicationConfiguration;
 import org.gcube.smartgears.context.application.ApplicationContext;
diff --git a/src/main/java/org/gcube/gcat/configuration/RestISConfigurationProxy.java b/src/main/java/org/gcube/gcat/configuration/isproxies/RestISConfigurationProxy.java
similarity index 68%
rename from src/main/java/org/gcube/gcat/configuration/RestISConfigurationProxy.java
rename to src/main/java/org/gcube/gcat/configuration/isproxies/RestISConfigurationProxy.java
index e63887f..c8e0665 100644
--- a/src/main/java/org/gcube/gcat/configuration/RestISConfigurationProxy.java
+++ b/src/main/java/org/gcube/gcat/configuration/isproxies/RestISConfigurationProxy.java
@@ -1,9 +1,12 @@
-package org.gcube.gcat.configuration;
+package org.gcube.gcat.configuration.isproxies;
+
+import org.gcube.gcat.configuration.service.ServiceCatalogueConfiguration;
+import org.gcube.resourcemanagement.model.reference.entities.resources.Configuration;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
-public class RestISConfigurationProxy extends ISConfigurationProxy {
+public class RestISConfigurationProxy extends ISConfigurationProxy<Configuration> {
 
 	public RestISConfigurationProxy(String context) {
 		super(context);
@@ -31,13 +34,13 @@ public class RestISConfigurationProxy extends ISConfigurationProxy {
 	}
 
 	@Override
-	protected Object getISResource() {
+	protected Configuration getISResource() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	protected ServiceCatalogueConfiguration updateOnIS(Object isResource) throws Exception {
+	protected ServiceCatalogueConfiguration updateOnIS(Configuration configuration) throws Exception {
 		// TODO Auto-generated method stub
 		return null;
 	}
diff --git a/src/main/java/org/gcube/gcat/configuration/ServiceCKANDB.java b/src/main/java/org/gcube/gcat/configuration/service/ServiceCKANDB.java
similarity index 97%
rename from src/main/java/org/gcube/gcat/configuration/ServiceCKANDB.java
rename to src/main/java/org/gcube/gcat/configuration/service/ServiceCKANDB.java
index dac0166..cf5b3da 100644
--- a/src/main/java/org/gcube/gcat/configuration/ServiceCKANDB.java
+++ b/src/main/java/org/gcube/gcat/configuration/service/ServiceCKANDB.java
@@ -1,4 +1,4 @@
-package org.gcube.gcat.configuration;
+package org.gcube.gcat.configuration.service;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.IllegalBlockSizeException;
diff --git a/src/main/java/org/gcube/gcat/configuration/ServiceCatalogueConfiguration.java b/src/main/java/org/gcube/gcat/configuration/service/ServiceCatalogueConfiguration.java
similarity index 99%
rename from src/main/java/org/gcube/gcat/configuration/ServiceCatalogueConfiguration.java
rename to src/main/java/org/gcube/gcat/configuration/service/ServiceCatalogueConfiguration.java
index 651b0ad..060029c 100644
--- a/src/main/java/org/gcube/gcat/configuration/ServiceCatalogueConfiguration.java
+++ b/src/main/java/org/gcube/gcat/configuration/service/ServiceCatalogueConfiguration.java
@@ -1,4 +1,4 @@
-package org.gcube.gcat.configuration;
+package org.gcube.gcat.configuration.service;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.IllegalBlockSizeException;
diff --git a/src/main/java/org/gcube/gcat/rest/administration/Configuration.java b/src/main/java/org/gcube/gcat/rest/administration/Configuration.java
index bb6d20a..f23c01e 100644
--- a/src/main/java/org/gcube/gcat/rest/administration/Configuration.java
+++ b/src/main/java/org/gcube/gcat/rest/administration/Configuration.java
@@ -31,7 +31,7 @@ import org.gcube.gcat.annotation.PURGE;
 import org.gcube.gcat.api.GCatConstants;
 import org.gcube.gcat.api.roles.Role;
 import org.gcube.gcat.configuration.CatalogueConfigurationFactory;
-import org.gcube.gcat.configuration.ServiceCatalogueConfiguration;
+import org.gcube.gcat.configuration.service.ServiceCatalogueConfiguration;
 import org.gcube.gcat.persistence.ckan.CKANUser;
 import org.gcube.gcat.persistence.ckan.CKANUserCache;
 import org.gcube.gcat.rest.BaseREST;
diff --git a/src/test/java/org/gcube/gcat/configuration/GCoreISConfigurationProxyTest.java b/src/test/java/org/gcube/gcat/configuration/isproxies/GCoreISConfigurationProxyTest.java
similarity index 98%
rename from src/test/java/org/gcube/gcat/configuration/GCoreISConfigurationProxyTest.java
rename to src/test/java/org/gcube/gcat/configuration/isproxies/GCoreISConfigurationProxyTest.java
index 9199a61..7982016 100644
--- a/src/test/java/org/gcube/gcat/configuration/GCoreISConfigurationProxyTest.java
+++ b/src/test/java/org/gcube/gcat/configuration/isproxies/GCoreISConfigurationProxyTest.java
@@ -1,4 +1,4 @@
-package org.gcube.gcat.configuration;
+package org.gcube.gcat.configuration.isproxies;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -8,6 +8,7 @@ import java.util.stream.Collectors;
 
 import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
 import org.gcube.gcat.ContextTest;
+import org.gcube.gcat.configuration.service.ServiceCatalogueConfiguration;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;