diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java
index 667184e..c7df8a3 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java
@@ -3,8 +3,8 @@ package org.gcube.portlets.user.reportgenerator.client.Presenter;
 import java.util.HashMap;
 import java.util.List;
 
-import org.gcube.portlets.d4sreporting.common.client.ComponentType;
 import org.gcube.portlets.d4sreporting.common.client.uicomponents.richtext.RichTextToolbar;
+import org.gcube.portlets.d4sreporting.common.shared.ComponentType;
 import org.gcube.portlets.d4sreporting.common.shared.Metadata;
 import org.gcube.portlets.d4sreporting.common.shared.SerializableModel;
 import org.gcube.portlets.user.gcubewidgets.client.popup.GCubeDialog;
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/DeleteCitationsDialog.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/DeleteCitationsDialog.java
index 97bb365..095d4b5 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/DeleteCitationsDialog.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/DeleteCitationsDialog.java
@@ -2,7 +2,7 @@ package org.gcube.portlets.user.reportgenerator.client.dialog;
 
 import java.util.ArrayList;
 
-import org.gcube.portlets.d4sreporting.common.client.ComponentType;
+import org.gcube.portlets.d4sreporting.common.shared.ComponentType;
 import org.gcube.portlets.d4sreporting.common.shared.SerializableComponent;
 import org.gcube.portlets.user.reportgenerator.client.events.RemovedCitationEvent;
 import org.gcube.portlets.user.reportgenerator.client.model.TemplateComponent;
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java
index 5ffb28c..3a85a04 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.gcube.portlets.d4sreporting.common.client.ComponentType;
+import org.gcube.portlets.d4sreporting.common.shared.ComponentType;
 import org.gcube.portlets.d4sreporting.common.shared.Metadata;
 import org.gcube.portlets.d4sreporting.common.shared.SerializableAttribute;
 import org.gcube.portlets.d4sreporting.common.shared.SerializableAttributeArea;
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java
index d598c59..03bf588 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java
@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Vector;
 import java.util.Map.Entry;
 
-import org.gcube.portlets.d4sreporting.common.client.ComponentType;
+import org.gcube.portlets.d4sreporting.common.shared.ComponentType;
 import org.gcube.portlets.d4sreporting.common.shared.Metadata;
 import org.gcube.portlets.d4sreporting.common.shared.SerializableComponent;
 import org.gcube.portlets.d4sreporting.common.shared.SerializableModel;
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/AttributeArea.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/AttributeArea.java
index 3ae77a3..2ae2e5a 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/AttributeArea.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/AttributeArea.java
@@ -1,5 +1,5 @@
 package org.gcube.portlets.user.reportgenerator.client.targets;
-import org.gcube.portlets.d4sreporting.common.client.ComponentType;
+import org.gcube.portlets.d4sreporting.common.shared.ComponentType;
 import org.gcube.portlets.d4sreporting.common.shared.SerializableAttribute;
 import org.gcube.portlets.d4sreporting.common.shared.SerializableAttributeArea;
 import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter;
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/BasicTextArea.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/BasicTextArea.java
index 1762722..0f87b3f 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/BasicTextArea.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/BasicTextArea.java
@@ -1,6 +1,6 @@
 package org.gcube.portlets.user.reportgenerator.client.targets;
 
-import org.gcube.portlets.d4sreporting.common.client.ComponentType;
+import org.gcube.portlets.d4sreporting.common.shared.ComponentType;
 import org.gcube.portlets.user.reportgenerator.client.ReportGenerator;
 import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter;
 
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/D4sRichTextarea.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/D4sRichTextarea.java
index dd61df4..129ae35 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/D4sRichTextarea.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/D4sRichTextarea.java
@@ -1,6 +1,6 @@
 package org.gcube.portlets.user.reportgenerator.client.targets;
 
-import org.gcube.portlets.d4sreporting.common.client.ComponentType;
+import org.gcube.portlets.d4sreporting.common.shared.ComponentType;
 import org.gcube.portlets.user.reportgenerator.client.ReportGenerator;
 import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter;
 
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ReportTextArea.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ReportTextArea.java
index 6683054..bd729e2 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ReportTextArea.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ReportTextArea.java
@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.reportgenerator.client.targets;
 
-import org.gcube.portlets.d4sreporting.common.client.ComponentType;
 import org.gcube.portlets.d4sreporting.common.client.ImageConstants;
+import org.gcube.portlets.d4sreporting.common.shared.ComponentType;
 import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter;
 import org.gcube.portlets.user.reportgenerator.client.dialog.CommentDialog;
 
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java
index f39eab1..2256a09 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java
@@ -37,8 +37,8 @@ import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
 import org.gcube.portlets.admin.wfdocslibrary.client.WfDocsLibrary;
 import org.gcube.portlets.admin.wfdocslibrary.server.db.MyDerbyStore;
 import org.gcube.portlets.admin.wfdocslibrary.server.db.Store;
-import org.gcube.portlets.d4sreporting.common.client.ComponentType;
 import org.gcube.portlets.d4sreporting.common.server.ServiceUtil;
+import org.gcube.portlets.d4sreporting.common.shared.ComponentType;
 import org.gcube.portlets.d4sreporting.common.shared.SerializableComponent;
 import org.gcube.portlets.d4sreporting.common.shared.SerializableModel;
 import org.gcube.portlets.d4sreporting.common.shared.SerializableSection;