diff --git a/distro/INSTALL b/distro/INSTALL
deleted file mode 100644
index 049006c..0000000
--- a/distro/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-Used as library in the gCube Framework
\ No newline at end of file
diff --git a/distro/LICENSE b/distro/LICENSE
index 07f22ed..cdf50bd 100644
--- a/distro/LICENSE
+++ b/distro/LICENSE
@@ -1,8 +1,4 @@
 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.
\ No newline at end of file
+${gcube.license}
\ No newline at end of file
diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS
deleted file mode 100644
index 2cdfd00..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1,2 +0,0 @@
-Luca Frosini (luca.frosini@isti.cnr.it), CNR Pisa, 
-Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
diff --git a/distro/README b/distro/README
index 6ad786c..ae26293 100644
--- a/distro/README
+++ b/distro/README
@@ -1,38 +1,65 @@
-The gCube System - Smart Executor Service
-------------------------------------------------------------
-This work has been partially supported by the following European projects: 
-DILIGENT (FP6-2003-IST-2), D4Science (FP7-INFRA-2007-1.2.2), 
-D4Science-II (FP7-INFRA-2008-1.2.2), iMarine (FP7-INFRASTRUCTURES-2011-2), 
-EUBrazilOpenBio (FP7-ICT-2011-EU-Brazil), Parthenos (H2020-INFRADEV-1-2014-1), 
-BlueBridge (H2020-EINFRA-2015-1).
-
-
-Authors
--------
-* Luca Frosini (luca.frosini@isti.cnr.it), CNR Pisa, 
-  Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
-  
-  
-Version and Release Date
-------------------------
-See changelog.xml file in this directory.
-
-        
-Description
------------
+The gCube System - ${name}
+--------------------------------------------------
+ 
 ${description}
-  
-  
+ 
+ 
+${gcube.description}
+ 
+${gcube.funding}
+ 
+ 
+Version
+--------------------------------------------------
+ 
+${version} (${buildDate})
+ 
+Please see the file named "changelog.xml" in this directory for the release notes.
+ 
+ 
+Authors
+--------------------------------------------------
+ 
+* Luca Frosini (luca.frosini-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
+
+Maintainers
+-----------
+ 
+* Luca Frosini (luca.frosini-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
+ 
+ 
 Download information
---------------------
-${scm.url}
-
-
+--------------------------------------------------
+ 
+Source code is available from SVN: 
+    ${scm.url}
+ 
+Binaries can be downloaded from the gCube website: 
+   ${gcube.website}
+ 
+ 
+Installation
+--------------------------------------------------
+ 
+Installation documentation is available on-line in the gCube Wiki:
+    ${gcube.wikiRoot}/SmartExecutor
+ 
+ 
 Documentation 
--------------
-${wiki}
-
+--------------------------------------------------
+ 
+Documentation is available on-line in the gCube Wiki:
+    ${gcube.wikiRoot}/SmartExecutor
+ 
+ 
+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.
+--------------------------------------------------
+ 
+This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 6a0302e..f4f8ed6 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,14 +1,16 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.vre-management.smart-executor-client.1.3.0" date="2016-02-08"> 
-		<Change>Port SmartExecutor to be compliant with new Authorization (refs #2112)</Change>
+	<Changeset component="org.gcube.vre-management.smart-executor-client.1.3.0" date="${buildDate}">
+		<Change></Change>
 	</Changeset>
-	<Changeset component="org.gcube.vre-management.smart-executor-client.1.2.0" date="2015-11-30"> 
-		<Change>Support Unscheduling of repetitive task on SmartExecutor (refs #521)</Change>
+    <Changeset component="org.gcube.vre-management.smart-executor-client.1.2.0" date="2016-02-08">
+		<Change>Using Persistence (CouchDB) to save Scheduled Task configuration (refs #579)</Change>
+		<Change>Added Unscheduling feature for repetitive task (refs #521)</Change>
 	</Changeset>
-	<Changeset component="org.gcube.vre-management.smart-executor-client.1.1.0" date="2015-08-31"> 
+    <Changeset component="org.gcube.vre-management.smart-executor-client.1.1.0" date="2015-12-09">
 		<Change>Added Recurrent and Scheduled Task support (refs #111)</Change>
+		<Change>Saving Task Evolution on Persistence (CouchDB) (refs #89)</Change>
 	</Changeset>
-	<Changeset component="org.gcube.vre-management.smart-executor-client.1.0.0" date="2015-02-05"> 
-		<Change>First Release</Change>
+	<Changeset component="org.gcube.vre-management.smart-executor-client.1.0.0" date="2015-02-05">
+		<Change>First Release</Change>	
 	</Changeset>
 </ReleaseNotes>
\ No newline at end of file
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
index c468f13..089683d 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -15,34 +15,17 @@
 			<includes>
 				<include>README</include>
 				<include>LICENSE</include>
-				<include>INSTALL</include>
-				<include>MAINTAINERS</include>
 				<include>changelog.xml</include>
+				<include>profile.xml</include>
 			</includes>
 			<fileMode>755</fileMode>
 			<filtered>true</filtered>
 		</fileSet>
-		<fileSet>
-			<directory>target/apidocs</directory>
-			<outputDirectory>/${artifactId}/doc/api</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<fileMode>755</fileMode>
-		</fileSet>
 	</fileSets>
 	<files>
-		<file>
-			<source>${distroDirectory}/profile.xml</source>
-			<outputDirectory>./</outputDirectory>
-			<filtered>true</filtered>
-		</file>
 		<file>
 			<source>target/${build.finalName}.jar</source>
 			<outputDirectory>/${artifactId}</outputDirectory>
 		</file>
-		<file>
-			<source>${distroDirectory}/svnpath.txt</source>
-			<outputDirectory>/${artifactId}</outputDirectory>
-			<filtered>true</filtered>
-		</file>
 	</files>
 </assembly>
\ No newline at end of file
diff --git a/distro/profile.xml b/distro/profile.xml
index 307711e..8e2f055 100644
--- a/distro/profile.xml
+++ b/distro/profile.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Resource>
 	<ID />
-	<Type>Library</Type>
+	<Type>Service</Type>
 	<Profile>
-		<Description>{description}</Description>
-		<Class>${serviceClass}</Class>
+	    <Description>${description}</Description>
+		<Class>VREManagement</Class>
 		<Name>${artifactId}</Name>
 		<Version>1.0.0</Version>
 		<Packages>
 			<Software>
-				<Description>{description}</Description>
+				<Description>${description}</Description>
 				<Name>${artifactId}</Name>
 				<Version>${version}</Version>
 				<MavenCoordinates>
@@ -17,7 +17,7 @@
 					<artifactId>${artifactId}</artifactId>
 					<version>${version}</version>
 				</MavenCoordinates>
-				<Type>Library</Type>
+				<Type>library</Type>
 				<Files>
 					<File>${build.finalName}.jar</File>
 				</Files>
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