diff --git a/distro/LICENSE b/distro/LICENSE
deleted file mode 100644
index cdf50bd..0000000
--- a/distro/LICENSE
+++ /dev/null
@@ -1,4 +0,0 @@
-gCube System - License
-------------------------------------------------------------
-
-${gcube.license}
\ No newline at end of file
diff --git a/distro/README b/distro/README
deleted file mode 100644
index fd496db..0000000
--- a/distro/README
+++ /dev/null
@@ -1,67 +0,0 @@
-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).
-* Lucio Lelii (lucio.lelii-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}/
- 
- 
-Documentation 
---------------------------------------------------
- 
-Documentation is available on-line in the gCube Wiki:
-    ${gcube.wikiRoot}/
- 
- 
-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
deleted file mode 100644
index 59dfe8a..0000000
--- a/distro/changelog.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<ReleaseNotes>
-	<Changeset component="org.gcube.distribution.maven-smartgears-bom.2-0-2" date="${buildDate}">
-		<Change>Dependencies are imported form gcube-bom and gcube-smartgears-bom to avoid misalignment</Change>
-	</Changeset>
-	<Changeset component="org.gcube.distribution.maven-smartgears-bom.1-0-0" date="">
-		<Change>First Release</Change>
-	</Changeset>
-</ReleaseNotes>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 30e91d7..82dd747 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
@@ -9,204 +8,12 @@
 	</parent>
 	<groupId>org.gcube.distribution</groupId>
 	<artifactId>maven-smartgears-bom</artifactId>
-	<version>2.0.2-SNAPSHOT</version>
+	<version>2.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Maven BOM for the Smartgears FW</name>
 
-	<properties>
-		<jackson.version>2.6.0</jackson.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<distroDirectory>distro</distroDirectory>
-	</properties>
-
 	<dependencyManagement>
 		<dependencies>
-		<!-- Imports -->
-			<dependency>
-				<groupId>org.gcube.distribution</groupId>
-				<artifactId>gcube-bom</artifactId>
-				<version>LATEST</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.distribution</groupId>
-				<artifactId>gcube-smartgears-bom</artifactId>
-				<version>LATEST</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		<!-- END Imports -->
-
-		<!-- Dependencies declared in gcube-bom -->
-			<dependency>
-				<groupId>org.gcube.core</groupId>
-				<artifactId>common-encryption</artifactId>
-				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.resources</groupId>
-				<artifactId>common-gcore-resources</artifactId>
-				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.core</groupId>
-				<artifactId>common-gcore-stubs</artifactId>
-				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.core</groupId>
-				<artifactId>common-scope</artifactId>
-				<version>[1.0.0-SNAPSHOT,  2.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.core</groupId>
-				<artifactId>common-scope-maps</artifactId>
-				<version>[1.0.0-SNAPSHOT,  2.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.resources</groupId>
-				<artifactId>registry-publisher</artifactId>
-				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.resources.discovery</groupId>
-				<artifactId>ic-client</artifactId>
-				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.resources.discovery</groupId>
-				<artifactId>discovery-client</artifactId>
-				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<!-- Facets Based Resource Model related dependencies -->
-			<dependency>
-				<groupId>org.gcube.information-system</groupId>
-				<artifactId>information-system-model</artifactId>
-				<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.resource-management</groupId>
-				<artifactId>gcube-model</artifactId>
-				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.information-system</groupId>
-				<artifactId>resource-registry-publisher</artifactId>
-				<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.information-system</groupId>
-				<artifactId>resource-registry-client</artifactId>
-				<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<!-- END Facets Based Resource Model related dependencies -->
-			<!-- Clients Related Dependencies -->
-			<dependency>
-				<groupId>org.gcube.core</groupId>
-				<artifactId>common-generic-clients</artifactId>
-				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.core</groupId>
-				<artifactId>common-gcube-calls</artifactId>
-				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.core</groupId>
-				<artifactId>common-jaxws-calls</artifactId>
-				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<!-- REMOVED <dependency>
-				<groupId>org.gcube.core</groupId>
-				<artifactId>common-clients</artifactId>
-				<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency> -->
-			<dependency>
-				<groupId>org.gcube.core</groupId>
-				<artifactId>common-fw-clients</artifactId>
-				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.common</groupId>
-				<artifactId>gxHTTP</artifactId>
-				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<!-- END Clients Related Dependencies -->
-			<!-- Authorization Related Dependencies -->
-			<dependency>
-				<groupId>org.gcube.common</groupId>
-				<artifactId>authorization-client</artifactId>
-				<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.common</groupId>
-				<artifactId>common-authorization</artifactId>
-				<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<!-- END Authorization Related Dependencies -->
-			<!-- Accounting Related Dependencies -->
-			<dependency>
-				<groupId>org.gcube.data.publishing</groupId>
-				<artifactId>document-store-lib</artifactId>
-				<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.gcube.accounting</groupId>
-				<artifactId>accounting-lib</artifactId>
-				<version>[3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT)</version>
-				<scope>provided</scope>
-			</dependency>
-			<!-- END Accounting Related Dependencies -->
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-api</artifactId>
-				<version>1.7.25</version>
-				<scope>provided</scope>
-			</dependency>
-			<!-- Jackson -->
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-databind</artifactId>
-				<version>${jackson.version}</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-annotations</artifactId>
-				<version>${jackson.version}</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-core</artifactId>
-				<version>${jackson.version}</version>
-				<scope>provided</scope>
-			</dependency>
-			<!-- END Jackson -->
-		<!-- END Dependencies declared in gcube-bom -->
-		<!-- Dependencies declared in gcube-smartgears-bom -->
 			<dependency>
 				<groupId>org.gcube.core</groupId>
 				<artifactId>common-smartgears</artifactId>
@@ -221,7 +28,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.gcube.core</groupId>
-				<artifactId>common-smartgears-utils</artifactId>
+				<artifactId>common-encryption</artifactId>
 				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 				<scope>provided</scope>
 			</dependency>
@@ -237,13 +44,86 @@
 				<version>[1.0.0-SNAPSHOT,  2.0.0-SNAPSHOT)</version>
 				<scope>provided</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.gcube.resources</groupId>
+				<artifactId>common-gcore-resources</artifactId>
+				<version>[1.0.0-SNAPSHOT,  2.0.0-SNAPSHOT)</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.gcube.resources</groupId>
+				<artifactId>registry-publisher</artifactId>
+				<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.gcube.core</groupId>
+				<artifactId>common-gcore-stubs</artifactId>
+				<version>[1.0.0-SNAPSHOT,  2.0.0-SNAPSHOT)</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.gcube.core</groupId>
+				<artifactId>common-scope</artifactId>
+				<version>[1.0.0-SNAPSHOT,  2.0.0-SNAPSHOT)</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.gcube.core</groupId>
+				<artifactId>common-scope-maps</artifactId>
+				<version>[1.0.0-SNAPSHOT,  2.0.0-SNAPSHOT)</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.gcube.resources.discovery</groupId>
+				<artifactId>ic-client</artifactId>
+				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.gcube.resources.discovery</groupId>
+				<artifactId>discovery-client</artifactId>
+				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+				<scope>provided</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.gcube.core</groupId>
 				<artifactId>common-validator</artifactId>
 				<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 				<scope>provided</scope>
 			</dependency>
-		<!-- END Dependencies declared in gcube-smartgears-bom -->
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-api</artifactId>
+				<version>1.7.5</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.gcube.common</groupId>
+				<artifactId>authorization-client</artifactId>
+				<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
+				<scope>provided</scope>
+			</dependency>
+
+			<dependency>
+				<groupId>org.gcube.common</groupId>
+				<artifactId>common-authorization</artifactId>
+				<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
+				<scope>provided</scope>
+			</dependency>
+
+			<dependency>
+				<groupId>org.gcube.data.publishing</groupId>
+				<artifactId>document-store-lib</artifactId>
+				<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
+			</dependency>
+			<dependency>
+				<groupId>org.gcube.accounting</groupId>
+				<artifactId>accounting-lib</artifactId>
+				<version>[3.0.0-SNAPSHOT,4.0.0-SNAPSHOT)</version>
+				<scope>provided</scope>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>
 </project>
\ No newline at end of file