diff --git a/.classpath b/.classpath
index 98950fb..67a8039 100644
--- a/.classpath
+++ b/.classpath
@@ -34,16 +34,16 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/giancarlo/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/home/giancarlo/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA-sources.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 54826f7..970976d 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -5,7 +5,7 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 0e1ab07..68b4be5 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,7 +4,10 @@
         <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="tabular-data-sdmx-import-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-share-widget/tabular-data-share-widget">
+        <dependent-module archiveName="tabular-data-csv-import-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-csv-import-widget/tabular-data-csv-import-widget">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="tabular-data-gwt-service-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-gwt-service/tabular-data-gwt-service">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="context-root" value="tabular-data-portlet"/>
diff --git a/TabularDataPortletTest-dev.launch b/TabularDataPortletTest-dev.launch
deleted file mode 100644
index afcfc4b..0000000
--- a/TabularDataPortletTest-dev.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="com.google.gwt.eclipse.core.launch.gwtJUnit">
-<stringAttribute key="com.google.gwt.eclipse.core.LOG_LEVEL" value="INFO"/>
-<booleanAttribute key="com.google.gwt.eclipse.core.NOT_HEADLESS" value="false"/>
-<stringAttribute key="com.google.gwt.eclipse.core.OUT_DIR" value="www-test"/>
-<booleanAttribute key="com.google.gwt.eclipse.core.STANDARDS_MODE" value="false"/>
-<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"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gdt.eclipse.maven.mavenClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.gcube.portlets.user.td.client.GwtTestTabularDataPortlet"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tabular-data-portlet"/>
-</launchConfiguration>
diff --git a/TabularDataPortletTest-prod.launch b/TabularDataPortletTest-prod.launch
deleted file mode 100644
index 98710e1..0000000
--- a/TabularDataPortletTest-prod.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="com.google.gwt.eclipse.core.launch.gwtJUnit">
-<stringAttribute key="com.google.gwt.eclipse.core.LOG_LEVEL" value="INFO"/>
-<booleanAttribute key="com.google.gwt.eclipse.core.NOT_HEADLESS" value="false"/>
-<stringAttribute key="com.google.gwt.eclipse.core.OUT_DIR" value="www-test"/>
-<booleanAttribute key="com.google.gwt.eclipse.core.STANDARDS_MODE" value="false"/>
-<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"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gdt.eclipse.maven.mavenClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.gcube.portlets.user.td.client.GwtTestTabularDataPortlet"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tabular-data-portlet"/>
-</launchConfiguration>
diff --git a/lib/logback-classic-1.0.1.jar b/lib/logback-classic-1.0.1.jar
new file mode 100644
index 0000000..16be5a5
Binary files /dev/null and b/lib/logback-classic-1.0.1.jar differ
diff --git a/lib/slf4j-api-1.6.4.jar b/lib/slf4j-api-1.6.4.jar
new file mode 100644
index 0000000..76ef305
Binary files /dev/null and b/lib/slf4j-api-1.6.4.jar differ
diff --git a/lib/slf4j-simple-1.7.5.jar b/lib/slf4j-simple-1.7.5.jar
new file mode 100644
index 0000000..eca11dd
Binary files /dev/null and b/lib/slf4j-simple-1.7.5.jar differ
diff --git a/pom.xml b/pom.xml
index 8fcb47e..1f75add 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,6 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>tabular-data-portlet</artifactId>
 	<version>2.0.0-SNAPSHOT</version>
-	<packaging>war</packaging>
 
 	<name>tabular-data-portlet</name>
 	<description>tabular-data-portlet manages tabular data</description>
@@ -255,6 +254,14 @@
 		<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>
 
 
@@ -298,7 +305,7 @@
 					</execution>
 				</executions>
 				<configuration>
-					<runTarget>TabularDataPortlet.html</runTarget>
+					<runTarget>tabulardataportlet.html</runTarget>
 					<hostedWebapp>${webappDirectory}</hostedWebapp>
 					<module>org.gcube.portlets.user.td.tabulardataportlet</module>
 				</configuration>
@@ -314,23 +321,15 @@
 				<executions>
 					<execution>
 						<phase>compile</phase>
-						<!--  <goals>
-							<goal>exploded</goal>
-						</goals> -->
+						<!-- <goals> <goal>exploded</goal> </goals> -->
 					</execution>
 				</executions>
 				<configuration>
 					<webappDirectory>${webappDirectory}</webappDirectory>
 					<!-- Include static jar into WEB-INF/lib -->
-					<!--  <webResources>
-						<resource>
-							<directory>lib</directory>
-							<includes>
-								<include>*.jar</include>
-							</includes>
-							<targetPath>WEB-INF/lib</targetPath>
-						</resource>
-					</webResources> -->
+					<!-- <webResources> <resource> <directory>lib</directory> <includes> 
+						<include>*.jar</include> </includes> <targetPath>WEB-INF/lib</targetPath> 
+						</resource> </webResources> -->
 				</configuration>
 			</plugin>
 
@@ -457,4 +456,5 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
+	<packaging>war</packaging>
 </project>
diff --git a/src/main/resources/devNext.gcubekey b/src/main/resources/devNext.gcubekey
new file mode 100644
index 0000000..b113201
--- /dev/null
+++ b/src/main/resources/devNext.gcubekey
@@ -0,0 +1 @@
+<	¬@Qaj¤F�€g¸ðQ
\ No newline at end of file
diff --git a/src/main/resources/devsec.gcubekey b/src/main/resources/devsec.gcubekey
new file mode 100644
index 0000000..b113201
--- /dev/null
+++ b/src/main/resources/devsec.gcubekey
@@ -0,0 +1 @@
+<	¬@Qaj¤F�€g¸ðQ
\ No newline at end of file
diff --git a/src/main/resources/gCubeApps.gcubekey b/src/main/resources/gCubeApps.gcubekey
new file mode 100644
index 0000000..b113201
--- /dev/null
+++ b/src/main/resources/gCubeApps.gcubekey
@@ -0,0 +1 @@
+<	¬@Qaj¤F�€g¸ðQ
\ No newline at end of file
diff --git a/src/main/resources/gcube.gcubekey b/src/main/resources/gcube.gcubekey
new file mode 100644
index 0000000..b113201
--- /dev/null
+++ b/src/main/resources/gcube.gcubekey
@@ -0,0 +1 @@
+<	¬@Qaj¤F�€g¸ðQ
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/TabularDataPortlet_view.jsp b/src/main/webapp/WEB-INF/jsp/TabularDataPortlet_view.jsp
index e6b047e..08e1347 100644
--- a/src/main/webapp/WEB-INF/jsp/TabularDataPortlet_view.jsp
+++ b/src/main/webapp/WEB-INF/jsp/TabularDataPortlet_view.jsp
@@ -6,7 +6,7 @@
 <!-- between html and your Web Toolkit module  -->		                                      
 <link rel="stylesheet" href="<%= request.getContextPath()%>/tabulardataportlet/reset.css" type="text/css"/>
 <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/gxt/css/gxt-all.css" />
-<link rel="stylesheet" href="<%= request.getContextPath()%>/TabularDataPortlet.css" type="text/css">
+<link rel="stylesheet" href="<%= request.getContextPath()%>/tabulardataportlet.css" type="text/css">
 <script src='<%=request.getContextPath()%>/tabulardataportlet/tabulardataportlet.nocache.js'></script>
 
 <div id="tdp" style="width: 100%; height: 100%">
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index abdc860..c05a2d1 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -49,10 +49,10 @@
 
 
 	<!-- CSV Import Wizard Workspace -->
-	<servlet>
+	<!--  <servlet>
 		<servlet-name>CSVImportServiceWorkspace</servlet-name>
 		<servlet-class>org.gcube.portlets.user.csvimportwizardgxt3.ws.server.ImportWizardWSServiceImpl</servlet-class>
-	</servlet>
+	</servlet> 
 
 	<servlet>
 		<servlet-name>downloadServlet</servlet-name>
@@ -75,7 +75,7 @@
 	<servlet>
 		<servlet-name>uploadServlet</servlet-name>
 		<servlet-class>org.gcube.portlets.user.workspace.server.UploadServlet</servlet-class>
-	</servlet>
+	</servlet> -->
 
 	<servlet>
 		<servlet-name>jUnitHostImpl</servlet-name>
@@ -120,13 +120,7 @@
 		<url-pattern>/tabulardataportlet/LocalUploadServlet</url-pattern>
 	</servlet-mapping>
 
-
-	<servlet-mapping>
-		<servlet-name>imageServlet</servlet-name>
-		<url-pattern>/tabulardataportlet/ImageService</url-pattern>
-	</servlet-mapping>
-
-
+	
 	<!-- Workspace Light Tree -->
 	<servlet-mapping>
 		<servlet-name>WorkspaceLightService</servlet-name>
@@ -134,10 +128,10 @@
 	</servlet-mapping>
 
 	<!-- CSV Import Wizard Workspace -->
-	<servlet-mapping>
+	<!--   <servlet-mapping>
 		<servlet-name>CSVImportServiceWorkspace</servlet-name>
 		<url-pattern>/tabulardataportlet/CSVImportServiceWorkspace</url-pattern>
-	</servlet-mapping>
+	</servlet-mapping> 
 
 	<servlet-mapping>
 		<servlet-name>downloadServlet</servlet-name>
@@ -149,12 +143,18 @@
 		<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>
 		<url-pattern>/tabulardataportlet/UploadService</url-pattern>
-	</servlet-mapping>
+	</servlet-mapping> 
 
+	-->
+	
 	<servlet-mapping>
 		<servlet-name>jUnitHostImpl</servlet-name>
 		<url-pattern>/tabulardataportlet/junithost/*</url-pattern>
@@ -163,6 +163,6 @@
 
 	<!-- Default page to serve -->
 	<welcome-file-list>
-		<welcome-file>TabularDataPortlet.html</welcome-file>
+		<welcome-file>tabulardataportlet.html</welcome-file>
 	</welcome-file-list>
 </web-app>
diff --git a/src/main/webapp/TabularDataPortlet.css b/src/main/webapp/tabulardataportlet.css
similarity index 100%
rename from src/main/webapp/TabularDataPortlet.css
rename to src/main/webapp/tabulardataportlet.css
diff --git a/src/main/webapp/TabularDataPortlet.html b/src/main/webapp/tabulardataportlet.html
similarity index 93%
rename from src/main/webapp/TabularDataPortlet.html
rename to src/main/webapp/tabulardataportlet.html
index 1441c3f..4e99c76 100644
--- a/src/main/webapp/TabularDataPortlet.html
+++ b/src/main/webapp/tabulardataportlet.html
@@ -8,7 +8,7 @@
     <!-- Consider inlining CSS to reduce the number of requested files -->
     <!--                                                               -->
     <link rel="stylesheet" type="text/css" href="tabulardataportlet/reset.css" />
-    <link type="text/css" rel="stylesheet" href="TabularDataPortlet.css">
+    <link type="text/css" rel="stylesheet" href="tabulardataportlet.css">
 
     <!--                                           -->
     <!-- Any title is fine                         -->
@@ -42,8 +42,8 @@
         in order for this application to display correctly.
       </div>
     </noscript>
-    <div id="tdp" style="width: 100%; height: 100%">
-	</div>
+    <!--  <div id="tdp" style="width: 100%; height: 100%">
+	</div> -->
 
   </body>
 </html>
diff --git a/tabulardataportlet.launch b/tabulardataportlet.launch
new file mode 100644
index 0000000..1a72288
--- /dev/null
+++ b/tabulardataportlet.launch
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.google.gdt.eclipse.suite.webapp">
+<stringAttribute key="com.google.gdt.eclipse.suiteMainTypeProcessor.PREVIOUSLY_SET_MAIN_TYPE_NAME" value="com.google.gwt.dev.DevMode"/>
+<booleanAttribute key="com.google.gdt.eclipse.suiteWarArgumentProcessor.IS_WAR_FROM_PROJECT_PROPERTIES" value="true"/>
+<stringAttribute key="com.google.gwt.eclipse.core.URL" value="tabulardataportlet.html"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/tabular-data-portlet"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="GLOBUS_LOCATION" value="${GLOBUS_LOCATION}"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gdt.eclipse.maven.mavenClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -startupUrl tabulardataportlet.html -logLevel INFO -codeServerPort 9997 -port 8888 -war /home/giancarlo/workspace/tabular-data-portlet/target/tabular-data-portlet-2.0.0-SNAPSHOT org.gcube.portlets.user.td.tabulardataportlet"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tabular-data-portlet"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -Dgwt.nowarn.legacy.tools"/>
+</launchConfiguration>