diff --git a/base_company_extension/__init__.py b/base_company_extension/__init__.py
index 52e1016..0650744 100644
--- a/base_company_extension/__init__.py
+++ b/base_company_extension/__init__.py
@@ -1 +1 @@
-from . import company
+from . import models
diff --git a/base_company_extension/__manifest__.py b/base_company_extension/__manifest__.py
index ef50d36..2f5f468 100644
--- a/base_company_extension/__manifest__.py
+++ b/base_company_extension/__manifest__.py
@@ -1,17 +1,17 @@
-# Copyright 2014-2020 Akretion (http://www.akretion.com)
+# Copyright 2014-2022 Akretion (http://www.akretion.com)
 # @author Alexis de Lattre <alexis.delattre@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
     'name': 'Base Company Extension',
-    'version': '14.0.1.0.0',
+    'version': '16.0.1.0.0',
     'category': 'Partner',
     'license': 'AGPL-3',
     'summary': 'Adds capital and title on company',
     'author': 'Akretion',
-    'website': 'http://www.akretion.com',
+    'website': 'https://github.com/akretion/odoo-usability',
     # I depend on base_usability only for _report_company_legal_name()
     'depends': ['base_usability'],
-    'data': ['company_view.xml'],
-    'installable': False,
+    'data': ['views/res_company.xml'],
+    'installable': True,
 }
diff --git a/base_company_extension/models/__init__.py b/base_company_extension/models/__init__.py
new file mode 100644
index 0000000..aff44f3
--- /dev/null
+++ b/base_company_extension/models/__init__.py
@@ -0,0 +1 @@
+from . import res_company
diff --git a/base_company_extension/company.py b/base_company_extension/models/res_company.py
similarity index 93%
rename from base_company_extension/company.py
rename to base_company_extension/models/res_company.py
index 6b826aa..d32e161 100644
--- a/base_company_extension/company.py
+++ b/base_company_extension/models/res_company.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2020 Akretion (http://www.akretion.com)
+# Copyright 2014-2022 Akretion (http://www.akretion.com)
 # @author Alexis de Lattre <alexis.delattre@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
diff --git a/base_company_extension/company_view.xml b/base_company_extension/views/res_company.xml
similarity index 82%
rename from base_company_extension/company_view.xml
rename to base_company_extension/views/res_company.xml
index 076ede8..8921f95 100644
--- a/base_company_extension/company_view.xml
+++ b/base_company_extension/views/res_company.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2014-2020 Akretion (http://www.akretion.com/)
+  Copyright 2014-2022 Akretion (http://www.akretion.com/)
   @author Alexis de Lattre <alexis.delattre@akretion.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
@@ -12,7 +12,7 @@
     <field name="model">res.company</field>
     <field name="inherit_id" ref="base.view_company_form" />
     <field name="arch" type="xml">
-        <field name="company_registry" position="after">
+        <field name="currency_id" position="after">
             <field name="capital_amount"/>
             <field name="legal_type"/>
         </field>