diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java
index b58c9da..94a91bd 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/rpc/GWTWorkspaceService.java
@@ -28,8 +28,6 @@ import org.gcube.portlets.user.workspace.shared.WorkspaceTrashOperation;
 import org.gcube.portlets.user.workspace.shared.WorkspaceUserQuote;
 import org.gcube.portlets.user.workspace.shared.WorkspaceVersioningOperation;
 import org.gcube.portlets.user.workspace.shared.accounting.GxtAccountingField;
-import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel;
-import org.gcube.portlets.widgets.workspacesharingwidget.shared.WorkspaceACL;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/PanelTogglePermission.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/PanelTogglePermission.java
index 5c811a9..4db35a4 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/PanelTogglePermission.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/PanelTogglePermission.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.gcube.portlets.user.workspace.client.util.GetPermissionIconByACL;
-
 import org.gcube.portlets.widgets.workspacesharingwidget.shared.WorkspaceACL;
 import org.gcube.portlets.widgets.workspacesharingwidget.shared.WorkspaceACL.USER_TYPE;
 
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiValuePanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiValuePanel.java
index e3c0b33..f017f9c 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiValuePanel.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiValuePanel.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-
 import org.gcube.portlets.user.workspace.client.util.MaskPanel;
 import org.gcube.portlets.user.workspace.client.view.sharing.ContactFetcher;
 import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel;
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/permissions/DialogPermission.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/permissions/DialogPermission.java
index 412edf5..a9766e9 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/permissions/DialogPermission.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/permissions/DialogPermission.java
@@ -9,9 +9,9 @@ import org.gcube.portlets.user.workspace.client.resources.Resources;
 import org.gcube.portlets.user.workspace.client.view.sharing.PanelTogglePermission;
 import org.gcube.portlets.user.workspace.client.view.windows.InfoDisplay;
 import org.gcube.portlets.user.workspace.client.view.windows.MessageBoxAlert;
-import org.gcube.portlets.widgets.workspacesharingwidget.shared.WorkspaceACL;
 import org.gcube.portlets.widgets.workspacesharingwidget.client.rpc.WorkspaceSharingServiceAsync;
 import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel;
+import org.gcube.portlets.widgets.workspacesharingwidget.shared.WorkspaceACL;
 
 import com.extjs.gxt.ui.client.Style.HorizontalAlignment;
 import com.extjs.gxt.ui.client.Style.Scroll;
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetLink.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetLink.java
index d9b76b8..f140861 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetLink.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetLink.java
@@ -5,7 +5,6 @@ import org.gcube.portlets.user.workspace.client.event.RefreshFolderEvent;
 import org.gcube.portlets.user.workspace.client.event.SessionExpiredEvent;
 import org.gcube.portlets.user.workspace.client.model.FileModel;
 import org.gcube.portlets.user.workspace.client.resources.Resources;
-
 import org.gcube.portlets.user.workspace.shared.PublicLink;
 import org.gcube.portlets.user.workspace.shared.SessionExpiredException;
 import org.gcube.portlets.widgets.workspacesharingwidget.client.rpc.WorkspaceSharingServiceAsync;
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/AllowedMimeTypeToInline.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/AllowedMimeTypeToInline.java
index c0ef6cc..5d4fd0c 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/util/AllowedMimeTypeToInline.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/AllowedMimeTypeToInline.java
@@ -3,10 +3,8 @@ package org.gcube.portlets.user.workspace.server.util;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
-import java.util.Set;
 
 import org.apache.log4j.Logger;
 
@@ -36,7 +34,7 @@ public class AllowedMimeTypeToInline {
     	
     	try {
         
-    		input = AllowedMimeTypeToInline.class.getClassLoader().getResourceAsStream(filename);
+    		input = AllowedMimeTypeToInline.class.getResourceAsStream(filename);
     		if(input==null){
     			logger.error("Sorry, unable to find " + filename);
     		    return null;
diff --git a/src/main/resources/MimeTypePrefixToInline.properties b/src/main/java/org/gcube/portlets/user/workspace/server/util/MimeTypePrefixToInline.properties
similarity index 100%
rename from src/main/resources/MimeTypePrefixToInline.properties
rename to src/main/java/org/gcube/portlets/user/workspace/server/util/MimeTypePrefixToInline.properties
diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java b/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java
index 13b8f6c..65f074e 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java
@@ -30,8 +30,9 @@ import org.gcube.portlets.user.workspace.server.resolver.UriResolverReaderParame
 import org.gcube.portlets.user.workspace.server.tostoragehub.StorageHubToWorkpaceConverter;
 import org.gcube.portlets.user.workspace.server.util.resource.PropertySpecialFolderReader;
 import org.gcube.portlets.user.workspace.server.util.scope.ScopeUtilFilter;
-import org.gcube.vomanagement.usermanagement.model.GCubeUser;
 import org.gcube.portlets.widgets.workspacesharingwidget.shared.InfoContactModel;
+import org.gcube.vomanagement.usermanagement.model.GCubeUser;
+
 import com.liferay.portal.service.UserLocalServiceUtil;
 
 /**