diff --git a/pom.xml b/pom.xml
index ffc3458..ed00129 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,12 +228,6 @@
 			<version>${enunciate.version}</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-		    <groupId>org.geotoolkit</groupId>
-		    <artifactId>geotk-xml-base</artifactId>
-		    <version>3.20-geoapi-3.0</version>
-		    <scope>provided</scope>
-		</dependency>
 		<dependency>
 		    <groupId>javax.servlet</groupId>
 		    <artifactId>javax.servlet-api</artifactId>
diff --git a/src/main/java/org/gcube/gcat/moderation/thread/ModerationThread.java b/src/main/java/org/gcube/gcat/moderation/thread/ModerationThread.java
index dd7831b..795c9f8 100644
--- a/src/main/java/org/gcube/gcat/moderation/thread/ModerationThread.java
+++ b/src/main/java/org/gcube/gcat/moderation/thread/ModerationThread.java
@@ -8,7 +8,7 @@ import org.gcube.common.authorization.utils.manager.SecretManager;
 import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
 import org.gcube.gcat.api.configuration.CatalogueConfiguration;
 import org.gcube.gcat.api.moderation.CMItemStatus;
-import org.gcube.gcat.moderation.thread.social.SocialMessageModerationThread;
+import org.gcube.gcat.moderation.thread.social.messages.SocialMessageModerationThread;
 import org.gcube.gcat.persistence.ckan.CKANUser;
 import org.gcube.portlets.user.uriresolvermanager.UriResolverManager;
 import org.gcube.portlets.user.uriresolvermanager.resolvers.query.CatalogueResolverQueryString.MODERATION_OP;
diff --git a/src/main/java/org/gcube/gcat/social/Message.java b/src/main/java/org/gcube/gcat/moderation/thread/social/messages/Message.java
similarity index 96%
rename from src/main/java/org/gcube/gcat/social/Message.java
rename to src/main/java/org/gcube/gcat/moderation/thread/social/messages/Message.java
index a5daf87..326a2fc 100644
--- a/src/main/java/org/gcube/gcat/social/Message.java
+++ b/src/main/java/org/gcube/gcat/moderation/thread/social/messages/Message.java
@@ -1,4 +1,4 @@
-package org.gcube.gcat.social;
+package org.gcube.gcat.moderation.thread.social.messages;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/org/gcube/gcat/social/SocialMessage.java b/src/main/java/org/gcube/gcat/moderation/thread/social/messages/SocialMessage.java
similarity index 98%
rename from src/main/java/org/gcube/gcat/social/SocialMessage.java
rename to src/main/java/org/gcube/gcat/moderation/thread/social/messages/SocialMessage.java
index eaa7c4a..cec279c 100644
--- a/src/main/java/org/gcube/gcat/social/SocialMessage.java
+++ b/src/main/java/org/gcube/gcat/moderation/thread/social/messages/SocialMessage.java
@@ -1,4 +1,4 @@
-package org.gcube.gcat.social;
+package org.gcube.gcat.moderation.thread.social.messages;
 
 import java.net.HttpURLConnection;
 
diff --git a/src/main/java/org/gcube/gcat/moderation/thread/social/SocialMessageModerationThread.java b/src/main/java/org/gcube/gcat/moderation/thread/social/messages/SocialMessageModerationThread.java
similarity index 98%
rename from src/main/java/org/gcube/gcat/moderation/thread/social/SocialMessageModerationThread.java
rename to src/main/java/org/gcube/gcat/moderation/thread/social/messages/SocialMessageModerationThread.java
index 92c1f01..2db8759 100644
--- a/src/main/java/org/gcube/gcat/moderation/thread/social/SocialMessageModerationThread.java
+++ b/src/main/java/org/gcube/gcat/moderation/thread/social/messages/SocialMessageModerationThread.java
@@ -1,4 +1,4 @@
-package org.gcube.gcat.moderation.thread.social;
+package org.gcube.gcat.moderation.thread.social.messages;
 
 import java.io.StringWriter;
 import java.util.Set;
@@ -9,8 +9,6 @@ import org.gcube.common.authorization.utils.secret.Secret;
 import org.gcube.gcat.api.moderation.CMItemStatus;
 import org.gcube.gcat.api.moderation.Moderated;
 import org.gcube.gcat.moderation.thread.ModerationThread;
-import org.gcube.gcat.social.Message;
-import org.gcube.gcat.social.SocialMessage;
 import org.gcube.gcat.social.SocialUsers;
 import org.gcube.gcat.utils.Constants;
 import org.slf4j.Logger;
@@ -201,3 +199,4 @@ public class SocialMessageModerationThread extends ModerationThread {
 	}
 	
 }
+	
\ No newline at end of file