diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
index 70b1f40..3e22974 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
@@ -3,8 +3,7 @@
  */
 package org.gcube.portlets.user.td.client;
 
-import org.gcube.portlets.user.csvimportwizardtd.client.CSVImportWizardTD;
-import org.gcube.portlets.user.sdmximportwizardtd.client.SDMXImportWizardTD;
+import org.gcube.portlets.user.td.sdmximportwidget.client.SDMXImportWizardTD;
 import org.gcube.portlets.user.td.client.event.CloseTabularResourceEvent;
 import org.gcube.portlets.user.td.client.event.CloseTabularResourceType;
 import org.gcube.portlets.user.td.client.event.ExportTableEvent;
@@ -15,9 +14,10 @@ import org.gcube.portlets.user.td.client.event.OpenFunctionalityEvent;
 import org.gcube.portlets.user.td.client.event.OpenFunctionalityType;
 import org.gcube.portlets.user.td.client.event.OpenTabularResourceEvent;
 import org.gcube.portlets.user.td.client.event.OpenTabularResourceType;
-import org.gcube.portlets.user.td.gxtservice.shared.TRId;
-import org.gcube.portlets.user.td.information.client.TabularResourceProperties;
-import org.gcube.portlets.user.td.open.client.TDOpen;
+import org.gcube.portlets.user.td.csvimportwidget.client.CSVImportWizardTD;
+import org.gcube.portlets.user.td.gwtservice.shared.TRId;
+import org.gcube.portlets.user.td.informationwidget.client.TabularResourceProperties;
+import org.gcube.portlets.user.td.openwidget.client.TDOpen;
 import org.gcube.portlets.user.tdw.client.TabularData;
 import org.gcube.portlets.user.tdw.shared.model.TableId;
 
@@ -307,7 +307,7 @@ public class TabularDataController {
 						"SDMX Import");
 
 				importWizard
-						.addListener(new org.gcube.portlets.user.sdmximportwizardtd.client.general.WizardListener() {
+						.addListener(new org.gcube.portlets.user.td.sdmximportwidget.client.general.WizardListener() {
 
 							@Override
 							public void completed(TRId tabularResourceId) {
@@ -418,7 +418,7 @@ public class TabularDataController {
 			public void onSuccess() {
 				TDOpen tdOpen = new TDOpen("Open Tabular Resource");
 
-				tdOpen.addListener(new org.gcube.portlets.user.td.open.client.general.WizardListener() {
+				tdOpen.addListener(new org.gcube.portlets.user.td.openwidget.client.general.WizardListener() {
 
 					@Override
 					public void aborted() {
@@ -476,7 +476,7 @@ public class TabularDataController {
 						"CSV Import");
 
 				importWizard
-						.addListener(new org.gcube.portlets.user.csvimportwizardtd.client.general.WizardListener() {
+						.addListener(new org.gcube.portlets.user.td.csvimportwidget.client.general.WizardListener() {
 
 							@Override
 							public void failed(Throwable throwable,