diff --git a/addons/l10n_be_intrastat/__init__.py b/addons/l10n_be_intrastat/__init__.py
index da9d9141b48..129c5113061 100644
--- a/addons/l10n_be_intrastat/__init__.py
+++ b/addons/l10n_be_intrastat/__init__.py
@@ -2,5 +2,5 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
-import l10n_be_intrastat
+import models
 import wizard
diff --git a/addons/l10n_be_intrastat/__openerp__.py b/addons/l10n_be_intrastat/__openerp__.py
index b32ae826af4..5196c9e53ad 100644
--- a/addons/l10n_be_intrastat/__openerp__.py
+++ b/addons/l10n_be_intrastat/__openerp__.py
@@ -11,14 +11,14 @@ Based on invoices.
     """,
     'depends': ['report_intrastat', 'sale_stock', 'account_accountant', 'l10n_be'],
     'data': [
-        'data/regions.xml',
+        'data/l10n_be_intrastat_chart_data.xml',
         'data/report.intrastat.code.csv',
-        'data/transaction.codes.xml',
-        'data/transport.modes.xml',
-        'security/groups.xml',
+        'data/l10n_be_intrastat_transaction_codes_data.xml',
+        'data/l10n_be_intrastat_transport_modes_data.xml',
+        'security/l10n_be_intrastat_security.xml',
         'security/ir.model.access.csv',
-        'l10n_be_intrastat.xml',
-        'wizard/l10n_be_intrastat_xml_view.xml',
+        'views/l10n_be_intrastat_view.xml',
+        'wizard/l10n_be_intrastat_declaration_view.xml',
     ],
     'installable': True,
 }
diff --git a/addons/l10n_be_intrastat/data/regions.xml b/addons/l10n_be_intrastat/data/l10n_be_intrastat_chart_data.xml
similarity index 100%
rename from addons/l10n_be_intrastat/data/regions.xml
rename to addons/l10n_be_intrastat/data/l10n_be_intrastat_chart_data.xml
diff --git a/addons/l10n_be_intrastat/data/transaction.codes.xml b/addons/l10n_be_intrastat/data/l10n_be_intrastat_transaction_codes_data.xml
similarity index 100%
rename from addons/l10n_be_intrastat/data/transaction.codes.xml
rename to addons/l10n_be_intrastat/data/l10n_be_intrastat_transaction_codes_data.xml
diff --git a/addons/l10n_be_intrastat/data/transport.modes.xml b/addons/l10n_be_intrastat/data/l10n_be_intrastat_transport_modes_data.xml
similarity index 100%
rename from addons/l10n_be_intrastat/data/transport.modes.xml
rename to addons/l10n_be_intrastat/data/l10n_be_intrastat_transport_modes_data.xml
diff --git a/addons/l10n_be_intrastat/models/__init__.py b/addons/l10n_be_intrastat/models/__init__.py
new file mode 100644
index 00000000000..192cd6b538b
--- /dev/null
+++ b/addons/l10n_be_intrastat/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import l10n_be_intrastat
diff --git a/addons/l10n_be_intrastat/l10n_be_intrastat.py b/addons/l10n_be_intrastat/models/l10n_be_intrastat.py
similarity index 100%
rename from addons/l10n_be_intrastat/l10n_be_intrastat.py
rename to addons/l10n_be_intrastat/models/l10n_be_intrastat.py
diff --git a/addons/l10n_be_intrastat/security/groups.xml b/addons/l10n_be_intrastat/security/l10n_be_intrastat_security.xml
similarity index 100%
rename from addons/l10n_be_intrastat/security/groups.xml
rename to addons/l10n_be_intrastat/security/l10n_be_intrastat_security.xml
diff --git a/addons/l10n_be_intrastat/l10n_be_intrastat.xml b/addons/l10n_be_intrastat/views/l10n_be_intrastat_view.xml
similarity index 100%
rename from addons/l10n_be_intrastat/l10n_be_intrastat.xml
rename to addons/l10n_be_intrastat/views/l10n_be_intrastat_view.xml
diff --git a/addons/l10n_be_intrastat/wizard/l10n_be_intrastat_xml_view.xml b/addons/l10n_be_intrastat/wizard/l10n_be_intrastat_declaration_view.xml
similarity index 100%
rename from addons/l10n_be_intrastat/wizard/l10n_be_intrastat_xml_view.xml
rename to addons/l10n_be_intrastat/wizard/l10n_be_intrastat_declaration_view.xml