diff --git a/mail_forward/__init__.py b/mail_forward/__init__.py
index 04742c5fc..65738b52f 100644
--- a/mail_forward/__init__.py
+++ b/mail_forward/__init__.py
@@ -2,4 +2,4 @@
 # © 2014-2015 Grupo ESOC <www.grupoesoc.es>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from . import models, wizard
+from . import models
diff --git a/mail_forward/__openerp__.py b/mail_forward/__openerp__.py
index f1a580c52..c5ac0df7e 100644
--- a/mail_forward/__openerp__.py
+++ b/mail_forward/__openerp__.py
@@ -18,8 +18,8 @@
     ],
     "data": [
         "views/assets.xml",
+        "views/compose_message.xml",
         "views/res_request_link.xml",
-        "wizard/mail_forward.xml",
     ],
     "qweb": [
         "static/src/xml/mail_forward.xml",
diff --git a/mail_forward/wizard/__init__.py b/mail_forward/models/__init__.py
similarity index 74%
rename from mail_forward/wizard/__init__.py
rename to mail_forward/models/__init__.py
index ec73f3254..3faf4bfa3 100644
--- a/mail_forward/wizard/__init__.py
+++ b/mail_forward/models/__init__.py
@@ -2,4 +2,4 @@
 # © 2014-2015 Grupo ESOC <www.grupoesoc.es>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from . import mail_forward
+from . import compose_message, res_request_link
diff --git a/mail_forward/wizard/mail_forward.py b/mail_forward/models/compose_message.py
similarity index 98%
rename from mail_forward/wizard/mail_forward.py
rename to mail_forward/models/compose_message.py
index 2f16dae5e..64b08da40 100644
--- a/mail_forward/wizard/mail_forward.py
+++ b/mail_forward/models/compose_message.py
@@ -11,7 +11,7 @@ class MailForwardComposeMessage(models.TransientModel):
     It duplicates the message and optionally attaches it to another object
     of the database and sends it to another recipients than the original one.
     """
-    _name = "mail_forward.compose.message"
+    _name = "mail_forward.compose_message"
     _inherits = {"mail.compose.message": "original_wizard_id"}
 
     @api.model
diff --git a/mail_forward/models.py b/mail_forward/models/res_request_link.py
similarity index 90%
rename from mail_forward/models.py
rename to mail_forward/models/res_request_link.py
index 8cc4fd6fc..e5d4dc7a5 100644
--- a/mail_forward/models.py
+++ b/mail_forward/models/res_request_link.py
@@ -5,7 +5,7 @@
 from openerp import fields, models
 
 
-class IrModel(models.Model):
+class ResRequestLink(models.Model):
     _inherit = "res.request.link"
 
     mail_forward_target = fields.Boolean(
diff --git a/mail_forward/wizard/mail_forward.xml b/mail_forward/views/compose_message.xml
similarity index 94%
rename from mail_forward/wizard/mail_forward.xml
rename to mail_forward/views/compose_message.xml
index ef84e1205..5b8dc8e8e 100644
--- a/mail_forward/wizard/mail_forward.xml
+++ b/mail_forward/views/compose_message.xml
@@ -8,7 +8,7 @@
 
 <record id="compose_form" model="ir.ui.view">
     <field name="name">Forward Email Form</field>
-    <field name="model">mail_forward.compose.message</field>
+    <field name="model">mail_forward.compose_message</field>
     <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
     <field name="arch" type="xml">
         <data>
@@ -51,7 +51,7 @@
 
 <record id="compose_action" model="ir.actions.act_window">
     <field name="name">Forward Email</field>
-    <field name="res_model">mail_forward.compose.message</field>
+    <field name="res_model">mail_forward.compose_message</field>
     <field name="src_model">mail.message</field>
     <field name="type">ir.actions.act_window</field>
     <field name="view_id" ref="compose_form"/>