diff --git a/addons/procurement/__init__.py b/addons/procurement/__init__.py
index 40f4ca0428f..11529f98733 100644
--- a/addons/procurement/__init__.py
+++ b/addons/procurement/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import procurement
+import models
 import wizard
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index 92cccc6702c..5f6a2282984 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -32,11 +32,11 @@ Procurements in exception should be checked manually and can be re-run.
     'data': [
         'security/ir.model.access.csv',
         'security/procurement_security.xml',
-        'procurement_data.xml',
-        'wizard/schedulers_all_view.xml',
-        'procurement_view.xml',
-        'company_view.xml',
-        'product_product_view.xml',
+        'data/procurement_data.xml',
+        'wizard/procurement_order_compute_all_views.xml',
+        'views/procurement_views.xml',
+        'views/res_company_views.xml',
+        'views/product_views.xml',
     ],
     'demo': [],
     'test': ['test/procurement.yml'],
diff --git a/addons/procurement/procurement_data.xml b/addons/procurement/data/procurement_data.xml
similarity index 100%
rename from addons/procurement/procurement_data.xml
rename to addons/procurement/data/procurement_data.xml
diff --git a/addons/procurement/models/__init__.py b/addons/procurement/models/__init__.py
new file mode 100644
index 00000000000..f4fe29f79ed
--- /dev/null
+++ b/addons/procurement/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import procurement
diff --git a/addons/procurement/procurement.py b/addons/procurement/models/procurement.py
similarity index 100%
rename from addons/procurement/procurement.py
rename to addons/procurement/models/procurement.py
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/views/procurement_views.xml
similarity index 100%
rename from addons/procurement/procurement_view.xml
rename to addons/procurement/views/procurement_views.xml
diff --git a/addons/procurement/product_product_view.xml b/addons/procurement/views/product_views.xml
similarity index 100%
rename from addons/procurement/product_product_view.xml
rename to addons/procurement/views/product_views.xml
diff --git a/addons/procurement/company_view.xml b/addons/procurement/views/res_company_views.xml
similarity index 100%
rename from addons/procurement/company_view.xml
rename to addons/procurement/views/res_company_views.xml
diff --git a/addons/procurement/wizard/__init__.py b/addons/procurement/wizard/__init__.py
index 1ebdbe36121..9692dc59e85 100644
--- a/addons/procurement/wizard/__init__.py
+++ b/addons/procurement/wizard/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import schedulers_all
+import procurement_order_compute_all
diff --git a/addons/procurement/wizard/schedulers_all.py b/addons/procurement/wizard/procurement_order_compute_all.py
similarity index 100%
rename from addons/procurement/wizard/schedulers_all.py
rename to addons/procurement/wizard/procurement_order_compute_all.py
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/procurement_order_compute_all_views.xml
similarity index 100%
rename from addons/procurement/wizard/schedulers_all_view.xml
rename to addons/procurement/wizard/procurement_order_compute_all_views.xml
diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py
index bb4fdd3cbdc..1f8ad23359b 100644
--- a/addons/stock/models/stock_move.py
+++ b/addons/stock/models/stock_move.py
@@ -7,7 +7,7 @@ import time
 
 from odoo import api, fields, models, _
 from odoo.addons import decimal_precision as dp
-from odoo.addons.procurement import procurement
+from odoo.addons.procurement.models import procurement
 from odoo.exceptions import UserError
 from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
 from odoo.tools.float_utils import float_compare, float_round, float_is_zero
diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 5bfd8e1d292..7cbb87b7e40 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -8,7 +8,7 @@ import time
 from odoo import api, fields, models, _
 from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
 from odoo.tools.float_utils import float_compare
-from odoo.addons.procurement import procurement
+from odoo.addons.procurement.models import procurement
 from odoo.exceptions import UserError