diff --git a/addons/fleet/__init__.py b/addons/fleet/__init__.py
index 443ea47f8fdde2a40da1865ee3a2cee5d5f48278..5f9ef702708ff495dece0bb2026a613c374a56e8 100644
--- a/addons/fleet/__init__.py
+++ b/addons/fleet/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-import fleet
\ No newline at end of file
+import models
\ No newline at end of file
diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py
index 80d01538a96c8ec6de03af0d2264a231ba291779..5a95ffc82b1fe890e78fa46ac920f8d74be49ebc 100644
--- a/addons/fleet/__openerp__.py
+++ b/addons/fleet/__openerp__.py
@@ -24,21 +24,21 @@ Main Features
 * Show all costs associated to a vehicle or to a type of service
 * Analysis graph for costs
 """,
-    'depends' : [
+    'depends': [
         'base',
         'mail',
     ],
-    'data' : [
+    'data': [
         'security/fleet_security.xml',
         'security/ir.model.access.csv',
-        'fleet_view.xml',
-        'fleet_cars.xml',
-        'fleet_data.xml',
-        'fleet_board_view.xml',
+        'views/fleet_view.xml',
+        'views/fleet_board_view.xml',
+        'data/fleet_cars_data.xml',
+        'data/fleet_data.xml',
     ],
 
-    'demo': ['fleet_demo.xml'],
+    'demo': ['data/fleet_demo.xml'],
 
-    'installable' : True,
-    'application' : True,
+    'installable': True,
+    'application': True,
 }
diff --git a/addons/fleet/fleet_cars.xml b/addons/fleet/data/fleet_cars_data.xml
similarity index 100%
rename from addons/fleet/fleet_cars.xml
rename to addons/fleet/data/fleet_cars_data.xml
diff --git a/addons/fleet/fleet_data.xml b/addons/fleet/data/fleet_data.xml
similarity index 100%
rename from addons/fleet/fleet_data.xml
rename to addons/fleet/data/fleet_data.xml
diff --git a/addons/fleet/fleet_demo.xml b/addons/fleet/data/fleet_demo.xml
similarity index 100%
rename from addons/fleet/fleet_demo.xml
rename to addons/fleet/data/fleet_demo.xml
diff --git a/addons/fleet/models/__init__.py b/addons/fleet/models/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..da96d13235cec50d57520e7d432374a965a953af
--- /dev/null
+++ b/addons/fleet/models/__init__.py
@@ -0,0 +1 @@
+import fleet
\ No newline at end of file
diff --git a/addons/fleet/fleet.py b/addons/fleet/models/fleet.py
similarity index 100%
rename from addons/fleet/fleet.py
rename to addons/fleet/models/fleet.py
diff --git a/addons/fleet/fleet_board_view.xml b/addons/fleet/views/fleet_board_view.xml
similarity index 100%
rename from addons/fleet/fleet_board_view.xml
rename to addons/fleet/views/fleet_board_view.xml
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/views/fleet_view.xml
similarity index 100%
rename from addons/fleet/fleet_view.xml
rename to addons/fleet/views/fleet_view.xml