diff --git a/src/main/java/org/gcube/social_networking/socialutillibrary/MessageParser.java b/src/main/java/org/gcube/social_networking/socialutillibrary/MessageParser.java
index e4c4c26..1c32aa2 100644
--- a/src/main/java/org/gcube/social_networking/socialutillibrary/MessageParser.java
+++ b/src/main/java/org/gcube/social_networking/socialutillibrary/MessageParser.java
@@ -9,6 +9,7 @@ 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.Token;
 import org.gcube.socialnetworking.token.URLToken;
diff --git a/src/main/java/org/gcube/social_networking/socialutillibrary/SocialStringTokenizer.java b/src/main/java/org/gcube/socialnetworking/token/SocialStringTokenizer.java
similarity index 92%
rename from src/main/java/org/gcube/social_networking/socialutillibrary/SocialStringTokenizer.java
rename to src/main/java/org/gcube/socialnetworking/token/SocialStringTokenizer.java
index cb1d4eb..85ba05d 100644
--- a/src/main/java/org/gcube/social_networking/socialutillibrary/SocialStringTokenizer.java
+++ b/src/main/java/org/gcube/socialnetworking/token/SocialStringTokenizer.java
@@ -1,12 +1,10 @@
-package org.gcube.social_networking.socialutillibrary;
+package org.gcube.socialnetworking.token;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.gcube.socialnetworking.token.Token;
-
 public class SocialStringTokenizer {
 
 	private final String originalString;
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 0b5e7d7..edfcce9 100644
--- a/src/test/java/org/gcube/social_networking/socialutillibrary/MessageParserTest.java
+++ b/src/test/java/org/gcube/social_networking/socialutillibrary/MessageParserTest.java
@@ -7,6 +7,7 @@ import java.util.List;
 import org.apache.commons.codec.binary.Base64;
 import org.gcube.portal.databook.client.GCubeSocialNetworking;
 import org.gcube.portlets.widgets.pickitem.shared.ItemBean;
+import org.gcube.socialnetworking.token.SocialStringTokenizer;
 import org.gcube.socialnetworking.token.Token;
 import org.junit.Assert;
 import org.junit.Test;