diff --git a/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
index 7343a95..4186408 100644
--- a/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
@@ -14,10 +14,9 @@
 	<!-- Other module inherits -->
 	<inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' />
 	<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />
-	<!-- <inherits name='org.gcube.portlets.user.workspace.lighttree.WorkspacePortletLightTree' 
-		/> -->
 
-	<inherits name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
+	<inherits
+		name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
 
 	<inherits name='org.gcube.portlets.widgets.wsmail.WsMail_Widget' />
 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 743d11d..2c9c223 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -64,9 +64,10 @@
 		<url-pattern>/workspace/mailWisdgetServlet</url-pattern>
 	</servlet-mapping>
 
+	<!-- Workspace Light Tree servlet -->
 	<servlet>
 		<servlet-name>WorkspaceLightService</servlet-name>
-		<servlet-class>org.gcube.portlets.user.workspace.lighttree.server.WorkspaceServiceImpl</servlet-class>
+		<servlet-class>org.gcube.portlets.widgets.lighttree.server.WorkspaceServiceImpl</servlet-class>
 	</servlet>
 
 	<servlet-mapping>
diff --git a/src/test/resources/org/gcube/portlets/user/workspace/WorkspacePortletJUnit.gwt.xml b/src/test/resources/org/gcube/portlets/user/workspace/WorkspacePortletJUnit.gwt.xml
index 095a664..b3e535d 100644
--- a/src/test/resources/org/gcube/portlets/user/workspace/WorkspacePortletJUnit.gwt.xml
+++ b/src/test/resources/org/gcube/portlets/user/workspace/WorkspacePortletJUnit.gwt.xml
@@ -3,7 +3,4 @@
   <!-- Inherit our applications main module.                      -->
   <inherits name='org.gcube.portlets.user.workspace.WorkspacePortlet' />
 
-  <!-- Specify the path to any remote services.                   -->
-<!--   <servlet path="/workspace/workspace" class="org.gcube.portlets.user.workspace.server.GreetingServiceImpl" /> -->
-
 </module>