diff --git a/pom.xml b/pom.xml
index 1044e81..89864d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,12 +165,35 @@
 		</dependency>
 		
 		-->
+		
+		<!-- Apache Common Library -->
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.googlecode.juniversalchardet</groupId>
+			<artifactId>juniversalchardet</artifactId>
+			<version>1.0.3</version>
+		</dependency>
+
+		<!-- csv4j -->
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>csv4j</artifactId>
+			<version>[1.2.0-SNAPSHOT, 2.0.0-common)</version>
+		</dependency>		
 
 		<!-- CSV IMPORT WIZARD -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>CSVImportWizardTD</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
+			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
 		
 		<!-- SDMX IMPORT WIZARD -->
@@ -235,10 +258,9 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<!-- <scope>compile</scope> -->
 		</dependency>
-		<!-- <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> 
-			<version>1.0.1</version> <scope>runtime</scope> </dependency> -->
+		
+		
 		<!-- JUnit TEST -->
 		<dependency>
 			<groupId>junit</groupId>
@@ -282,9 +304,9 @@
 				<executions>
 					<execution>
 						<phase>compile</phase>
-						<goals>
+						<!--  <goals>
 							<goal>exploded</goal>
-						</goals>
+						</goals>-->
 					</execution>
 				</executions>
 				<configuration>
@@ -323,6 +345,4 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-
-
 </project>
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 d700929..ddbdef8 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
@@ -6,7 +6,8 @@
 	<!-- Other module inherits -->
 	<inherits name='com.sencha.gxt.ui.GXT' />
 	<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
-
+	<inherits name="com.google.gwt.resources.Resources" />
+		
 	<inherits name="org.gcube.portlets.user.tdw.TabularDataWidget" />
 	
 	<!-- <inherits name='org.gcube.portlets.user.td.ciw.csvimporterwidget' /> -->
@@ -26,7 +27,7 @@
 	<!-- Specify the app entry point class. -->
 	<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
 
-	<set-property name="log_DivLogger" value="DISABLED" />
+	<set-property name="log_DivLogger" value="ENABLED" />
 	<set-property name="log_ConsoleLogger" value="ENABLED" />
 	<set-property name="log_FirebugLogger" value="ENABLED" />
 	<set-property name="log_GWTLogger" value="ENABLED" />
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 64b8f22..1c46cab 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -28,24 +28,18 @@
 		<servlet-name>TDGXTService</servlet-name>
 		<servlet-class>org.gcube.portlets.user.td.gxtservice.server.TDGXTServiceImpl</servlet-class>
 	</servlet>
-	
-	
-	
+		
 	<!-- CSV IMPORT WIZARD -->
 	<servlet>
-		<servlet-name>CSVImportService</servlet-name>
-		<servlet-class>org.gcube.portlets.user.csvimportwizardgxt3.server.CSVImportServiceImpl</servlet-class>
+		<servlet-name>CSVImportFileServlet</servlet-name>
+		<servlet-class>org.gcube.portlets.user.td.service.server.CSVImportFileServlet</servlet-class>
 	</servlet>
-
+	
 	<servlet>
 		<servlet-name>LocalUploadServlet</servlet-name>
-		<servlet-class>org.gcube.portlets.user.csvimportwizardgxt3.server.local.LocalUploadServlet</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>CSVServlet</servlet-name>
-		<servlet-class>org.gcube.portlets.user.csvimportwizardgxt3.server.CSVServlet</servlet-class>
+		<servlet-class>org.gcube.portlets.user.td.service.server.LocalUploadServlet</servlet-class>
 	</servlet>
+	
 
 	<!-- Workspace Light Tree -->
 	<servlet>
@@ -65,10 +59,6 @@
 		<servlet-class>org.gcube.portlets.user.workspace.server.DownloadServlet</servlet-class>
 	</servlet>
 	
-	<servlet>
-		<servlet-name>imageServlet</servlet-name>
-		<servlet-class>org.gcube.portlets.user.workspace.server.ImageServlet</servlet-class>
-	</servlet>
 
 	<servlet>
 		<servlet-name>gWTWorkspaceServiceImpl</servlet-name>
@@ -113,25 +103,22 @@
 	
 
 	<!-- CSV IMPORT WIZARD -->
-	<servlet-mapping>
-		<servlet-name>CSVImportService</servlet-name>
-		<url-pattern>/tabulardataportlet/CSVImportService</url-pattern>
+		<servlet-mapping>
+		<servlet-name>CSVImportFileServlet</servlet-name>
+		<url-pattern>/tabulardataportlet/CSVImportFileServlet</url-pattern>
 	</servlet-mapping>
 	
+	<servlet-mapping>
+		<servlet-name>LocalUploadServlet</servlet-name>
+		<url-pattern>/tabulardataportlet/LocalUploadServlet</url-pattern>
+	</servlet-mapping>
+	
+	
 	<servlet-mapping>
 		<servlet-name>imageServlet</servlet-name>
 		<url-pattern>/tabulardataportlet/ImageService</url-pattern>
 	</servlet-mapping>
 
-	<servlet-mapping>
-		<servlet-name>LocalUploadServlet</servlet-name>
-		<url-pattern>/tabulardataportlet/LocalUploadServlet</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>CSVServlet</servlet-name>
-		<url-pattern>/tabulardataportlet/CSVServlet</url-pattern>
-	</servlet-mapping>
 
 	<!-- Workspace Light Tree -->
 	<servlet-mapping>
@@ -155,10 +142,6 @@
 		<url-pattern>/tabulardataportlet/WorkspaceService</url-pattern>
 	</servlet-mapping>
 
-	<servlet-mapping>
-		<servlet-name>imageServlet</servlet-name>
-		<url-pattern>/tabulardataportlet/ImageService</url-pattern>
-	</servlet-mapping>
 
 	<servlet-mapping>
 		<servlet-name>uploadServlet</servlet-name>
diff --git a/src/main/webapp/icon.png b/src/main/webapp/icon.png
new file mode 100644
index 0000000..432066c
Binary files /dev/null and b/src/main/webapp/icon.png differ
diff --git a/src/test/java/org/gcube/portlets/user/td/TestManager.java b/src/test/java/org/gcube/portlets/user/td/TestManager.java
deleted file mode 100644
index 8bb586c..0000000
--- a/src/test/java/org/gcube/portlets/user/td/TestManager.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * 
- */
-package org.gcube.portlets.user.td;
-
-import org.gcube.portlets.user.td.importer.server.TabularDataImporter;
-import org.gcube.portlets.user.td.importer.server.TabularDataImporterManager;
-
-/**
- * @author "Federico De Faveri defaveri@isti.cnr.it"
- *
- */
-public class TestManager {
-
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		TabularDataImporterManager importerManager = new TabularDataImporterManager();
-		//importerManager.scanAvailableImporters();
-		
-		System.out.println("Importers:");
-		for (TabularDataImporter importer:importerManager.getImporters()) System.out.println(importer.getName());
-		
-	}
-
-}