diff --git a/addons/l10n_be_invoice_bba/__init__.py b/addons/l10n_be_invoice_bba/__init__.py
index 8f6fe00c3fa..4a6d28deb46 100644
--- a/addons/l10n_be_invoice_bba/__init__.py
+++ b/addons/l10n_be_invoice_bba/__init__.py
@@ -3,5 +3,4 @@
 
 # Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved.
 
-import partner
-import invoice
+import models
diff --git a/addons/l10n_be_invoice_bba/__openerp__.py b/addons/l10n_be_invoice_bba/__openerp__.py
index 1330b0420a4..6a74125157b 100644
--- a/addons/l10n_be_invoice_bba/__openerp__.py
+++ b/addons/l10n_be_invoice_bba/__openerp__.py
@@ -33,8 +33,8 @@ generated if no algorithm is specified on the Partner record.
     'depends': ['account'],
     'demo': [],
     'data' : [
-        'partner_view.xml',
-        'account_invoice_view.xml',        
+        'views/res_partner_view.xml',
+        'views/account_invoice_view.xml',        
     ],
     'auto_install': False,
     'installable': True,
diff --git a/addons/l10n_be_invoice_bba/models/__init__.py b/addons/l10n_be_invoice_bba/models/__init__.py
new file mode 100644
index 00000000000..30428dceb77
--- /dev/null
+++ b/addons/l10n_be_invoice_bba/models/__init__.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+# Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved.
+
+import res_partner
+import account_invoice
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/models/account_invoice.py
similarity index 100%
rename from addons/l10n_be_invoice_bba/invoice.py
rename to addons/l10n_be_invoice_bba/models/account_invoice.py
diff --git a/addons/l10n_be_invoice_bba/partner.py b/addons/l10n_be_invoice_bba/models/res_partner.py
similarity index 100%
rename from addons/l10n_be_invoice_bba/partner.py
rename to addons/l10n_be_invoice_bba/models/res_partner.py
diff --git a/addons/l10n_be_invoice_bba/account_invoice_view.xml b/addons/l10n_be_invoice_bba/views/account_invoice_view.xml
similarity index 100%
rename from addons/l10n_be_invoice_bba/account_invoice_view.xml
rename to addons/l10n_be_invoice_bba/views/account_invoice_view.xml
diff --git a/addons/l10n_be_invoice_bba/partner_view.xml b/addons/l10n_be_invoice_bba/views/res_partner_view.xml
similarity index 100%
rename from addons/l10n_be_invoice_bba/partner_view.xml
rename to addons/l10n_be_invoice_bba/views/res_partner_view.xml