diff --git a/idea/io.iml b/idea/io.iml
deleted file mode 100644
index b785ed0..0000000
--- a/idea/io.iml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="EclipseModuleManager">
-    <conelement value="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" />
-    <src_description expected_position="0">
-      <src_folder value="file://$MODULE_DIR$/../io/src/main/java" expected_position="0" />
-      <src_folder value="file://$MODULE_DIR$/../io/src/test/java" expected_position="1" />
-    </src_description>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/../io/target/classes" />
-    <output-test url="file://$MODULE_DIR$/../io/target/test-classes" />
-    <content url="file://$MODULE_DIR$/../io">
-      <sourceFolder url="file://$MODULE_DIR$/../io/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../io/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/../io/target" />
-    </content>
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="library" scope="RUNTIME" name="Ma ven: org.glassfish.jersey.ext:jersey-entity-filtering:2.25.1" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.common:gxJRS:1.1.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: javax.ws.rs:javax.ws.rs-api:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.common:gxHTTP:1.1.2-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.common:authorization-client:2.0.4-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.common:common-authorization:2.1.5-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.core:common-scope:1.2.2-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.core:common-scope-maps:1.1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.gcube.core:common-configuration-scanner:1.1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.glassfish.jersey.media:jersey-media-json-jackson:2.25.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.glassfish.jersey.core:jersey-common:2.25.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.annotation:javax.annotation-api:1.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.glassfish.jersey.bundles.repackaged:jersey-guava:2.25.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.glassfish.hk2:hk2-api:2.5.0-b32" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.glassfish.hk2:hk2-utils:2.5.0-b32" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b32" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.glassfish.hk2.external:javax.inject:2.5.0-b32" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.glassfish.hk2:hk2-locator:2.5.0-b32" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.glassfish.jersey.ext:jersey-entity-filtering:2.25.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.8.4" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.8.4" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.8.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/resource-manager.iml b/idea/resource-manager.iml
deleted file mode 100644
index c99ad14..0000000
--- a/idea/resource-manager.iml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="EclipseModuleManager">
-    <conelement value="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" />
-    <src_description expected_position="0">
-      <src_folder value="file://$MODULE_DIR$/../webapp/src/main/java" expected_position="0" />
-      <src_folder value="file://$MODULE_DIR$/../io/src/main/java" expected_position="1" />
-      <src_folder value="file://$MODULE_DIR$/../webapp/src/test/java" expected_position="2" />
-      <src_folder value="file://$MODULE_DIR$/../webapp/src/test/resources" expected_position="3" />
-      <src_folder value="file://$MODULE_DIR$/../io/src/test/java" expected_position="4" />
-    </src_description>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/../target/classes" />
-    <output-test url="file://$MODULE_DIR$/../target/test-classes" />
-    <content url="file://$MODULE_DIR$/..">
-      <sourceFolder url="file://$MODULE_DIR$/../webapp/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../io/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../webapp/src/test/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../webapp/src/test/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../io/src/test/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/../target" />
-    </content>
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="inheritedJdk" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/idea/webapp.iml b/idea/webapp.iml
deleted file mode 100644
index eb738a7..0000000
--- a/idea/webapp.iml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="EclipseModuleManager">
-    <conelement value="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" />
-    <src_description expected_position="0">
-      <src_folder value="file://$MODULE_DIR$/../webapp/src/main/java" expected_position="0" />
-      <src_folder value="file://$MODULE_DIR$/../webapp/src/test/java" expected_position="1" />
-    </src_description>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/../webapp/target/classes" />
-    <output-test url="file://$MODULE_DIR$/../webapp/target/test-classes" />
-    <content url="file://$MODULE_DIR$/../webapp">
-      <sourceFolder url="file://$MODULE_DIR$/../webapp/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../webapp/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../webapp/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/../webapp/target" />
-    </content>
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="library" name="Maven: org.gcube.information-system:resource-registry-publisher:2.1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.common:authorization-client:2.0.4-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.resources.discovery:ic-client:1.0.4-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.resources.discovery:discovery-client:1.0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.core:common-gcore-stubs:1.2.2-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.information-system:resource-registry-api:2.1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.common:gxHTTP:1.1.2-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.information-system:resource-registry-client:2.1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.information-system:resource-registry-context-client:2.1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.gcube.core:common-events:1.0.2-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.gcube.core:common-smartgears:2.1.9-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.common:common-authorization:2.1.5-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.gcube.core:common-configuration-scanner:1.1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.gcube.data.publishing:document-store-lib:2.5.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.gcube.accounting:accounting-lib:3.5.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.gcube.resources:registry-publisher:1.2.9-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.resources:common-gcore-resources:1.3.4-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.gcube.core:common-validator:1.0.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.core:common-scope:1.2.2-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.core:common-scope-maps:1.1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.information-system:information-system-model:2.1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.core:common-encryption:1.1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.resource-management:gcube-model:1.1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.gcube.common:gxJRS:1.1.2-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: javax.ws.rs:javax.ws.rs-api:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.containers:jersey-container-servlet:2.25.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.containers:jersey-container-servlet-core:2.25.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2.external:javax.inject:2.5.0-b32" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-common:2.25.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.bundles.repackaged:jersey-guava:2.25.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-api:2.5.0-b32" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-utils:2.5.0-b32" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b32" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-locator:2.5.0-b32" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-server:2.25.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-jaxb:2.25.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="module" module-name="io" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-json-jackson:2.25.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.ext:jersey-entity-filtering:2.25.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.8.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.8.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.8.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-simple:2.25.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.jersey.test-framework:jersey-test-framework-core:2.25.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.jersey.containers:jersey-container-simple-http:2.25.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.simpleframework:simple-http:6.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.simpleframework:simple-transport:6.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.simpleframework:simple-common:6.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-client:2.25.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.0.13" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.0.13" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/io.iml b/io.iml
new file mode 100644
index 0000000..6ac42c2
--- /dev/null
+++ b/io.iml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager">
+    <conelement value="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" />
+    <src_description expected_position="0">
+      <src_folder value="file://$MODULE_DIR$/io/src/main/java" expected_position="0" />
+      <src_folder value="file://$MODULE_DIR$/io/src/test/java" expected_position="1" />
+    </src_description>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$/io">
+      <sourceFolder url="file://$MODULE_DIR$/io/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/io/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/io/target" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" scope="RUNTIME" name="Ma ven: org.glassfish.jersey.ext:jersey-entity-filtering:2.25.1" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/resource-manager.iml b/resource-manager.iml
new file mode 100644
index 0000000..0d0630e
--- /dev/null
+++ b/resource-manager.iml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager">
+    <conelement value="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" />
+    <src_description expected_position="0">
+      <src_folder value="file://$MODULE_DIR$/webapp/src/main/java" expected_position="0" />
+      <src_folder value="file://$MODULE_DIR$/io/src/main/java" expected_position="1" />
+      <src_folder value="file://$MODULE_DIR$/webapp/src/test/java" expected_position="2" />
+      <src_folder value="file://$MODULE_DIR$/webapp/src/test/resources" expected_position="3" />
+      <src_folder value="file://$MODULE_DIR$/io/src/test/java" expected_position="4" />
+    </src_description>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$/">
+      <sourceFolder url="file://$MODULE_DIR$/webapp/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/io/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/webapp/src/test/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/webapp/src/test/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/io/src/test/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/webapp.iml b/webapp.iml
new file mode 100644
index 0000000..08fc4ae
--- /dev/null
+++ b/webapp.iml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager">
+    <conelement value="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" />
+    <src_description expected_position="0">
+      <src_folder value="file://$MODULE_DIR$/webapp/src/main/java" expected_position="0" />
+      <src_folder value="file://$MODULE_DIR$/webapp/src/test/java" expected_position="1" />
+    </src_description>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$/webapp">
+      <sourceFolder url="file://$MODULE_DIR$/webapp/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/webapp/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/webapp/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/webapp/target" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+  </component>
+</module>
\ No newline at end of file