diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 999e91888ed..3552bfb77c1 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -20,16 +20,13 @@ It allows the manager to quickly check the issues, assign them and decide on the
     ],
     'data': [
         'data/mail_message_subtype_data.xml',
-        'report/project_issue_report_view.xml',
+        'report/project_issue_report_views.xml',
         'security/project_issue_security.xml',
         'security/ir.model.access.csv',
-        'views/project_issue_view.xml',
-        'views/project_issue_config_settings_views.xml',
-        'views/account_analytic_account_view.xml',
-        'views/project_project_view.xml',
-        'views/res_partner_view.xml',
-        'views/project_issue_menu.xml',
-        'views/project_dashboard.xml',
+        'views/project_issue_views.xml',
+        'views/account_analytic_account_views.xml',
+        'views/project_project_views.xml',
+        'views/res_partner_views.xml',
         'views/project_config_settings_views.xml',
     ],
     'demo': ['data/project_issue_demo.xml'],
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_views.xml
similarity index 100%
rename from addons/project_issue/report/project_issue_report_view.xml
rename to addons/project_issue/report/project_issue_report_views.xml
diff --git a/addons/project_issue/views/account_analytic_account_view.xml b/addons/project_issue/views/account_analytic_account_views.xml
similarity index 100%
rename from addons/project_issue/views/account_analytic_account_view.xml
rename to addons/project_issue/views/account_analytic_account_views.xml
diff --git a/addons/project_issue/views/project_config_settings_views.xml b/addons/project_issue/views/project_config_settings_views.xml
index 3880f7235b1..220707950d2 100644
--- a/addons/project_issue/views/project_config_settings_views.xml
+++ b/addons/project_issue/views/project_config_settings_views.xml
@@ -6,6 +6,12 @@
         <field name="model">project.config.settings</field>
         <field name="inherit_id" ref="project.view_config_settings"/>
         <field name="arch" type="xml">
+            <xpath expr="//group[@name='timesheets']" position="attributes">
+                <attribute name="string">Timesheets</attribute>
+            </xpath>
+            <xpath expr="//group[@name='timesheets']" position="inside">
+                <field name="module_project_issue_sheet" widget="radio"/>
+            </xpath>
             <xpath expr="//group[@name='timesheets']" position="after">
                 <group string="Helpdesk &amp; Support">
                     <field name="module_rating_project_issue" widget="radio"/>
diff --git a/addons/project_issue/views/project_issue_config_settings_views.xml b/addons/project_issue/views/project_issue_config_settings_views.xml
deleted file mode 100644
index 7555571ec83..00000000000
--- a/addons/project_issue/views/project_issue_config_settings_views.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-    	<record id="view_config_settings_form_inherit_project_issue" model="ir.ui.view">
-            <field name="name">project issue settings</field>
-            <field name="model">project.config.settings</field>
-            <field name="inherit_id" ref="project.view_config_settings"/>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='timesheets']" position="attributes">
-                    <attribute name="string">Timesheets</attribute>
-                </xpath>
-                <xpath expr="//group[@name='timesheets']" position="inside">
-                    <field name="module_project_issue_sheet" widget="radio"/>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</odoo>
diff --git a/addons/project_issue/views/project_issue_menu.xml b/addons/project_issue/views/project_issue_menu.xml
deleted file mode 100644
index 675b5061af4..00000000000
--- a/addons/project_issue/views/project_issue_menu.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <!--
-        ALL BUGS
-    -->
-    <record id="project_issue_categ_act0" model="ir.actions.act_window">
-        <field name="name">Issues</field>
-        <field name="res_model">project.issue</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">kanban,tree,calendar,form,pivot,graph</field>
-        <field name="view_id" eval="False"/>
-        <field name="domain" eval=""/>
-        <field name="context">{'search_default_my_issues': 1}</field>
-        <field name="search_view_id" ref="view_project_issue_filter"/>
-        <field name="help" type="html">
-            <p>
-                The Odoo issues tracker allows you to efficiently manage things
-                like internal requests, software development bugs, customer
-                complaints, project troubles, material breakdowns, etc.
-            </p>
-        </field>
-    </record>
-
-    <record id="action_crm_tag_kanban_view0" model="ir.actions.act_window.view">
-        <field name="sequence" eval="0"/>
-        <field name="view_mode">kanban</field>
-        <field name="view_id" ref="project_issue_kanban_view"/>
-        <field name="act_window_id" ref="project_issue_categ_act0"/>
-    </record>
-
-    <record id="action_crm_tag_tree_view0" model="ir.actions.act_window.view">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="project_issue_tree_view"/>
-        <field name="act_window_id" ref="project_issue_categ_act0"/>
-    </record>
-
-    <record id="action_crm_tag_calendar_view0" model="ir.actions.act_window.view">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="project_issue_calendar_view"/>
-        <field name="act_window_id" ref="project_issue_categ_act0"/>
-    </record>
-
-    <record id="action_crm_tag_form_view0" model="ir.actions.act_window.view">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="project_issue_form_view"/>
-        <field name="act_window_id" ref="project_issue_categ_act0"/>
-    </record>
-
-    <record id="action_crm_tag_graph_view0" model="ir.actions.act_window.view">
-        <field name="sequence" eval="4"/>
-        <field name="view_mode">graph</field>
-        <field name="view_id" ref="project_issue_graph_view"/>
-        <field name="act_window_id" ref="project_issue_categ_act0"/>
-    </record>
-
-    <menuitem id="menu_project_issue_track" name="Issues" parent="project.menu_project_management"
-            action="project_issue_categ_act0" sequence="15"/>
-</odoo>
diff --git a/addons/project_issue/views/project_issue_view.xml b/addons/project_issue/views/project_issue_views.xml
similarity index 84%
rename from addons/project_issue/views/project_issue_view.xml
rename to addons/project_issue/views/project_issue_views.xml
index ed29e2db2e8..f1d8f636c3a 100644
--- a/addons/project_issue/views/project_issue_view.xml
+++ b/addons/project_issue/views/project_issue_views.xml
@@ -267,4 +267,60 @@
                 </p>
             </field>
         </record>
+
+        <record id="project_issue_categ_act0" model="ir.actions.act_window">
+            <field name="name">Issues</field>
+            <field name="res_model">project.issue</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,calendar,form,pivot,graph</field>
+            <field name="view_id" eval="False"/>
+            <field name="domain" eval=""/>
+            <field name="context">{'search_default_my_issues': 1}</field>
+            <field name="search_view_id" ref="view_project_issue_filter"/>
+            <field name="help" type="html">
+                <p>
+                    The Odoo issues tracker allows you to efficiently manage things
+                    like internal requests, software development bugs, customer
+                    complaints, project troubles, material breakdowns, etc.
+                </p>
+            </field>
+        </record>
+
+        <record id="action_crm_tag_kanban_view0" model="ir.actions.act_window.view">
+            <field name="sequence" eval="0"/>
+            <field name="view_mode">kanban</field>
+            <field name="view_id" ref="project_issue_kanban_view"/>
+            <field name="act_window_id" ref="project_issue_categ_act0"/>
+        </record>
+
+        <record id="action_crm_tag_tree_view0" model="ir.actions.act_window.view">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="project_issue_tree_view"/>
+            <field name="act_window_id" ref="project_issue_categ_act0"/>
+        </record>
+
+        <record id="action_crm_tag_calendar_view0" model="ir.actions.act_window.view">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">calendar</field>
+            <field name="view_id" ref="project_issue_calendar_view"/>
+            <field name="act_window_id" ref="project_issue_categ_act0"/>
+        </record>
+
+        <record id="action_crm_tag_form_view0" model="ir.actions.act_window.view">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="project_issue_form_view"/>
+            <field name="act_window_id" ref="project_issue_categ_act0"/>
+        </record>
+
+        <record id="action_crm_tag_graph_view0" model="ir.actions.act_window.view">
+            <field name="sequence" eval="4"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="project_issue_graph_view"/>
+            <field name="act_window_id" ref="project_issue_categ_act0"/>
+        </record>
+
+        <menuitem id="menu_project_issue_track" name="Issues" parent="project.menu_project_management"
+                action="project_issue_categ_act0" sequence="15"/>
 </odoo>
diff --git a/addons/project_issue/views/project_project_view.xml b/addons/project_issue/views/project_project_view.xml
deleted file mode 100644
index 76bce706a8f..00000000000
--- a/addons/project_issue/views/project_project_view.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <!-- Project -->
-    <record id="view_project_form_inherited" model="ir.ui.view">
-        <field name="name">project.project.form.inherited</field>
-        <field name="model">project.project</field>
-        <field name="inherit_id" ref="project.edit_project"/>
-        <field name="arch" type="xml">
-            <xpath expr='//div[@name="options_active"]' position="attributes">
-                <attribute name="invisible">0</attribute>
-            </xpath>
-            <xpath expr='//div[@name="options_active"]' position='inside'>
-                <div>
-                    <field name="use_issues" class="oe_inline"/>
-                    <label for="use_issues" class="oe_inline" string="Issues"/>
-                    <span attrs="{'invisible':[('use_issues', '=', False)]}">as </span>
-                    <field name="label_issues" class="oe_inline oe_input_align" attrs="{'invisible': [('use_issues', '=', False)]}"/>
-                </div>
-            </xpath>
-            <div name="button_box" position="inside">
-                <button class="oe_stat_button" type="action" attrs="{'invisible':[('use_issues','=', False)]}"
-                    name="%(act_project_project_2_project_issue_all)d" icon="fa-bug">
-                    <field string="Issues" name="issue_count" widget="statinfo" options="{'label_field': 'label_issues'}"/>
-                </button>
-            </div>
-        </field>
-   </record>
-</odoo>
diff --git a/addons/project_issue/views/project_dashboard.xml b/addons/project_issue/views/project_project_views.xml
similarity index 54%
rename from addons/project_issue/views/project_dashboard.xml
rename to addons/project_issue/views/project_project_views.xml
index 0138a09f382..3b5fd6e34bd 100644
--- a/addons/project_issue/views/project_dashboard.xml
+++ b/addons/project_issue/views/project_project_views.xml
@@ -28,4 +28,29 @@
 
         </field>
     </record>
+
+    <record id="view_project_form_inherited" model="ir.ui.view">
+        <field name="name">project.project.form.inherited</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.edit_project"/>
+        <field name="arch" type="xml">
+            <xpath expr='//div[@name="options_active"]' position="attributes">
+                <attribute name="invisible">0</attribute>
+            </xpath>
+            <xpath expr='//div[@name="options_active"]' position='inside'>
+                <div>
+                    <field name="use_issues" class="oe_inline"/>
+                    <label for="use_issues" class="oe_inline" string="Issues"/>
+                    <span attrs="{'invisible':[('use_issues', '=', False)]}">as </span>
+                    <field name="label_issues" class="oe_inline oe_input_align" attrs="{'invisible': [('use_issues', '=', False)]}"/>
+                </div>
+            </xpath>
+            <div name="button_box" position="inside">
+                <button class="oe_stat_button" type="action" attrs="{'invisible':[('use_issues','=', False)]}"
+                    name="%(act_project_project_2_project_issue_all)d" icon="fa-bug">
+                    <field string="Issues" name="issue_count" widget="statinfo" options="{'label_field': 'label_issues'}"/>
+                </button>
+            </div>
+        </field>
+   </record>
 </odoo>
diff --git a/addons/project_issue/views/res_partner_view.xml b/addons/project_issue/views/res_partner_views.xml
similarity index 100%
rename from addons/project_issue/views/res_partner_view.xml
rename to addons/project_issue/views/res_partner_views.xml