diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py
index 3a40e7dfc0a..8a4761867da 100644
--- a/addons/fleet/__openerp__.py
+++ b/addons/fleet/__openerp__.py
@@ -49,12 +49,13 @@ Main Features
     ],
     'data' : [
         'fleet_view.xml',
+        'fleet_cars.xml',
         'fleet_data.xml',
         'fleet_board_view.xml',
     ],
     'update_xml' : ['security/ir.model.access.csv'],
 
-    'demo': ['fleet_cars.xml','fleet_demo.xml'],
+    'demo': ['fleet_demo.xml'],
 
     'installable' : True,
     'application' : True,
diff --git a/addons/fleet/fleet_data.xml b/addons/fleet/fleet_data.xml
index 9b8ebb19e19..f3975f5a580 100644
--- a/addons/fleet/fleet_data.xml
+++ b/addons/fleet/fleet_data.xml
@@ -436,5 +436,230 @@
       <record id="vehicle_tag_break" model="fleet.vehicle.tag" >
         <field name="name">Break</field>
       </record>
+
+      <record id="model_corsa" model="fleet.vehicle.model">
+          <field name="modelname">Corsa</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_astra" model="fleet.vehicle.model">
+          <field name="modelname">Astra</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_agila" model="fleet.vehicle.model">
+          <field name="modelname">Agila</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_combotour" model="fleet.vehicle.model">
+          <field name="modelname">Combo Tour</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_meriva" model="fleet.vehicle.model">
+          <field name="modelname">Meriva</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_astragtc" model="fleet.vehicle.model">
+          <field name="modelname">AstraGTC</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_zafira" model="fleet.vehicle.model">
+          <field name="modelname">Zafira</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_zafiratourer" model="fleet.vehicle.model">
+          <field name="modelname">Zafira Tourer</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_insignia" model="fleet.vehicle.model">
+          <field name="modelname">Insignia</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_mokka" model="fleet.vehicle.model">
+          <field name="modelname">Mokka</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_antara" model="fleet.vehicle.model">
+          <field name="modelname">Antara</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_ampera" model="fleet.vehicle.model">
+          <field name="modelname">Ampera</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_a1" model="fleet.vehicle.model">
+          <field name="modelname">A1</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a3" model="fleet.vehicle.model">
+          <field name="modelname">A3</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a4" model="fleet.vehicle.model">
+          <field name="modelname">A4</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a5" model="fleet.vehicle.model">
+          <field name="modelname">A5</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a6" model="fleet.vehicle.model">
+          <field name="modelname">A6</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a7" model="fleet.vehicle.model">
+          <field name="modelname">A7</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a8" model="fleet.vehicle.model">
+          <field name="modelname">A8</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_q3" model="fleet.vehicle.model">
+          <field name="modelname">Q3</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_q5" model="fleet.vehicle.model">
+          <field name="modelname">Q5</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_q7" model="fleet.vehicle.model">
+          <field name="modelname">Q7</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_tt" model="fleet.vehicle.model">
+          <field name="modelname">TT</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_serie1" model="fleet.vehicle.model">
+          <field name="modelname">Serie 1</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_serie3" model="fleet.vehicle.model">
+          <field name="modelname">Serie 3</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_serie5" model="fleet.vehicle.model">
+          <field name="modelname">Serie 5</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_serie6" model="fleet.vehicle.model">
+          <field name="modelname">Serie 6</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_serie7" model="fleet.vehicle.model">
+          <field name="modelname">Serie 7</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_seriex" model="fleet.vehicle.model">
+          <field name="modelname">Serie X</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_seriez4" model="fleet.vehicle.model">
+          <field name="modelname">Serie Z4</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_seriem" model="fleet.vehicle.model">
+          <field name="modelname">Serie M</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_seriehybrid" model="fleet.vehicle.model">
+          <field name="modelname">Serie Hybrid</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_classa" model="fleet.vehicle.model">
+          <field name="modelname">Class A</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classb" model="fleet.vehicle.model">
+          <field name="modelname">Class B</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classc" model="fleet.vehicle.model">
+          <field name="modelname">Class C</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classcl" model="fleet.vehicle.model">
+          <field name="modelname">Class CL</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classcls" model="fleet.vehicle.model">
+          <field name="modelname">Class CLS</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classe" model="fleet.vehicle.model">
+          <field name="modelname">Class E</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classm" model="fleet.vehicle.model">
+          <field name="modelname">Class M</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classgl" model="fleet.vehicle.model">
+          <field name="modelname">Class GL</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classglk" model="fleet.vehicle.model">
+          <field name="modelname">Class GLK</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classr" model="fleet.vehicle.model">
+          <field name="modelname">Class R</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classs" model="fleet.vehicle.model">
+          <field name="modelname">Class S</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classslk" model="fleet.vehicle.model">
+          <field name="modelname">Class SLK</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classsls" model="fleet.vehicle.model">
+          <field name="modelname">SLS</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
      </data>
 </openerp>
diff --git a/addons/fleet/fleet_demo.xml b/addons/fleet/fleet_demo.xml
index 4760e336dd1..d00cfd9ac3e 100644
--- a/addons/fleet/fleet_demo.xml
+++ b/addons/fleet/fleet_demo.xml
@@ -1,231 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-      <record id="model_corsa" model="fleet.vehicle.model">
-          <field name="modelname">Corsa</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_astra" model="fleet.vehicle.model">
-          <field name="modelname">Astra</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_agila" model="fleet.vehicle.model">
-          <field name="modelname">Agila</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_combotour" model="fleet.vehicle.model">
-          <field name="modelname">Combo Tour</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_meriva" model="fleet.vehicle.model">
-          <field name="modelname">Meriva</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_astragtc" model="fleet.vehicle.model">
-          <field name="modelname">AstraGTC</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_zafira" model="fleet.vehicle.model">
-          <field name="modelname">Zafira</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_zafiratourer" model="fleet.vehicle.model">
-          <field name="modelname">Zafira Tourer</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_insignia" model="fleet.vehicle.model">
-          <field name="modelname">Insignia</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_mokka" model="fleet.vehicle.model">
-          <field name="modelname">Mokka</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_antara" model="fleet.vehicle.model">
-          <field name="modelname">Antara</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_ampera" model="fleet.vehicle.model">
-          <field name="modelname">Ampera</field>
-          <field name="brand" ref="brand_opel" />
-      </record>
-
-      <record id="model_a1" model="fleet.vehicle.model">
-          <field name="modelname">A1</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_a3" model="fleet.vehicle.model">
-          <field name="modelname">A3</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_a4" model="fleet.vehicle.model">
-          <field name="modelname">A4</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_a5" model="fleet.vehicle.model">
-          <field name="modelname">A5</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_a6" model="fleet.vehicle.model">
-          <field name="modelname">A6</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_a7" model="fleet.vehicle.model">
-          <field name="modelname">A7</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_a8" model="fleet.vehicle.model">
-          <field name="modelname">A8</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_q3" model="fleet.vehicle.model">
-          <field name="modelname">Q3</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_q5" model="fleet.vehicle.model">
-          <field name="modelname">Q5</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_q7" model="fleet.vehicle.model">
-          <field name="modelname">Q7</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_tt" model="fleet.vehicle.model">
-          <field name="modelname">TT</field>
-          <field name="brand" ref="brand_audi" />
-      </record>
-
-      <record id="model_serie1" model="fleet.vehicle.model">
-          <field name="modelname">Serie 1</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_serie3" model="fleet.vehicle.model">
-          <field name="modelname">Serie 3</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_serie5" model="fleet.vehicle.model">
-          <field name="modelname">Serie 5</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_serie6" model="fleet.vehicle.model">
-          <field name="modelname">Serie 6</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_serie7" model="fleet.vehicle.model">
-          <field name="modelname">Serie 7</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_seriex" model="fleet.vehicle.model">
-          <field name="modelname">Serie X</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_seriez4" model="fleet.vehicle.model">
-          <field name="modelname">Serie Z4</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_seriem" model="fleet.vehicle.model">
-          <field name="modelname">Serie M</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_seriehybrid" model="fleet.vehicle.model">
-          <field name="modelname">Serie Hybrid</field>
-          <field name="brand" ref="brand_bmw" />
-      </record>
-
-      <record id="model_classa" model="fleet.vehicle.model">
-          <field name="modelname">Class A</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classb" model="fleet.vehicle.model">
-          <field name="modelname">Class B</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classc" model="fleet.vehicle.model">
-          <field name="modelname">Class C</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classcl" model="fleet.vehicle.model">
-          <field name="modelname">Class CL</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classcls" model="fleet.vehicle.model">
-          <field name="modelname">Class CLS</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classe" model="fleet.vehicle.model">
-          <field name="modelname">Class E</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classm" model="fleet.vehicle.model">
-          <field name="modelname">Class M</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classgl" model="fleet.vehicle.model">
-          <field name="modelname">Class GL</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classglk" model="fleet.vehicle.model">
-          <field name="modelname">Class GLK</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classr" model="fleet.vehicle.model">
-          <field name="modelname">Class R</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classs" model="fleet.vehicle.model">
-          <field name="modelname">Class S</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classslk" model="fleet.vehicle.model">
-          <field name="modelname">Class SLK</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
-      <record id="model_classsls" model="fleet.vehicle.model">
-          <field name="modelname">SLS</field>
-          <field name="brand" ref="brand_mercedes" />
-      </record>
-
       <record id="vehicle_state_inshop" model="fleet.vehicle.state">
         <field name="name">In shop</field>
         <field name="sequence">1</field>