diff --git a/addons/barcodes/__init__.py b/addons/barcodes/__init__.py
index 42a4cc552ac..c7b5ac7e1f2 100644
--- a/addons/barcodes/__init__.py
+++ b/addons/barcodes/__init__.py
@@ -1,5 +1,3 @@
 # -*- coding: utf-8 -*-
 
-import barcodes
-
 import models
diff --git a/addons/barcodes/__openerp__.py b/addons/barcodes/__openerp__.py
index 3e3fae6af42..211efe958e2 100644
--- a/addons/barcodes/__openerp__.py
+++ b/addons/barcodes/__openerp__.py
@@ -27,9 +27,9 @@ It provides the following features:
     'depends': ['web'],
     'data': [
         'data/barcodes_data.xml',
-        'barcodes_view.xml',
+        'views/barcodes_view.xml',
         'security/ir.model.access.csv',
-        'views/templates.xml',
+        'views/barcodes_templates.xml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/barcodes/models/__init__.py b/addons/barcodes/models/__init__.py
index 5c31ffd4a98..ce467f9134f 100644
--- a/addons/barcodes/models/__init__.py
+++ b/addons/barcodes/models/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-
+import barcodes
 import barcode_events_mixin
diff --git a/addons/barcodes/barcodes.py b/addons/barcodes/models/barcodes.py
similarity index 100%
rename from addons/barcodes/barcodes.py
rename to addons/barcodes/models/barcodes.py
diff --git a/addons/barcodes/views/templates.xml b/addons/barcodes/views/barcodes_templates.xml
similarity index 100%
rename from addons/barcodes/views/templates.xml
rename to addons/barcodes/views/barcodes_templates.xml
diff --git a/addons/barcodes/barcodes_view.xml b/addons/barcodes/views/barcodes_view.xml
similarity index 100%
rename from addons/barcodes/barcodes_view.xml
rename to addons/barcodes/views/barcodes_view.xml