diff --git a/addons/sale_order_dates/__init__.py b/addons/sale_order_dates/__init__.py
index 3d17e0eda45..81fc81d29c9 100644
--- a/addons/sale_order_dates/__init__.py
+++ b/addons/sale_order_dates/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import sale_order_dates
+import models
diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py
index 1f86d4e81c4..5cd6f517b3a 100644
--- a/addons/sale_order_dates/__openerp__.py
+++ b/addons/sale_order_dates/__openerp__.py
@@ -18,7 +18,7 @@ You can add the following additional dates to a sales order:
 """,
     'website': 'https://www.odoo.com/page/crm',
     'depends': ['sale_stock'],
-    'data': ['sale_order_dates_view.xml'],
+    'data': ['views/sale_order_views.xml'],
     'demo': [],
     'test': ['test/requested_date.yml'],
     'installable': True,
diff --git a/addons/sale_order_dates/models/__init__.py b/addons/sale_order_dates/models/__init__.py
new file mode 100644
index 00000000000..76bcb3512a1
--- /dev/null
+++ b/addons/sale_order_dates/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import sale_order
diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/models/sale_order.py
similarity index 100%
rename from addons/sale_order_dates/sale_order_dates.py
rename to addons/sale_order_dates/models/sale_order.py
diff --git a/addons/sale_order_dates/sale_order_dates_view.xml b/addons/sale_order_dates/views/sale_order_views.xml
similarity index 100%
rename from addons/sale_order_dates/sale_order_dates_view.xml
rename to addons/sale_order_dates/views/sale_order_views.xml