diff --git a/addons/stock_calendar/__init__.py b/addons/stock_calendar/__init__.py
index 7a3be6818a8..81fc81d29c9 100644
--- a/addons/stock_calendar/__init__.py
+++ b/addons/stock_calendar/__init__.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import stock
-import procurement
-import resource
+import models
diff --git a/addons/stock_calendar/__openerp__.py b/addons/stock_calendar/__openerp__.py
index d6c763073ee..9d96e5c14e5 100644
--- a/addons/stock_calendar/__openerp__.py
+++ b/addons/stock_calendar/__openerp__.py
@@ -45,7 +45,9 @@
 
     ],
     'data': [
-        'stock_calendar_view.xml'
+        'views/stock_views.xml',
+        'views/procurement_views.xml',
+        'views/resource_views.xml',
     ],
     'test': [
         'test/orderpoint_calendar.yml'
diff --git a/addons/stock_calendar/models/__init__.py b/addons/stock_calendar/models/__init__.py
new file mode 100644
index 00000000000..03dad687433
--- /dev/null
+++ b/addons/stock_calendar/models/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import procurement
+import resource
+import stock
diff --git a/addons/stock_calendar/procurement.py b/addons/stock_calendar/models/procurement.py
similarity index 100%
rename from addons/stock_calendar/procurement.py
rename to addons/stock_calendar/models/procurement.py
diff --git a/addons/stock_calendar/resource.py b/addons/stock_calendar/models/resource.py
similarity index 100%
rename from addons/stock_calendar/resource.py
rename to addons/stock_calendar/models/resource.py
diff --git a/addons/stock_calendar/stock.py b/addons/stock_calendar/models/stock.py
similarity index 100%
rename from addons/stock_calendar/stock.py
rename to addons/stock_calendar/models/stock.py
diff --git a/addons/stock_calendar/stock_calendar_view.xml b/addons/stock_calendar/stock_calendar_view.xml
deleted file mode 100644
index 86d3dcd5e29..00000000000
--- a/addons/stock_calendar/stock_calendar_view.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<openerp>
-    <data>
-        <record id="view_warehouse_orderpoint_form_inherit" model="ir.ui.view">
-            <field name="name">stock.warehouse.orderpoint.form.inherit</field>
-            <field name="model">stock.warehouse.orderpoint</field>
-            <field name="inherit_id" ref="stock.view_warehouse_orderpoint_form"/>
-            <field name="arch" type="xml">
-                <field name="company_id" position="after">
-                    <field name="calendar_id"/>
-                    <field name="purchase_calendar_id"/>
-                </field>
-            </field>
-        </record>
-
-        <!-- Procurement group to be used on the calendar attendance to match triggers and purchases-->
-        <record id="view_resource_calendar_attendance_tree_procurement_group" model="ir.ui.view">
-            <field name="name">resource.calendar.attendance.tree.procurement</field>
-            <field name="inherit_id" ref="resource.view_resource_calendar_attendance_tree"/>
-            <field name="model">resource.calendar.attendance</field>
-            <field name="arch" type="xml">
-                <field name="date_to" position="after">
-                    <field name="group_id"/>
-                </field>
-            </field>
-        </record>
-
-        <!-- For testing purposes -->
-        <record id="view_procurement_form_stock_inherit" model="ir.ui.view">
-            <field name="name">procurement.order.form.stock.inherit</field>
-            <field name="model">procurement.order</field>
-            <field name="inherit_id" ref="procurement.procurement_form_view"/>
-            <field name="arch" type="xml">
-                <field name="state" position="before">
-                    <button name="assign_group_date" string="Calculate dates according to Orderpoint" type="object"/>
-                </field>
-            </field>
-        </record>
-
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/stock_calendar/views/procurement_views.xml b/addons/stock_calendar/views/procurement_views.xml
new file mode 100644
index 00000000000..b12f7d3d63a
--- /dev/null
+++ b/addons/stock_calendar/views/procurement_views.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- For testing purposes -->
+    <record id="view_procurement_form_stock_inherit" model="ir.ui.view">
+        <field name="name">procurement.order.form.stock.inherit</field>
+        <field name="model">procurement.order</field>
+        <field name="inherit_id" ref="procurement.procurement_form_view"/>
+        <field name="arch" type="xml">
+            <field name="state" position="before">
+                <button name="assign_group_date" string="Calculate dates according to Orderpoint" type="object"/>
+            </field>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/stock_calendar/views/resource_views.xml b/addons/stock_calendar/views/resource_views.xml
new file mode 100644
index 00000000000..a0f7e6c2ab6
--- /dev/null
+++ b/addons/stock_calendar/views/resource_views.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- Procurement group to be used on the calendar attendance to match triggers and purchases-->
+    <record id="view_resource_calendar_attendance_tree_procurement_group" model="ir.ui.view">
+        <field name="name">resource.calendar.attendance.tree.procurement</field>
+        <field name="inherit_id" ref="resource.view_resource_calendar_attendance_tree"/>
+        <field name="model">resource.calendar.attendance</field>
+        <field name="arch" type="xml">
+            <field name="date_to" position="after">
+                <field name="group_id"/>
+            </field>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/stock_calendar/views/stock_views.xml b/addons/stock_calendar/views/stock_views.xml
new file mode 100644
index 00000000000..c63bcf8d995
--- /dev/null
+++ b/addons/stock_calendar/views/stock_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_warehouse_orderpoint_form_inherit" model="ir.ui.view">
+            <field name="name">stock.warehouse.orderpoint.form.inherit</field>
+            <field name="model">stock.warehouse.orderpoint</field>
+            <field name="inherit_id" ref="stock.view_warehouse_orderpoint_form"/>
+            <field name="arch" type="xml">
+                <field name="company_id" position="after">
+                    <field name="calendar_id"/>
+                    <field name="purchase_calendar_id"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>