diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_ExpressionContainer.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/C_ExpressionContainer.java
similarity index 92%
rename from src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_ExpressionContainer.java
rename to src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/C_ExpressionContainer.java
index 540ed90..92a4147 100644
--- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/shared/expression/C_ExpressionContainer.java
+++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/C_ExpressionContainer.java
@@ -1,7 +1,9 @@
-package org.gcube.portlets.user.td.widgetcommonevent.shared.expression;
+package org.gcube.portlets.user.td.widgetcommonevent.client.expression;
 
 import java.io.Serializable;
 
+import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression;
+
 
 /**
  * 
diff --git a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapper.java b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapper.java
index 5705f46..0f69a24 100644
--- a/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapper.java
+++ b/src/main/java/org/gcube/portlets/user/td/widgetcommonevent/client/expression/ExpressionWrapper.java
@@ -3,7 +3,6 @@ package org.gcube.portlets.user.td.widgetcommonevent.client.expression;
 import java.io.Serializable;
 
 import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
-import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_ExpressionContainer;
 
 /**
  *