diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index fecffa8..6fbb2ac 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,6 +5,12 @@
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <dependent-module archiveName="workspace-tree-widget-6.11.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget-TRUNK/workspace-tree-widget-TRUNK">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="workspace-uploader-1.1.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-uploader-TRUNK/workspace-uploader-TRUNK">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
 
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="workspace"/>
diff --git a/pom.xml b/pom.xml
index a686800..782d0d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>workspace</artifactId>
 	<packaging>war</packaging>
-	<version>6.11.0-SNAPSHOT</version>
+	<version>6.12.0-SNAPSHOT</version>
 	<name>gCube Workspace Portlet</name>
 	<description>
 		gCube Workspace Portlet is a web-gui to manage the gCube workspace a collaborative area where users can exchange and organize information objects (workspace items) according to their specific needs. 
@@ -41,7 +41,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>LATEST</version>
+				<version>2.6.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 				<exclusions>
@@ -56,18 +56,17 @@
 				</exclusions>
 			</dependency>
 		</dependencies>
-
 	</dependencyManagement>
 
 	<dependencies>
 
 		<!-- UNCOMMENT THIS TO RUN IN DEVO MODE -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>xerces</groupId> -->
-<!-- 			<artifactId>xerces</artifactId> -->
-<!-- 			<version>2.4.0</version> -->
-<!-- 		</dependency> -->
-		
+		<!-- <dependency> -->
+		<!-- <groupId>xerces</groupId> -->
+		<!-- <artifactId>xerces</artifactId> -->
+		<!-- <version>2.4.0</version> -->
+		<!-- </dependency> -->
+
 		<!-- This dependency is needed and is need on TOP to use GWT UI BInder 
 			without old Xerces version of gCore complaining -->
 		<dependency>
@@ -152,29 +151,23 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>workspace-tree-widget</artifactId>
+			<version>[6.0.0-SNAPSHOT, 7.0.0-SNAPSHOT)</version>
+			<scope>compile</scope>
+		</dependency>
+
+
 		<!-- HOME LIBRARY -->
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>home-library-model</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>home-library-jcr</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-			<scope>provided</scope>
-			<exclusions>
-				<exclusion>
-					<artifactId>asm-debug-all</artifactId>
-					<groupId>org.ow2.asm</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>home-library</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -183,6 +176,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>home-library-jcr</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>com.liferay.portal</groupId>
@@ -196,6 +194,14 @@
 			<scope>provided</scope>
 		</dependency>
 
+
+		<dependency>
+			<groupId>org.gcube.portlets.widgets</groupId>
+			<artifactId>wsmail-widget</artifactId>
+			<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<scope>compile</scope>
+		</dependency>
+
 		<!-- LOGGER -->
 		<dependency>
 			<groupId>log4j</groupId>
@@ -212,41 +218,6 @@
 			<scope>runtime</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.gcube.portlets.user</groupId>
-			<artifactId>workspace-tree-widget</artifactId>
-			<version>[6.0.0-SNAPSHOT, 7.0.0-SNAPSHOT)</version>
-			<scope>compile</scope>
-		</dependency>
-
-		<!-- WSLT dependencies -->
-		<dependency>
-			<groupId>org.gcube.portlets.widgets</groupId>
-			<artifactId>workspace-light-tree</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.gcube.portlets.widgets</groupId>
-			<artifactId>fileupload-progress-bar</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-			<scope>compile</scope>
-			<exclusions>
-				<exclusion>
-					<artifactId>gwt-user</artifactId>
-					<groupId>com.google.gwt</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.gcube.portlets.widgets</groupId>
-			<artifactId>wsmail-widget</artifactId>
-			<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-			<scope>compile</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java b/src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java
index 1537a60..38b448a 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java
@@ -14,7 +14,7 @@ import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.RootPanel;
 
 /**
- * 
+ *
  * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
  *
  */
@@ -22,15 +22,15 @@ public class WorkspacePortlet implements EntryPoint {
 	/**
 	 * This is the entry point method.
 	 */
-	
+
 	AppController appController;
-	
+
 	public void onModuleLoad() {
 
 		AppControllerExplorer appControllerExplorer = new AppControllerExplorer();
 		appController = new AppController(appControllerExplorer);
 		appController.go(RootPanel.get(ConstantsPortlet.WORKSPACEDIV));
-				
+
 		 Window.addResizeHandler(new ResizeHandler() {
              @Override
              public void onResize(ResizeEvent event) {
@@ -38,35 +38,35 @@ public class WorkspacePortlet implements EntryPoint {
                      updateSize();
              }
 		 });
-		 
+
 		 updateSize();
 		 showGuidedTour();
 	}
-	
+
 	/**
 	 * Update window size
 	 */
     public void updateSize(){
-    	
+
 	    RootPanel workspace = RootPanel.get(ConstantsPortlet.WORKSPACEDIV);
 	    int topBorder = workspace.getAbsoluteTop();
 	    int leftBorder = workspace.getAbsoluteLeft();
 	    int footer = 85; //footer is bottombar + sponsor
-	     
-//	    int rootHeight = (Window.getClientHeight() - topBorder - 4) ;// - ((footer == null)?0:(footer.getOffsetHeight()-15));    
+
+//	    int rootHeight = (Window.getClientHeight() - topBorder - 4) ;// - ((footer == null)?0:(footer.getOffsetHeight()-15));
 //	    if (rootHeight > 550)
 //	    	rootHeight = 550;
-	    
-	    int rootHeight = (Window.getClientHeight() - topBorder - 4 - footer);// - ((footer == null)?0:(footer.getOffsetHeight()-15));
+
+	    int rootHeight = Window.getClientHeight() - topBorder - 4 - footer;// - ((footer == null)?0:(footer.getOffsetHeight()-15));
 	    if (rootHeight < 550)
 	    	rootHeight = 550;
-	     
+
 	    int rootWidth = Window.getClientWidth() - 2* leftBorder; //- rightScrollBar;
 	    System.out.println("New workspace dimension Height: "+rootHeight+" Width: "+rootWidth);
 	    appController.getMainPanel().setHeight(rootHeight);
 	    appController.getMainPanel().setWidth(rootWidth);
     }
-    
+
 	private void showGuidedTour() {
 		GWT.runAsync(GCUBEGuidedTour.class, new RunAsyncCallback() {
 			public void onSuccess() {
diff --git a/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
index 46081ba..cf118b8 100644
--- a/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
@@ -18,13 +18,8 @@
 	<inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' />
 	<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />
 
-<!-- 	<inherits name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' /> -->
-
 	<inherits name='org.gcube.portlets.widgets.wsmail.WsMail_Widget' />
-
-	<inherits name='org.gcube.portlets.widgets.fileupload.FileUpload' />
 	<inherits name='org.gcube.portlets.widgets.sessionchecker.SessionChecker' />
-	
 	<inherits name="org.gcube.portlets.widgets.workspaceuploader.WorkspaceUploader"></inherits>
 	
 	<!-- Specify the app entry point class. -->
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 8a8b530..852085a 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -10,27 +10,11 @@
 		<welcome-file>WorkspacePortlet.html</welcome-file>
 	</welcome-file-list>
 
-
-	<!-- FILE UPLOAD WIDGET -->
-	<servlet>
-		<servlet-name>uploadprogress</servlet-name>
-		<servlet-class>org.gcube.portlets.widgets.fileupload.server.UploadProgressServlet</servlet-class>
-	</servlet>
-
-
-	<!-- DO NOT CHANGE - DO NOT Replace URL PATTERN HERE -->
-	<servlet>
-		<servlet-name>upload</servlet-name>
-		<servlet-class>org.gcube.portlets.widgets.fileupload.server.UploadServlet</servlet-class>
-	</servlet>
-
 	<servlet>
 		<servlet-name>workspacesharing</servlet-name>
 		<servlet-class>org.gcube.portlets.widgets.workspacesharingwidget.server.WorkspaceSharingServiceImpl</servlet-class>
 	</servlet>
 
-	<!-- END DO NOT CHANGE -->
-
 	<servlet>
 		<servlet-name>UploadService</servlet-name>
 		<servlet-class>org.gcube.portlets.user.workspace.server.UploadServlet</servlet-class>
@@ -63,7 +47,6 @@
 		<servlet-class>org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl</servlet-class>
 	</servlet>
 
-
 	<servlet>
 		<servlet-name>ImageService</servlet-name>
 		<servlet-class>org.gcube.portlets.user.workspace.server.ImageServlet</servlet-class>
@@ -89,7 +72,19 @@
 		<servlet-name>workspaceUploaderWsUtil</servlet-name>
 		<servlet-class>org.gcube.portlets.widgets.workspaceuploader.server.WorkspaceUploaderWsUtil</servlet-class>
 	</servlet>
-	
+
+	<servlet>
+		<servlet-name>jUnitHostImpl</servlet-name>
+		<servlet-class>com.google.gwt.junit.server.JUnitHostImpl</servlet-class>
+	</servlet>
+
+	<!-- Quick Tour -->
+	<servlet>
+		<servlet-name>quicktourServlet</servlet-name>
+		<servlet-class>org.gcube.portlets.widgets.guidedtour.server.TourServiceImpl</servlet-class>
+	</servlet>
+
+	<!-- ###################### MAPPING ######################à -->
 	<servlet-mapping>
 		<servlet-name>workspaceUploaderWsUtil</servlet-name>
 		<url-pattern>/workspace/workspaceUploaderWsUtil</url-pattern>
@@ -110,22 +105,16 @@
 		<url-pattern>/workspace/workspaceUploaderService</url-pattern>
 	</servlet-mapping>
 
-	<!-- END Servlets UploadServletStream -->
-
-	<servlet-mapping>
-		<servlet-name>ImageService</servlet-name>
-		<url-pattern>/workspace/ImageService</url-pattern>
-	</servlet-mapping>
-
 	<servlet-mapping>
 		<servlet-name>WorkspaceService</servlet-name>
 		<url-pattern>/workspace/WorkspaceService</url-pattern>
 	</servlet-mapping>
 
 	<servlet-mapping>
-		<servlet-name>uploadprogress</servlet-name>
-		<url-pattern>/workspace/uploadprogress</url-pattern>
+		<servlet-name>ImageService</servlet-name>
+		<url-pattern>/workspace/ImageService</url-pattern>
 	</servlet-mapping>
+
 	<servlet-mapping>
 		<servlet-name>checkServlet</servlet-name>
 		<url-pattern>/workspace/checksession</url-pattern>
@@ -136,17 +125,6 @@
 		<url-pattern>/workspace/mailWisdgetServlet</url-pattern>
 	</servlet-mapping>
 
-	<!-- Workspace Light Tree servlet -->
-	<servlet>
-		<servlet-name>WorkspaceLightService</servlet-name>
-		<servlet-class>org.gcube.portlets.widgets.lighttree.server.WorkspaceServiceImpl</servlet-class>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>WorkspaceLightService</servlet-name>
-		<url-pattern>/workspace/WorkspaceLightService</url-pattern>
-	</servlet-mapping>
-
 	<servlet-mapping>
 		<servlet-name>LocalUploadService</servlet-name>
 		<url-pattern>/workspace/LocalUploadService</url-pattern>
@@ -167,14 +145,7 @@
 		<url-pattern>/workspace/workspacesharing</url-pattern>
 	</servlet-mapping>
 
-	<servlet-mapping>
-		<servlet-name>upload</servlet-name>
-		<url-pattern>/FileUpload/upload</url-pattern>
-	</servlet-mapping>
-	<servlet>
-		<servlet-name>jUnitHostImpl</servlet-name>
-		<servlet-class>com.google.gwt.junit.server.JUnitHostImpl</servlet-class>
-	</servlet>
+
 	<servlet-mapping>
 		<servlet-name>jUnitHostImpl</servlet-name>
 		<url-pattern>/org.gcube.portlets.user.workspace.WorkspacePortletJUnit/junithost/*</url-pattern>
@@ -189,10 +160,10 @@
 		<url-pattern>/org.gcube.portlets.user.workspace.WorkspacePortletJUnit/DownloadService</url-pattern>
 	</servlet-mapping>
 
-	<servlet-mapping>
-		<servlet-name>WorkspaceService</servlet-name>
-		<url-pattern>/org.gcube.portlets.user.workspace.WorkspacePortletJUnit/WorkspaceService</url-pattern>
-	</servlet-mapping>
+	<!-- <servlet-mapping> -->
+	<!-- <servlet-name>WorkspaceService</servlet-name> -->
+	<!-- <url-pattern>/org.gcube.portlets.user.workspace.WorkspacePortletJUnit/WorkspaceService</url-pattern> -->
+	<!-- </servlet-mapping> -->
 
 	<servlet-mapping>
 		<servlet-name>ImageService</servlet-name>
@@ -203,11 +174,7 @@
 		<servlet-name>UploadService</servlet-name>
 		<url-pattern>/org.gcube.portlets.user.workspace.WorkspacePortletJUnit/UploadService</url-pattern>
 	</servlet-mapping>
-	<!-- Quick Tour -->
-	<servlet>
-		<servlet-name>quicktourServlet</servlet-name>
-		<servlet-class>org.gcube.portlets.widgets.guidedtour.server.TourServiceImpl</servlet-class>
-	</servlet>
+
 
 	<servlet-mapping>
 		<servlet-name>quicktourServlet</servlet-name>