diff --git a/addons/purchase_requisition/__init__.py b/addons/purchase_requisition/__init__.py
index 5dc71cd70fe..1c726f4f08f 100644
--- a/addons/purchase_requisition/__init__.py
+++ b/addons/purchase_requisition/__init__.py
@@ -1,3 +1,3 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import purchase_requisition
+import models
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index 90f870c0399..41d3a81de85 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -13,14 +13,14 @@ related requisition. This new object will regroup and will allow you to easily
 keep track and order all your purchase orders.
 """,
     'depends' : ['purchase'],
-    'demo': ['purchase_requisition_demo.xml'],
+    'demo': ['data/purchase_requisition_demo.xml'],
     'data': [
         'security/purchase_tender.xml',
-        'purchase_requisition_data.xml',
-        'purchase_requisition_view.xml',
-        'purchase_requisition_report.xml',
         'security/ir.model.access.csv',
-        'views/report_purchaserequisition.xml',
+        'data/purchase_requisition_data.xml',
+        'views/purchase_requisition_views.xml',
+        'report/purchase_requisition_report.xml',
+        'report/report_purchaserequisition.xml',
     ],
     'auto_install': False,
     'test': [
diff --git a/addons/purchase_requisition/purchase_requisition_data.xml b/addons/purchase_requisition/data/purchase_requisition_data.xml
similarity index 100%
rename from addons/purchase_requisition/purchase_requisition_data.xml
rename to addons/purchase_requisition/data/purchase_requisition_data.xml
diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/data/purchase_requisition_demo.xml
similarity index 100%
rename from addons/purchase_requisition/purchase_requisition_demo.xml
rename to addons/purchase_requisition/data/purchase_requisition_demo.xml
diff --git a/addons/purchase_requisition/models/__init__.py b/addons/purchase_requisition/models/__init__.py
new file mode 100644
index 00000000000..5dc71cd70fe
--- /dev/null
+++ b/addons/purchase_requisition/models/__init__.py
@@ -0,0 +1,3 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import purchase_requisition
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/models/purchase_requisition.py
similarity index 100%
rename from addons/purchase_requisition/purchase_requisition.py
rename to addons/purchase_requisition/models/purchase_requisition.py
diff --git a/addons/purchase_requisition/purchase_requisition_report.xml b/addons/purchase_requisition/report/purchase_requisition_report.xml
similarity index 82%
rename from addons/purchase_requisition/purchase_requisition_report.xml
rename to addons/purchase_requisition/report/purchase_requisition_report.xml
index 84e3b695d14..052d894d9ed 100644
--- a/addons/purchase_requisition/purchase_requisition_report.xml
+++ b/addons/purchase_requisition/report/purchase_requisition_report.xml
@@ -7,7 +7,7 @@
             model="purchase.requisition" 
             report_type="qweb-pdf"
             name="purchase_requisition.report_purchaserequisitions" 
-            file="purchase_requisition.report_purchaserequisitions"
+            file="purchase_requisition.report.report_purchaserequisitions"
          />
     </data>
 </openerp>
diff --git a/addons/purchase_requisition/views/report_purchaserequisition.xml b/addons/purchase_requisition/report/report_purchaserequisition.xml
similarity index 100%
rename from addons/purchase_requisition/views/report_purchaserequisition.xml
rename to addons/purchase_requisition/report/report_purchaserequisition.xml
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/views/purchase_requisition_views.xml
similarity index 100%
rename from addons/purchase_requisition/purchase_requisition_view.xml
rename to addons/purchase_requisition/views/purchase_requisition_views.xml