diff --git a/addons/project/__manifest__.py b/addons/project/__manifest__.py
index 5ce2daf2d44..dc8537070df 100644
--- a/addons/project/__manifest__.py
+++ b/addons/project/__manifest__.py
@@ -34,9 +34,9 @@
         'views/mail_activity_views.xml',
         'views/project_assets.xml',
         'views/project_portal_templates.xml',
-        'data/digest_data.xml',
-        'data/project_mail_template_data.xml',
-        'data/project_data.xml',
+        'data/ir_cron_data.xml',
+        'data/mail_data.xml',
+        'data/mail_template_data.xml',
         'wizard/project_delete_wizard_views.xml',
         'wizard/project_task_type_delete_views.xml',
     ],
diff --git a/addons/project/data/ir_cron_data.xml b/addons/project/data/ir_cron_data.xml
new file mode 100644
index 00000000000..838bfd4e148
--- /dev/null
+++ b/addons/project/data/ir_cron_data.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+    <record id="ir_cron_rating_project" model="ir.cron">
+        <field name="name">Project: Send rating</field>
+        <field name="model_id" ref="project.model_project_project"/>
+        <field name="state">code</field>
+        <field name="code">model._send_rating_all()</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+    </record>
+
+    <record id="ir_cron_recurring_tasks" model="ir.cron">
+        <field name="name">Project: Create Recurring Tasks</field>
+        <field name="model_id" ref="project.model_project_task_recurrence"/>
+        <field name="state">code</field>
+        <field name="code">model._cron_create_recurring_tasks()</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+        <field name="nextcall" eval="(DateTime.now().replace(hour=3, minute=0) + timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')" />
+    </record>
+</odoo>
diff --git a/addons/project/data/mail_data.xml b/addons/project/data/mail_data.xml
new file mode 100644
index 00000000000..e38884fecc2
--- /dev/null
+++ b/addons/project/data/mail_data.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+    <!-- Task-related subtypes for messaging / Chatter -->
+    <record id="mt_task_new" model="mail.message.subtype">
+        <field name="name">Task Created</field>
+        <field name="res_model">project.task</field>
+        <field name="default" eval="False"/>
+        <field name="hidden" eval="True"/>
+        <field name="description">Task Created</field>
+    </record>
+    <record id="mt_task_blocked" model="mail.message.subtype">
+        <field name="name">Task Blocked</field>
+        <field name="res_model">project.task</field>
+        <field name="default" eval="False"/>
+        <field name="description">Task blocked</field>
+    </record>
+    <record id="mt_task_ready" model="mail.message.subtype">
+        <field name="name">Task Ready</field>
+        <field name="res_model">project.task</field>
+        <field name="default" eval="False"/>
+        <field name="description">Task ready for Next Stage</field>
+    </record>
+    <record id="mt_task_stage" model="mail.message.subtype">
+        <field name="name">Stage Changed</field>
+        <field name="res_model">project.task</field>
+        <field name="default" eval="False"/>
+        <field name="description">Stage changed</field>
+    </record>
+    <record id="mt_task_rating" model="mail.message.subtype">
+        <field name="name">Task Rating</field>
+        <field name="res_model">project.task</field>
+        <field name="default" eval="True"/>
+        <field name="description">Ratings</field>
+    </record>
+    <!-- Project-related subtypes for messaging / Chatter -->
+    <record id="mt_project_task_new" model="mail.message.subtype">
+        <field name="name">Task Created</field>
+        <field name="sequence">10</field>
+        <field name="res_model">project.project</field>
+        <field name="default" eval="False"/>
+        <field name="parent_id" ref="mt_task_new"/>
+        <field name="relation_field">project_id</field>
+    </record>
+    <record id="mt_project_task_blocked" model="mail.message.subtype">
+        <field name="name">Task Blocked</field>
+        <field name="sequence">11</field>
+        <field name="res_model">project.project</field>
+        <field name="default" eval="False"/>
+        <field name="parent_id" ref="mt_task_blocked"/>
+        <field name="relation_field">project_id</field>
+    </record>
+    <record id="mt_project_task_ready" model="mail.message.subtype">
+        <field name="name">Task Ready</field>
+        <field name="sequence">12</field>
+        <field name="res_model">project.project</field>
+        <field name="default" eval="False"/>
+        <field name="parent_id" ref="mt_task_ready"/>
+        <field name="relation_field">project_id</field>
+    </record>
+    <record id="mt_project_task_stage" model="mail.message.subtype">
+        <field name="name">Task Stage Changed</field>
+        <field name="sequence">13</field>
+        <field name="res_model">project.project</field>
+        <field name="default" eval="False"/>
+        <field name="parent_id" ref="mt_task_stage"/>
+        <field name="relation_field">project_id</field>
+    </record>
+    <record id="mt_project_task_rating" model="mail.message.subtype">
+        <field name="name">Task Rating</field>
+        <field name="sequence">14</field>
+        <field name="res_model">project.project</field>
+        <field name="default" eval="True"/>
+        <field name="parent_id" ref="mt_task_rating"/>
+        <field name="relation_field">project_id</field>
+    </record>
+</odoo>
diff --git a/addons/project/data/project_mail_template_data.xml b/addons/project/data/mail_template_data.xml
similarity index 100%
rename from addons/project/data/project_mail_template_data.xml
rename to addons/project/data/mail_template_data.xml
diff --git a/addons/project/data/project_data.xml b/addons/project/data/project_data.xml
deleted file mode 100644
index 6c17952e3f5..00000000000
--- a/addons/project/data/project_data.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo noupdate="1">
-
-        <record id="ir_cron_rating_project" model="ir.cron">
-            <field name="name">Project: Send rating</field>
-            <field name="model_id" ref="project.model_project_project"/>
-            <field name="state">code</field>
-            <field name="code">model._send_rating_all()</field>
-            <field name="interval_type">days</field>
-            <field name="numbercall">-1</field>
-        </record>
-
-        <record id="ir_cron_recurring_tasks" model="ir.cron">
-            <field name="name">Project: Create Recurring Tasks</field>
-            <field name="model_id" ref="project.model_project_task_recurrence"/>
-            <field name="state">code</field>
-            <field name="code">model._cron_create_recurring_tasks()</field>
-            <field name="interval_type">days</field>
-            <field name="numbercall">-1</field>
-            <field name="nextcall" eval="(DateTime.now().replace(hour=3, minute=0) + timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')" />
-        </record>
-
-        <!-- Task-related subtypes for messaging / Chatter -->
-        <record id="mt_task_new" model="mail.message.subtype">
-            <field name="name">Task Created</field>
-            <field name="res_model">project.task</field>
-            <field name="default" eval="False"/>
-            <field name="hidden" eval="True"/>
-            <field name="description">Task Created</field>
-        </record>
-        <record id="mt_task_blocked" model="mail.message.subtype">
-            <field name="name">Task Blocked</field>
-            <field name="res_model">project.task</field>
-            <field name="default" eval="False"/>
-            <field name="description">Task blocked</field>
-        </record>
-        <record id="mt_task_ready" model="mail.message.subtype">
-            <field name="name">Task Ready</field>
-            <field name="res_model">project.task</field>
-            <field name="default" eval="False"/>
-            <field name="description">Task ready for Next Stage</field>
-        </record>
-        <record id="mt_task_stage" model="mail.message.subtype">
-            <field name="name">Stage Changed</field>
-            <field name="res_model">project.task</field>
-            <field name="default" eval="False"/>
-            <field name="description">Stage changed</field>
-        </record>
-        <record id="mt_task_rating" model="mail.message.subtype">
-            <field name="name">Task Rating</field>
-            <field name="res_model">project.task</field>
-            <field name="default" eval="True"/>
-            <field name="description">Ratings</field>
-        </record>
-        <!-- Project-related subtypes for messaging / Chatter -->
-        <record id="mt_project_task_new" model="mail.message.subtype">
-            <field name="name">Task Created</field>
-            <field name="sequence">10</field>
-            <field name="res_model">project.project</field>
-            <field name="default" eval="False"/>
-            <field name="parent_id" ref="mt_task_new"/>
-            <field name="relation_field">project_id</field>
-        </record>
-        <record id="mt_project_task_blocked" model="mail.message.subtype">
-            <field name="name">Task Blocked</field>
-            <field name="sequence">11</field>
-            <field name="res_model">project.project</field>
-            <field name="default" eval="False"/>
-            <field name="parent_id" ref="mt_task_blocked"/>
-            <field name="relation_field">project_id</field>
-        </record>
-        <record id="mt_project_task_ready" model="mail.message.subtype">
-            <field name="name">Task Ready</field>
-            <field name="sequence">12</field>
-            <field name="res_model">project.project</field>
-            <field name="default" eval="False"/>
-            <field name="parent_id" ref="mt_task_ready"/>
-            <field name="relation_field">project_id</field>
-        </record>
-        <record id="mt_project_task_stage" model="mail.message.subtype">
-            <field name="name">Task Stage Changed</field>
-            <field name="sequence">13</field>
-            <field name="res_model">project.project</field>
-            <field name="default" eval="False"/>
-            <field name="parent_id" ref="mt_task_stage"/>
-            <field name="relation_field">project_id</field>
-        </record>
-        <record id="mt_project_task_rating" model="mail.message.subtype">
-            <field name="name">Task Rating</field>
-            <field name="sequence">14</field>
-            <field name="res_model">project.project</field>
-            <field name="default" eval="True"/>
-            <field name="parent_id" ref="mt_task_rating"/>
-            <field name="relation_field">project_id</field>
-        </record>
-</odoo>