diff --git a/.classpath b/.classpath
index 0300e96..10c9e78 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/reports-4.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/reports-4.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -30,5 +30,5 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/reports-4.4.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/reports-4.5.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index 33612c4..a1aed63 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,8 +1,7 @@
-#Tue Jul 16 14:28:26 CEST 2013
 =\=\=\=\=\=\=
 <<<<<<<=.mine
 >>>>>>>=.r71295
 eclipse.preferences.version=1
-lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.4.0-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.5.0-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml b/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml
index 29b1d2e..ebf9a7e 100644
--- a/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml
@@ -8,7 +8,7 @@
 	<!-- To Comment out -->
 <!-- 	<set-property name="user.agent" value="gecko1_8" /> -->
 	
-	<inherits name='org.gcube.portlets.user.guidedtour.GuidedTour' />
+	<inherits name='org.gcube.portlets.widgets.guidedtour.GuidedTour' />
 	<inherits name='org.gcube.portlets.d4sreporting.common.Reporting' />
 		<inherits name='org.gcube.portlets.user.workspace.lighttree.WorkspacePortletLightTree' />
 	<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />
@@ -16,7 +16,7 @@
 	<inherits name='com.extjs.gxt.themes.Themes' />
 	<inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' />
 
-	<inherits name='org.gcube.portlets.user.exporter.Report_exporter_widget' />
+	<inherits name='org.gcube.portlets.widgets.exporter.Report_exporter_widget' />
 
 	<!-- Specify the app entry point class. -->
 	<entry-point
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 3a56241..7d8c2a4 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -17,7 +17,7 @@
 	<!-- quicktourServlet -->
 	<servlet>
 		<servlet-name>quicktourServlet</servlet-name>
-		<servlet-class>org.gcube.portlets.user.guidedtour.server.TourServiceImpl</servlet-class>
+		<servlet-class>org.gcube.portlets.widgets.guidedtour.server.TourServiceImpl</servlet-class>
 	</servlet>
 
 	<servlet-mapping>
@@ -38,7 +38,7 @@
 
 	<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>