diff --git a/.classpath b/.classpath
index 74e5673..5cca4e3 100644
--- a/.classpath
+++ b/.classpath
@@ -23,6 +23,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
-	<classpathentry kind="output" path="war/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 7c80706..50ed371 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="rmp-common-library">
         <wb-resource deploy-path="/" source-path="/src/main/java"/>
     </wb-module>
diff --git a/distro/INSTALL b/distro/INSTALL
deleted file mode 100644
index dfeae98..0000000
--- a/distro/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-Used as a Web service in the gCube Framework
\ No newline at end of file
diff --git a/distro/LICENSE b/distro/LICENSE
index bd0c2b4..2d9616a 100644
--- a/distro/LICENSE
+++ b/distro/LICENSE
@@ -1,8 +1 @@
-gCube System - License
-------------------------------------------------------------
-
-The gCube/gCore software is licensed as Free Open Source software conveying to
-the EUPL (http://ec.europa.eu/idabc/eupl).
-The software and documentation is provided by its authors/distributors "as is"
-and no expressed or implied warranty is given for its use, quality or fitness 
-for a particular case.
+${gcube.license}
\ No newline at end of file
diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS
deleted file mode 100644
index 1c0d747..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1,5 +0,0 @@
-* Daniele Strollo (daniele.strollo@isti.cnr.it), CNR Pisa, 
-  Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
-
-* Valentina Marioli (valentina.marioli@isti.cnr.it), CNR Pisa, 
-  Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
\ No newline at end of file
diff --git a/distro/README b/distro/README
index 9f02f32..70cc12c 100644
--- a/distro/README
+++ b/distro/README
@@ -1,49 +1,45 @@
 The gCube System
 ------------------------------------------------------------
 
-This work is partially funded by the European Commission in the
-context of the D4Science project (www.d4science.eu), under the 1st
-call of FP7 IST priority.
+${gcube.description}
+ 
+${gcube.funding}
 
 
-Authors
--------
-
-* Valentina Marioli (valentina.marioli@isti.cnr.it), CNR Pisa, 
-  Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
-  
-* Daniele Strollo (daniele.strollo@isti.cnr.it), CNR Pisa, 
-  Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
+Version
+--------------------------------------------------
+${version} (${buildDate})
+ 
+Please see the file named "changelog.xml" in this directory for the release notes.
 
-Version and Release Date
-------------------------
 
-version 1.0.0 (20-05-2010)  
-version 1.2.0 (19-04-2013) 
-
-Description
---------------------
+Authors
+-------
 
-Consists of a gcube service able to properly manage the scheduling and
-the deployment planning of services in a gcube infrastructure.
+ 
+Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
 
 
-Download information
---------------------
+Maintainers
+-----------
+ 
+Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
+ 
+ 
+Documentation
+-------------
 
-Source code is available from SVN:
-http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/vre-management/ResourceBroker/org.gcube.vremanagement.resourcebroker/
+Documentation is available on - line from the Projects Documentation wiki:
 
-Binaries can be downloaded from:
-http://software.d4science.research-infrastructures.eu/
+ {gcube.wikiRoot}/gcube/index.php/UserManagement_Core
 
-Documentation 
--------------
-VREManager documentation is available on-line from the Projects Documentation Wiki:
-https://gcube.wiki.gcube-system.org/gcube/index.php/Resource_Broker
 
+Support 
+--------------------------------------------------
+Bugs and support requests can be reported in the gCube issue tracking tool:
+    ${gcube.issueTracking}
+ 
+ 
 Licensing
----------
-
+--------------------------------------------------
 This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
-
diff --git a/distro/svnpath.txt b/distro/svnpath.txt
deleted file mode 100644
index edacb04..0000000
--- a/distro/svnpath.txt
+++ /dev/null
@@ -1 +0,0 @@
-${scm.url} 
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c9c4435..0359d23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,17 @@
 			<version>2.7.0</version>
 			<scope>compile</scope>
 		</dependency>
+		<!-- Auth Framework -->
+			<dependency>
+				<groupId>org.gcube.common</groupId>
+				<artifactId>authorization-client</artifactId>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.gcube.common</groupId>
+				<artifactId>common-authorization</artifactId>
+				<scope>provided</scope>
+			</dependency>
 		<!-- FWS DEPS -->
 		<dependency>
 			<groupId>org.gcube.resources.discovery</groupId>