diff --git a/addons/anonymization/__init__.py b/addons/anonymization/__init__.py
index 6ac286f90336cfa1ced4d82a4111f7178561bd98..2b6fd3008e4dd42e463641633957e1c19410e94b 100644
--- a/addons/anonymization/__init__.py
+++ b/addons/anonymization/__init__.py
@@ -1,4 +1,4 @@
 # -*- encoding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import anonymization
+import models
diff --git a/addons/anonymization/__openerp__.py b/addons/anonymization/__openerp__.py
index 3f82cc44b45fac04e60b6f88301db30a7a6f200a..967f5f82a20d5b989fa8631b8ab448f3709367a8 100644
--- a/addons/anonymization/__openerp__.py
+++ b/addons/anonymization/__openerp__.py
@@ -19,11 +19,11 @@ team. Once you get back your migrated database, you restore it and reverse the
 anonymization process to recover your previous data.
     """,
     'depends': ['base'],
-    'demo': ['anonymization_demo.xml'],
+    'demo': ['data/anonymization_demo.xml'],
     'data': [
-        'ir.model.fields.anonymization.csv',
+        'data/ir.model.fields.anonymization.csv',
         'security/ir.model.access.csv',
-        'anonymization_view.xml',
+        'views/anonymization_views.xml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/anonymization/anonymization_demo.xml b/addons/anonymization/data/anonymization_demo.xml
similarity index 100%
rename from addons/anonymization/anonymization_demo.xml
rename to addons/anonymization/data/anonymization_demo.xml
diff --git a/addons/anonymization/ir.model.fields.anonymization.csv b/addons/anonymization/data/ir.model.fields.anonymization.csv
similarity index 100%
rename from addons/anonymization/ir.model.fields.anonymization.csv
rename to addons/anonymization/data/ir.model.fields.anonymization.csv
diff --git a/addons/anonymization/models/__init__.py b/addons/anonymization/models/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..5d2a1a794f045dc188c64f3ebf8ab513d452434a
--- /dev/null
+++ b/addons/anonymization/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import anonymization
diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/models/anonymization.py
similarity index 100%
rename from addons/anonymization/anonymization.py
rename to addons/anonymization/models/anonymization.py
diff --git a/addons/anonymization/anonymization_view.xml b/addons/anonymization/views/anonymization_views.xml
similarity index 100%
rename from addons/anonymization/anonymization_view.xml
rename to addons/anonymization/views/anonymization_views.xml