diff --git a/src/main/java/org/gcube/social_networking/socialutillibrary/MessageParser.java b/src/main/java/org/gcube/socialnetworking/token/MessageParser.java
similarity index 91%
rename from src/main/java/org/gcube/social_networking/socialutillibrary/MessageParser.java
rename to src/main/java/org/gcube/socialnetworking/token/MessageParser.java
index e67d8a8..154490e 100644
--- a/src/main/java/org/gcube/social_networking/socialutillibrary/MessageParser.java
+++ b/src/main/java/org/gcube/socialnetworking/token/MessageParser.java
@@ -1,4 +1,4 @@
-package org.gcube.social_networking.socialutillibrary;
+package org.gcube.socialnetworking.token;
 
 import java.io.StringWriter;
 import java.net.URL;
@@ -8,11 +8,6 @@ import java.util.List;
 import org.gcube.common.portal.GCubePortalConstants;
 import org.gcube.portal.databook.client.GCubeSocialNetworking;
 import org.gcube.portlets.widgets.pickitem.shared.ItemBean;
-import org.gcube.socialnetworking.token.ReplaceableToken;
-import org.gcube.socialnetworking.token.SocialStringTokenizer;
-import org.gcube.socialnetworking.token.TagToken;
-import org.gcube.socialnetworking.token.URLToken;
-import org.gcube.socialnetworking.token.Token;
 import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager;
 import org.gcube.vomanagement.usermanagement.impl.LiferayRoleManager;
 import org.gcube.vomanagement.usermanagement.model.GCubeTeam;
diff --git a/src/test/java/org/gcube/social_networking/socialutillibrary/MessageParserTest.java b/src/test/java/org/gcube/social_networking/socialutillibrary/MessageParserTest.java
index 0468b35..c27d27d 100644
--- a/src/test/java/org/gcube/social_networking/socialutillibrary/MessageParserTest.java
+++ b/src/test/java/org/gcube/social_networking/socialutillibrary/MessageParserTest.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.gcube.portlets.widgets.pickitem.shared.ItemBean;
+import org.gcube.socialnetworking.token.MessageParser;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;