diff --git a/addons/crm_helpdesk/__init__.py b/addons/crm_helpdesk/__init__.py
new file mode 100644
index 00000000000..5d270dbebf8
--- /dev/null
+++ b/addons/crm_helpdesk/__init__.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import crm_helpdesk
+import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py
new file mode 100644
index 00000000000..93bb5af70c9
--- /dev/null
+++ b/addons/crm_helpdesk/__openerp__.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'CRM Helpdesk',
+    'version': '1.0',
+    'category': 'Generic Modules/CRM & SRM',
+    'description': """Helpdesk Management""",
+    'author': 'Tiny',
+    'website': 'http://www.openerp.com',
+    'depends': ['crm'],
+    'init_xml': [
+         'crm_helpdesk_data.xml',
+    ],
+
+    'update_xml': [
+        'crm_helpdesk_view.xml',
+        'crm_helpdesk_menu.xml',
+        'security/ir.model.access.csv',
+        'report/crm_helpdesk_report_view.xml',
+    ],
+    'demo_xml': [
+        'crm_helpdesk_demo.xml',
+        'test/test_crm_helpdesk.yml'
+    ],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
similarity index 99%
rename from addons/crm/crm_helpdesk.py
rename to addons/crm_helpdesk/crm_helpdesk.py
index 9bb93d17e1a..fda251d16ac 100644
--- a/addons/crm/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -22,7 +22,7 @@
 from osv import fields
 from osv import orm
 from osv import osv
-import crm
+from crm import crm
 
 class crm_helpdesk(osv.osv):
     """ Helpdesk Cases """
diff --git a/addons/crm/crm_helpdesk_data.xml b/addons/crm_helpdesk/crm_helpdesk_data.xml
similarity index 100%
rename from addons/crm/crm_helpdesk_data.xml
rename to addons/crm_helpdesk/crm_helpdesk_data.xml
diff --git a/addons/crm/crm_helpdesk_demo.xml b/addons/crm_helpdesk/crm_helpdesk_demo.xml
similarity index 100%
rename from addons/crm/crm_helpdesk_demo.xml
rename to addons/crm_helpdesk/crm_helpdesk_demo.xml
diff --git a/addons/crm/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
similarity index 95%
rename from addons/crm/crm_helpdesk_menu.xml
rename to addons/crm_helpdesk/crm_helpdesk_menu.xml
index bd3f0889bd1..5030fd65506 100644
--- a/addons/crm/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -11,7 +11,7 @@
         <field name="res_model">crm.helpdesk</field>
         <field name="view_mode">tree,calendar,form</field>
         <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
-        <field name="search_view_id" ref="crm.view_crm_case_helpdesk_filter"/>
+        <field name="search_view_id" ref="view_crm_case_helpdesk_filter"/>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
similarity index 98%
rename from addons/crm/crm_helpdesk_view.xml
rename to addons/crm_helpdesk/crm_helpdesk_view.xml
index fa2071f950b..15f00e66cf5 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -127,7 +127,7 @@
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
                                        string="Reply to Last Email"
-                                       name="%(action_crm_send_mail)d"
+                                       name="%(crm.action_crm_send_mail)d"
                                        context="{'mail':'reply', 'model': 'crm.helpdesk'}"
                                        icon="gtk-undo" type="action" />
                                </form>
@@ -138,7 +138,7 @@
                                </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                               name="%(action_crm_send_mail)d"
+                               name="%(crm.action_crm_send_mail)d"
                                context="{'mail':'new', 'model': 'crm.helpdesk'}"
                                icon="gtk-go-forward" type="action" />
                     </page>
diff --git a/addons/crm_helpdesk/report/__init__.py b/addons/crm_helpdesk/report/__init__.py
new file mode 100644
index 00000000000..0e0ad35740e
--- /dev/null
+++ b/addons/crm_helpdesk/report/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import crm_helpdesk_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py
similarity index 100%
rename from addons/crm/report/crm_helpdesk_report.py
rename to addons/crm_helpdesk/report/crm_helpdesk_report.py
diff --git a/addons/crm/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
similarity index 99%
rename from addons/crm/report/crm_helpdesk_report_view.xml
rename to addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index b10f51162e7..39101be2449 100644
--- a/addons/crm/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -30,7 +30,7 @@
         <record id="view_report_crm_helpdesk_form" model="ir.ui.view">
             <field name="name">crm.helpdesk.report.form</field>
             <field name="model">crm.helpdesk.report</field>
-            <field name="inherit_id" ref="view_crm_case_form"/>
+            <field name="inherit_id" ref="crm.view_crm_case_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
diff --git a/addons/crm_helpdesk/security/ir.model.access.csv b/addons/crm_helpdesk/security/ir.model.access.csv
new file mode 100644
index 00000000000..c1420a5b2d6
--- /dev/null
+++ b/addons/crm_helpdesk/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_crm_helpdesk","crm.helpdesk","model_crm_helpdesk","crm.group_crm_manager",1,1,1,1
+"access_report_crm_helpdesk","report.crm.helpdesk","model_crm_helpdesk_report","crm.group_crm_user",1,1,1,1
diff --git a/addons/crm/test/test_crm_helpdesk.yml b/addons/crm_helpdesk/test/test_crm_helpdesk.yml
similarity index 100%
rename from addons/crm/test/test_crm_helpdesk.yml
rename to addons/crm_helpdesk/test/test_crm_helpdesk.yml