diff --git a/weboob2mail b/weboob/frontends/mail/scripts/mail
similarity index 96%
rename from weboob2mail
rename to weboob/frontends/mail/scripts/mail
index d6c3c9e20750735cea38f299cab51ffd9cdfd75d..c71588a45c1e8eb907172a792ba5a327bd83b1e9 100755
--- a/weboob2mail
+++ b/weboob/frontends/mail/scripts/mail
@@ -31,14 +31,8 @@ from weboob import Weboob
 from weboob.capabilities.messages import ICapMessages
 from weboob.tools.application import BaseApplication
 
-class User:
-    def __init__(self, username, password, email):
-        self.username = username
-        self.password = password
-        self.email = email
-
 class Application(BaseApplication):
-    APPNAME = 'weboob2mail'
+    APPNAME = 'mail'
     CONFIG = {'interval':  15,
               'domain':    'weboob.example.org',
               'recipient': 'weboob@example.org',