diff --git a/src/main/java/org/gcube/socialnetworking/socialtoken/ReplaceableToken.java b/src/main/java/org/gcube/socialnetworking/socialtoken/ReplaceableToken.java
index 715b139..fd51825 100644
--- a/src/main/java/org/gcube/socialnetworking/socialtoken/ReplaceableToken.java
+++ b/src/main/java/org/gcube/socialnetworking/socialtoken/ReplaceableToken.java
@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.codec.binary.Base64;
+import org.gcube.socialnetworking.tokenization.Token;
 
 public class ReplaceableToken extends Token {
 	
diff --git a/src/main/java/org/gcube/socialnetworking/socialtoken/SocialMessageParser.java b/src/main/java/org/gcube/socialnetworking/socialtoken/SocialMessageParser.java
index aad6bfc..5dbafb6 100644
--- a/src/main/java/org/gcube/socialnetworking/socialtoken/SocialMessageParser.java
+++ b/src/main/java/org/gcube/socialnetworking/socialtoken/SocialMessageParser.java
@@ -8,6 +8,8 @@ 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.tokenization.SocialStringTokenizer;
+import org.gcube.socialnetworking.tokenization.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/main/java/org/gcube/socialnetworking/socialtoken/TagToken.java b/src/main/java/org/gcube/socialnetworking/socialtoken/TagToken.java
index 1328da3..f0b0c1e 100644
--- a/src/main/java/org/gcube/socialnetworking/socialtoken/TagToken.java
+++ b/src/main/java/org/gcube/socialnetworking/socialtoken/TagToken.java
@@ -1,6 +1,7 @@
 package org.gcube.socialnetworking.socialtoken;
 
 import org.gcube.portal.databook.client.GCubeSocialNetworking;
+import org.gcube.socialnetworking.tokenization.Token;
 
 public class TagToken extends ReplaceableToken {
 
@@ -14,7 +15,7 @@ public class TagToken extends ReplaceableToken {
 	
 	public String getTokenReplacement() {
 		if(!replaced) {
-			String linkTarget = ReplaceableToken.createHref("", GCubeSocialNetworking.HASHTAG_OID, token);
+			String linkTarget = ReplaceableToken.createHref("", GCubeSocialNetworking.HASHTAG_OID, super.token);
 			tokenReplacement = ReplaceableToken.createLink(linkTarget, token, null);
 			replaced = true;
 		}
diff --git a/src/main/java/org/gcube/socialnetworking/socialtoken/URLToken.java b/src/main/java/org/gcube/socialnetworking/socialtoken/URLToken.java
index 7fd2068..0a582d6 100644
--- a/src/main/java/org/gcube/socialnetworking/socialtoken/URLToken.java
+++ b/src/main/java/org/gcube/socialnetworking/socialtoken/URLToken.java
@@ -5,6 +5,8 @@ import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.gcube.socialnetworking.tokenization.Token;
+
 public class URLToken extends ReplaceableToken {
 	
 	public URLToken(String token, String delimiter, int start, int end) {
diff --git a/src/main/java/org/gcube/socialnetworking/socialtoken/SocialStringTokenizer.java b/src/main/java/org/gcube/socialnetworking/tokenization/SocialStringTokenizer.java
similarity index 96%
rename from src/main/java/org/gcube/socialnetworking/socialtoken/SocialStringTokenizer.java
rename to src/main/java/org/gcube/socialnetworking/tokenization/SocialStringTokenizer.java
index 1f2e0a7..d61308f 100644
--- a/src/main/java/org/gcube/socialnetworking/socialtoken/SocialStringTokenizer.java
+++ b/src/main/java/org/gcube/socialnetworking/tokenization/SocialStringTokenizer.java
@@ -1,4 +1,4 @@
-package org.gcube.socialnetworking.socialtoken;
+package org.gcube.socialnetworking.tokenization;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/gcube/socialnetworking/socialtoken/Token.java b/src/main/java/org/gcube/socialnetworking/tokenization/Token.java
similarity index 81%
rename from src/main/java/org/gcube/socialnetworking/socialtoken/Token.java
rename to src/main/java/org/gcube/socialnetworking/tokenization/Token.java
index 79ffe79..1ba22cf 100644
--- a/src/main/java/org/gcube/socialnetworking/socialtoken/Token.java
+++ b/src/main/java/org/gcube/socialnetworking/tokenization/Token.java
@@ -1,11 +1,11 @@
-package org.gcube.socialnetworking.socialtoken;
+package org.gcube.socialnetworking.tokenization;
 
 public class Token{
 	
-	final String token;
-	final String delimiter;
-	final int start;
-	final int end;
+	protected final String token;
+	protected final String delimiter;
+	protected final int start;
+	protected final int end;
 	
 	/**
 	 * @param token the Token String