diff --git a/odoo/addons/base/__manifest__.py b/odoo/addons/base/__manifest__.py
index 19d58daa0f1..43e00714ddd 100644
--- a/odoo/addons/base/__manifest__.py
+++ b/odoo/addons/base/__manifest__.py
@@ -13,7 +13,7 @@ The kernel of Odoo, needed for all installation.
     'depends': [],
     'data': [
         'res/res.lang.csv',
-        'base_data.xml',
+        'data/base_data.xml',
         'res/res_currency_data.xml',
         'res/res_country_data.xml',
         'security/base_security.xml',
@@ -65,7 +65,7 @@ The kernel of Odoo, needed for all installation.
         'security/ir.model.access.csv',
     ],
     'demo': [
-        'base_demo.xml',
+        'data/base_demo.xml',
         'res/res_currency_demo.xml',
         'res/res_bank_demo.xml',
         'res/res_partner_demo.xml',
diff --git a/odoo/addons/base/base_data.xml b/odoo/addons/base/data/base_data.xml
similarity index 100%
rename from odoo/addons/base/base_data.xml
rename to odoo/addons/base/data/base_data.xml
diff --git a/odoo/addons/base/base_demo.xml b/odoo/addons/base/data/base_demo.xml
similarity index 100%
rename from odoo/addons/base/base_demo.xml
rename to odoo/addons/base/data/base_demo.xml