diff --git a/frontends/src/jp/base.py b/frontends/src/jp/base.py
index 728ef84d..365ea544 100644
--- a/frontends/src/jp/base.py
+++ b/frontends/src/jp/base.py
@@ -36,7 +36,7 @@ import argparse
 from gi.repository import GLib, GObject
 from glob import iglob
 from importlib import import_module
-from sat.tools.jid import JID
+from sat_frontends.tools.jid import JID
 from sat_frontends.bridge.DBus import DBusBridgeFrontend
 from sat.core import exceptions
 import sat_frontends.jp
diff --git a/frontends/src/jp/cmd_profile.py b/frontends/src/jp/cmd_profile.py
index 1d30602d..f5f31f2d 100644
--- a/frontends/src/jp/cmd_profile.py
+++ b/frontends/src/jp/cmd_profile.py
@@ -23,7 +23,7 @@ and retrieve informations about a profile."""
 from logging import debug, info, error, warning
 from sat.core.i18n import _
 from sat_frontends.jp import base
-from sat.tools.jid import JID
+from sat_frontends.tools.jid import JID
 
 __commands__ = ["Profile"]
 
diff --git a/frontends/src/primitivus/chat.py b/frontends/src/primitivus/chat.py
index 923a13c6..9eca13fa 100644
--- a/frontends/src/primitivus/chat.py
+++ b/frontends/src/primitivus/chat.py
@@ -27,7 +27,7 @@ from sat_frontends.quick_frontend.quick_utils import escapePrivate, unescapePriv
 from sat_frontends.primitivus import xmlui
 from sat_frontends.primitivus.constants import Const as C
 import time
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 
 
 class ChatText(urwid.FlowWidget):
diff --git a/frontends/src/primitivus/contact_list.py b/frontends/src/primitivus/contact_list.py
index 98396d7d..5d6e33e8 100644
--- a/frontends/src/primitivus/contact_list.py
+++ b/frontends/src/primitivus/contact_list.py
@@ -22,7 +22,7 @@ import urwid
 from urwid_satext import sat_widgets
 from sat_frontends.quick_frontend.quick_contact_list import QuickContactList
 from sat_frontends.quick_frontend.quick_utils import escapePrivate, unescapePrivate
-from sat.tools.jid import JID
+from sat_frontends.tools.jid import JID
 from sat_frontends.primitivus.status import StatusBar
 from sat_frontends.primitivus.constants import Const
 
@@ -79,7 +79,7 @@ class ContactList(urwid.WidgetWrap, QuickContactList):
 
     def setFocus(self, text, select=False):
         """give focus to the first element that matches the given text. You can also
-        pass in text a sat.tools.jid.JID (it's a subclass of unicode).
+        pass in text a sat_frontends.tools.jid.JID (it's a subclass of unicode).
         @param text: contact group name, contact or muc userhost, muc private dialog jid
         @param select: if True, the element is also clicked
         """
diff --git a/frontends/src/primitivus/primitivus b/frontends/src/primitivus/primitivus
index 3a194236..f0c0712e 100755
--- a/frontends/src/primitivus/primitivus
+++ b/frontends/src/primitivus/primitivus
@@ -38,7 +38,7 @@ from sat_frontends.primitivus.progress import Progress
 from sat_frontends.primitivus.notify import Notify
 from sat_frontends.tools.misc import InputHistory
 from sat_frontends.constants import Const as commonConst # FIXME
-from sat.tools.jid import JID
+from sat_frontends.tools.jid import JID
 from os.path import join
 
 
diff --git a/frontends/src/primitivus/profile_manager.py b/frontends/src/primitivus/profile_manager.py
index 08691495..34b2428c 100644
--- a/frontends/src/primitivus/profile_manager.py
+++ b/frontends/src/primitivus/profile_manager.py
@@ -21,7 +21,7 @@ from sat.core.i18n import _
 from sat_frontends.primitivus.constants import Const as C
 import urwid
 from urwid_satext.sat_widgets import AdvancedEdit, Password, List, InputDialog, ConfirmDialog, Alert
-from sat.tools.jid import JID
+from sat_frontends.tools.jid import JID
 
 
 class ProfileManager(urwid.WidgetWrap):
diff --git a/frontends/src/quick_frontend/constants.py b/frontends/src/quick_frontend/constants.py
index 098d5731..b1673255 100644
--- a/frontends/src/quick_frontend/constants.py
+++ b/frontends/src/quick_frontend/constants.py
@@ -22,4 +22,4 @@ from sat_frontends import constants
 
 class Const(constants.Const):
 
-    PRIVATE_PREFIX = "@PRIVATE@"
+    PRIVATE_PREFIX = "@private@"
diff --git a/frontends/src/quick_frontend/quick_app.py b/frontends/src/quick_frontend/quick_app.py
index d666c66f..fa985867 100644
--- a/frontends/src/quick_frontend/quick_app.py
+++ b/frontends/src/quick_frontend/quick_app.py
@@ -21,7 +21,7 @@ from sat.core.i18n import _
 import sys
 from sat.core.log import getLogger
 log = getLogger(__name__)
-from sat.tools.jid import JID
+from sat_frontends.tools.jid import JID
 from sat_frontends.bridge.DBus import DBusBridgeFrontend
 from sat.core import exceptions
 from sat_frontends.quick_frontend.quick_utils import escapePrivate, unescapePrivate
diff --git a/frontends/src/quick_frontend/quick_card_game.py b/frontends/src/quick_frontend/quick_card_game.py
index d64e5efa..bb67a22c 100644
--- a/frontends/src/quick_frontend/quick_card_game.py
+++ b/frontends/src/quick_frontend/quick_card_game.py
@@ -19,7 +19,7 @@
 
 from sat.core.log import getLogger
 log = getLogger(__name__)
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 
 
 
diff --git a/frontends/src/quick_frontend/quick_chat.py b/frontends/src/quick_frontend/quick_chat.py
index ebf6d896..b940d8b4 100644
--- a/frontends/src/quick_frontend/quick_chat.py
+++ b/frontends/src/quick_frontend/quick_chat.py
@@ -20,7 +20,7 @@
 from sat.core.i18n import _
 from sat.core.log import getLogger
 log = getLogger(__name__)
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 from sat_frontends.quick_frontend.quick_utils import unescapePrivate
 from sat_frontends.quick_frontend.constants import Const
 
diff --git a/frontends/src/quick_frontend/quick_chat_list.py b/frontends/src/quick_frontend/quick_chat_list.py
index 08e2959c..f72d1887 100644
--- a/frontends/src/quick_frontend/quick_chat_list.py
+++ b/frontends/src/quick_frontend/quick_chat_list.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 
 
 class QuickChatList(dict):
diff --git a/frontends/src/quick_frontend/quick_contact_management.py b/frontends/src/quick_frontend/quick_contact_management.py
index d6f015e5..81592749 100644
--- a/frontends/src/quick_frontend/quick_contact_management.py
+++ b/frontends/src/quick_frontend/quick_contact_management.py
@@ -20,7 +20,7 @@
 from sat.core.i18n import _
 from sat.core.log import getLogger
 log = getLogger(__name__)
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 
 
 class QuickContactManagement(object):
diff --git a/frontends/src/quick_frontend/quick_utils.py b/frontends/src/quick_frontend/quick_utils.py
index 3cb282c2..62cd0eb6 100644
--- a/frontends/src/quick_frontend/quick_utils.py
+++ b/frontends/src/quick_frontend/quick_utils.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 from os.path import exists, splitext
 from sat_frontends.quick_frontend.constants import Const
 
diff --git a/src/tools/jid.py b/frontends/src/tools/jid.py
similarity index 100%
rename from src/tools/jid.py
rename to frontends/src/tools/jid.py
diff --git a/frontends/src/wix/chat.py b/frontends/src/wix/chat.py
index d6fd9dc7..98bfe171 100644
--- a/frontends/src/wix/chat.py
+++ b/frontends/src/wix/chat.py
@@ -25,7 +25,7 @@ import os.path
 import time
 from sat.core.log import getLogger
 log = getLogger(__name__)
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 from sat_frontends.quick_frontend.quick_chat import QuickChat
 from sat_frontends.wix.contact_list import ContactList
 from sat_frontends.wix.card_game import CardPanel
diff --git a/frontends/src/wix/contact_list.py b/frontends/src/wix/contact_list.py
index 2cdd2c13..dcab9596 100644
--- a/frontends/src/wix/contact_list.py
+++ b/frontends/src/wix/contact_list.py
@@ -24,7 +24,7 @@ from sat_frontends.wix.constants import Const
 from sat.core.log import getLogger
 log = getLogger(__name__)
 from cgi import escape
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 from os.path import join
 
 
diff --git a/frontends/src/wix/main_window.py b/frontends/src/wix/main_window.py
index 8762a774..35b2a67f 100644
--- a/frontends/src/wix/main_window.py
+++ b/frontends/src/wix/main_window.py
@@ -29,7 +29,7 @@ from sat_frontends.wix import xmlui
 from sat_frontends.wix.profile import Profile
 from sat_frontends.wix.profile_manager import ProfileManager
 import os.path
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 from sat.core.log import getLogger
 log = getLogger(__name__)
 from sat_frontends.wix.constants import Const
diff --git a/frontends/src/wix/profile.py b/frontends/src/wix/profile.py
index b9463938..702f796a 100644
--- a/frontends/src/wix/profile.py
+++ b/frontends/src/wix/profile.py
@@ -22,7 +22,7 @@ import wx
 import pdb
 from sat.core.log import getLogger
 log = getLogger(__name__)
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 
 
 class Profile(wx.Frame):
diff --git a/frontends/src/wix/quiz_game.py b/frontends/src/wix/quiz_game.py
index 030b22fd..cba903c8 100644
--- a/frontends/src/wix/quiz_game.py
+++ b/frontends/src/wix/quiz_game.py
@@ -25,7 +25,7 @@ import os.path, glob
 import pdb
 from sat.core.log import getLogger
 log = getLogger(__name__)
-from sat.tools.jid  import JID
+from sat_frontends.tools.jid  import JID
 from time import time
 from math import sin, cos, pi