diff --git a/addons/project_gtd/project_gtd_data.xml b/addons/project_gtd/project_gtd_data.xml
index 2780cd0f8d0..659b0fe9cb2 100644
--- a/addons/project_gtd/project_gtd_data.xml
+++ b/addons/project_gtd/project_gtd_data.xml
@@ -1,5 +1,31 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
+        <record model="project.gtd.context" id="context_office">
+            <field name="name">Office</field>
+            <field name="sequence">0</field>
+        </record>
+        <record model="project.gtd.context" id="context_travel">
+            <field name="name">Travel</field>
+            <field name="sequence">2</field>
+        </record>
+
+        <record model="project.gtd.timebox" id="timebox_daily">
+            <field name="name">Today</field>
+            <field name="icon">terp-go-today</field>
+        </record>
+        <record model="project.gtd.timebox" id="timebox_weekly">
+            <field name="name">This Week</field>
+            <field name="icon">terp-go-week</field>
+        </record>
+        <record model="project.gtd.timebox" id="timebox_monthly">
+            <field name="name">This Month</field>
+            <field name="icon">terp-go-month</field>
+        </record>
+        <record model="project.gtd.timebox" id="timebox_lt">
+            <field name="name">Long Term</field>
+            <field name="icon">terp-project</field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/project_gtd/project_gtd_demo.xml b/addons/project_gtd/project_gtd_demo.xml
index a2d3cf65923..5ae12dff7bf 100644
--- a/addons/project_gtd/project_gtd_demo.xml
+++ b/addons/project_gtd/project_gtd_demo.xml
@@ -2,38 +2,14 @@
 <openerp>
     <data>
 
-    <record model="project.gtd.context" id="context_office">
-        <field name="name">Office</field>
-        <field name="sequence">0</field>
-    </record>
-    <record model="project.gtd.context" id="context_travel">
-        <field name="name">Travel</field>
-        <field name="sequence">2</field>
-    </record>
-    <record model="project.gtd.context" id="context_car">
-        <field name="name">Car</field>
-        <field name="sequence">1</field>
-    </record>
+
     <record model="project.gtd.context" id="context_home">
         <field name="name">Home</field>
         <field name="sequence">3</field>
     </record>
-
-    <record model="project.gtd.timebox" id="timebox_daily">
-        <field name="name">Today</field>
-        <field name="icon">terp-go-today</field>
-    </record>
-    <record model="project.gtd.timebox" id="timebox_weekly">
-        <field name="name">This Week</field>
-        <field name="icon">terp-go-week</field>
-    </record>
-    <record model="project.gtd.timebox" id="timebox_monthly">
-        <field name="name">This Month</field>
-        <field name="icon">terp-go-month</field>
-    </record>
-    <record model="project.gtd.timebox" id="timebox_lt">
-        <field name="name">Long Term</field>
-        <field name="icon">terp-project</field>
+    <record model="project.gtd.context" id="context_car">
+        <field name="name">Car</field>
+        <field name="sequence">1</field>
     </record>
 
     <record id="project.project_task_116" model="project.task">