diff --git a/addons/base_vat/__init__.py b/addons/base_vat/__init__.py
index f2dc51b6e24..81fc81d29c9 100644
--- a/addons/base_vat/__init__.py
+++ b/addons/base_vat/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import res_company
-import base_vat
+import models
diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index 0238e78046d..07a52fb0b17 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -20,7 +20,7 @@ There are two different levels of VAT number validation:
       rules for the country, usually a simple check digit. This is quick and 
       always available, but allows numbers that are perhaps not truly allocated,
       or not valid anymore.
-      
+
     * When the "VAT VIES Check" option is enabled (in the configuration of the user's
       Company), VAT numbers will be instead submitted to the online EU VIES
       database, which will truly verify that the number is valid and currently
@@ -36,7 +36,10 @@ only the country code will be validated.
     """,
     'depends': ['account'],
     'website': 'https://www.odoo.com/page/accounting',
-    'data': ['base_vat_view.xml'],
+    'data': [
+        'views/res_partner_views.xml',
+        'views/res_company_views.xml',
+    ],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/base_vat/models/__init__.py b/addons/base_vat/models/__init__.py
new file mode 100644
index 00000000000..94402c7fcd0
--- /dev/null
+++ b/addons/base_vat/models/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import res_company
+import res_partner
diff --git a/addons/base_vat/res_company.py b/addons/base_vat/models/res_company.py
similarity index 100%
rename from addons/base_vat/res_company.py
rename to addons/base_vat/models/res_company.py
diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/models/res_partner.py
similarity index 100%
rename from addons/base_vat/base_vat.py
rename to addons/base_vat/models/res_partner.py
diff --git a/addons/base_vat/views/res_company_views.xml b/addons/base_vat/views/res_company_views.xml
new file mode 100644
index 00000000000..471c81dcb62
--- /dev/null
+++ b/addons/base_vat/views/res_company_views.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="company_form_vat" model="ir.ui.view">
+        <field name="name">res.company.form.vat.inherit</field>
+        <field name="model">res.company</field>
+        <field name="inherit_id" ref="base.view_company_form"/>
+        <field name="arch" type="xml">
+            <field name="currency_id" position="after">
+                <field name="vat_check_vies" />
+            </field>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/views/res_partner_views.xml
similarity index 60%
rename from addons/base_vat/base_vat_view.xml
rename to addons/base_vat/views/res_partner_views.xml
index 4ee6cea9a94..b1776976c29 100644
--- a/addons/base_vat/base_vat_view.xml
+++ b/addons/base_vat/views/res_partner_views.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
         <record id="view_partner_form" model="ir.ui.view">
             <field name="name">res.partner.vat.inherit</field>
             <field name="model">res.partner</field>
@@ -15,18 +14,6 @@
                 </field>
             </field>
         </record>
-
-        <record id="company_form_vat" model="ir.ui.view">
-            <field name="name">res.company.form.vat.inherit</field>
-            <field name="model">res.company</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="arch" type="xml">
-                <field name="currency_id" position="after">
-                    <field name="vat_check_vies" />
-                </field>
-            </field>
-        </record>
-
     </data>
 </openerp>