diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/WorkspaceUploader.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/WorkspaceUploader.java
index c0d72e1..0362db7 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/WorkspaceUploader.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/WorkspaceUploader.java
@@ -1,6 +1,6 @@
 package org.gcube.portlets.widgets.workspaceuploader.client;
 
-import org.gcube.portlets.widgets.workspaceuploader.client.uploader.MultipleDilaogUploadStream;
+import org.gcube.portlets.widgets.workspaceuploader.client.uploader.MultipleDilaogUpload;
 
 import com.google.gwt.core.client.EntryPoint;
 import com.google.gwt.core.client.ScriptInjector;
@@ -79,7 +79,7 @@ public class WorkspaceUploader implements EntryPoint {
 
 			@Override
 			public void onClick(ClickEvent event) {
-				MultipleDilaogUploadStream uploadStream = new MultipleDilaogUploadStream(headerTitle, parentId, org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUploadStream.UPLOAD_TYPE.File);
+				MultipleDilaogUpload uploadStream = new MultipleDilaogUpload(headerTitle, parentId, org.gcube.portlets.widgets.workspaceuploader.client.uploader.DialogUpload.UPLOAD_TYPE.File);
 				uploadStream.center();
 			}
 		});
diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUploadStream.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUpload.java
similarity index 97%
rename from src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUploadStream.java
rename to src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUpload.java
index bf19ef7..487377e 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUploadStream.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/DialogUpload.java
@@ -42,9 +42,9 @@ import com.google.gwt.user.client.ui.VerticalPanel;
  * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
  * Sep 24, 2015
  */
-public class DialogUploadStream extends ClosableDialog implements HasWorskpaceUploadNotificationListener{  
+public class DialogUpload extends ClosableDialog implements HasWorskpaceUploadNotificationListener{  
 
-	private DialogUploadStream INSTANCE = this;
+	private DialogUpload INSTANCE = this;
 	protected Button btnUpload  = new Button("Upload"); 
 	private Hidden hiddenOverwrite = new Hidden(ConstantsWorkspaceUploader.IS_OVERWRITE,"false");
 	protected final FormPanel formPanel = new FormPanel(); 
@@ -76,7 +76,7 @@ public class DialogUploadStream extends ClosableDialog implements HasWorskpaceUp
 	 * @param parentId the parent id
 	 * @param uploadType the upload type
 	 */
-	public DialogUploadStream(String headerTitle, final String parentId, UPLOAD_TYPE uploadType){
+	public DialogUpload(String headerTitle, final String parentId, UPLOAD_TYPE uploadType){
 		super(false, true, headerTitle);
 //		setText(headerTitle);
 		this.parentIdentifier = parentId;
diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/MultipleDilaogUploadStream.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/MultipleDilaogUpload.java
similarity index 98%
rename from src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/MultipleDilaogUploadStream.java
rename to src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/MultipleDilaogUpload.java
index dccfcde..a7978b7 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/MultipleDilaogUploadStream.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/client/uploader/MultipleDilaogUpload.java
@@ -35,7 +35,7 @@ import com.google.gwt.user.client.ui.HTML;
  * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
  * Oct 2, 2015
  */
-public class MultipleDilaogUploadStream extends DialogUploadStream {
+public class MultipleDilaogUpload extends DialogUpload {
 
 	
 	private static final String FILE_DELEMITER = ";";
@@ -48,7 +48,7 @@ public class MultipleDilaogUploadStream extends DialogUploadStream {
 	 * @param parentId the parent id
 	 * @param uploadType the upload type
 	 */
-	public MultipleDilaogUploadStream(String headerTitle, String parentId, UPLOAD_TYPE uploadType) {
+	public MultipleDilaogUpload(String headerTitle, String parentId, UPLOAD_TYPE uploadType) {
 		super(headerTitle, parentId, uploadType);
 		fileUpload.getElement().setAttribute("multiple", "multiple");
 		fileUploadID = GenerateUUID.get(10, 16); //is tagID
diff --git a/src/main/webapp/WEB-INF/jsp/WorkspaceUploader_view.jsp b/src/main/webapp/WEB-INF/jsp/WorkspaceUploader_view.jsp
deleted file mode 100644
index 460b486..0000000
--- a/src/main/webapp/WEB-INF/jsp/WorkspaceUploader_view.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@page contentType="text/html"%>
-<%@page pageEncoding="UTF-8"%>
-
-<%-- Uncomment below lines to add portlet taglibs to jsp
-<%@ page import="javax.portlet.*"%>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
-
-<portlet:defineObjects />
---%>
-
-<link rel="stylesheet"
-	href="<%=request.getContextPath()%>/workspaceuploader.css"
-	type="text/css">
-
-
-<script type="text/javascript" language="javascript"
-	src="<%=request.getContextPath()%>/workspaceuploader/workspaceuploader.nocache.js"></script>
-<div id="workspace-uploader"></div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/liferay-display.xml b/src/main/webapp/WEB-INF/liferay-display.xml
deleted file mode 100644
index 8b6eafc..0000000
--- a/src/main/webapp/WEB-INF/liferay-display.xml
+++ /dev/null
@@ -1,5 +0,0 @@
- <display>
-     <category name="gCube Applications">
-        <portlet id="WorkspaceUploader" />
-     </category>
-  </display>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
deleted file mode 100644
index aea1e47..0000000
--- a/src/main/webapp/WEB-INF/liferay-plugin-package.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-name=WorkspaceUploader
-module-group-id=liferay
-module-incremental-version=2
-tags=
-short-description=
-change-log=
-page-url=http://www.gcube-system.org
-author=gCube
-licenses=EUPL
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml
deleted file mode 100644
index 0632ed0..0000000
--- a/src/main/webapp/WEB-INF/liferay-portlet.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 5.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_5_2_0.dtd">
-
-<liferay-portlet-app>
-	<portlet>
-		<portlet-name>WorkspaceUploader</portlet-name>
-		<layout-cacheable>false</layout-cacheable>
-		<instanceable>false</instanceable>
-		<ajaxable>false</ajaxable>
-	</portlet>
-</liferay-portlet-app>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/portlet.xml b/src/main/webapp/WEB-INF/portlet.xml
deleted file mode 100644
index 618d6f9..0000000
--- a/src/main/webapp/WEB-INF/portlet.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<portlet-app>
-	<portlet>
-		<description>Workspace Uploader</description>
-		<portlet-name>WorkspaceUploader</portlet-name>
-		<display-name>Workspace Uploader Portlet</display-name>
-		<portlet-class>org.gcube.portlets.widgets.workspaceuploader.portlet.WorkspaceUploaderPortlet</portlet-class>
-		<expiration-cache>0</expiration-cache>
-		<supports>
-			<mime-type>text/html</mime-type>
-			<portlet-mode>VIEW</portlet-mode>
-		</supports>
-		<portlet-info>
-			<title>WorkspaceUploader</title>
-			<short-title>WorkspaceUploader</short-title>
-		</portlet-info>
-	</portlet>
-</portlet-app>