diff --git a/frontends/src/primitivus/card_game.py b/frontends/src/primitivus/card_game.py
index 2b0be6ab..aa66d4c0 100644
--- a/frontends/src/primitivus/card_game.py
+++ b/frontends/src/primitivus/card_game.py
@@ -19,7 +19,7 @@
 
 import urwid
 from urwid_satext import sat_widgets
-from sat.tools.frontends.games import TarotCard
+from sat_frontends.tools.games import TarotCard
 from sat_frontends.quick_frontend.quick_card_game import QuickCardGame
 from sat_frontends.primitivus.xmlui import XMLUI
 
diff --git a/frontends/src/primitivus/primitivus b/frontends/src/primitivus/primitivus
index 7fb4a971..1276e02d 100755
--- a/frontends/src/primitivus/primitivus
+++ b/frontends/src/primitivus/primitivus
@@ -31,7 +31,7 @@ from sat_frontends.primitivus.gateways import GatewaysManager
 from sat_frontends.primitivus.xmlui import XMLUI
 from sat_frontends.primitivus.progress import Progress
 from sat_frontends.primitivus.notify import Notify
-from sat.tools.frontends.misc import InputHistory
+from sat_frontends.tools.misc import InputHistory
 import sat_frontends.primitivus.constants
 import logging
 from logging import debug, info, error
diff --git a/src/tools/frontends/__init__.py b/frontends/src/tools/__init__.py
similarity index 100%
rename from src/tools/frontends/__init__.py
rename to frontends/src/tools/__init__.py
diff --git a/src/tools/frontends/composition.py b/frontends/src/tools/composition.py
similarity index 100%
rename from src/tools/frontends/composition.py
rename to frontends/src/tools/composition.py
diff --git a/src/tools/frontends/games.py b/frontends/src/tools/games.py
similarity index 100%
rename from src/tools/frontends/games.py
rename to frontends/src/tools/games.py
diff --git a/src/tools/frontends/misc.py b/frontends/src/tools/misc.py
similarity index 100%
rename from src/tools/frontends/misc.py
rename to frontends/src/tools/misc.py
diff --git a/src/tools/frontends/strings.py b/frontends/src/tools/strings.py
similarity index 100%
rename from src/tools/frontends/strings.py
rename to frontends/src/tools/strings.py
diff --git a/src/tools/frontends/xml.py b/frontends/src/tools/xml.py
similarity index 100%
rename from src/tools/frontends/xml.py
rename to frontends/src/tools/xml.py
diff --git a/frontends/src/wix/card_game.py b/frontends/src/wix/card_game.py
index 73d12015..b4693e29 100644
--- a/frontends/src/wix/card_game.py
+++ b/frontends/src/wix/card_game.py
@@ -24,7 +24,7 @@ import os.path, glob
 import pdb
 from logging import debug, info, error
 from sat.tools.jid  import JID
-from sat.tools.frontends.games import TarotCard
+from sat_frontends.tools.games import TarotCard
 from sat_frontends.quick_frontend.quick_card_game import QuickCardGame
 from sat_frontends.wix.xmlui import XMLUI
 
diff --git a/setup.py b/setup.py
index bb47aa70..48eb0aef 100644
--- a/setup.py
+++ b/setup.py
@@ -160,7 +160,7 @@ setup(name=NAME,
       package_dir={'sat': 'src', 'sat_frontends': 'frontends/src'},
       packages=['sat', 'sat.tools', 'sat.bridge', 'sat.plugins', 'sat.test', 'sat.core', 'sat.memory',
                 'sat_frontends', 'sat_frontends.bridge', 'sat_frontends.quick_frontend',
-                'sat_frontends.primitivus', 'sat_frontends.wix'],
+                'sat_frontends.primitivus', 'sat_frontends.wix', 'sat_frontends.tools'],
       package_data={'sat': ['sat.tac', 'sat.sh'],
                     'sat_frontends': ['wix/COPYING']},
       data_files=[(os.path.join(sys.prefix, 'share/locale/fr/LC_MESSAGES'), ['i18n/fr/LC_MESSAGES/sat.mo']),
diff --git a/src/plugins/plugin_misc_quiz.py b/src/plugins/plugin_misc_quiz.py
index b3601ce3..bc4a65ac 100755
--- a/src/plugins/plugin_misc_quiz.py
+++ b/src/plugins/plugin_misc_quiz.py
@@ -27,7 +27,7 @@ import random
 
 from wokkel import data_form
 from sat.tools.xml_tools import dataForm2XML
-from sat.tools.frontends.games import TarotCard
+from sat_frontends.tools.games import TarotCard
 from time import time
 
 
diff --git a/src/plugins/plugin_misc_tarot.py b/src/plugins/plugin_misc_tarot.py
index 55ad043b..d927623f 100755
--- a/src/plugins/plugin_misc_tarot.py
+++ b/src/plugins/plugin_misc_tarot.py
@@ -23,7 +23,7 @@ from twisted.words.protocols.jabber import jid
 from wokkel import data_form
 
 from sat.tools.xml_tools import dataForm2XML
-from sat.tools.frontends.games import TarotCard
+from sat_frontends.tools.games import TarotCard
 from time import time
 import random
 
diff --git a/src/tools/plugins/__init__.py b/src/tools/plugins/__init__.py
deleted file mode 100644
index e69de29b..00000000