diff --git a/mrp_average_cost/__init__.py b/mrp_average_cost/__init__.py
index 8104f48..69f7bab 100644
--- a/mrp_average_cost/__init__.py
+++ b/mrp_average_cost/__init__.py
@@ -1,3 +1,3 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import mrp
+from . import models
diff --git a/mrp_average_cost/__manifest__.py b/mrp_average_cost/__manifest__.py
index 54caf47..797bcf8 100644
--- a/mrp_average_cost/__manifest__.py
+++ b/mrp_average_cost/__manifest__.py
@@ -24,10 +24,10 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
     'website': 'http://www.akretion.com',
     'depends': ['mrp'],
     'data': [
-        'mrp_view.xml',
-        'mrp_data.xml',
-        'security/labour_cost_profile_security.xml',
+        'security/mrp_average_cost_security.xml',
         'security/ir.model.access.csv',
+        'data/mrp_data.xml',
+        'views/mrp_view.xml',
         ],
     'installable': True,
 }
diff --git a/mrp_average_cost/mrp_data.xml b/mrp_average_cost/data/mrp_data.xml
similarity index 100%
rename from mrp_average_cost/mrp_data.xml
rename to mrp_average_cost/data/mrp_data.xml
diff --git a/mrp_average_cost/models/__init__.py b/mrp_average_cost/models/__init__.py
new file mode 100644
index 0000000..8104f48
--- /dev/null
+++ b/mrp_average_cost/models/__init__.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import mrp
diff --git a/mrp_average_cost/mrp.py b/mrp_average_cost/models/mrp.py
similarity index 100%
rename from mrp_average_cost/mrp.py
rename to mrp_average_cost/models/mrp.py
diff --git a/mrp_average_cost/security/labour_cost_profile_security.xml b/mrp_average_cost/security/mrp_average_cost_security.xml
similarity index 100%
rename from mrp_average_cost/security/labour_cost_profile_security.xml
rename to mrp_average_cost/security/mrp_average_cost_security.xml
diff --git a/mrp_average_cost/mrp_view.xml b/mrp_average_cost/views/mrp_view.xml
similarity index 100%
rename from mrp_average_cost/mrp_view.xml
rename to mrp_average_cost/views/mrp_view.xml