diff --git a/partner_contact_birthdate/README.rst b/partner_contact_birthdate/README.rst
index 590cd7f74..d367fd71b 100644
--- a/partner_contact_birthdate/README.rst
+++ b/partner_contact_birthdate/README.rst
@@ -58,6 +58,7 @@ Contributors
 * Jairo Llopis <j.llopis@grupoesoc.es>
 * Matjaž Mozetič <m.mozetic@matmoz.si>
 * Rudolf Schnapka <schnapkar@golive-saar.de>
+* Denis Leemann <denis.leemann@camptocamp.com>
 
 Maintainer
 ----------
diff --git a/partner_contact_birthdate/__init__.py b/partner_contact_birthdate/__init__.py
index 3b3430c28..2fe0926df 100644
--- a/partner_contact_birthdate/__init__.py
+++ b/partner_contact_birthdate/__init__.py
@@ -1,19 +1,4 @@
 # -*- coding: utf-8 -*-
-
-# Odoo, Open Source Management Solution
 # Copyright (C) 2014-2015  Grupo ESOC <www.grupoesoc.es>
-#
-# 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/>.
-
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from . import models
diff --git a/partner_contact_birthdate/__openerp__.py b/partner_contact_birthdate/__openerp__.py
index 15bd44841..fe8b7472c 100644
--- a/partner_contact_birthdate/__openerp__.py
+++ b/partner_contact_birthdate/__openerp__.py
@@ -1,25 +1,12 @@
 # -*- coding: utf-8 -*-
-
-# Odoo, Open Source Management Solution
-# Copyright (C) 2014-2015  Grupo ESOC <www.grupoesoc.es>
-#
-# 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/>.
+# Copyright 2014-2015  Grupo ESOC <www.grupoesoc.es>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 {
     "name": "Contact's birthdate",
-    "version": "8.0.1.0.0",
-    "author": "Odoo Community Association (OCA)",
+    "version": "9.0.1.0.0",
+    "author": "Jairo Llopis,"
+              "Odoo Community Association (OCA)",
     "category": "Customer Relationship Management",
     "website": "https://odoo-community.org/",
     "depends": [
@@ -28,5 +15,5 @@
     "data": [
         "views/res_partner.xml",
     ],
-    'installable': False,
+    'installable': True,
 }
diff --git a/partner_contact_birthdate/data/res_partner.yml b/partner_contact_birthdate/data/res_partner.yml
index 2b3d5efe9..d6be2f47e 100644
--- a/partner_contact_birthdate/data/res_partner.yml
+++ b/partner_contact_birthdate/data/res_partner.yml
@@ -1,19 +1,5 @@
 # -*- coding: utf-8 -*-
-
-# Odoo, Open Source Management Solution
 # Copyright (C) 2014-2015  Grupo ESOC <www.grupoesoc.es>
-#
-# 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/>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 - !function {model: res.partner, name: _birthdate_install}
diff --git a/partner_contact_birthdate/models/__init__.py b/partner_contact_birthdate/models/__init__.py
new file mode 100644
index 000000000..bc4712911
--- /dev/null
+++ b/partner_contact_birthdate/models/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Copyright 2014-2015  Grupo ESOC <www.grupoesoc.es>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from . import res_partner
diff --git a/partner_contact_birthdate/models.py b/partner_contact_birthdate/models/res_partner.py
similarity index 65%
rename from partner_contact_birthdate/models.py
rename to partner_contact_birthdate/models/res_partner.py
index 2686fed6d..d98771922 100644
--- a/partner_contact_birthdate/models.py
+++ b/partner_contact_birthdate/models/res_partner.py
@@ -1,21 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Odoo, Open Source Management Solution
 # Copyright (C) 2014-2015  Grupo ESOC <www.grupoesoc.es>
-#
-# 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/>.
-
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from openerp import _, api, fields, models
 import logging
 
diff --git a/partner_contact_birthdate/tests/__init__.py b/partner_contact_birthdate/tests/__init__.py
index 73d8cb813..90bda5ac1 100644
--- a/partner_contact_birthdate/tests/__init__.py
+++ b/partner_contact_birthdate/tests/__init__.py
@@ -1,19 +1,4 @@
 # -*- coding: utf-8 -*-
-
-# Odoo, Open Source Management Solution
 # Copyright (C) 2014-2015  Grupo ESOC <www.grupoesoc.es>
-#
-# 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/>.
-
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from . import test_birthdate
diff --git a/partner_contact_birthdate/tests/test_birthdate.py b/partner_contact_birthdate/tests/test_birthdate.py
index 1782d3a40..7cfa2e695 100644
--- a/partner_contact_birthdate/tests/test_birthdate.py
+++ b/partner_contact_birthdate/tests/test_birthdate.py
@@ -1,20 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Odoo, Open Source Management Solution
 # Copyright (C) 2014-2015  Grupo ESOC <www.grupoesoc.es>
-#
-# 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/>.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from openerp import fields
 from openerp.tests.common import TransactionCase
diff --git a/partner_contact_birthdate/views/res_partner.xml b/partner_contact_birthdate/views/res_partner.xml
index d3ec7399b..49c636171 100644
--- a/partner_contact_birthdate/views/res_partner.xml
+++ b/partner_contact_birthdate/views/res_partner.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
+<!-- License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+     © 2015 Grupo ESOC Ingeniería de Servicios, S.L.U. -->
+     
+<odoo>
 
-<record id="birthdate_date" model="ir.ui.view">
+<record id="view_personal_information_birthdate_date" model="ir.ui.view">
     <field name="name">Birthdate Date field</field>
     <field name="model">res.partner</field>
     <field name="inherit_id" ref="partner_contact_personal_information_page.personal_information"/>
@@ -15,5 +17,4 @@
   </field>
 </record>
 
-</data>
-</openerp>
+</odoo>
diff --git a/partner_contact_gender/__openerp__.py b/partner_contact_gender/__openerp__.py
index 0338c1a32..0070b6575 100644
--- a/partner_contact_gender/__openerp__.py
+++ b/partner_contact_gender/__openerp__.py
@@ -18,7 +18,7 @@
     'installable': True,
     'auto_install': False,
     "depends": [
-        "base",
+        "partner_contact_personal_information_page",
     ],
     "data": [
         "views/res_partner.xml",
diff --git a/partner_contact_gender/views/res_partner.xml b/partner_contact_gender/views/res_partner.xml
index 01b71a253..d71d0630a 100644
--- a/partner_contact_gender/views/res_partner.xml
+++ b/partner_contact_gender/views/res_partner.xml
@@ -2,29 +2,10 @@
 <odoo>
 <data>
 
-<!-- Declared the same in every module that may need it -->
-<record id="base.personal_contact_information" model="ir.ui.view">
-    <field name="name">Personal information page for contacts form</field>
-    <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.view_partner_form"/>
-    <field name="priority">2</field>
-    <field name="arch" type="xml">
-        <data>
-            <xpath expr="//page[@name='internal_notes']" position="after">
-                <page name="personal_information_page"
-                      string="Personal Information"
-                      attrs="{'invisible': [('is_company','=',True)]}">
-                    <group name="personal_information_group"/>
-                </page>
-            </xpath>
-        </data>
-    </field>
-</record>
-
-<record id="personal_contact_information" model="ir.ui.view">
+<record id="view_personal_information_gender" model="ir.ui.view">
     <field name="name">Partner gender: personal info</field>
     <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.personal_contact_information"/>
+    <field name="inherit_id" ref="partner_contact_personal_information_page.personal_information"/>
     <field name="arch" type="xml">
         <data>
             <xpath expr="//page[@name='personal_information_page']/group[@name='personal_information_group']">
diff --git a/partner_contact_in_several_companies/__openerp__.py b/partner_contact_in_several_companies/__openerp__.py
index a668001fc..7dde7c792 100644
--- a/partner_contact_in_several_companies/__openerp__.py
+++ b/partner_contact_in_several_companies/__openerp__.py
@@ -23,7 +23,8 @@
     'installable': True,
     'auto_install': False,
     "depends": [
-        "base"
+        "base",
+        "partner_contact_personal_information_page",
     ],
     "data": [
         "views/res_partner.xml",
diff --git a/partner_contact_in_several_companies/views/res_partner.xml b/partner_contact_in_several_companies/views/res_partner.xml
index 2e4fcaab4..a56bb51b3 100644
--- a/partner_contact_in_several_companies/views/res_partner.xml
+++ b/partner_contact_in_several_companies/views/res_partner.xml
@@ -2,25 +2,6 @@
 <odoo>
 <data>
 
-<!-- Declared the same in every module that may need it -->
-<record id="base.personal_contact_information" model="ir.ui.view">
-    <field name="name">Personal information page for contacts form</field>
-    <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.view_partner_form"/>
-    <field name="priority">2</field>
-    <field name="arch" type="xml">
-        <data>
-            <xpath expr="//page[@name='internal_notes']" position="after">
-                <page name="personal_information_page"
-                      string="Personal Information"
-                      attrs="{'invisible': [('is_company','=',True)]}">
-                    <group name="personal_information_group"/>
-                </page>
-            </xpath>
-        </data>
-    </field>
-</record>
-
 <record id="view_res_partner_filter_contact" model="ir.ui.view">
     <field name="name">res.partner.select.contact</field>
     <field name="model">res.partner</field>
@@ -162,7 +143,7 @@
 <record id="personal_contact_information" model="ir.ui.view">
     <field name="name">Contacts in several partners: personal info</field>
     <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.personal_contact_information"/>
+    <field name="inherit_id" ref="partner_contact_personal_information_page.personal_information"/>
     <field name="arch" type="xml">
         <data>
             <xpath expr="//page[@name='personal_information_page']/group[@name='personal_information_group']"
diff --git a/partner_contact_nationality/__openerp__.py b/partner_contact_nationality/__openerp__.py
index 9b119648c..1c62acb27 100644
--- a/partner_contact_nationality/__openerp__.py
+++ b/partner_contact_nationality/__openerp__.py
@@ -18,7 +18,7 @@
     'installable': True,
     'auto_install': False,
     "depends": [
-        "base",
+        "partner_contact_personal_information_page",
     ],
     "data": [
         "views/res_partner.xml",
diff --git a/partner_contact_nationality/views/res_partner.xml b/partner_contact_nationality/views/res_partner.xml
index b9b08460d..d5c00fafd 100644
--- a/partner_contact_nationality/views/res_partner.xml
+++ b/partner_contact_nationality/views/res_partner.xml
@@ -1,30 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-<data>
 
-<!-- Declared the same in every module that may need it -->
-<record id="base.personal_contact_information" model="ir.ui.view">
-    <field name="name">Personal information page for contacts form</field>
-    <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.view_partner_form"/>
-    <field name="priority">2</field>
-    <field name="arch" type="xml">
-        <data>
-            <xpath expr="//page[@name='internal_notes']" position="after">
-                <page name="personal_information_page"
-                      string="Personal Information"
-                      attrs="{'invisible': [('is_company','=',True)]}">
-                    <group name="personal_information_group"/>
-                </page>
-            </xpath>
-        </data>
-    </field>
-</record>
-
-<record id="personal_contact_information" model="ir.ui.view">
+<record id="view_personal_information_page_nationality" model="ir.ui.view">
     <field name="name">Partner nationality: personal info</field>
     <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.personal_contact_information"/>
+    <field name="inherit_id" ref="partner_contact_personal_information_page.personal_information"/>
     <field name="arch" type="xml">
         <data>
             <xpath expr="//page[@name='personal_information_page']/group[@name='personal_information_group']">
@@ -34,5 +14,4 @@
     </field>
 </record>
 
-</data>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/partner_contact_personal_information_page/views/res_partner.xml b/partner_contact_personal_information_page/views/res_partner.xml
index a2a2889bf..d1bef3018 100644
--- a/partner_contact_personal_information_page/views/res_partner.xml
+++ b/partner_contact_personal_information_page/views/res_partner.xml
@@ -3,7 +3,7 @@
 <data>
 
 <!-- Declared the same in every module that may need it -->
-<record id="base.personal_contact_information" model="ir.ui.view">
+<record id="personal_information" model="ir.ui.view">
     <field name="name">Personal information page for contacts form</field>
     <field name="model">res.partner</field>
     <field name="inherit_id" ref="base.view_partner_form"/>