diff --git a/account_fiscal_position_payable_receivable/__init__.py b/account_fiscal_position_payable_receivable/__init__.py
index 235b7d4..0650744 100644
--- a/account_fiscal_position_payable_receivable/__init__.py
+++ b/account_fiscal_position_payable_receivable/__init__.py
@@ -1,3 +1 @@
-# -*- coding: utf-8 -*-
-
-from . import account_fiscal_position
+from . import models
diff --git a/account_fiscal_position_payable_receivable/__manifest__.py b/account_fiscal_position_payable_receivable/__manifest__.py
index b69daf9..3d5c007 100644
--- a/account_fiscal_position_payable_receivable/__manifest__.py
+++ b/account_fiscal_position_payable_receivable/__manifest__.py
@@ -1,10 +1,9 @@
-# -*- coding: utf-8 -*-
 # © 2016-2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
     'name': 'Account Fiscal Position Payable Receivable',
-    'version': '10.0.1.0.0',
+    'version': '12.0.1.0.0',
     'category': 'Accounting & Finance',
     'license': 'AGPL-3',
     'summary': 'Configure payable/receivable accounts on fiscal positions',
@@ -20,7 +19,7 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
     'website': 'http://www.akretion.com',
     'depends': ['account'],
     'data': [
-        'account_fiscal_position_view.xml',
+        'views/account_fiscal_position_view.xml',
     ],
     'installable': True,
 }
diff --git a/account_fiscal_position_payable_receivable/models/__init__.py b/account_fiscal_position_payable_receivable/models/__init__.py
new file mode 100644
index 0000000..b52c676
--- /dev/null
+++ b/account_fiscal_position_payable_receivable/models/__init__.py
@@ -0,0 +1,2 @@
+from . import account_fiscal_position
+from . import res_partner
diff --git a/account_fiscal_position_payable_receivable/models/account_fiscal_position.py b/account_fiscal_position_payable_receivable/models/account_fiscal_position.py
new file mode 100644
index 0000000..d8d0f89
--- /dev/null
+++ b/account_fiscal_position_payable_receivable/models/account_fiscal_position.py
@@ -0,0 +1,15 @@
+# © 2016-2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models, fields
+
+
+class AccountFiscalPosition(models.Model):
+    _inherit = 'account.fiscal.position'
+
+    receivable_account_id = fields.Many2one(
+        'account.account', string='Partner Receivable Account',
+        company_dependent=True, domain=[('internal_type', '=', 'receivable')])
+    payable_account_id = fields.Many2one(
+        'account.account', string='Partner Payable Account',
+        company_dependent=True, domain=[('internal_type', '=', 'payable')])
diff --git a/account_fiscal_position_payable_receivable/account_fiscal_position.py b/account_fiscal_position_payable_receivable/models/res_partner.py
similarity index 63%
rename from account_fiscal_position_payable_receivable/account_fiscal_position.py
rename to account_fiscal_position_payable_receivable/models/res_partner.py
index 7d1b915..b487c5a 100644
--- a/account_fiscal_position_payable_receivable/account_fiscal_position.py
+++ b/account_fiscal_position_payable_receivable/models/res_partner.py
@@ -1,19 +1,7 @@
-# -*- coding: utf-8 -*-
 # © 2016-2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import models, fields, api
-
-
-class AccountFiscalPosition(models.Model):
-    _inherit = 'account.fiscal.position'
-
-    receivable_account_id = fields.Many2one(
-        'account.account', string='Partner Receivable Account',
-        company_dependent=True, domain=[('internal_type', '=', 'receivable')])
-    payable_account_id = fields.Many2one(
-        'account.account', string='Partner Payable Account',
-        company_dependent=True, domain=[('internal_type', '=', 'payable')])
+from odoo import models, api
 
 
 class ResPartner(models.Model):
diff --git a/account_fiscal_position_payable_receivable/account_fiscal_position_view.xml b/account_fiscal_position_payable_receivable/views/account_fiscal_position_view.xml
similarity index 100%
rename from account_fiscal_position_payable_receivable/account_fiscal_position_view.xml
rename to account_fiscal_position_payable_receivable/views/account_fiscal_position_view.xml