diff --git a/addons/hr_fleet_management/__init__.py b/addons/hr_fleet_management/__init__.py
index 4fe53db08ca..4da53d5adab 100644
--- a/addons/hr_fleet_management/__init__.py
+++ b/addons/hr_fleet_management/__init__.py
@@ -1 +1,3 @@
+# -*- coding: utf-8 -*-
+
 import hr_fleet_management
diff --git a/addons/hr_fleet_management/__openerp__.py b/addons/hr_fleet_management/__openerp__.py
index 1a3acb9b742..7823e967699 100644
--- a/addons/hr_fleet_management/__openerp__.py
+++ b/addons/hr_fleet_management/__openerp__.py
@@ -31,7 +31,7 @@
 	- managing cars insurance
 	- remind insurance renewing
 	""",
-	'data': ['hr_fleet_management_view.xml'],
+	'data': ['view/hr_fleet_management_view.xml'],
 	'demo': [],
 	'installable': True,
 	'auto_install': False,
diff --git a/addons/hr_fleet_management/hr_fleet_management.py b/addons/hr_fleet_management/hr_fleet_management.py
index fb6cda1da39..46efcdfd46e 100644
--- a/addons/hr_fleet_management/hr_fleet_management.py
+++ b/addons/hr_fleet_management/hr_fleet_management.py
@@ -1,10 +1,20 @@
+# -*- coding: utf-8 -*-
 from osv import osv, fields
 
-class Car (osv.Model):
+class fleet_vehicle_model (osv.Model):
 
-	_name = ’hr_fleet_management.car’
+	_name = 'fleet.vehicle.model'
+	_description = '...'
 
 	_columns = {
-		’name’ : fields.char(’Car name’, 128, required = True),
-		’description’ : fields.text(’Description’),
+		'name' : fields.char('Car name', 128, required = True),
+	}
+	
+class fleet_vehicle(osv.Model):
+	_name = 'fleet.vehicle'
+	_description = 'Fleet Vehicle'
+
+	_columns = {
+		'name' : fields.char('Name', size=32, required=True),
+		'model_id' : fields.many2one('fleet.vehicle.model','Model', required=True),
 	}
diff --git a/addons/hr_fleet_management/view/hr_fleet_management_view.xml b/addons/hr_fleet_management/view/hr_fleet_management_view.xml
index 963c339a1bb..9deb8786382 100644
--- a/addons/hr_fleet_management/view/hr_fleet_management_view.xml
+++ b/addons/hr_fleet_management/view/hr_fleet_management_view.xml
@@ -1,14 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
 	<data>
-		<menuitem id="hr_fleet_management_menu" name="Fleet Management" />
-	
-		<record model="ir.actions.act_window" id="car_list_action">
-			<field name="name">Cars</field>
-			<field name="res_model">car_fleet_management.car</field>
+
+		<record model='ir.ui.view' id='fleet_vehicle_model_form'>
+			<field name="name">fleet.vehicle.model.form</field>
+			<field name="model">fleet.vehicle.model</field>
+			<field name="arch" type="xml">
+				<form string="Model" version="7.0">
+					<field name="name" />
+				</form>
+			</field>
+		</record>	
+
+		<record model='ir.ui.view' id='fleet_vehicle_model_tree'>
+			<field name="name">fleet.vehicle.model.tree</field>
+			<field name="model">fleet.vehicle.model</field>
+			<field name="arch" type="xml">
+				<tree string="Model" version="7.0">
+					<field name="name" />
+				</tree>
+			</field>
+		</record>
+		<record model='ir.actions.act_window' id='fleet_vehicle_model_act'>
+			<field name="name">Vehicle Model</field>
+			<field name="res_model">fleet.vehicle.model</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
 		</record>
-		<menuitem id="car_menu" name="Cars" parent="hr_fleet_management_menu" action="car_list_action" />
+		<menuitem name="Fleet Management" id="menu_root" />
+		<menuitem name="Vehicles" parent="menu_root" id="fleet_vehicles" />
+		<menuitem action="fleet_vehicle_model_act" parent="fleet_vehicles" id="fleet_vehicle_model_menu" />
 	</data>
 </openerp>