diff --git a/addons/website_sale/models/__init__.py b/addons/website_sale/models/__init__.py
index c0025143d45..1f9c38d727f 100644
--- a/addons/website_sale/models/__init__.py
+++ b/addons/website_sale/models/__init__.py
@@ -5,6 +5,8 @@ from . import crm_team
 from . import ir_http
 from . import mail_compose_message
 from . import product
+from . import res_country
+from . import res_partner
 from . import sale_order
 from . import website
 from . import res_config_settings
diff --git a/addons/website_sale/models/res_country.py b/addons/website_sale/models/res_country.py
new file mode 100644
index 00000000000..d22846fa894
--- /dev/null
+++ b/addons/website_sale/models/res_country.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models
+
+
+class ResCountry(models.Model):
+    _inherit = 'res.country'
+
+    def get_website_sale_countries(self, mode='billing'):
+        return self.sudo().search([])
+
+    def get_website_sale_states(self, mode='billing'):
+        return self.sudo().state_ids
diff --git a/addons/website_sale/models/res_partner.py b/addons/website_sale/models/res_partner.py
new file mode 100644
index 00000000000..6755a4b6a54
--- /dev/null
+++ b/addons/website_sale/models/res_partner.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models, fields
+
+
+class ResPartner(models.Model):
+    _inherit = 'res.partner'
+
+    last_website_so_id = fields.Many2one('sale.order', string='Last Online Sales Order')
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index 98ba455acdd..70a37fd775e 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -245,19 +245,3 @@ class SaleOrder(models.Model):
             self.payment_tx_id.state = 'done'
         else:
             raise ValidationError(_("The quote should be sent and the payment acquirer type should be manual or wire transfer"))
-
-
-class ResCountry(models.Model):
-    _inherit = 'res.country'
-
-    def get_website_sale_countries(self, mode='billing'):
-        return self.sudo().search([])
-
-    def get_website_sale_states(self, mode='billing'):
-        return self.sudo().state_ids
-
-
-class ResPartner(models.Model):
-    _inherit = 'res.partner'
-
-    last_website_so_id = fields.Many2one('sale.order', string='Last Online Sales Order')