diff --git a/odoo/addons/base/__manifest__.py b/odoo/addons/base/__manifest__.py
index 43e00714ddd..8923cde79bb 100644
--- a/odoo/addons/base/__manifest__.py
+++ b/odoo/addons/base/__manifest__.py
@@ -12,14 +12,14 @@ The kernel of Odoo, needed for all installation.
 """,
     'depends': [],
     'data': [
-        'res/res.lang.csv',
+        'data/res.lang.csv',
         'data/base_data.xml',
-        'res/res_currency_data.xml',
-        'res/res_country_data.xml',
+        'data/res_currency_data.xml',
+        'data/res_country_data.xml',
         'security/base_security.xml',
         'base_menu.xml',
         'res/res_config.xml',
-        'res/res.country.state.csv',
+        'data/res.country.state.csv',
         'ir/ir_actions.xml',
         'ir/ir_config_parameter_view.xml',
         'ir/ir_cron_view.xml',
@@ -57,7 +57,7 @@ The kernel of Odoo, needed for all installation.
         'res/res_country_view.xml',
         'res/res_currency_view.xml',
         'res/res_users_view.xml',
-        'res/res_partner_data.xml',
+        'data/res_partner_data.xml',
         'res/ir_property_view.xml',
         'res/res_config_settings_views.xml',
         'res/res_security.xml',
@@ -66,10 +66,10 @@ The kernel of Odoo, needed for all installation.
     ],
     'demo': [
         'data/base_demo.xml',
-        'res/res_currency_demo.xml',
-        'res/res_bank_demo.xml',
-        'res/res_partner_demo.xml',
-        'res/res_partner_image_demo.xml',
+        'data/res_currency_rate_demo.xml',
+        'data/res_bank_demo.xml',
+        'data/res_partner_demo.xml',
+        'data/res_partner_image_demo.xml',
     ],
     'test': [],
     'installable': True,
diff --git a/odoo/addons/base/data/base_demo.xml b/odoo/addons/base/data/base_demo.xml
index 89c6ac05d03..6ae5660805b 100644
--- a/odoo/addons/base/data/base_demo.xml
+++ b/odoo/addons/base/data/base_demo.xml
@@ -31,7 +31,7 @@
             <field name="phone">+1 555 123 8069</field>
             <field name="email">info@yourcompany.example.com</field>
             <field name="website">www.example.com</field>
-            <field name="image" type="base64" file="base/res/res_company_logo.png"/>
+            <field name="image" type="base64" file="base/static/img/res_company_logo.png"/>
         </record>
 
         <record id="main_company" model="res.company">
diff --git a/odoo/addons/base/res/res.country.state.csv b/odoo/addons/base/data/res.country.state.csv
similarity index 100%
rename from odoo/addons/base/res/res.country.state.csv
rename to odoo/addons/base/data/res.country.state.csv
diff --git a/odoo/addons/base/res/res.lang.csv b/odoo/addons/base/data/res.lang.csv
similarity index 100%
rename from odoo/addons/base/res/res.lang.csv
rename to odoo/addons/base/data/res.lang.csv
diff --git a/odoo/addons/base/res/res_bank_demo.xml b/odoo/addons/base/data/res_bank_demo.xml
similarity index 100%
rename from odoo/addons/base/res/res_bank_demo.xml
rename to odoo/addons/base/data/res_bank_demo.xml
diff --git a/odoo/addons/base/res/res_country_data.xml b/odoo/addons/base/data/res_country_data.xml
similarity index 100%
rename from odoo/addons/base/res/res_country_data.xml
rename to odoo/addons/base/data/res_country_data.xml
diff --git a/odoo/addons/base/res/res_currency_data.xml b/odoo/addons/base/data/res_currency_data.xml
similarity index 100%
rename from odoo/addons/base/res/res_currency_data.xml
rename to odoo/addons/base/data/res_currency_data.xml
diff --git a/odoo/addons/base/res/res_currency_demo.xml b/odoo/addons/base/data/res_currency_rate_demo.xml
similarity index 100%
rename from odoo/addons/base/res/res_currency_demo.xml
rename to odoo/addons/base/data/res_currency_rate_demo.xml
diff --git a/odoo/addons/base/res/res_partner_data.xml b/odoo/addons/base/data/res_partner_data.xml
similarity index 100%
rename from odoo/addons/base/res/res_partner_data.xml
rename to odoo/addons/base/data/res_partner_data.xml
diff --git a/odoo/addons/base/res/res_partner_demo.xml b/odoo/addons/base/data/res_partner_demo.xml
similarity index 100%
rename from odoo/addons/base/res/res_partner_demo.xml
rename to odoo/addons/base/data/res_partner_demo.xml
diff --git a/odoo/addons/base/res/res_partner_image_demo.xml b/odoo/addons/base/data/res_partner_image_demo.xml
similarity index 100%
rename from odoo/addons/base/res/res_partner_image_demo.xml
rename to odoo/addons/base/data/res_partner_image_demo.xml
diff --git a/odoo/addons/base/res/res_company.py b/odoo/addons/base/res/res_company.py
index 88e1adfc66f..b95b502f6a3 100644
--- a/odoo/addons/base/res/res_company.py
+++ b/odoo/addons/base/res/res_company.py
@@ -27,7 +27,7 @@ class Company(models.Model):
         return super(Company, self).copy(default)
 
     def _get_logo(self):
-        return base64.b64encode(open(os.path.join(tools.config['root_path'], 'addons', 'base', 'res', 'res_company_logo.png'), 'rb') .read())
+        return base64.b64encode(open(os.path.join(tools.config['root_path'], 'addons', 'base', 'static', 'img', 'res_company_logo.png'), 'rb') .read())
 
     @api.model
     def _get_euro(self):
diff --git a/odoo/addons/base/res/res_partner.py b/odoo/addons/base/res/res_partner.py
index 4862689ea64..58ab2953e4e 100644
--- a/odoo/addons/base/res/res_partner.py
+++ b/odoo/addons/base/res/res_partner.py
@@ -288,13 +288,13 @@ class Partner(models.Model):
             image = parent_image and parent_image.decode('base64') or None
 
         if not image and partner_type == 'invoice':
-            img_path = get_module_resource('base', 'static/src/img', 'money.png')
+            img_path = get_module_resource('base', 'static/img', 'money.png')
         elif not image and partner_type == 'delivery':
-            img_path = get_module_resource('base', 'static/src/img', 'truck.png')
+            img_path = get_module_resource('base', 'static/img', 'truck.png')
         elif not image and is_company:
-            img_path = get_module_resource('base', 'static/src/img', 'company_image.png')
+            img_path = get_module_resource('base', 'static/img', 'company_image.png')
         elif not image:
-            img_path = get_module_resource('base', 'static/src/img', 'avatar.png')
+            img_path = get_module_resource('base', 'static/img', 'avatar.png')
             colorize = True
 
         if img_path:
diff --git a/odoo/addons/base/res/res_partner_view.xml b/odoo/addons/base/res/res_partner_view.xml
index e8e46465d86..83c39fce280 100644
--- a/odoo/addons/base/res/res_partner_view.xml
+++ b/odoo/addons/base/res/res_partner_view.xml
@@ -296,11 +296,11 @@
                                                 <div class="o_kanban_image">
                                                     <img t-if="record.image_small.raw_value" t-att-src="'data:image/png;base64,'+record.image_small.raw_value"/>
                                                     <t t-if="!record.image_small.raw_value">
-                                                        <img t-if="record.type.raw_value === 'delivery'" t-att-src='_s + "/base/static/src/img/truck.png"'/>
-                                                        <img t-if="record.type.raw_value === 'invoice'" t-att-src='_s + "/base/static/src/img/money.png"'/>
+                                                        <img t-if="record.type.raw_value === 'delivery'" t-att-src='_s + "/base/static/img/truck.png"'/>
+                                                        <img t-if="record.type.raw_value === 'invoice'" t-att-src='_s + "/base/static/img/money.png"'/>
                                                         <t t-if="record.type.raw_value !== 'invoice' &amp;&amp; record.type.raw_value !== 'delivery'">
-                                                            <img t-if="record.is_company.raw_value === true" t-att-src='_s + "/base/static/src/img/company_image.png"'/>
-                                                            <img t-if="record.is_company.raw_value === false" t-att-src='_s + "/base/static/src/img/avatar.png"'/>
+                                                            <img t-if="record.is_company.raw_value === true" t-att-src='_s + "/base/static/img/company_image.png"'/>
+                                                            <img t-if="record.is_company.raw_value === false" t-att-src='_s + "/base/static/img/avatar.png"'/>
                                                         </t>
                                                     </t>
                                                 </div>
@@ -453,17 +453,17 @@
                                     </t>
                                     <t t-if="!record.image_small.raw_value">
                                         <t t-if="record.type.raw_value === 'delivery'">
-                                            <img t-att-src='_s + "/base/static/src/img/truck.png"' class="o_kanban_image oe_kanban_avatar_smallbox"/>
+                                            <img t-att-src='_s + "/base/static/img/truck.png"' class="o_kanban_image oe_kanban_avatar_smallbox"/>
                                         </t>
                                         <t t-if="record.type.raw_value === 'invoice'">
-                                            <img t-att-src='_s + "/base/static/src/img/money.png"' class="o_kanban_image oe_kanban_avatar_smallbox"/>
+                                            <img t-att-src='_s + "/base/static/img/money.png"' class="o_kanban_image oe_kanban_avatar_smallbox"/>
                                          </t>
                                         <t t-if="record.type.raw_value != 'invoice' &amp;&amp; record.type.raw_value != 'delivery'">
                                             <t t-if="record.is_company.raw_value === true">
-                                                <img t-att-src='_s + "/base/static/src/img/company_image.png"'/>
+                                                <img t-att-src='_s + "/base/static/img/company_image.png"'/>
                                             </t>
                                             <t t-if="record.is_company.raw_value === false">
-                                                <img t-att-src='_s + "/base/static/src/img/avatar.png"'/>
+                                                <img t-att-src='_s + "/base/static/img/avatar.png"'/>
                                             </t>
                                         </t>
                                     </t>
diff --git a/odoo/addons/base/static/src/img/avatar.png b/odoo/addons/base/static/img/avatar.png
similarity index 100%
rename from odoo/addons/base/static/src/img/avatar.png
rename to odoo/addons/base/static/img/avatar.png
diff --git a/odoo/addons/base/static/src/img/company_image.png b/odoo/addons/base/static/img/company_image.png
similarity index 100%
rename from odoo/addons/base/static/src/img/company_image.png
rename to odoo/addons/base/static/img/company_image.png
diff --git a/odoo/addons/base/static/src/img/money.png b/odoo/addons/base/static/img/money.png
similarity index 100%
rename from odoo/addons/base/static/src/img/money.png
rename to odoo/addons/base/static/img/money.png
diff --git a/odoo/addons/base/res/res_company_logo.png b/odoo/addons/base/static/img/res_company_logo.png
similarity index 100%
rename from odoo/addons/base/res/res_company_logo.png
rename to odoo/addons/base/static/img/res_company_logo.png
diff --git a/odoo/addons/base/static/src/img/truck.png b/odoo/addons/base/static/img/truck.png
similarity index 100%
rename from odoo/addons/base/static/src/img/truck.png
rename to odoo/addons/base/static/img/truck.png