diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index 062e198..81ec451 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=/home/fedy2/workspace/tabular-data-portlet/target/tabular-data-portlet-1.0.0-SNAPSHOT
+lastWarOutDir=/home/giancarlo/workspace/tabular-data-portlet/target/tabular-data-portlet-1.0.0-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index ee70df4..ec3b4fb 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,27 +5,6 @@
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
     <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="td-importer-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/td-importer-widget/td-importer-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="td-csv-importer-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/td-csv-importer-widget/td-csv-importer-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="csv-import-wizard-gxt3-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/csv-import-wizard-gxt3/csv-import-wizard-gxt3">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="csv4j-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/csv4j-custom/csv4j-custom">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="csv-import-wizard-workspace-gxt3-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/csv-import-wizard-workspace-gxt3/csv-import-wizard-workspace-gxt3">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="workspace-light-tree-gxt3-2.9.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-light-tree-gxt3/workspace-light-tree-gxt3">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="sdmx-import-wizard-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/sdmx-import-wizard/sdmx-import-wizard">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="tabular-data-portlet"/>
   </wb-module>
diff --git a/TabularDataPortletTest-dev.launch b/TabularDataPortletTest-dev.launch
index 9d1e2b3..afcfc4b 100644
--- a/TabularDataPortletTest-dev.launch
+++ b/TabularDataPortletTest-dev.launch
@@ -7,10 +7,10 @@
 <stringAttribute key="com.google.gwt.eclipse.core.STYLE" value="OBFUSCATED"/>
 <stringAttribute key="com.google.gwt.eclipse.core.WEB_MODE" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/tabular-data-portlet/src/test/java/org/gcube/portlets/user/td/client/GwtTestTabularDataPortlet.java"/>
+<listEntry value="/tabular-data-portlet"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
+<listEntry value="4"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
diff --git a/TabularDataPortletTest-prod.launch b/TabularDataPortletTest-prod.launch
index 35eacdb..98710e1 100644
--- a/TabularDataPortletTest-prod.launch
+++ b/TabularDataPortletTest-prod.launch
@@ -7,10 +7,10 @@
 <stringAttribute key="com.google.gwt.eclipse.core.STYLE" value="OBFUSCATED"/>
 <stringAttribute key="com.google.gwt.eclipse.core.WEB_MODE" value="true"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/tabular-data-portlet/src/test/java/org/gcube/portlets/user/td/client/GwtTestTabularDataPortlet.java"/>
+<listEntry value="/tabular-data-portlet"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
+<listEntry value="4"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
diff --git a/pom.xml b/pom.xml
index 3a66974..302a5a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,10 +49,17 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
+			<scope>runtime</scope>
 		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.slf4j</groupId> -->
+		<!-- <artifactId>slf4j-log4j12</artifactId> -->
+		<!-- <scope>runtime</scope> -->
+		<!-- </dependency> -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.0.1</version>
 			<scope>runtime</scope>
 		</dependency>
 
@@ -77,7 +84,11 @@
 		</dependency>
 
 
-
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>workspace-light-tree-gxt3</artifactId>
+			<version>2.9.1-SNAPSHOT</version>
+		</dependency>
 		<!-- WORKSPACE -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
@@ -90,6 +101,12 @@
 		</dependency>
 
 		<!-- TABULAR DATA WIDGET -->
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>tabular-data-widget</artifactId>
+			<version>[1.1.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+			<classifier>sources</classifier>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>tabular-data-widget</artifactId>
@@ -102,6 +119,12 @@
 			<artifactId>td-importer-widget</artifactId>
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT]</version>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>td-importer-widget</artifactId>
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT]</version>
+			<classifier>sources</classifier>
+		</dependency>
 
 		<!-- CSV IMPORTER WIDGET -->
 		<dependency>
@@ -109,12 +132,31 @@
 			<artifactId>td-csv-importer-widget</artifactId>
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT]</version>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>td-csv-importer-widget</artifactId>
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT]</version>
+			<classifier>sources</classifier>
+		</dependency>
 
 		<!-- SDMX IMPORT WIZARD -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>sdmx-import-wizard</artifactId>
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+			<!-- <classifier>sources</classifier> -->
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>log4j-over-slf4j</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>sdmx-import-wizard</artifactId>
+			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+			<classifier>sources</classifier>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@@ -122,8 +164,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-
-
 
 	</dependencies>
 
@@ -168,15 +208,6 @@
 					<webappDirectory>${webappDirectory}</webappDirectory>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml
index b0e0a8e..b5de836 100644
--- a/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml
@@ -10,7 +10,8 @@
 	<inherits name="org.gcube.portlets.user.tdw.TabularDataWidget" />
 	<inherits name='org.gcube.portlets.user.sdmximportwizard.sdmximportwizard' />
 	<inherits name='org.gcube.portlets.user.td.ciw.csvimporterwidget' />
-
+<!--     <inherits name='org.gcube.portlets.user.workspace.lighttree.WorkspacePortletLightTree' /> -->
+	
 	<!-- Specify the app entry point class. -->
 	<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />