diff --git a/addons/calendar/__init__.py b/addons/calendar/__init__.py
index 74719d7f424..ac0011716f6 100644
--- a/addons/calendar/__init__.py
+++ b/addons/calendar/__init__.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import calendar
 import controllers
-import contacts
+import models
diff --git a/addons/calendar/__openerp__.py b/addons/calendar/__openerp__.py
index e7551ad181c..7422127163a 100644
--- a/addons/calendar/__openerp__.py
+++ b/addons/calendar/__openerp__.py
@@ -20,14 +20,16 @@ If you need to manage your meetings, you should install the CRM module.
     """,
     'category': 'Extra Tools',
     'website': 'https://www.odoo.com/page/crm',
-    'demo': ['calendar_demo.xml'],
+    'demo': [
+        'data/calendar_demo.xml'
+    ],
     'data': [
-        'calendar_cron.xml',
         'security/ir.model.access.csv',
         'security/calendar_security.xml',
-        'calendar_view.xml',
-        'calendar_data.xml',
-        'views/calendar.xml',
+        'data/calendar_cron.xml',
+        'data/calendar_data.xml',
+        'views/calendar_templates.xml',
+        'views/calendar_views.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
     'test': [
diff --git a/addons/calendar/calendar_cron.xml b/addons/calendar/data/calendar_cron.xml
similarity index 100%
rename from addons/calendar/calendar_cron.xml
rename to addons/calendar/data/calendar_cron.xml
diff --git a/addons/calendar/calendar_data.xml b/addons/calendar/data/calendar_data.xml
similarity index 100%
rename from addons/calendar/calendar_data.xml
rename to addons/calendar/data/calendar_data.xml
diff --git a/addons/calendar/calendar_demo.xml b/addons/calendar/data/calendar_demo.xml
similarity index 100%
rename from addons/calendar/calendar_demo.xml
rename to addons/calendar/data/calendar_demo.xml
diff --git a/addons/calendar/models/__init__.py b/addons/calendar/models/__init__.py
new file mode 100644
index 00000000000..d5f1dcfd725
--- /dev/null
+++ b/addons/calendar/models/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import calendar
+import contacts
diff --git a/addons/calendar/calendar.py b/addons/calendar/models/calendar.py
similarity index 100%
rename from addons/calendar/calendar.py
rename to addons/calendar/models/calendar.py
diff --git a/addons/calendar/contacts.py b/addons/calendar/models/contacts.py
similarity index 100%
rename from addons/calendar/contacts.py
rename to addons/calendar/models/contacts.py
diff --git a/addons/calendar/views/calendar.xml b/addons/calendar/views/calendar_templates.xml
similarity index 100%
rename from addons/calendar/views/calendar.xml
rename to addons/calendar/views/calendar_templates.xml
diff --git a/addons/calendar/calendar_view.xml b/addons/calendar/views/calendar_views.xml
similarity index 100%
rename from addons/calendar/calendar_view.xml
rename to addons/calendar/views/calendar_views.xml