[MOV] calendar: reoganize module directory

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

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': [

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