diff --git a/addons/outlook/__init__.py b/addons/plugin_outlook/__init__.py
similarity index 97%
rename from addons/outlook/__init__.py
rename to addons/plugin_outlook/__init__.py
index 7f5a7a9a9f1..ccae4d7ed96 100644
--- a/addons/outlook/__init__.py
+++ b/addons/plugin_outlook/__init__.py
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import installer
+import plugin_outlook
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/__openerp__.py b/addons/plugin_outlook/__openerp__.py
similarity index 93%
rename from addons/outlook/__openerp__.py
rename to addons/plugin_outlook/__openerp__.py
index 9d1c5a554f4..9bc79433dfc 100644
--- a/addons/outlook/__openerp__.py
+++ b/addons/plugin_outlook/__openerp__.py
@@ -30,14 +30,14 @@
     'description': '''
 This module provides the Outlook Plug-in.
 =========================================
-Outlook plug-in allows you to select an object that you’d like to add
+Outlook plug-in allows you to select an object that you would like to add
 to your email and its attachments from MS Outlook. You can select a partner, a task,
 a project, an analytical account, or any other object and archive selected
 mail into mail.message with attachments.
       ''',
     'init_xml' : [],
     'demo_xml' : [],
-    'update_xml' : ['outlook_installer.xml'],
+    'update_xml' : ['plugin_outlook.xml'],
     'active': False,
     'installable': True,
     'certificate' : '001278773815818292125',
diff --git a/addons/outlook/i18n/bg.po b/addons/plugin_outlook/i18n/bg.po
similarity index 100%
rename from addons/outlook/i18n/bg.po
rename to addons/plugin_outlook/i18n/bg.po
diff --git a/addons/outlook/i18n/ca.po b/addons/plugin_outlook/i18n/ca.po
similarity index 100%
rename from addons/outlook/i18n/ca.po
rename to addons/plugin_outlook/i18n/ca.po
diff --git a/addons/outlook/i18n/de.po b/addons/plugin_outlook/i18n/de.po
similarity index 100%
rename from addons/outlook/i18n/de.po
rename to addons/plugin_outlook/i18n/de.po
diff --git a/addons/outlook/i18n/el.po b/addons/plugin_outlook/i18n/el.po
similarity index 100%
rename from addons/outlook/i18n/el.po
rename to addons/plugin_outlook/i18n/el.po
diff --git a/addons/outlook/i18n/es.po b/addons/plugin_outlook/i18n/es.po
similarity index 100%
rename from addons/outlook/i18n/es.po
rename to addons/plugin_outlook/i18n/es.po
diff --git a/addons/outlook/i18n/es_MX.po b/addons/plugin_outlook/i18n/es_MX.po
similarity index 100%
rename from addons/outlook/i18n/es_MX.po
rename to addons/plugin_outlook/i18n/es_MX.po
diff --git a/addons/outlook/i18n/es_VE.po b/addons/plugin_outlook/i18n/es_VE.po
similarity index 100%
rename from addons/outlook/i18n/es_VE.po
rename to addons/plugin_outlook/i18n/es_VE.po
diff --git a/addons/outlook/i18n/et.po b/addons/plugin_outlook/i18n/et.po
similarity index 100%
rename from addons/outlook/i18n/et.po
rename to addons/plugin_outlook/i18n/et.po
diff --git a/addons/outlook/i18n/fi.po b/addons/plugin_outlook/i18n/fi.po
similarity index 100%
rename from addons/outlook/i18n/fi.po
rename to addons/plugin_outlook/i18n/fi.po
diff --git a/addons/outlook/i18n/fr.po b/addons/plugin_outlook/i18n/fr.po
similarity index 100%
rename from addons/outlook/i18n/fr.po
rename to addons/plugin_outlook/i18n/fr.po
diff --git a/addons/outlook/i18n/gl.po b/addons/plugin_outlook/i18n/gl.po
similarity index 100%
rename from addons/outlook/i18n/gl.po
rename to addons/plugin_outlook/i18n/gl.po
diff --git a/addons/outlook/i18n/hr.po b/addons/plugin_outlook/i18n/hr.po
similarity index 100%
rename from addons/outlook/i18n/hr.po
rename to addons/plugin_outlook/i18n/hr.po
diff --git a/addons/outlook/i18n/hu.po b/addons/plugin_outlook/i18n/hu.po
similarity index 100%
rename from addons/outlook/i18n/hu.po
rename to addons/plugin_outlook/i18n/hu.po
diff --git a/addons/outlook/i18n/it.po b/addons/plugin_outlook/i18n/it.po
similarity index 100%
rename from addons/outlook/i18n/it.po
rename to addons/plugin_outlook/i18n/it.po
diff --git a/addons/outlook/i18n/mn.po b/addons/plugin_outlook/i18n/mn.po
similarity index 100%
rename from addons/outlook/i18n/mn.po
rename to addons/plugin_outlook/i18n/mn.po
diff --git a/addons/outlook/i18n/nl.po b/addons/plugin_outlook/i18n/nl.po
similarity index 100%
rename from addons/outlook/i18n/nl.po
rename to addons/plugin_outlook/i18n/nl.po
diff --git a/addons/outlook/i18n/outlook.pot b/addons/plugin_outlook/i18n/outlook.pot
similarity index 100%
rename from addons/outlook/i18n/outlook.pot
rename to addons/plugin_outlook/i18n/outlook.pot
diff --git a/addons/outlook/i18n/pl.po b/addons/plugin_outlook/i18n/pl.po
similarity index 100%
rename from addons/outlook/i18n/pl.po
rename to addons/plugin_outlook/i18n/pl.po
diff --git a/addons/outlook/i18n/pt.po b/addons/plugin_outlook/i18n/pt.po
similarity index 100%
rename from addons/outlook/i18n/pt.po
rename to addons/plugin_outlook/i18n/pt.po
diff --git a/addons/outlook/i18n/pt_BR.po b/addons/plugin_outlook/i18n/pt_BR.po
similarity index 100%
rename from addons/outlook/i18n/pt_BR.po
rename to addons/plugin_outlook/i18n/pt_BR.po
diff --git a/addons/outlook/i18n/ru.po b/addons/plugin_outlook/i18n/ru.po
similarity index 100%
rename from addons/outlook/i18n/ru.po
rename to addons/plugin_outlook/i18n/ru.po
diff --git a/addons/outlook/i18n/sl.po b/addons/plugin_outlook/i18n/sl.po
similarity index 100%
rename from addons/outlook/i18n/sl.po
rename to addons/plugin_outlook/i18n/sl.po
diff --git a/addons/outlook/i18n/sr@latin.po b/addons/plugin_outlook/i18n/sr@latin.po
similarity index 100%
rename from addons/outlook/i18n/sr@latin.po
rename to addons/plugin_outlook/i18n/sr@latin.po
diff --git a/addons/outlook/i18n/sv.po b/addons/plugin_outlook/i18n/sv.po
similarity index 100%
rename from addons/outlook/i18n/sv.po
rename to addons/plugin_outlook/i18n/sv.po
diff --git a/addons/outlook/i18n/tr.po b/addons/plugin_outlook/i18n/tr.po
similarity index 100%
rename from addons/outlook/i18n/tr.po
rename to addons/plugin_outlook/i18n/tr.po
diff --git a/addons/outlook/i18n/zh_CN.po b/addons/plugin_outlook/i18n/zh_CN.po
similarity index 100%
rename from addons/outlook/i18n/zh_CN.po
rename to addons/plugin_outlook/i18n/zh_CN.po
diff --git a/addons/outlook/installer.py b/addons/plugin_outlook/plugin_outlook.py
similarity index 54%
rename from addons/outlook/installer.py
rename to addons/plugin_outlook/plugin_outlook.py
index 547d0b18650..d91070afccc 100644
--- a/addons/outlook/installer.py
+++ b/addons/plugin_outlook/plugin_outlook.py
@@ -29,38 +29,20 @@ class outlook_installer(osv.osv_memory):
     _name = 'outlook.installer'
     _inherit = 'res.config.installer'
 
-    def default_get(self, cr, uid, fields, context=None):
-        data = super(outlook_installer, self).default_get(cr, uid, fields, context=context)
-        data['doc_file'] = 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_outlook.html'
-        file = open(addons.get_module_resource('outlook','static','openerp-outlook-plugin','OpenERPOutlookPluginSetup','Release','OpenERPOutlookPluginSetup.msi'), 'r')
-        data['plugin_file'] = base64.encodestring(file.read())
-        return data
-
     _columns = {
-        'name':fields.char('File name', size=34),
-        'doc_name':fields.char('File name', size=64),
-        'outlook':fields.boolean('Outlook Plug-in ', help="Allows you to select an object that you would like to add to your email and its attachments."),
-        'plugin_file':fields.binary('Outlook Plug-in', readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
-        'doc_file':fields.char('Installation Manual',size=264,help="The documentation file :- how to install Outlook Plug-in.", readonly=True),
+        'name':fields.char('Outlook Plug-in', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
         'description':fields.text('Description', readonly=True)
-        }
+    }
 
     _defaults = {
-        'outlook' : True,
-        'name' : 'OpenERPOutlookPlugin.msi',
-        'doc_name' : 'Installation Guide to OpenERP Outlook Plug-in.doc',
+        'name' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup.msi',
         'description' : """
+Click on icon next to the link above to download the installer and execute it.
+
 System requirements:
     1.  MS Outlook 2005 or above.
     2.  MS .Net Framework 3.5 .
-    
-
-Plugin installation:
-    1.  Save the msi plug-in file.
-    2.  Close the Outlook application if it is open.
-    3.  Run the executable plug-in file (OpenERPOutlookPlugin.msi).
 """
         }
-outlook_installer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/outlook/outlook_installer.xml b/addons/plugin_outlook/plugin_outlook.xml
similarity index 83%
rename from addons/outlook/outlook_installer.xml
rename to addons/plugin_outlook/plugin_outlook.xml
index 4cdb0127631..62400e22f71 100644
--- a/addons/outlook/outlook_installer.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -14,9 +14,7 @@
                         <attribute name="string">Install Outlook Plug-In</attribute>
                     </separator>
                     <xpath expr="//label[@string='description']" position="attributes">
-                        <attribute name="string">This plug-in allows you to create new contact or link contact to an existing partner. 
-Also allows to link your e-mail to OpenERP's documents. 
-You can attach it to any existing one in OpenERP or create a new one.</attribute>
+                        <attribute name="string">This plug-in allows you to create and link outlook emails with openerp objects.</attribute>
                     </xpath>
                     <xpath expr="//button[@string='Install Modules']" position="replace">
                         <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
@@ -29,14 +27,8 @@ You can attach it to any existing one in OpenERP or create a new one.</attribute
                     </xpath>
                     <group colspan="8" position="replace">
                         <group colspan="8" height="450" width="750">
-                            <field name="outlook" invisible="1"/>
-                            <field name="name" invisible="1"/>
-                            <field name="doc_name" invisible="1"/>
-                                <newline/>
-                            <field name="plugin_file" filename="name"/>
-                                <newline/>
-                            <field name="doc_file" filename="doc_name" widget="url"/>
-                                <newline/>
+                            <field name="name" widget="url"/>
+                            <newline/>
                             <separator string="Installation and Configuration Steps" colspan="4"/>
                             <field name="description" nolabel="1" colspan="8"/>
                         </group>
@@ -54,7 +46,7 @@ You can attach it to any existing one in OpenERP or create a new one.</attribute
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        
+
         <record id="outlook_installer_todo" model="ir.actions.todo">
             <field name="action_id" ref="action_outlook_installer"/>
             <field name="category_id" ref="base.category_sales_management_config"/>
diff --git a/addons/outlook/static/openerp-outlook-plugin/CookComputing.XmlRpcV2.dll b/addons/plugin_outlook/static/openerp-outlook-plugin/CookComputing.XmlRpcV2.dll
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/CookComputing.XmlRpcV2.dll
rename to addons/plugin_outlook/static/openerp-outlook-plugin/CookComputing.XmlRpcV2.dll
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Model.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/Model.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Model.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/Model.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPClient.csproj b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPClient.csproj
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPClient.csproj
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPClient.csproj
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPConnect.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPConnect.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPConnect.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPConnect.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Properties/AssemblyInfo.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/Properties/AssemblyInfo.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Properties/AssemblyInfo.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/Properties/AssemblyInfo.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Record.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/Record.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPClient/Record.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/Record.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPClient/XMLRPCClient.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/XMLRPCClient.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPClient/XMLRPCClient.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/XMLRPCClient.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/AssemblyInfo.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/AssemblyInfo.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/AssemblyInfo.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/AssemblyInfo.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Cache.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Cache.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Cache.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Cache.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/ConfigManager.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/ConfigManager.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/ConfigManager.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/ConfigManager.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Connect.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Connect.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Connect.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Connect.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj.user b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj.user
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj.user
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj.user
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.Designer.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.Designer.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.Designer.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.Designer.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.resx b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.resx
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.resx
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Resources.resx
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.Designer.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.Designer.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.Designer.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.Designer.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.settings b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.settings
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.settings
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Properties/Settings.settings
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/195737_152643643962_3595480_n.jpg b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/195737_152643643962_3595480_n.jpg
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/195737_152643643962_3595480_n.jpg
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/195737_152643643962_3595480_n.jpg
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.ico b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.ico
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.ico
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.ico
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Account.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Archive.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Archive.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Archive.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Archive.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Case.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Case.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Case.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Case.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Contact.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Contact.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Contact.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Contact.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Create.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Create.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Create.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Create.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Error.gif b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Error.gif
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Error.gif
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Error.gif
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Invoice.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Invoice.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Invoice.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Invoice.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Move.gif b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Move.gif
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Move.gif
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Move.gif
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveDown.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveDown.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveDown.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveDown.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveLeft.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveLeft.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveLeft.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/MoveLeft.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/OpenERP_icon.ico b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/OpenERP_icon.ico
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/OpenERP_icon.ico
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/OpenERP_icon.ico
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Partner.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Partner.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Partner.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Partner.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Product.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Product.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Product.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Product.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Project.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Project.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Project.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Project.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Sale.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Sale.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Sale.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Sale.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Search.gif b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Search.gif
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Search.gif
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Search.gif
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Success.gif b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Success.gif
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Success.gif
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Success.gif
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Task.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Task.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Task.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/Task.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/developped_by.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/developped_by.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/developped_by.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/developped_by.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/logo.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/logo.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/logo.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/logo.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/openerp.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/openerp.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/openerp.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/openerp.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/perform.gif b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/perform.gif
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/perform.gif
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/perform.gif
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/settings.png b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/settings.png
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/settings.png
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Resources/settings.png
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Tools.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Tools.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Tools.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Tools.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.Designer.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.Designer.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.Designer.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.Designer.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.resx b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.resx
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.resx
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_choose_document_opt.resx
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.designer.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.designer.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.designer.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.designer.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.resx b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.resx
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.resx
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_contact.resx
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.Designer.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.Designer.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.Designer.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.Designer.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.resx b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.resx
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.resx
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_create_doc.resx
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.Designer.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.Designer.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.Designer.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.Designer.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.resx b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.resx
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.resx
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_configuration.resx
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.resx b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.resx
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.resx
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.resx
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.designer.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.designer.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.designer.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.designer.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.resx b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.resx
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.resx
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_partner.resx
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.designer.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.designer.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.designer.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.designer.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.resx b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.resx
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.resx
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_push_mail.resx
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.Designer.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.Designer.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.Designer.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.Designer.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.cs
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.cs
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.cs
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.resx b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.resx
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.resx
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_select_partner.resx
diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup.msi b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup.msi
new file mode 100644
index 00000000000..45f2d7cd6f4
Binary files /dev/null and b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup.msi differ
diff --git a/addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup/OpenERPOutlookPluginSetup.vdproj b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup/OpenERPOutlookPluginSetup.vdproj
similarity index 100%
rename from addons/outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup/OpenERPOutlookPluginSetup.vdproj
rename to addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup/OpenERPOutlookPluginSetup.vdproj