diff --git a/.classpath b/.classpath
index fae1a2b..f4fa461 100644
--- a/.classpath
+++ b/.classpath
@@ -1,33 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="src" path="webapp/src/main/java"/>
 	<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>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 29abf99..99f26c0 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,2 @@
 eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8
diff --git a/pom.xml b/pom.xml
index f856a36..70bdfd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,18 +9,16 @@
 	<groupId>org.gcube.resource-management</groupId>
 	<artifactId>resource-manager</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<packaging>war</packaging>
+	<packaging>pom</packaging>
 	<name>Resource Manager service</name>
 	<description>Manager for resources based on the gCube Model</description>
 	<url>https://wiki.gcube-system.org/gcube/Facet_Based_Resource_Model#gCube_Model</url>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<webappDirectory>${project.basedir}/src/main/webapp/WEB-INF</webappDirectory>
-		<distroDirectory>${project.basedir}/distro</distroDirectory>
-		<serviceClass>ResourceManagement</serviceClass>
-	</properties>
-	
-	<dependencyManagement>
+
+	<modules>
+		<module>webapp</module>
+	</modules>
+
+<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
@@ -38,50 +36,9 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-profile</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<phase>process-resources</phase>
-						<configuration>
-							<outputDirectory>${webappDirectory}</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${distroDirectory}</directory>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<warName>resource-manager</warName>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
-				</configuration>
-				<executions>
-					<execution>
-						<id>servicearchive</id>
-						<phase>install</phase>
-						<goals>
-							<goal>war</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+		
+	<build/>
+		
 	<dependencies>
 		<dependency>
 			<groupId>org.gcube.information-system</groupId>
@@ -113,7 +70,7 @@
 			<groupId>org.gcube.information-system</groupId>
 			<artifactId>gcube-resources</artifactId>
 		</dependency>
-		
+
 		<!-- jersey -->
 		<dependency>
 			<groupId>javax.ws.rs</groupId>
@@ -161,6 +118,5 @@
 			<version>1.0.13</version>
 			<scope>test</scope>
 		</dependency>
-
-	</dependencies>
+	</dependencies>		
 </project>
\ No newline at end of file
diff --git a/webapp/.classpath b/webapp/.classpath
new file mode 100644
index 0000000..af1430b
--- /dev/null
+++ b/webapp/.classpath
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<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>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/webapp/.project b/webapp/.project
new file mode 100644
index 0000000..74c4970
--- /dev/null
+++ b/webapp/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>webapp</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/webapp/.settings/org.eclipse.core.resources.prefs b/webapp/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..f9fe345
--- /dev/null
+++ b/webapp/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding/<project>=UTF-8
diff --git a/webapp/.settings/org.eclipse.jdt.core.prefs b/webapp/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..714351a
--- /dev/null
+++ b/webapp/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +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/webapp/.settings/org.eclipse.m2e.core.prefs b/webapp/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/webapp/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/distro/LICENSE b/webapp/distro/LICENSE
similarity index 100%
rename from distro/LICENSE
rename to webapp/distro/LICENSE
diff --git a/distro/README b/webapp/distro/README
similarity index 100%
rename from distro/README
rename to webapp/distro/README
diff --git a/distro/changelog.xml b/webapp/distro/changelog.xml
similarity index 100%
rename from distro/changelog.xml
rename to webapp/distro/changelog.xml
diff --git a/distro/descriptor.xml b/webapp/distro/descriptor.xml
similarity index 100%
rename from distro/descriptor.xml
rename to webapp/distro/descriptor.xml
diff --git a/distro/gcube-app.xml b/webapp/distro/gcube-app.xml
similarity index 100%
rename from distro/gcube-app.xml
rename to webapp/distro/gcube-app.xml
diff --git a/distro/profile.xml b/webapp/distro/profile.xml
similarity index 100%
rename from distro/profile.xml
rename to webapp/distro/profile.xml
diff --git a/distro/web.xml b/webapp/distro/web.xml
similarity index 100%
rename from distro/web.xml
rename to webapp/distro/web.xml
diff --git a/webapp/pom.xml b/webapp/pom.xml
new file mode 100644
index 0000000..8cd5fa8
--- /dev/null
+++ b/webapp/pom.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.gcube.resource-management</groupId>
+		<artifactId>resource-manager</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+ 	</parent>
+	<groupId>org.gcube.resource-management</groupId>
+	<artifactId>webapp</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>war</packaging>
+	<name>webapp</name>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<webappDirectory>${project.basedir}/src/main/webapp/WEB-INF</webappDirectory>
+		<distroDirectory>${project.basedir}/distro</distroDirectory>
+		<serviceClass>ResourceManagement</serviceClass>
+	</properties>
+	
+	
+
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-profile</id>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<phase>process-resources</phase>
+						<configuration>
+							<outputDirectory>${webappDirectory}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${distroDirectory}</directory>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<warName>resource-manager</warName>
+					<failOnMissingWebXml>false</failOnMissingWebXml>
+				</configuration>
+				<executions>
+					<execution>
+						<id>servicearchive</id>
+						<phase>install</phase>
+						<goals>
+							<goal>war</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.gcube.information-system</groupId>
+			<artifactId>resource-registry-publisher</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.gcube.information-system</groupId>
+			<artifactId>resource-registry-client</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.gcube.core</groupId>
+			<artifactId>common-events</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.gcube.core</groupId>
+			<artifactId>common-smartgears</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.gcube.information-system</groupId>
+			<artifactId>information-system-model</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.gcube.information-system</groupId>
+			<artifactId>gcube-resources</artifactId>
+		</dependency>
+
+		<!-- jersey -->
+		<dependency>
+			<groupId>javax.ws.rs</groupId>
+			<artifactId>javax.ws.rs-api</artifactId>
+			<version>2.0.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.glassfish.jersey.containers</groupId>
+			<artifactId>jersey-container-servlet</artifactId>
+			<version>2.13</version>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.0.1</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Test Dependency -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
+			<artifactId>jersey-test-framework-provider-simple</artifactId>
+			<version>2.17</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.0.13</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/package-info.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/package-info.java
new file mode 100644
index 0000000..23fb3f7
--- /dev/null
+++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/package-info.java
@@ -0,0 +1,6 @@
+
+/**
+ * @author Manuele Simi (ISTI - CNR)
+ *
+ */
+package org.gcube.resourcemanagement.manager.webapp;
\ No newline at end of file
diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rest/package-info.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rest/package-info.java
new file mode 100644
index 0000000..905621f
--- /dev/null
+++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rest/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * @author Manuele Simi (ISTI - CNR)
+ *
+ */
+package org.gcube.resourcemanagement.manager.webapp.rest;
\ No newline at end of file