diff --git a/addons/project/__init__.py b/addons/project/__init__.py
index 433a751190b..a5f67aebd79 100644
--- a/addons/project/__init__.py
+++ b/addons/project/__init__.py
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import project
-import company
+import models
 import report
-import res_partner
-import res_config
-import web_planner
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 7550b6027ec..a1aa33ae70d 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -37,20 +37,20 @@ Dashboard / Reports for Project Management will include:
     'data': [
         'security/project_security.xml',
         'security/ir.model.access.csv',
-        'project_data.xml',
-        'project_view.xml',
-        'res_partner_view.xml',
-        'report/project_report_view.xml',
-        'report/project_cumulative.xml',
-        'res_config_view.xml',
-        'views/project.xml',
-        'project_dashboard.xml',
-        'tour_view.xml',
-        'web_planner_data.xml',
-        'project_mail_template_data.xml',
+        'data/project_data.xml',
+        'views/project_views.xml',
+        'views/res_partner_views.xml',
+        'report/project_report_views.xml',
+        'report/project_cumulative_views.xml',
+        'views/res_config_views.xml',
+        'views/project_templates.xml',
+        'views/project_dashboard.xml',
+        'views/tour_views.xml',
+        'data/web_planner_data.xml',
+        'data/project_mail_template_data.xml',
     ],
     'qweb': ['static/src/xml/project.xml'],
-    'demo': ['project_demo.xml'],
+    'demo': ['data/project_demo.xml'],
     'test': [
     ],
     'installable': True,
diff --git a/addons/project/project_data.xml b/addons/project/data/project_data.xml
similarity index 100%
rename from addons/project/project_data.xml
rename to addons/project/data/project_data.xml
diff --git a/addons/project/project_demo.xml b/addons/project/data/project_demo.xml
similarity index 100%
rename from addons/project/project_demo.xml
rename to addons/project/data/project_demo.xml
diff --git a/addons/project/project_mail_template_data.xml b/addons/project/data/project_mail_template_data.xml
similarity index 100%
rename from addons/project/project_mail_template_data.xml
rename to addons/project/data/project_mail_template_data.xml
diff --git a/addons/project/web_planner_data.xml b/addons/project/data/web_planner_data.xml
similarity index 100%
rename from addons/project/web_planner_data.xml
rename to addons/project/data/web_planner_data.xml
diff --git a/addons/project/models/__init__.py b/addons/project/models/__init__.py
new file mode 100644
index 00000000000..04eb14303cb
--- /dev/null
+++ b/addons/project/models/__init__.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import project
+import res_company
+import res_partner
+import res_config
+import web_planner
diff --git a/addons/project/project.py b/addons/project/models/project.py
similarity index 100%
rename from addons/project/project.py
rename to addons/project/models/project.py
diff --git a/addons/project/company.py b/addons/project/models/res_company.py
similarity index 100%
rename from addons/project/company.py
rename to addons/project/models/res_company.py
diff --git a/addons/project/res_config.py b/addons/project/models/res_config.py
similarity index 100%
rename from addons/project/res_config.py
rename to addons/project/models/res_config.py
diff --git a/addons/project/res_partner.py b/addons/project/models/res_partner.py
similarity index 100%
rename from addons/project/res_partner.py
rename to addons/project/models/res_partner.py
diff --git a/addons/project/web_planner.py b/addons/project/models/web_planner.py
similarity index 100%
rename from addons/project/web_planner.py
rename to addons/project/models/web_planner.py
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative_views.xml
similarity index 100%
rename from addons/project/report/project_cumulative.xml
rename to addons/project/report/project_cumulative_views.xml
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_views.xml
similarity index 100%
rename from addons/project/report/project_report_view.xml
rename to addons/project/report/project_report_views.xml
diff --git a/addons/project/project_dashboard.xml b/addons/project/views/project_dashboard.xml
similarity index 100%
rename from addons/project/project_dashboard.xml
rename to addons/project/views/project_dashboard.xml
diff --git a/addons/project/views/project.xml b/addons/project/views/project_templates.xml
similarity index 100%
rename from addons/project/views/project.xml
rename to addons/project/views/project_templates.xml
diff --git a/addons/project/project_view.xml b/addons/project/views/project_views.xml
similarity index 100%
rename from addons/project/project_view.xml
rename to addons/project/views/project_views.xml
diff --git a/addons/project/res_config_view.xml b/addons/project/views/res_config_views.xml
similarity index 100%
rename from addons/project/res_config_view.xml
rename to addons/project/views/res_config_views.xml
diff --git a/addons/project/res_partner_view.xml b/addons/project/views/res_partner_views.xml
similarity index 100%
rename from addons/project/res_partner_view.xml
rename to addons/project/views/res_partner_views.xml
diff --git a/addons/project/tour_view.xml b/addons/project/views/tour_views.xml
similarity index 100%
rename from addons/project/tour_view.xml
rename to addons/project/views/tour_views.xml