diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index c4905ef..38aaaba 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -12,44 +12,17 @@
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 
-	<servlet-mapping>
-		<servlet-name>tdservlet</servlet-name>
-		<url-pattern>/tabulardataportlet/tds</url-pattern>
-	</servlet-mapping>
-
-	<!-- Workspace Tree 
-	<servlet>
-		<servlet-name>WorkspaceService</servlet-name>
-		<servlet-class>org.gcube.portlets.user.workspace.server.GWTWorkspaceServiceImpl</servlet-class>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>WorkspaceService</servlet-name>
-		<url-pattern>/tabulardataportlet/WorkspaceService</url-pattern>
-	</servlet-mapping>-->
-	
-		<!-- TDWidget -->
-
+	<!-- TDWidget -->
 	<servlet>
 		<servlet-name>tdwService</servlet-name>
 		<servlet-class>org.gcube.portlets.user.tdw.server.TabularDataServiceImpl</servlet-class>
 	</servlet>
 
-	<servlet-mapping>
-		<servlet-name>tdwService</servlet-name>
-		<url-pattern>/tabulardataportlet/tdw</url-pattern>
-	</servlet-mapping>
-
 	<servlet>
 		<servlet-name>tdwServlet</servlet-name>
 		<servlet-class>org.gcube.portlets.user.tdw.server.TabularDataServlet</servlet-class>
 	</servlet>
 
-	<servlet-mapping>
-		<servlet-name>tdwServlet</servlet-name>
-		<url-pattern>/tabulardataportlet/tdwdata</url-pattern>
-	</servlet-mapping>
-	
 	<!-- SDMX IMPORT WIZARD -->
 	<servlet>
 		<servlet-name>SDMXImportWizardServlet</servlet-name>
@@ -57,68 +30,93 @@
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 
-	<servlet-mapping>
-		<servlet-name>SDMXImportWizardServlet</servlet-name>
-		<url-pattern>/tabulardataportlet/SDMXImportWizardService</url-pattern>
-	</servlet-mapping>
-	
 	<!-- CSV IMPORT WIZARD -->
 	<servlet>
 		<servlet-name>CSVImportService</servlet-name>
 		<servlet-class>org.gcube.portlets.user.csvimportwizardgxt3.server.CSVImportServiceImpl</servlet-class>
 	</servlet>
 
-	<servlet-mapping>
-		<servlet-name>CSVImportService</servlet-name>
-		<url-pattern>/tabulardataportlet/CSVImportService</url-pattern>
-	</servlet-mapping>
-
 	<servlet>
 		<servlet-name>LocalUploadServlet</servlet-name>
 		<servlet-class>org.gcube.portlets.user.csvimportwizardgxt3.server.local.LocalUploadServlet</servlet-class>
 	</servlet>
 
-	<servlet-mapping>
-		<servlet-name>LocalUploadServlet</servlet-name>
-		<url-pattern>/tabulardataportlet/LocalUploadServlet</url-pattern>
-	</servlet-mapping>
-
 	<servlet>
 		<servlet-name>CSVServlet</servlet-name>
 		<servlet-class>org.gcube.portlets.user.csvimportwizardgxt3.server.CSVServlet</servlet-class>
 	</servlet>
 
-	<servlet-mapping>
-		<servlet-name>CSVServlet</servlet-name>
-		<url-pattern>/tabulardataportlet/CSVServlet</url-pattern>
-	</servlet-mapping>
-	
 	<!-- Workspace Light Tree -->
 	<servlet>
 		<servlet-name>WorkspaceLightService</servlet-name>
 		<servlet-class>org.gcube.portlets.user.workspace.lighttreegxt3.server.WorkspaceServiceImpl</servlet-class>
 	</servlet>
 
-	<servlet-mapping>
-		<servlet-name>WorkspaceLightService</servlet-name>
-		<url-pattern>/tabulardataportlet/WorkspaceLightService</url-pattern>
-	</servlet-mapping>
-
-	<!-- CSV Import Wizard Workspace-->
+	<!-- CSV Import Wizard Workspace -->
 	<servlet>
 		<servlet-name>CSVImportServiceWorkspace</servlet-name>
 		<servlet-class>org.gcube.portlets.user.csvimportwizardgxt3.ws.server.ImportWizardWSServiceImpl</servlet-class>
 	</servlet>
 
+
+
+
+	<!-- Servlets -->
+	<servlet-mapping>
+		<servlet-name>tdservlet</servlet-name>
+		<url-pattern>/tabulardataportlet/tds</url-pattern>
+	</servlet-mapping>
+
+	<!-- TDWidget -->
+
+	<servlet-mapping>
+		<servlet-name>tdwService</servlet-name>
+		<url-pattern>/tabulardataportlet/tdw</url-pattern>
+	</servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>tdwServlet</servlet-name>
+		<url-pattern>/tabulardataportlet/tdwdata</url-pattern>
+	</servlet-mapping>
+
+	<!-- SDMX IMPORT WIZARD -->
+
+	<servlet-mapping>
+		<servlet-name>SDMXImportWizardServlet</servlet-name>
+		<url-pattern>/tabulardataportlet/SDMXImportWizardService</url-pattern>
+	</servlet-mapping>
+
+	<!-- CSV IMPORT WIZARD -->
+	<servlet-mapping>
+		<servlet-name>CSVImportService</servlet-name>
+		<url-pattern>/tabulardataportlet/CSVImportService</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>
+		<servlet-name>WorkspaceLightService</servlet-name>
+		<url-pattern>/tabulardataportlet/WorkspaceLightService</url-pattern>
+	</servlet-mapping>
+
+	<!-- CSV Import Wizard Workspace -->
 	<servlet-mapping>
 		<servlet-name>CSVImportServiceWorkspace</servlet-name>
 		<url-pattern>/tabulardataportlet/CSVImportServiceWorkspace</url-pattern>
 	</servlet-mapping>
-	
+
 
 	<!-- Default page to serve -->
 	<welcome-file-list>
 		<welcome-file>TabularDataPortlet.html</welcome-file>
 	</welcome-file-list>
-
 </web-app>