diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java
index bf83f3e..1964ffd 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java
@@ -21,8 +21,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.licenses.LicenceData;
 import org.gcube.portlets.user.td.gwtservice.shared.monitor.BackgroundOperationMonitorSession;
 import org.gcube.portlets.user.td.gwtservice.shared.monitor.OperationMonitor;
 import org.gcube.portlets.user.td.gwtservice.shared.monitor.OperationMonitorSession;
-import org.gcube.portlets.user.td.gwtservice.shared.resource.ResourceTDDescriptor;
-import org.gcube.portlets.user.td.gwtservice.shared.resource.ResourceTDType;
 import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession;
 import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession;
 import org.gcube.portlets.user.td.gwtservice.shared.share.ShareInfo;
@@ -52,6 +50,8 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.Normalizati
 import org.gcube.portlets.user.td.gwtservice.shared.tr.open.TDOpenSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.CodelistPagingLoadConfig;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.CodelistPagingLoadResult;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.ResourceTDDescriptor;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.ResourceTDType;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DeleteRowsSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DuplicatesSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.EditRowSession;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java
index cb516e5..d587135 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java
@@ -20,8 +20,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.licenses.LicenceData;
 import org.gcube.portlets.user.td.gwtservice.shared.monitor.BackgroundOperationMonitorSession;
 import org.gcube.portlets.user.td.gwtservice.shared.monitor.OperationMonitor;
 import org.gcube.portlets.user.td.gwtservice.shared.monitor.OperationMonitorSession;
-import org.gcube.portlets.user.td.gwtservice.shared.resource.ResourceTDDescriptor;
-import org.gcube.portlets.user.td.gwtservice.shared.resource.ResourceTDType;
 import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession;
 import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession;
 import org.gcube.portlets.user.td.gwtservice.shared.share.ShareInfo;
@@ -51,6 +49,8 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.Normalizati
 import org.gcube.portlets.user.td.gwtservice.shared.tr.open.TDOpenSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.CodelistPagingLoadConfig;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.CodelistPagingLoadResult;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.ResourceTDDescriptor;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.ResourceTDType;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DeleteRowsSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DuplicatesSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.EditRowSession;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
index c13258e..b386d8f 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
@@ -166,8 +166,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.monitor.BackgroundOperationM
 import org.gcube.portlets.user.td.gwtservice.shared.monitor.OperationMonitor;
 import org.gcube.portlets.user.td.gwtservice.shared.monitor.OperationMonitorCreator;
 import org.gcube.portlets.user.td.gwtservice.shared.monitor.OperationMonitorSession;
-import org.gcube.portlets.user.td.gwtservice.shared.resource.ResourceTDDescriptor;
-import org.gcube.portlets.user.td.gwtservice.shared.resource.ResourceTDType;
 import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession;
 import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXImportSession;
 import org.gcube.portlets.user.td.gwtservice.shared.share.Contacts;
@@ -223,6 +221,8 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.CodelistPagingLoad
 import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.CodelistPagingLoadResult;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.Direction;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.OrderInfo;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.ResourceTDDescriptor;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.ResourceTDType;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DeleteRowsSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.DuplicatesSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.rows.EditRowSession;
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTDCreator.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTDCreator.java
index 6009046..7ac854c 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTDCreator.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTDCreator.java
@@ -11,12 +11,12 @@ import org.gcube.data.analysis.tabulardata.model.resources.ResourceType;
 import org.gcube.data.analysis.tabulardata.model.resources.StringResource;
 import org.gcube.data.analysis.tabulardata.model.resources.TableResource;
 import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
-import org.gcube.portlets.user.td.gwtservice.shared.resource.InternalURITD;
-import org.gcube.portlets.user.td.gwtservice.shared.resource.ResourceTD;
-import org.gcube.portlets.user.td.gwtservice.shared.resource.ResourceTDDescriptor;
-import org.gcube.portlets.user.td.gwtservice.shared.resource.ResourceTDType;
-import org.gcube.portlets.user.td.gwtservice.shared.resource.StringResourceTD;
-import org.gcube.portlets.user.td.gwtservice.shared.resource.TableResourceTD;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.InternalURITD;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.ResourceTD;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.ResourceTDDescriptor;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.ResourceTDType;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.StringResourceTD;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.TableResourceTD;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTDTypeMap.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTDTypeMap.java
index 3c596b5..e55d98a 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTDTypeMap.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTDTypeMap.java
@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.td.gwtservice.server.resource;
 
 import org.gcube.data.analysis.tabulardata.model.resources.ResourceType;
-import org.gcube.portlets.user.td.gwtservice.shared.resource.ResourceTDType;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.ResourceTDType;
 
 public class ResourceTDTypeMap {
 	
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/codelisthelper/CodelistMappingSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/codelisthelper/CodelistMappingSession.java
index a70eb71..20dbe71 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/codelisthelper/CodelistMappingSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/codelisthelper/CodelistMappingSession.java
@@ -2,10 +2,10 @@ package org.gcube.portlets.user.td.gwtservice.shared.codelisthelper;
 
 import java.io.Serializable;
 
-import org.gcube.portlets.user.td.gwtservice.shared.resource.ResourceTDDescriptor;
 import org.gcube.portlets.user.td.gwtservice.shared.source.Source;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.resources.ResourceTDDescriptor;
 import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
 
 /**
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/InternalURITD.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/InternalURITD.java
similarity index 92%
rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/InternalURITD.java
rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/InternalURITD.java
index 682029d..c59fddc 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/InternalURITD.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/InternalURITD.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.td.gwtservice.shared.resource;
+package org.gcube.portlets.user.td.gwtservice.shared.tr.resources;
 
 
 /**
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/ResourceTD.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/ResourceTD.java
similarity index 90%
rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/ResourceTD.java
rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/ResourceTD.java
index d102833..ab202f7 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/ResourceTD.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/ResourceTD.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.td.gwtservice.shared.resource;
+package org.gcube.portlets.user.td.gwtservice.shared.tr.resources;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/ResourceTDDescriptor.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/ResourceTDDescriptor.java
similarity index 97%
rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/ResourceTDDescriptor.java
rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/ResourceTDDescriptor.java
index 36bf8c4..4d8a08d 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/ResourceTDDescriptor.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/ResourceTDDescriptor.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.td.gwtservice.shared.resource;
+package org.gcube.portlets.user.td.gwtservice.shared.tr.resources;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/ResourceTDType.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/ResourceTDType.java
similarity index 82%
rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/ResourceTDType.java
rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/ResourceTDType.java
index a34aff9..e4958ab 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/ResourceTDType.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/ResourceTDType.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.td.gwtservice.shared.resource;
+package org.gcube.portlets.user.td.gwtservice.shared.tr.resources;
 
 public enum ResourceTDType {
 
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/StringResourceTD.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/StringResourceTD.java
similarity index 91%
rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/StringResourceTD.java
rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/StringResourceTD.java
index 0e7030f..946a8c0 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/StringResourceTD.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/StringResourceTD.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.td.gwtservice.shared.resource;
+package org.gcube.portlets.user.td.gwtservice.shared.tr.resources;
 
 /**
  * 
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/TableResourceTD.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/TableResourceTD.java
similarity index 93%
rename from src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/TableResourceTD.java
rename to src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/TableResourceTD.java
index b2a9821..c8d77b6 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/resource/TableResourceTD.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/resources/TableResourceTD.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.td.gwtservice.shared.resource;
+package org.gcube.portlets.user.td.gwtservice.shared.tr.resources;
 
 /**
  *