diff --git a/addons/fetchmail/__init__.py b/addons/fetchmail/__init__.py
index 394c311ffad..7546aae6c85 100644
--- a/addons/fetchmail/__init__.py
+++ b/addons/fetchmail/__init__.py
@@ -1,5 +1,4 @@
 #-*- coding:utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import fetchmail
-import res_config
+import models
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 326a7aa96c6..68c880ea415 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -36,10 +36,9 @@ For more specific needs, you may also assign custom-defined actions
     """,
     'website': 'https://www.odoo.com/page/mailing',
     'data': [
-        'fetchmail_data.xml',
-        'fetchmail_view.xml',
+        'data/fetchmail_data.xml',
         'security/ir.model.access.csv',
-        'fetchmail_installer_view.xml'
+        'views/fetchmail_views.xml',
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/fetchmail/fetchmail_data.xml b/addons/fetchmail/data/fetchmail_data.xml
similarity index 100%
rename from addons/fetchmail/fetchmail_data.xml
rename to addons/fetchmail/data/fetchmail_data.xml
diff --git a/addons/fetchmail/fetchmail_installer_view.xml b/addons/fetchmail/fetchmail_installer_view.xml
deleted file mode 100644
index 918b7ecd430..00000000000
--- a/addons/fetchmail/fetchmail_installer_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<openerp>
-    <data>
-
-    </data>
-</openerp>
diff --git a/addons/fetchmail/models/__init__.py b/addons/fetchmail/models/__init__.py
new file mode 100644
index 00000000000..d25bd214b77
--- /dev/null
+++ b/addons/fetchmail/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+import fetchmail
+import res_config
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/models/fetchmail.py
similarity index 100%
rename from addons/fetchmail/fetchmail.py
rename to addons/fetchmail/models/fetchmail.py
diff --git a/addons/fetchmail/res_config.py b/addons/fetchmail/models/res_config.py
similarity index 100%
rename from addons/fetchmail/res_config.py
rename to addons/fetchmail/models/res_config.py
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/views/fetchmail_views.xml
similarity index 100%
rename from addons/fetchmail/fetchmail_view.xml
rename to addons/fetchmail/views/fetchmail_views.xml