diff --git a/addons/account_analytic_default/__init__.py b/addons/account_analytic_default/__init__.py
index 5bad4cb1c6f..81fc81d29c9 100644
--- a/addons/account_analytic_default/__init__.py
+++ b/addons/account_analytic_default/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import account_analytic_default
+import models
diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py
index 5862c840e8e..a8420228fdd 100644
--- a/addons/account_analytic_default/__openerp__.py
+++ b/addons/account_analytic_default/__openerp__.py
@@ -20,11 +20,9 @@ Allows to automatically select analytic accounts based on criterions:
     'website': 'https://www.odoo.com/page/accounting',
     'depends': ['sale_stock'],
     'data': [
-        'security/ir.model.access.csv', 
-        'security/account_analytic_default_security.xml', 
-        'account_analytic_default_view.xml'
+        'security/ir.model.access.csv',
+        'security/account_analytic_default_security.xml',
+        'views/account_analytic_default_view.xml'
     ],
-    'demo': [],
     'installable': True,
-    'auto_install': False,
 }
diff --git a/addons/account_analytic_default/models/__init__.py b/addons/account_analytic_default/models/__init__.py
new file mode 100644
index 00000000000..5bad4cb1c6f
--- /dev/null
+++ b/addons/account_analytic_default/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import account_analytic_default
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/models/account_analytic_default.py
similarity index 100%
rename from addons/account_analytic_default/account_analytic_default.py
rename to addons/account_analytic_default/models/account_analytic_default.py
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/views/account_analytic_default_view.xml
similarity index 100%
rename from addons/account_analytic_default/account_analytic_default_view.xml
rename to addons/account_analytic_default/views/account_analytic_default_view.xml