diff --git a/addons/sale_margin/__init__.py b/addons/sale_margin/__init__.py
index c61d2d59a98..0ed5c5445e8 100644
--- a/addons/sale_margin/__init__.py
+++ b/addons/sale_margin/__init__.py
@@ -1,4 +1,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import sale_margin
+import models
 import report
diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py
index f4a693a31e3..eae9ff673a9 100644
--- a/addons/sale_margin/__openerp__.py
+++ b/addons/sale_margin/__openerp__.py
@@ -13,9 +13,9 @@ Price and Cost Price.
     """,
     'author':'OpenERP SA',
     'depends':['sale'],
-    'demo':['sale_margin_demo.xml'],
+    'demo':['data/sale_margin_demo.xml'],
     'test': ['test/sale_margin.yml'],
-    'data':['security/ir.model.access.csv','sale_margin_view.xml'],
+    'data':['security/ir.model.access.csv','views/sale_margin_view.xml'],
     'auto_install': False,
     'installable': True,
 }
diff --git a/addons/sale_margin/sale_margin_demo.xml b/addons/sale_margin/data/sale_margin_demo.xml
similarity index 100%
rename from addons/sale_margin/sale_margin_demo.xml
rename to addons/sale_margin/data/sale_margin_demo.xml
diff --git a/addons/sale_margin/models/__init__.py b/addons/sale_margin/models/__init__.py
new file mode 100644
index 00000000000..76bcb3512a1
--- /dev/null
+++ b/addons/sale_margin/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_margin/sale_margin.py b/addons/sale_margin/models/sale_order.py
similarity index 100%
rename from addons/sale_margin/sale_margin.py
rename to addons/sale_margin/models/sale_order.py
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/views/sale_margin_view.xml
similarity index 100%
rename from addons/sale_margin/sale_margin_view.xml
rename to addons/sale_margin/views/sale_margin_view.xml