diff --git a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
new file mode 100644
index 0000000..cc81385
--- /dev/null
+++ b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
@@ -0,0 +1,7 @@
+<root>
+  <facet id="jst.jaxrs">
+    <node name="libprov">
+      <attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
+    </node>
+  </facet>
+</root>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index b3a52d7..1a80958 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -5,4 +5,5 @@
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="java" version="1.7"/>
   <installed facet="liferay.portlet" version="6.0"/>
+  <installed facet="jst.jaxrs" version="2.0"/>
 </faceted-project>
diff --git a/distro/INSTALL b/distro/INSTALL
deleted file mode 100644
index adeb14f..0000000
--- a/distro/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-
-	
diff --git a/distro/LICENSE b/distro/LICENSE
index 630ba97..2d9616a 100644
--- a/distro/LICENSE
+++ b/distro/LICENSE
@@ -1,6 +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 9fdb056..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1,5 +0,0 @@
-Mantainers
--------
-
-* Massimiliano Assante (assante@isti.cnr.it), CNR Pisa, 
-  Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
diff --git a/distro/README b/distro/README
index 5e91e48..70cc12c 100644
--- a/distro/README
+++ b/distro/README
@@ -1,53 +1,45 @@
-The gCube System - VRE Deploy portlet
+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}
+
+
+Version
+--------------------------------------------------
+${version} (${buildDate})
+ 
+Please see the file named "changelog.xml" in this directory for the release notes.
 
 
 Authors
 -------
 
-* Massimiliano Assante (assante@isti.cnr.it), CNR Pisa, 
-  Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
+ 
+Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
 
 
-Version and Release Date
-------------------------
-
-
-
-
-Description
+Maintainers
 -----------
-
-
-
-Download information
---------------------
-
-Source code is available from SVN:
-https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/vre-deploy
-
-
-Binaries can be downloaded from:
-http://software.d4science.research-infrastructures.eu/
-
-
-Documentation 
+ 
+Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
+ 
+ 
+Documentation
 -------------
 
-Documentation is available on-line from the Projects Documentation Wiki:
-
-https://gcube.wiki.gcube-system.org/gcube/index.php/VRE_Administration#VRE_Approval
+Documentation is available on - line from the Projects Documentation wiki:
 
+ {gcube.wikiRoot}/gcube/index.php/UserManagement_Core
 
 
+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