diff --git a/addons/stock_picking_wave/__init__.py b/addons/stock_picking_wave/__init__.py
index c3ad0a0f12c..11529f98733 100644
--- a/addons/stock_picking_wave/__init__.py
+++ b/addons/stock_picking_wave/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import stock_picking_wave
+import models
 import wizard
diff --git a/addons/stock_picking_wave/__openerp__.py b/addons/stock_picking_wave/__openerp__.py
index 704ecc1ebd7..7eef4a93889 100644
--- a/addons/stock_picking_wave/__openerp__.py
+++ b/addons/stock_picking_wave/__openerp__.py
@@ -12,13 +12,13 @@ This module adds the picking wave option in warehouse management.
     'website': 'https://www.odoo.com/page/warehouse',
     'depends': ['stock'],
     'data': ['security/ir.model.access.csv',
-            'stock_picking_wave_view.xml',
-            'stock_picking_wave_data.xml',
-            'stock_picking_wave_sequence.xml',
-            'wizard/picking_to_wave_view.xml',
+            'views/stock_picking_wave_views.xml',
+            'data/stock_picking_wave_data.xml',
+            'data/ir_sequence_data_picking_wave.xml',
+            'wizard/stock_picking_to_wave_views.xml',
             ],
     'demo': [
-            'stock_picking_wave_demo.xml',
+            'data/stock_picking_wave_demo.xml',
              ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/stock_picking_wave/stock_picking_wave_sequence.xml b/addons/stock_picking_wave/data/ir_sequence_data_picking_wave.xml
similarity index 100%
rename from addons/stock_picking_wave/stock_picking_wave_sequence.xml
rename to addons/stock_picking_wave/data/ir_sequence_data_picking_wave.xml
diff --git a/addons/stock_picking_wave/stock_picking_wave_data.xml b/addons/stock_picking_wave/data/stock_picking_wave_data.xml
similarity index 100%
rename from addons/stock_picking_wave/stock_picking_wave_data.xml
rename to addons/stock_picking_wave/data/stock_picking_wave_data.xml
diff --git a/addons/stock_picking_wave/stock_picking_wave_demo.xml b/addons/stock_picking_wave/data/stock_picking_wave_demo.xml
similarity index 100%
rename from addons/stock_picking_wave/stock_picking_wave_demo.xml
rename to addons/stock_picking_wave/data/stock_picking_wave_demo.xml
diff --git a/addons/stock_picking_wave/models/__init__.py b/addons/stock_picking_wave/models/__init__.py
new file mode 100644
index 00000000000..2c858e134f3
--- /dev/null
+++ b/addons/stock_picking_wave/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+import stock_picking_wave
\ No newline at end of file
diff --git a/addons/stock_picking_wave/stock_picking_wave.py b/addons/stock_picking_wave/models/stock_picking_wave.py
similarity index 100%
rename from addons/stock_picking_wave/stock_picking_wave.py
rename to addons/stock_picking_wave/models/stock_picking_wave.py
diff --git a/addons/stock_picking_wave/stock_picking_wave_view.xml b/addons/stock_picking_wave/views/stock_picking_wave_views.xml
similarity index 100%
rename from addons/stock_picking_wave/stock_picking_wave_view.xml
rename to addons/stock_picking_wave/views/stock_picking_wave_views.xml
diff --git a/addons/stock_picking_wave/wizard/__init__.py b/addons/stock_picking_wave/wizard/__init__.py
index 2e4dda55a53..40ab8564b02 100644
--- a/addons/stock_picking_wave/wizard/__init__.py
+++ b/addons/stock_picking_wave/wizard/__init__.py
@@ -1 +1 @@
-import picking_to_wave
\ No newline at end of file
+import stock_picking_to_wave
\ No newline at end of file
diff --git a/addons/stock_picking_wave/wizard/picking_to_wave.py b/addons/stock_picking_wave/wizard/stock_picking_to_wave.py
similarity index 100%
rename from addons/stock_picking_wave/wizard/picking_to_wave.py
rename to addons/stock_picking_wave/wizard/stock_picking_to_wave.py
diff --git a/addons/stock_picking_wave/wizard/picking_to_wave_view.xml b/addons/stock_picking_wave/wizard/stock_picking_to_wave_views.xml
similarity index 100%
rename from addons/stock_picking_wave/wizard/picking_to_wave_view.xml
rename to addons/stock_picking_wave/wizard/stock_picking_to_wave_views.xml