diff --git a/addons/website_hr_recruitment/__init__.py b/addons/website_hr_recruitment/__init__.py
index 9f86759e32b..ac0011716f6 100644
--- a/addons/website_hr_recruitment/__init__.py
+++ b/addons/website_hr_recruitment/__init__.py
@@ -1,2 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 import controllers
 import models
diff --git a/addons/website_hr_recruitment/__openerp__.py b/addons/website_hr_recruitment/__openerp__.py
index 4c0baa427cd..8bb0b4e7a13 100644
--- a/addons/website_hr_recruitment/__openerp__.py
+++ b/addons/website_hr_recruitment/__openerp__.py
@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 {
     'name': 'Online Jobs',
     'category': 'Human Resources',
@@ -13,7 +16,6 @@ Odoo Contact Form
         'security/ir.model.access.csv',
         'security/website_hr_recruitment_security.xml',
         'data/config_data.xml',
-        'views/hr_job_views.xml',
         'views/website_hr_recruitment_templates.xml',
         'views/hr_recruitment_views.xml',
     ],
diff --git a/addons/website_hr_recruitment/data/config_data.xml b/addons/website_hr_recruitment/data/config_data.xml
index 24e4ed8b30f..56919da2e3c 100644
--- a/addons/website_hr_recruitment/data/config_data.xml
+++ b/addons/website_hr_recruitment/data/config_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
+<odoo>
     <data noupdate="1">
         <record id="menu_jobs" model="website.menu">
             <field name="name">Jobs</field>
@@ -18,7 +18,7 @@
         </record>
     </data>
     <data>
-        <record id="hr_recruitment.model_hr_applicant" model="ir.model">         
+        <record id="hr_recruitment.model_hr_applicant" model="ir.model">
             <field name="website_form_default_field_id" ref="hr_recruitment.field_hr_applicant_description" />
             <field name="website_form_access">True</field>
             <field name="website_form_label">Apply for a Job</field>
@@ -35,4 +35,4 @@
             ]"/>
         </function>
     </data>
-</openerp>
+</odoo>
diff --git a/addons/website_hr_recruitment/data/hr_job_demo.xml b/addons/website_hr_recruitment/data/hr_job_demo.xml
index 2f92113ca3a..82ff9260da9 100644
--- a/addons/website_hr_recruitment/data/hr_job_demo.xml
+++ b/addons/website_hr_recruitment/data/hr_job_demo.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
 
     <record id="hr.job_marketing" model="hr.job">
         <field name="website_published">True</field>
@@ -915,5 +914,4 @@
         </field>
     </record>
 
-    </data>
-</openerp>
+</odoo>
diff --git a/addons/website_hr_recruitment/models/__init__.py b/addons/website_hr_recruitment/models/__init__.py
index 51930ad5d98..18a9584117d 100644
--- a/addons/website_hr_recruitment/models/__init__.py
+++ b/addons/website_hr_recruitment/models/__init__.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import hr_job
 import hr_recruitment
-import hr_applicant
diff --git a/addons/website_hr_recruitment/models/hr_applicant.py b/addons/website_hr_recruitment/models/hr_applicant.py
deleted file mode 100644
index e630d27a595..00000000000
--- a/addons/website_hr_recruitment/models/hr_applicant.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import models
-
-class Applicant(models.Model):
-
-    _inherit = 'hr.applicant'
-
-    def website_form_input_filter(self, request, values):
-        if 'partner_name' in values:
-            values.setdefault('name', '%s\'s Application' % values['partner_name'])
-        return values
diff --git a/addons/website_hr_recruitment/models/hr_job.py b/addons/website_hr_recruitment/models/hr_job.py
deleted file mode 100644
index 244ef5721fb..00000000000
--- a/addons/website_hr_recruitment/models/hr_job.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import api, fields, models
-
-class Job(models.Model):
-
-    _name = 'hr.job'
-    _inherit = ['hr.job', 'website.seo.metadata', 'website.published.mixin']
-
-    website_description = fields.Html('Website description', translate=True)
-
-    @api.multi
-    def _website_url(self, field_name, arg):
-        result = super(Job, self)._website_url(field_name, arg)
-        for job in self:
-            result[job.id] = "/jobs/detail/%s" % job.id
-        return result
-
-    @api.multi
-    def set_open(self):
-        self.write({'website_published': False})
-        return super(Job, self).set_open()
diff --git a/addons/website_hr_recruitment/models/hr_recruitment.py b/addons/website_hr_recruitment/models/hr_recruitment.py
index 0f2d87eb5f9..5560ccc5f87 100644
--- a/addons/website_hr_recruitment/models/hr_recruitment.py
+++ b/addons/website_hr_recruitment/models/hr_recruitment.py
@@ -1,14 +1,20 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 from urlparse import urljoin
 from werkzeug import url_encode
 
-from openerp import models, fields, api
-from openerp.addons.website.models.website import slug
+from odoo import api, fields, models
+from odoo.addons.website.models.website import slug
 
-class HrRecruitmentSource(models.Model):
+
+class RecruitmentSource(models.Model):
     _inherit = 'hr.recruitment.source'
 
-    @api.depends('source_id', 'source_id.name', 'job_id')
+    url = fields.Char(compute='_compute_url', string='Url Parameters')
+
     @api.one
+    @api.depends('source_id', 'source_id.name', 'job_id')
     def _compute_url(self):
         base_url = self.env['ir.config_parameter'].get_param('web.base.url')
         for source in self:
@@ -20,4 +26,32 @@ class HrRecruitmentSource(models.Model):
                 })
             ))
 
-    url = fields.Char(compute='_compute_url', string='Url Parameters')
\ No newline at end of file
+
+class Applicant(models.Model):
+
+    _inherit = 'hr.applicant'
+
+    def website_form_input_filter(self, request, values):
+        if 'partner_name' in values:
+            values.setdefault('name', '%s\'s Application' % values['partner_name'])
+        return values
+
+
+class Job(models.Model):
+
+    _name = 'hr.job'
+    _inherit = ['hr.job', 'website.seo.metadata', 'website.published.mixin']
+
+    website_description = fields.Html('Website description', translate=True)
+
+    @api.multi
+    def _website_url(self, field_name, arg):
+        result = super(Job, self)._website_url(field_name, arg)
+        for job in self:
+            result[job.id] = "/jobs/detail/%s" % job.id
+        return result
+
+    @api.multi
+    def set_open(self):
+        self.write({'website_published': False})
+        return super(Job, self).set_open()
diff --git a/addons/website_hr_recruitment/views/hr_job_views.xml b/addons/website_hr_recruitment/views/hr_job_views.xml
deleted file mode 100644
index cfa7fc675f2..00000000000
--- a/addons/website_hr_recruitment/views/hr_job_views.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="view_hr_job_form_website_published_button" model="ir.ui.view" >
-        <field name="name">hr.job.form.inherit.published.button</field>
-        <field name="model">hr.job</field>
-        <field name="inherit_id" ref="hr_recruitment.hr_job_survey"/>
-        <field name="arch" type="xml">
-            <div name="button_box" position="inside">
-                <button class="oe_stat_button" name="website_publish_button"
-                    type="object" icon="fa-globe">
-                    <field name="website_published" widget="website_button"/>
-                </button>
-            </div>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/website_hr_recruitment/views/hr_recruitment_views.xml b/addons/website_hr_recruitment/views/hr_recruitment_views.xml
index 8c4b14dc984..92335ded748 100644
--- a/addons/website_hr_recruitment/views/hr_recruitment_views.xml
+++ b/addons/website_hr_recruitment/views/hr_recruitment_views.xml
@@ -10,4 +10,18 @@
             </xpath>
         </field>
     </record>
+
+    <record id="view_hr_job_form_website_published_button" model="ir.ui.view" >
+        <field name="name">hr.job.form.inherit.published.button</field>
+        <field name="model">hr.job</field>
+        <field name="inherit_id" ref="hr_recruitment.hr_job_survey"/>
+        <field name="arch" type="xml">
+            <div name="button_box" position="inside">
+                <button class="oe_stat_button" name="website_publish_button"
+                    type="object" icon="fa-globe">
+                    <field name="website_published" widget="website_button"/>
+                </button>
+            </div>
+        </field>
+    </record>
 </odoo>
\ No newline at end of file
diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
index 09ac1c2f3ad..2894cbc42c3 100644
--- a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
+<odoo>
 
 <template id="job_footer_custom" inherit_id="website.footer_default" name="Footer Job Link">
     <xpath expr="//div[@id='info']/ul" position="inside">
@@ -304,5 +303,4 @@
     </xpath>
 </template>
 
-</data>
-</openerp>
+</odoo>