diff --git a/.classpath b/.classpath
index 049ef28..71f6d8a 100644
--- a/.classpath
+++ b/.classpath
@@ -28,28 +28,10 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER/GWT (2)"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="/Users/massi/.p2/pool/plugins/com.google.gwt.eclipse.sdkbundle_2.7.0/gwt-2.7.0/gwt-user.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="file:/Users/massi/.p2/pool/plugins/com.google.gwt.eclipse.sdkbundle_2.7.0/gwt-2.7.0/doc/javadoc/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/Users/massi/.p2/pool/plugins/com.google.gwt.eclipse.sdkbundle_2.7.0/gwt-2.7.0/gwt-codeserver.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="file:/Users/massi/.p2/pool/plugins/com.google.gwt.eclipse.sdkbundle_2.7.0/gwt-2.7.0/doc/javadoc/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/Users/massi/.p2/pool/plugins/com.google.gwt.eclipse.sdkbundle_2.7.0/gwt-2.7.0/gwt-dev.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="file:/Users/massi/.p2/pool/plugins/com.google.gwt.eclipse.sdkbundle_2.7.0/gwt-2.7.0/doc/javadoc/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="/Users/massi/.p2/pool/plugins/com.google.gwt.eclipse.sdkbundle_2.7.0/gwt-2.7.0/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="lib" path="/Users/massi/.p2/pool/plugins/com.google.gwt.eclipse.sdkbundle_2.7.0/gwt-2.7.0/validation-api-1.0.0.GA.jar" sourcepath="/Users/massi/.p2/pool/plugins/com.google.gwt.eclipse.sdkbundle_2.7.0/gwt-2.7.0/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="output" path="target/workspace-6.17.4-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.project b/.project
index 80e7d94..ddeb7b2 100644
--- a/.project
+++ b/.project
@@ -40,6 +40,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>com.gwtplugins.gdt.eclipse.core.webAppProjectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.gwtplugins.gwt.eclipse.core.gwtProjectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -56,5 +66,6 @@
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 		<nature>com.google.gwt.eclipse.core.gwtNature</nature>
 		<nature>com.liferay.ide.core.liferayNature</nature>
+		<nature>com.gwtplugins.gwt.eclipse.core.gwtNature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
new file mode 100644
index 0000000..7afb0ad
--- /dev/null
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+lastWarOutDir=/home/francesco-mangiacrapa/eclipse-oxygen/workspace/target/workspace-6.17.4-SNAPSHOT
+warSrcDir=src/main/webapp
+warSrcDirIsOutput=false
diff --git a/.settings/com.gwtplugins.gwt.eclipse.core.prefs b/.settings/com.gwtplugins.gwt.eclipse.core.prefs
new file mode 100644
index 0000000..be2bff7
--- /dev/null
+++ b/.settings/com.gwtplugins.gwt.eclipse.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+T0JGVVNDQVRFRDwvb3V0cHV0LXN0eWxlPjxleHRyYS1hcmdzPjwhW0NEQVRBW11dPjwvZXh0cmEtYXJncz48dm0tYXJncz48IVtDREFUQVstWG14MWddXT48L3ZtLWFyZ3M+PGVudHJ5LXBvaW50LW1vZHVsZT5vcmcuZ2N1YmUucG9ydGxldHMudXNlci53b3Jrc3BhY2UuV29ya3NwYWNlUG9ydGxldDwvZW50cnktcG9pbnQtbW9kdWxlPjwvZ3d0LWNvbXBpbGUtc2V0dGluZ3M+
+gwtSyncCodeServer=true
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 7c53c84..2336a53 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-  <wb-module deploy-name="workspace-portlet">
+  <wb-module deploy-name="workspace-6.17.4-SNAPSHOT">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <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.19.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree">
+            <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/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index bd8876c..fb656ba 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -6,4 +6,5 @@
   <installed facet="liferay.portlet" version="6.0"/>
   <installed facet="jst.web" version="3.0"/>
   <installed facet="jst.jaxrs" version="2.0"/>
+  <installed facet="com.gwtplugins.gwt.facet" version="1.0"/>
 </faceted-project>
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/WorskpacePortlet.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/WorskpacePortlet.java
index 1390441..e0113f5 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/WorskpacePortlet.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/WorskpacePortlet.java
@@ -38,7 +38,7 @@ public class WorskpacePortlet {
 		this.listViewContainer = new GxtListView();
 		this.toolBarItemDetails = new GxtBottomToolBarItem();
 
-		this.gxtCardLayoutResultPanel = new GxtCardLayoutResultPanel(gridFilterGroupContainer, listViewContainer, toolBarItemDetails);
+		this.gxtCardLayoutResultPanel = new GxtCardLayoutResultPanel(gridFilterGroupContainer, listViewContainer, toolBarItemDetails, toolBarPathPanel);
 	}
 	
 	public WorskpacePortlet(ExplorerPanel expPanel, boolean activeGroup) {
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtCardLayoutResultPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtCardLayoutResultPanel.java
index bc0fc18..9c8f867 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtCardLayoutResultPanel.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtCardLayoutResultPanel.java
@@ -4,6 +4,7 @@ import org.gcube.portlets.user.workspace.client.ConstantsPortlet.ViewSwitchTypeI
 import org.gcube.portlets.user.workspace.client.view.GxtListView;
 import org.gcube.portlets.user.workspace.client.view.grids.GxtGridFilterGroupPanel;
 import org.gcube.portlets.user.workspace.client.view.toolbars.GxtBottomToolBarItem;
+import org.gcube.portlets.user.workspace.client.view.toolbars.GxtBreadcrumbPathPanel;
 import org.gcube.portlets.user.workspace.client.view.toolbars.GxtToolBarItemFunctionality;
 
 import com.extjs.gxt.ui.client.widget.ContentPanel;
@@ -26,21 +27,23 @@ public class GxtCardLayoutResultPanel extends LayoutContainer{
 	private ContentPanel activePanel = null;
 	private GxtToolBarItemFunctionality toolBarItemFunct;
 	private GxtBottomToolBarItem toolBarItemDetails;
+	private GxtBreadcrumbPathPanel breadcrumbPanel;
 
 	public GxtCardLayoutResultPanel(
 			GxtGridFilterGroupPanel gridFilterGroupContainer,
 			GxtListView listViewContainer,
-			GxtBottomToolBarItem toolBarItemDetails) {
+			GxtBottomToolBarItem toolBarItemDetails, GxtBreadcrumbPathPanel toolBarPathPanel) {
 		this.iconsViewContainer = listViewContainer;
 		this.gridGroupViewContainer = gridFilterGroupContainer;
 		this.toolBarItemDetails = toolBarItemDetails;
+		this.breadcrumbPanel = toolBarPathPanel;
 
 		instanceItemsPanel();
 
 	}
 
 	private void instanceItemsPanel(){
-		this.toolBarItemFunct = new GxtToolBarItemFunctionality(gridGroupViewContainer); //instance toolbar
+		this.toolBarItemFunct = new GxtToolBarItemFunctionality(gridGroupViewContainer, breadcrumbPanel); //instance toolbar
 		this.itemPanel = new GxtItemsPanel(iconsViewContainer, gridGroupViewContainer, toolBarItemFunct, toolBarItemDetails);
 	}
 
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtToolBarItemFunctionality.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtToolBarItemFunctionality.java
index f626cee..4233e8d 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtToolBarItemFunctionality.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtToolBarItemFunctionality.java
@@ -74,6 +74,7 @@ public class GxtToolBarItemFunctionality {
 	private Button btnPasteItem;
 	private Button btnCutItem;
 	private Button btnSetPermission;
+	private GxtBreadcrumbPathPanel breadcrumbPanel;
 
 	/**
 	 * Instantiates a new gxt tool bar item functionality.
@@ -87,10 +88,12 @@ public class GxtToolBarItemFunctionality {
 	 * Instantiates a new gxt tool bar item functionality.
 	 *
 	 * @param gridFilterGroupContainer the grid filter group container
+	 * @param breadcrumbPanel 
 	 */
-	public GxtToolBarItemFunctionality(GxtGridFilterGroupPanel gridFilterGroupContainer) {
+	public GxtToolBarItemFunctionality(GxtGridFilterGroupPanel gridFilterGroupContainer, GxtBreadcrumbPathPanel breadcrumbPanel) {
 		this();
 		this.gridGroupViewContainer = gridFilterGroupContainer;
+		this.breadcrumbPanel = breadcrumbPanel;
 	}
 
 	/**
@@ -390,11 +393,14 @@ public class GxtToolBarItemFunctionality {
 				final FileGridModel fileGridModel = gridGroupViewContainer.getSelectedItem();
 				FileModel parentTarget = getParentDirectory(fileGridModel);
 
-				if(parentTarget==null)
-					if(fileGridModel.isDirectory()){
-						GWT.log("Forcing internal pasting..");
-						parentTarget = fileGridModel;
-					}
+				if(parentTarget==null) {
+					parentTarget = breadcrumbPanel.getLastParent();
+					GWT.log("Target is breadcrumb folder: "+parentTarget);
+				}
+//					if(fileGridModel.isDirectory()){
+//						GWT.log("Forcing internal pasting..");
+//						parentTarget = fileGridModel;
+//					}
 
 
 				String parentId = null;