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 632a1bc..ed2b585 100644
--- a/distro/README
+++ b/distro/README
@@ -1,28 +1,65 @@
-The gCube System - Accounting Common Library
-------------------------------------------------------------
-
-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), 
-and 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
-------------------------
-
-v 1.0, 30/09/2015 
-  
-
-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
+--------------------------------------------------
+ 
+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}/Accounting_Analytics
+ 
+ 
+Documentation 
+--------------------------------------------------
+ 
+Documentation is available on-line in the gCube Wiki:
+    ${gcube.wikiRoot}/Accounting_Analytics
+ 
+ 
+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/changelog.xml b/distro/changelog.xml
index 1ec01ad..dbbfff1 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,5 +1,14 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.accounting.accounting-analytics.1-0-0" date="2015-09-30">
+	<Changeset component="org.gcube.accounting.accounting-analytics.2-0-0" date="${buildDate}">
+		<Change>Reoganized API and added new API to get top values #2253</Change>
+	</Changeset>
+   <Changeset component="org.gcube.accounting.accounting-analytics.1-2-0" date="2015-04-08">
+		<Change>Ready for ScopeProvider Removal #2194</Change>
+	</Changeset>
+   <Changeset component="org.gcube.accounting.accounting-analytics.1-1-0" date="2015-02-08">
+		<Change>Internal Changes due to Accounting Lib generalization #1746</Change>
+	</Changeset>
+	<Changeset component="org.gcube.accounting.accounting-analytics.1-0-0" date="2015-12-09">
 		<Change>First Release</Change>
 	</Changeset>
 </ReleaseNotes>
\ No newline at end of file
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
index 21d8c88..089683d 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -15,28 +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>
 	</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 70d3ede..014ca47 100644
--- a/distro/profile.xml
+++ b/distro/profile.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Resource>
-	<ID></ID>
+	<ID />
 	<Type>Service</Type>
 	<Profile>
-		<Class>Accounting</Class>
-		<Name>${artifactId}</Name>
 		<Description>${description}</Description>
+		<Class>${serviceClass}</Class>
+		<Name>${artifactId}</Name>
 		<Version>1.0.0</Version>
 		<Packages>
 			<Software>
-				<Description>${description}</Description>
 				<Name>${artifactId}</Name>
 				<Version>${version}</Version>
 				<MavenCoordinates>
@@ -17,7 +16,6 @@
 					<artifactId>${artifactId}</artifactId>
 					<version>${version}</version>
 				</MavenCoordinates>
-				<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 dcd0d22..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 3bb0ee2..8cb009e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,13 @@
 	<artifactId>accounting-analytics</artifactId>
 	<version>2.0.0-SNAPSHOT</version>
 	<name>accounting-analytics</name>
-
+	
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<distroDirectory>${project.basedir}/distro</distroDirectory>
+		<serviceClass>Accounting</serviceClass>
+	</properties>
+	
 	<scm>
 		<connection>scm:https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/${project.artifactId}</connection>
 		<developerConnection>scm:https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/${project.artifactId}</developerConnection>