diff --git a/golem_member_familyquotient/golem_member.py b/golem_member_familyquotient/models/golem_member.py
similarity index 100%
rename from golem_member_familyquotient/golem_member.py
rename to golem_member_familyquotient/models/golem_member.py
diff --git a/golem_member_familyquotient/golem_member_view.xml b/golem_member_familyquotient/views/golem_member_views.xml
similarity index 100%
rename from golem_member_familyquotient/golem_member_view.xml
rename to golem_member_familyquotient/views/golem_member_views.xml
diff --git a/golem_member_skills/i18n/fr.po b/golem_member_skills/i18n/fr.po
index 5b78556..5515e5b 100644
--- a/golem_member_skills/i18n/fr.po
+++ b/golem_member_skills/i18n/fr.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-13 17:33+0000\n"
-"PO-Revision-Date: 2016-07-13 17:33+0000\n"
+"POT-Creation-Date: 2017-05-01 20:50+0000\n"
+"PO-Revision-Date: 2017-05-01 20:50+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,60 +17,55 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: golem_member_skills
-#: field:golem.member.skill,create_uid:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill_create_uid
 msgid "Created by"
 msgstr "Créé par"
 
 #. module: golem_member_skills
-#: field:golem.member.skill,create_date:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill_create_date
 msgid "Created on"
 msgstr "Créé le"
 
 #. module: golem_member_skills
-#: field:golem.member.skill,display_name:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill_display_name
 msgid "Display Name"
 msgstr "Nom affiché"
 
-#. module: golem_member_skills
-#: model:ir.model,name:golem_member_skills.model_golem_member
-msgid "GOLEM Member"
-msgstr "GOLEM : adhérent"
-
 #. module: golem_member_skills
 #: model:ir.model,name:golem_member_skills.model_golem_member_skill
 msgid "GOLEM Member Skill"
 msgstr "GOLEM : compétence de l'adhérent"
 
 #. module: golem_member_skills
-#: model:ir.actions.act_window,name:golem_member_skills.skills_action_list
+#: model:ir.actions.act_window,name:golem_member_skills.golem_member_skill_action
 msgid "GOLEM Member Skills"
 msgstr "GOLEM : compétences des adhérents"
 
 #. module: golem_member_skills
-#: field:golem.member.skill,id:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill_id
 msgid "ID"
 msgstr "ID"
 
 #. module: golem_member_skills
-#: view:golem.member:golem_member_skills.golem_member_skills_search
-#: view:res.partner:golem_member_skills.res_partner_skills_search
+#: model:ir.ui.view,arch_db:golem_member_skills.golem_member_search_inherit_skills
+#: model:ir.ui.view,arch_db:golem_member_skills.res_partner_search_inherit_skills
 msgid "Is volunteer"
 msgstr "Est bénévole"
 
 #. module: golem_member_skills
-#: field:golem.member.skill,__last_update:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill___last_update
 msgid "Last Modified on"
-msgstr "Dernière modification le"
+msgstr "Dernière Modification le"
 
 #. module: golem_member_skills
-#: field:golem.member.skill,write_uid:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill_write_uid
 msgid "Last Updated by"
-msgstr "Dernière modification par"
+msgstr "Dernière mise à jour par"
 
 #. module: golem_member_skills
-#: field:golem.member.skill,write_date:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill_write_date
 msgid "Last Updated on"
-msgstr "Dernière modification le"
+msgstr "Dernière mise à jour le"
 
 #. module: golem_member_skills
 #: sql_constraint:golem.member.skill:0
@@ -78,7 +73,7 @@ msgid "Member skill must be unique."
 msgstr "Les compétences adhérents doivent être unique."
 
 #. module: golem_member_skills
-#: model:ir.ui.menu,name:golem_member_skills.skill_menu_list
+#: model:ir.ui.menu,name:golem_member_skills.golem_member_skill_menu
 msgid "Member skills"
 msgstr "Compétences de l'adhérent"
 
@@ -88,26 +83,28 @@ msgid "Partner"
 msgstr "Partenaire"
 
 #. module: golem_member_skills
-#: field:golem.member.skill,name:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill_name
 msgid "Skill"
 msgstr "Compétence"
 
 #. module: golem_member_skills
-#: field:golem.member,skill_ids:0
-#: view:res.partner:golem_member_skills.res_partner_skills_form
-#: field:res.partner,skill_ids:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill_ids
+#: model:ir.model.fields,field_description:golem_member_skills.field_res_partner_skill_ids
+#: model:ir.model.fields,field_description:golem_member_skills.field_res_users_skill_ids
+#: model:ir.ui.view,arch_db:golem_member_skills.res_partner_form_inherit_skills
 msgid "Skills"
 msgstr "Compétences"
 
 #. module: golem_member_skills
-#: view:golem.member:golem_member_skills.golem_member_skills_form
-#: view:res.partner:golem_member_skills.res_partner_skills_form
+#: model:ir.ui.view,arch_db:golem_member_skills.golem_member_form_inherit_skills
+#: model:ir.ui.view,arch_db:golem_member_skills.res_partner_form_inherit_skills
 msgid "Skills..."
 msgstr "Compétences..."
 
 #. module: golem_member_skills
-#: field:golem.member,is_volunteer:0
-#: field:res.partner,is_volunteer:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_is_volunteer
+#: model:ir.model.fields,field_description:golem_member_skills.field_res_partner_is_volunteer
+#: model:ir.model.fields,field_description:golem_member_skills.field_res_users_is_volunteer
 msgid "Volunteer?"
 msgstr "Bénévole?"
 
diff --git a/golem_member_skills/i18n/golem_member_skills.pot b/golem_member_skills/i18n/golem_member_skills.pot
index a0e0a30..4178f3a 100644
--- a/golem_member_skills/i18n/golem_member_skills.pot
+++ b/golem_member_skills/i18n/golem_member_skills.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-13 17:32+0000\n"
-"PO-Revision-Date: 2016-07-13 17:32+0000\n"
+"POT-Creation-Date: 2017-05-01 20:49+0000\n"
+"PO-Revision-Date: 2017-05-01 20:49+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,58 +16,53 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: golem_member_skills
-#: field:golem.member.skill,create_uid:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill_create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: golem_member_skills
-#: field:golem.member.skill,create_date:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill_create_date
 msgid "Created on"
 msgstr ""
 
 #. module: golem_member_skills
-#: field:golem.member.skill,display_name:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill_display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: golem_member_skills
-#: model:ir.model,name:golem_member_skills.model_golem_member
-msgid "GOLEM Member"
-msgstr ""
-
 #. module: golem_member_skills
 #: model:ir.model,name:golem_member_skills.model_golem_member_skill
 msgid "GOLEM Member Skill"
 msgstr ""
 
 #. module: golem_member_skills
-#: model:ir.actions.act_window,name:golem_member_skills.skills_action_list
+#: model:ir.actions.act_window,name:golem_member_skills.golem_member_skill_action
 msgid "GOLEM Member Skills"
 msgstr ""
 
 #. module: golem_member_skills
-#: field:golem.member.skill,id:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill_id
 msgid "ID"
 msgstr ""
 
 #. module: golem_member_skills
-#: view:golem.member:golem_member_skills.golem_member_skills_search
-#: view:res.partner:golem_member_skills.res_partner_skills_search
+#: model:ir.ui.view,arch_db:golem_member_skills.golem_member_search_inherit_skills
+#: model:ir.ui.view,arch_db:golem_member_skills.res_partner_search_inherit_skills
 msgid "Is volunteer"
 msgstr ""
 
 #. module: golem_member_skills
-#: field:golem.member.skill,__last_update:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill___last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: golem_member_skills
-#: field:golem.member.skill,write_uid:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill_write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: golem_member_skills
-#: field:golem.member.skill,write_date:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill_write_date
 msgid "Last Updated on"
 msgstr ""
 
@@ -77,7 +72,7 @@ msgid "Member skill must be unique."
 msgstr ""
 
 #. module: golem_member_skills
-#: model:ir.ui.menu,name:golem_member_skills.skill_menu_list
+#: model:ir.ui.menu,name:golem_member_skills.golem_member_skill_menu
 msgid "Member skills"
 msgstr ""
 
@@ -87,26 +82,28 @@ msgid "Partner"
 msgstr ""
 
 #. module: golem_member_skills
-#: field:golem.member.skill,name:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill_name
 msgid "Skill"
 msgstr ""
 
 #. module: golem_member_skills
-#: field:golem.member,skill_ids:0
-#: view:res.partner:golem_member_skills.res_partner_skills_form
-#: field:res.partner,skill_ids:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_skill_ids
+#: model:ir.model.fields,field_description:golem_member_skills.field_res_partner_skill_ids
+#: model:ir.model.fields,field_description:golem_member_skills.field_res_users_skill_ids
+#: model:ir.ui.view,arch_db:golem_member_skills.res_partner_form_inherit_skills
 msgid "Skills"
 msgstr ""
 
 #. module: golem_member_skills
-#: view:golem.member:golem_member_skills.golem_member_skills_form
-#: view:res.partner:golem_member_skills.res_partner_skills_form
+#: model:ir.ui.view,arch_db:golem_member_skills.golem_member_form_inherit_skills
+#: model:ir.ui.view,arch_db:golem_member_skills.res_partner_form_inherit_skills
 msgid "Skills..."
 msgstr ""
 
 #. module: golem_member_skills
-#: field:golem.member,is_volunteer:0
-#: field:res.partner,is_volunteer:0
+#: model:ir.model.fields,field_description:golem_member_skills.field_golem_member_is_volunteer
+#: model:ir.model.fields,field_description:golem_member_skills.field_res_partner_is_volunteer
+#: model:ir.model.fields,field_description:golem_member_skills.field_res_users_is_volunteer
 msgid "Volunteer?"
 msgstr ""