diff --git a/addons/plugin_thunderbird/__init__.py b/addons/plugin_thunderbird/__init__.py
index 70ca2fd409a..e1c886f81fa 100644
--- a/addons/plugin_thunderbird/__init__.py
+++ b/addons/plugin_thunderbird/__init__.py
@@ -19,4 +19,4 @@
 #
 ##############################################################################
 
-import installer
+import plugin_thunderbird
diff --git a/addons/plugin_thunderbird/__openerp__.py b/addons/plugin_thunderbird/__openerp__.py
index 04926ea2d32..050855db05e 100644
--- a/addons/plugin_thunderbird/__openerp__.py
+++ b/addons/plugin_thunderbird/__openerp__.py
@@ -38,8 +38,7 @@ HR Applicant and Project Issue from selected mails.
       """,
     "init_xml" : [],
     "demo_xml" : [],
-    "update_xml" : ['thunderbird_installer.xml',
-                    'security/ir.model.access.csv'],
+    "update_xml" : ['plugin_thunderbird.xml'],
     "active": False,
     "installable": True,
     "certificate" : "00899858104035139949",
diff --git a/addons/plugin_thunderbird/installer.py b/addons/plugin_thunderbird/plugin_thunderbird.py
similarity index 74%
rename from addons/plugin_thunderbird/installer.py
rename to addons/plugin_thunderbird/plugin_thunderbird.py
index d0ba1dfd845..7e9b5626e5b 100644
--- a/addons/plugin_thunderbird/installer.py
+++ b/addons/plugin_thunderbird/plugin_thunderbird.py
@@ -22,11 +22,8 @@
 from osv import fields
 from osv import osv
 
-import base64
-import addons
-
-class thunderbird_installer(osv.osv_memory):
-    _name = 'thunderbird.installer'
+class plugin_thunderbird_installer(osv.osv_memory):
+    _name = 'plugin_thunderbird.installer'
     _inherit = 'res.config.installer'
 
     _columns = {
@@ -42,24 +39,16 @@ class thunderbird_installer(osv.osv_memory):
         'thunderbird' : True,
         'name' : 'openerp_plugin.xpi',
         'pdf_file' : 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html',
-        'plugin_file' : 'https://addons.mozilla.org/en-US/thunderbird/addon/openerp-plugin/',
+        'plugin_file' : '/plugin_thunderbird/static/openerp_plugin.xpi',
         'description' : """
 Thunderbird plugin installation:
-    1.  Save the Thunderbird plug-­in.
-    2.  From the menu bar of Thunderbird, open Tools ­> Add-ons.
-    3.  Click "Install".
+    1.  Save the Thunderbird plug-in.
+    2.  From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...
     4.  Select the plug-in (the file named openerp_plugin.xpi).
     5.  Click "Install Now".
     6.  Restart Thunderbird.
-
-Configure OpenERP in Thunderbird:
-    1.  Go to Tools > OpenERP Configuration.
-    2.  Check the data (configured by default).
-    3.  Click "Connect".
-    4.  A message appears with the state of your connection.
-    5.  If the connection fails, check if your database is opened, and check the data again.
-    6.  If the connection succeeds, start to archive e-mails in OpenERP.
+    7.  From the Thunderbird menubar: OpenERP -> Configuration.
+    8.  Configure your openerp server.
 """
     }
 
-thunderbird_installer()
diff --git a/addons/plugin_thunderbird/thunderbird_installer.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
similarity index 80%
rename from addons/plugin_thunderbird/thunderbird_installer.xml
rename to addons/plugin_thunderbird/plugin_thunderbird.xml
index 0bd7f42a49a..3b4107c8358 100644
--- a/addons/plugin_thunderbird/thunderbird_installer.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -2,8 +2,8 @@
   <data>
 
     <record id="view_thunderbird_installer" model="ir.ui.view">
-      <field name="name">thunderbird.installer.view</field>
-      <field name="model">thunderbird.installer</field>
+      <field name="name">plugin_thunderbird.installer.view</field>
+      <field name="model">plugin_thunderbird.installer</field>
       <field name="type">form</field>
       <field name="inherit_id" ref="base.res_config_installer"/>
       <field name="arch" type="xml">
@@ -48,13 +48,12 @@
     <record id="action_thunderbird_installer" model="ir.actions.act_window">
       <field name="name">Install Thunderbird Plug-In</field>
       <field name="type">ir.actions.act_window</field>
-      <field name="res_model">thunderbird.installer</field>
+      <field name="res_model">plugin_thunderbird.installer</field>
       <field name="view_id" ref="view_thunderbird_installer"/>
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
       <field name="target">new</field>
     </record>
-
     <record id="thunderbird_installer_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_thunderbird_installer"/>
         <field name="category_id" ref="base.category_sales_management_config"/>
@@ -62,20 +61,8 @@
         <field name="type">automatic</field>
     </record>
 
-
-    <record id="action_thunderbird_wizard" model="ir.actions.act_window">
-      <field name="name">Install Thunderbird Plug-In</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">thunderbird.installer</field>
-      <field name="view_id" ref="view_thunderbird_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-      <field name="context">{'menu':True}</field>
-    </record>
-
     <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>
-    <menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" parent="base.menu_base_config_plugins" sequence="10"/>
+    <menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_installer" parent="base.menu_base_config_plugins" sequence="10"/>
 
   </data>
 </openerp>
diff --git a/addons/plugin_thunderbird/security/ir.model.access.csv b/addons/plugin_thunderbird/security/ir.model.access.csv
deleted file mode 100644
index 6c3e9555132..00000000000
--- a/addons/plugin_thunderbird/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_thunderbird_ir_actions_todo","ir.actions.todo.thunderbird.installer","base.model_ir_actions_todo","base.group_sale_manager",1,0,0,0
diff --git a/addons/plugin_thunderbird/static/openerp_plugin.xpi b/addons/plugin_thunderbird/static/openerp_plugin.xpi
new file mode 100644
index 00000000000..f2800f6cae3
Binary files /dev/null and b/addons/plugin_thunderbird/static/openerp_plugin.xpi differ
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome.manifest b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome.manifest
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome.manifest
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome.manifest
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin.jar
similarity index 62%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin.jar
index de15f57d606..d6ff77f76e0 100644
Binary files a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin.jar differ
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/config.xul
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.xul
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/config.xul
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/config_change.xul
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/config_change.xul
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/create.xul
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/create.xul
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/create.xul
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/config.js b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/config.js
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/config.js
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/config.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/create.js b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/create.js
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/create.js
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/create.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/dialog.js b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/dialog.js
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/dialog.js
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/dialog.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/overlay.js b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/overlay.js
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/overlay.js
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/overlay.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/push.js b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/push.js
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/push.js
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/push.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tiny_xmlrpc.js b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/tiny_xmlrpc.js
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tiny_xmlrpc.js
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/tiny_xmlrpc.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tools.js b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/tools.js
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/js/tools.js
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/js/tools.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/overlay.xul
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.xul
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/overlay.xul
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/push.xul
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push.xul
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/push.xul
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/push_dialog.xul
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_dialog.xul
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/push_dialog.xul
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_new.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/push_new.xul
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/push_new.xul
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/push_new.xul
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/selectpartner.xul
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/selectpartner.xul
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/selectpartner.xul
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/style.css b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/style.css
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/style.css
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/style.css
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/address.dtd b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/address.dtd
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/address.dtd
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/address.dtd
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config.dtd b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/config.dtd
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config.dtd
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/config.dtd
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/create.dtd b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/create.dtd
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/create.dtd
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/create.dtd
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Archive.png b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Archive.png
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Archive.png
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Archive.png
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Create.png b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Create.png
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Create.png
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Create.png
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Error.gif b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Error.gif
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Error.gif
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Error.gif
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Move.gif b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Move.gif
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Move.gif
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Move.gif
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveDown.png b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/MoveDown.png
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveDown.png
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/MoveDown.png
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveLeft.png b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/MoveLeft.png
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/MoveLeft.png
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/MoveLeft.png
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Search.gif b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Search.gif
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Search.gif
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Search.gif
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Success.gif b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Success.gif
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/Success.gif
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/Success.gif
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/developped_by.png
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/developped_by.png
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/developped_by.png
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/logo.png b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/logo.png
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/logo.png
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/logo.png
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp.png b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/openerp.png
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/openerp.png
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/openerp.png
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/overlay.css b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/overlay.css
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/overlay.css
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/overlay.css
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/perform.gif b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/perform.gif
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/perform.gif
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/perform.gif
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/settings.png b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/settings.png
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/settings.png
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/settings.png
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico
rename to addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js b/addons/plugin_thunderbird/static/thunderbird_plugin/components/nsXmlRpcClient.js
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js
rename to addons/plugin_thunderbird/static/thunderbird_plugin/components/nsXmlRpcClient.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt b/addons/plugin_thunderbird/static/thunderbird_plugin/components/xml-rpc.xpt
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt
rename to addons/plugin_thunderbird/static/thunderbird_plugin/components/xml-rpc.xpt
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js b/addons/plugin_thunderbird/static/thunderbird_plugin/defaults/preferences/tiny.js
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/defaults/preferences/tiny.js
rename to addons/plugin_thunderbird/static/thunderbird_plugin/defaults/preferences/tiny.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/install.js b/addons/plugin_thunderbird/static/thunderbird_plugin/install.js
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/install.js
rename to addons/plugin_thunderbird/static/thunderbird_plugin/install.js
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/install.rdf b/addons/plugin_thunderbird/static/thunderbird_plugin/install.rdf
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/install.rdf
rename to addons/plugin_thunderbird/static/thunderbird_plugin/install.rdf
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/install.sh b/addons/plugin_thunderbird/static/thunderbird_plugin/install.sh
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/install.sh
rename to addons/plugin_thunderbird/static/thunderbird_plugin/install.sh
diff --git a/addons/plugin_thunderbird/plugin/openerp_plugin/makefile b/addons/plugin_thunderbird/static/thunderbird_plugin/makefile
similarity index 100%
rename from addons/plugin_thunderbird/plugin/openerp_plugin/makefile
rename to addons/plugin_thunderbird/static/thunderbird_plugin/makefile