diff --git a/pom.xml b/pom.xml
index 5b1c8ab..600a586 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>species-discovery</artifactId>
 	<packaging>war</packaging>
-	<version>3.4.0-SNAPSHOT</version>
+	<version>3.5.0-SNAPSHOT</version>
 	<name>gCube Species Discovery</name>
 	<description>
 		gCube Species Discovery Portlet lets the users discovery species information from the Species Service.
@@ -134,17 +134,18 @@
 			<scope>provided</scope>
 		</dependency>
 
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.gcube.contentmanagement</groupId> -->
-<!-- 			<artifactId>storage-resource-link-plugin</artifactId> -->
-<!-- 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
-<!-- 			<scope>provided</scope> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.gcube.contentmanagement</groupId> -->
+		<!-- <artifactId>storage-resource-link-plugin</artifactId> -->
+		<!-- <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
+		<!-- <scope>provided</scope> -->
+		<!-- </dependency> -->
 
 		<!-- WSLT dependencies -->
 		<dependency>
-			<groupId>org.gcube.portlets.user</groupId>
+			<groupId>org.gcube.portlets.widgets</groupId>
 			<artifactId>workspace-light-tree</artifactId>
+			<version>[2.13.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -184,6 +185,7 @@
 			<!-- <scope>provided</scope> -->
 		</dependency>
 
+
 		<dependency>
 			<groupId>com.sencha.gxt</groupId>
 			<artifactId>gxt</artifactId>
@@ -206,7 +208,6 @@
 		</dependency>
 		<!-- END FWS -->
 
-
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>gcube-widgets</artifactId>
@@ -230,19 +231,6 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- <dependency> -->
-		<!-- <groupId>org.gcube.portlets.user</groupId> -->
-		<!-- <artifactId>home-library</artifactId> -->
-		<!-- <version>[4.3.0-SNAPSHOT, 5.0.0-SNAPSHOT)</version> -->
-		<!-- <scope>provided</scope> -->
-		<!-- </dependency> -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.gcube.portlets.user</groupId> -->
-		<!-- <artifactId>home-library-jcr</artifactId> -->
-		<!-- <version>[1.3.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
-		<!-- <scope>provided</scope> -->
-		<!-- </dependency> -->
-
 		<!-- HOME LIBRARY -->
 		<dependency>
 			<groupId>org.gcube.common</groupId>
diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/ConstantsSpeciesDiscovery.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/ConstantsSpeciesDiscovery.java
index fb0719e..00e2c56 100644
--- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/ConstantsSpeciesDiscovery.java
+++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/ConstantsSpeciesDiscovery.java
@@ -12,7 +12,6 @@ public final class ConstantsSpeciesDiscovery {
 	public static final String RANK = "Rank";
 //	public static final String GROUPEDIDLIST = "GroupedIDList";
 	
-	
 	//USED IN CLASSIFICATION FILTER
 	public static final String BIOTACLASSID = "BiotaID";
 	public static final String BIOTACLASS = "Biota";
diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SearchController.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SearchController.java
index 59089e1..31b8e74 100644
--- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SearchController.java
+++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SearchController.java
@@ -94,12 +94,12 @@ import org.gcube.portlets.user.speciesdiscovery.shared.SpeciesCapability;
 import org.gcube.portlets.user.speciesdiscovery.shared.TaxonomyRow;
 import org.gcube.portlets.user.speciesdiscovery.shared.filter.ResultFilter;
 import org.gcube.portlets.user.speciesdiscovery.shared.util.SearchTermValidator;
-import org.gcube.portlets.user.workspace.lighttree.client.ItemType;
-import org.gcube.portlets.user.workspace.lighttree.client.event.DataLoadEvent;
-import org.gcube.portlets.user.workspace.lighttree.client.event.DataLoadHandler;
-import org.gcube.portlets.user.workspace.lighttree.client.event.PopupEvent;
-import org.gcube.portlets.user.workspace.lighttree.client.event.PopupHandler;
-import org.gcube.portlets.user.workspace.lighttree.client.save.WorkspaceLightTreeSavePopup;
+import org.gcube.portlets.widgets.lighttree.client.ItemType;
+import org.gcube.portlets.widgets.lighttree.client.event.DataLoadEvent;
+import org.gcube.portlets.widgets.lighttree.client.event.DataLoadHandler;
+import org.gcube.portlets.widgets.lighttree.client.event.PopupEvent;
+import org.gcube.portlets.widgets.lighttree.client.event.PopupHandler;
+import org.gcube.portlets.widgets.lighttree.client.save.WorkspaceLightTreeSavePopup;
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.extjs.gxt.ui.client.data.BaseModelData;
@@ -936,7 +936,7 @@ public class SearchController {
 
 			public void onPopup(PopupEvent event) {
 				if (!event.isCanceled()){
-					org.gcube.portlets.user.workspace.lighttree.client.Item destinationFolder = event.getSelectedItem();
+					org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
 					final String name = event.getName();
 					
 					Info.display("Saving in progress", "...");	
@@ -1009,7 +1009,7 @@ public class SearchController {
 
 					public void onPopup(PopupEvent event) {
 						if (!event.isCanceled()){
-							org.gcube.portlets.user.workspace.lighttree.client.Item destinationFolder = event.getSelectedItem();
+							org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
 							final String name = event.getName();
 							
 							Info.display("Saving in progress", "...");	
@@ -1067,7 +1067,7 @@ public class SearchController {
 
 			public void onPopup(PopupEvent event) {
 				if (!event.isCanceled()){
-					org.gcube.portlets.user.workspace.lighttree.client.Item destinationFolder = event.getSelectedItem();
+					org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
 					final String name = event.getName();
 					
 					Info.display("Saving in progress", "...");	
@@ -1153,7 +1153,7 @@ public class SearchController {
 
 					public void onPopup(PopupEvent event) {
 						if (!event.isCanceled()){
-							org.gcube.portlets.user.workspace.lighttree.client.Item destinationFolder = event.getSelectedItem();
+							org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
 							final String name = event.getName();
 							
 							Info.display("Saving in progress", "...");	
@@ -1236,7 +1236,7 @@ public class SearchController {
 
 			public void onPopup(PopupEvent event) {
 				if (!event.isCanceled()){
-					org.gcube.portlets.user.workspace.lighttree.client.Item destinationFolder = event.getSelectedItem();
+					org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
 					final String name = event.getName();
 					
 					Info.display("Saving in progress", "...");	
@@ -1330,7 +1330,7 @@ public class SearchController {
 
 			public void onPopup(PopupEvent event) {
 				if (!event.isCanceled()){
-					org.gcube.portlets.user.workspace.lighttree.client.Item destinationFolder = event.getSelectedItem();
+					org.gcube.portlets.widgets.lighttree.client.Item destinationFolder = event.getSelectedItem();
 					final String name = event.getName();
 					
 					Info.display("Saving in progress", "...");	
diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/cluster/TabItemForTaxonomyRow.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/cluster/TabItemForTaxonomyRow.java
index 477edb7..4109b3b 100644
--- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/cluster/TabItemForTaxonomyRow.java
+++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/cluster/TabItemForTaxonomyRow.java
@@ -139,7 +139,7 @@ public class TabItemForTaxonomyRow {
 		
 		//FOR DEBUG
 //		TaxonomyRow printParent = taxonomyItem;
-		System.out.println("Load child of item name: " + parentName + " parent id: " + taxonomyItem.getServiceId());
+//		System.out.println("Load child of item name: " + parentName + " parent id: " + taxonomyItem.getServiceId());
 //		while(printParent!=null){
 //			
 //			System.out.println("Parent Name: " + printParent.getName() + " parent id: " +printParent.getServiceId());
diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/TaxonomySearchServiceImpl.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/TaxonomySearchServiceImpl.java
index b2bf75a..6e50935 100644
--- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/TaxonomySearchServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/TaxonomySearchServiceImpl.java
@@ -26,11 +26,9 @@ import net.sf.csv4j.CSVWriter;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.gcube.application.framework.core.session.ASLSession;
-import org.gcube.common.homelibrary.home.HomeLibrary;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
 import org.gcube.common.homelibrary.util.WorkspaceUtil;
-import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.data.spd.model.products.OccurrencePoint;
 import org.gcube.data.spd.model.products.ResultElement;
 import org.gcube.data.spd.model.products.TaxonomyItem;
diff --git a/src/main/resources/org/gcube/portlets/user/speciesdiscovery/SpeciesDiscovery.gwt.xml b/src/main/resources/org/gcube/portlets/user/speciesdiscovery/SpeciesDiscovery.gwt.xml
index 6921145..2b3d2f2 100644
--- a/src/main/resources/org/gcube/portlets/user/speciesdiscovery/SpeciesDiscovery.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/speciesdiscovery/SpeciesDiscovery.gwt.xml
@@ -10,8 +10,8 @@
 	<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
 	<set-property name="log_DivLogger" value="DISABLED" />
 
-
-<!-- 	<inherits name='com.google.gwt.query.Query' /> -->
+	<inherits name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
+	<!-- <inherits name='com.google.gwt.query.Query' /> -->
 
 	<!-- Specify the app entry point class. -->
 	<entry-point
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 5e5c69b..e3b3ee3 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -40,7 +40,7 @@
 	<!-- Workspace Light Tree servlet -->
 	<servlet>
 		<servlet-name>WorkspaceLightService</servlet-name>
-		<servlet-class>org.gcube.portlets.user.workspace.lighttree.server.WorkspaceServiceImpl</servlet-class>
+		<servlet-class>org.gcube.portlets.widgets.lighttree.server.WorkspaceServiceImpl</servlet-class>
 	</servlet>
 
 	<servlet-mapping>