diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressUpdater.java
index 450d879..7fa0481 100644
--- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressUpdater.java
+++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/ChangeTableTypeProgressUpdater.java
@@ -6,7 +6,7 @@ package org.gcube.portlets.user.td.tablewidget.client.progress;
 import java.util.ArrayList;
 
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.table.ChangeTableTypeMonitor;
+import org.gcube.portlets.user.td.gwtservice.shared.monitor.ChangeTableTypeMonitor;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
 
 import com.allen_sauer.gwt.log.client.Log;
diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressUpdater.java
index 58aca60..8950d27 100644
--- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressUpdater.java
+++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DeleteRowsProgressUpdater.java
@@ -6,7 +6,7 @@ package org.gcube.portlets.user.td.tablewidget.client.progress;
 import java.util.ArrayList;
 
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DeleteRowsMonitor;
+import org.gcube.portlets.user.td.gwtservice.shared.monitor.DeleteRowsMonitor;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
 
 import com.allen_sauer.gwt.log.client.Log;
diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DenormalizationProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DenormalizationProgressUpdater.java
index a0d5410..9b88eb4 100644
--- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DenormalizationProgressUpdater.java
+++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DenormalizationProgressUpdater.java
@@ -6,7 +6,7 @@ package org.gcube.portlets.user.td.tablewidget.client.progress;
 import java.util.ArrayList;
 
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.DenormalizationMonitor;
+import org.gcube.portlets.user.td.gwtservice.shared.monitor.DenormalizationMonitor;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
 
 import com.allen_sauer.gwt.log.client.Log;
diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressUpdater.java
index 91ba1e7..70e6c60 100644
--- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressUpdater.java
+++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/DuplicatesRowsProgressUpdater.java
@@ -6,7 +6,7 @@ package org.gcube.portlets.user.td.tablewidget.client.progress;
 import java.util.ArrayList;
 
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DuplicatesMonitor;
+import org.gcube.portlets.user.td.gwtservice.shared.monitor.DuplicatesMonitor;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
 
 import com.allen_sauer.gwt.log.client.Log;
diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/EditRowProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/EditRowProgressUpdater.java
index 1bd934b..ac59e0f 100644
--- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/EditRowProgressUpdater.java
+++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/EditRowProgressUpdater.java
@@ -6,7 +6,7 @@ package org.gcube.portlets.user.td.tablewidget.client.progress;
 import java.util.ArrayList;
 
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.EditRowMonitor;
+import org.gcube.portlets.user.td.gwtservice.shared.monitor.EditRowMonitor;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
 
 import com.allen_sauer.gwt.log.client.Log;
diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/NormalizationProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/NormalizationProgressUpdater.java
index a58d54c..84fd632 100644
--- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/NormalizationProgressUpdater.java
+++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/NormalizationProgressUpdater.java
@@ -6,7 +6,7 @@ package org.gcube.portlets.user.td.tablewidget.client.progress;
 import java.util.ArrayList;
 
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
-import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.NormalizationMonitor;
+import org.gcube.portlets.user.td.gwtservice.shared.monitor.NormalizationMonitor;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
 
 import com.allen_sauer.gwt.log.client.Log;
diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressUpdater.java
index c9b4e0e..62609f2 100644
--- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressUpdater.java
+++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/progress/RollBackProgressUpdater.java
@@ -6,7 +6,7 @@ package org.gcube.portlets.user.td.tablewidget.client.progress;
 import java.util.ArrayList;
 
 import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
-import org.gcube.portlets.user.td.gwtservice.shared.history.RollBackSessionMonitor;
+import org.gcube.portlets.user.td.gwtservice.shared.monitor.RollBackSessionMonitor;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
 
 import com.allen_sauer.gwt.log.client.Log;