diff --git a/addons/account_budget/__init__.py b/addons/account_budget/__init__.py
index 90a108dd3f4..d84fb182e8f 100644
--- a/addons/account_budget/__init__.py
+++ b/addons/account_budget/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import account_budget
+import models
 import report
 import wizard
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index 0b8122eee93..8156cf56ac5 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -9,48 +9,47 @@
 This module allows accountants to manage analytic and crossovered budgets.
 ==========================================================================
 
-Once the Budgets are defined (in Invoicing/Budgets/Budgets), the Project Managers 
+Once the Budgets are defined (in Invoicing/Budgets/Budgets), the Project Managers
 can set the planned amount on each Analytic Account.
 
 The accountant has the possibility to see the total of amount planned for each
-Budget in order to ensure the total planned is not greater/lower than what he 
-planned for this Budget. Each list of record can also be switched to a graphical 
+Budget in order to ensure the total planned is not greater/lower than what he
+planned for this Budget. Each list of record can also be switched to a graphical
 view of it.
 
 Three reports are available:
 ----------------------------
-    1. The first is available from a list of Budgets. It gives the spreading, for 
+    1. The first is available from a list of Budgets. It gives the spreading, for
        these Budgets, of the Analytic Accounts.
 
-    2. The second is a summary of the previous one, it only gives the spreading, 
+    2. The second is a summary of the previous one, it only gives the spreading,
        for the selected Budgets, of the Analytic Accounts.
 
-    3. The last one is available from the Analytic Chart of Accounts. It gives 
+    3. The last one is available from the Analytic Chart of Accounts. It gives
        the spreading, for the selected Analytic Accounts of Budgets.
 """,
     'website': 'https://www.odoo.com/page/accounting',
     'depends': ['account'],
     'data': [
+        'data/account_budget_workflow.xml',
+        'report/account_budget_report.xml',
+        'report/analytic_account_budget_report_templates.xml',
+        'report/budget_report_templates.xml',
+        'report/crossovered_budget_report_templates.xml',
         'security/ir.model.access.csv',
         'security/account_budget_security.xml',
-        'account_budget_view.xml',
-        'account_budget_report.xml',
-        'account_budget_workflow.xml',
-        'wizard/account_budget_analytic_view.xml',
-        'wizard/account_budget_report_view.xml',
-        'wizard/account_budget_crossovered_summary_report_view.xml',
-        'wizard/account_budget_crossovered_report_view.xml',
-
-        'views/report_analyticaccountbudget.xml',
-        'views/report_budget.xml',
-        'views/report_crossoveredbudget.xml',
+        'views/account_budget_views.xml',
+        'wizard/account_budget_analytic_views.xml',
+        'wizard/account_budget_report_views.xml',
+        'wizard/account_budget_crossovered_summary_report_views.xml',
+        'wizard/account_budget_crossovered_report_views.xml',
     ],
-    'demo': ['account_budget_demo.xml', 'account_budget_demo.yml'],
+    'demo': ['data/account_budget_demo.xml', 'data/account_budget_demo.yml'],
     'test': [
         '../account/test/account_minimal_test.xml',
-        'account_budget_demo.yml',
         'test/account_budget.yml',
         'test/account_budget_report.yml',
+        'test/account_budget_spread.yml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/account_budget/account_budget_demo.xml b/addons/account_budget/data/account_budget_demo.xml
similarity index 100%
rename from addons/account_budget/account_budget_demo.xml
rename to addons/account_budget/data/account_budget_demo.xml
diff --git a/addons/account_budget/account_budget_demo.yml b/addons/account_budget/data/account_budget_demo.yml
similarity index 100%
rename from addons/account_budget/account_budget_demo.yml
rename to addons/account_budget/data/account_budget_demo.yml
diff --git a/addons/account_budget/account_budget_workflow.xml b/addons/account_budget/data/account_budget_workflow.xml
similarity index 100%
rename from addons/account_budget/account_budget_workflow.xml
rename to addons/account_budget/data/account_budget_workflow.xml
diff --git a/addons/account_budget/models/__init__.py b/addons/account_budget/models/__init__.py
new file mode 100644
index 00000000000..3b1e405ab8f
--- /dev/null
+++ b/addons/account_budget/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import account_budget
\ No newline at end of file
diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/models/account_budget.py
similarity index 100%
rename from addons/account_budget/account_budget.py
rename to addons/account_budget/models/account_budget.py
diff --git a/addons/account_budget/account_budget_report.xml b/addons/account_budget/report/account_budget_report.xml
similarity index 100%
rename from addons/account_budget/account_budget_report.xml
rename to addons/account_budget/report/account_budget_report.xml
diff --git a/addons/account_budget/views/report_analyticaccountbudget.xml b/addons/account_budget/report/analytic_account_budget_report_templates.xml
similarity index 100%
rename from addons/account_budget/views/report_analyticaccountbudget.xml
rename to addons/account_budget/report/analytic_account_budget_report_templates.xml
diff --git a/addons/account_budget/views/report_budget.xml b/addons/account_budget/report/budget_report_templates.xml
similarity index 100%
rename from addons/account_budget/views/report_budget.xml
rename to addons/account_budget/report/budget_report_templates.xml
diff --git a/addons/account_budget/views/report_crossoveredbudget.xml b/addons/account_budget/report/crossovered_budget_report_templates.xml
similarity index 100%
rename from addons/account_budget/views/report_crossoveredbudget.xml
rename to addons/account_budget/report/crossovered_budget_report_templates.xml
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/views/account_budget_views.xml
similarity index 100%
rename from addons/account_budget/account_budget_view.xml
rename to addons/account_budget/views/account_budget_views.xml
diff --git a/addons/account_budget/wizard/account_budget_analytic_view.xml b/addons/account_budget/wizard/account_budget_analytic_views.xml
similarity index 100%
rename from addons/account_budget/wizard/account_budget_analytic_view.xml
rename to addons/account_budget/wizard/account_budget_analytic_views.xml
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_report_views.xml
similarity index 100%
rename from addons/account_budget/wizard/account_budget_crossovered_report_view.xml
rename to addons/account_budget/wizard/account_budget_crossovered_report_views.xml
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_summary_report_views.xml
similarity index 100%
rename from addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
rename to addons/account_budget/wizard/account_budget_crossovered_summary_report_views.xml
diff --git a/addons/account_budget/wizard/account_budget_report_view.xml b/addons/account_budget/wizard/account_budget_report_views.xml
similarity index 100%
rename from addons/account_budget/wizard/account_budget_report_view.xml
rename to addons/account_budget/wizard/account_budget_report_views.xml