diff --git a/openerp/cli/templates/default/__init__.py b/openerp/cli/templates/default/__init__.py
new file mode 100644
index 00000000000..aa4d0fd63a9
--- /dev/null
+++ b/openerp/cli/templates/default/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import controllers
+from . import models
diff --git a/openerp/cli/templates/default/__init__.py.template b/openerp/cli/templates/default/__init__.py.template
deleted file mode 100644
index 43dbbaa6318..00000000000
--- a/openerp/cli/templates/default/__init__.py.template
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
-import controllers
-import models
diff --git a/openerp/cli/templates/default/__openerp__.py.template b/openerp/cli/templates/default/__openerp__.py.template
index 1e8f759ba4e..97b8372007c 100644
--- a/openerp/cli/templates/default/__openerp__.py.template
+++ b/openerp/cli/templates/default/__openerp__.py.template
@@ -25,11 +25,11 @@
     # always loaded
     'data': [
         # 'security/ir.model.access.csv',
-        'views.xml',
-        'templates.xml',
+        'views/views.xml',
+        'views/templates.xml',
     ],
     # only loaded in demonstration mode
     'demo': [
-        'demo.xml',
+        'demo/demo.xml',
     ],
 }
diff --git a/openerp/cli/templates/default/controllers/__init__.py b/openerp/cli/templates/default/controllers/__init__.py
new file mode 100644
index 00000000000..b0f26a9a602
--- /dev/null
+++ b/openerp/cli/templates/default/controllers/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import controllers
diff --git a/openerp/cli/templates/default/controllers.py.template b/openerp/cli/templates/default/controllers/controllers.py.template
similarity index 100%
rename from openerp/cli/templates/default/controllers.py.template
rename to openerp/cli/templates/default/controllers/controllers.py.template
diff --git a/openerp/cli/templates/default/demo.xml.template b/openerp/cli/templates/default/demo/demo.xml.template
similarity index 100%
rename from openerp/cli/templates/default/demo.xml.template
rename to openerp/cli/templates/default/demo/demo.xml.template
diff --git a/openerp/cli/templates/default/models/__init__.py b/openerp/cli/templates/default/models/__init__.py
new file mode 100644
index 00000000000..cde864bae21
--- /dev/null
+++ b/openerp/cli/templates/default/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import models
diff --git a/openerp/cli/templates/default/models.py.template b/openerp/cli/templates/default/models/models.py.template
similarity index 100%
rename from openerp/cli/templates/default/models.py.template
rename to openerp/cli/templates/default/models/models.py.template
diff --git a/openerp/cli/templates/default/templates.xml.template b/openerp/cli/templates/default/views/templates.xml.template
similarity index 100%
rename from openerp/cli/templates/default/templates.xml.template
rename to openerp/cli/templates/default/views/templates.xml.template
diff --git a/openerp/cli/templates/default/views.xml b/openerp/cli/templates/default/views/views.xml.template
similarity index 97%
rename from openerp/cli/templates/default/views.xml
rename to openerp/cli/templates/default/views/views.xml.template
index 2a1be8942b4..b19f7f7067b 100644
--- a/openerp/cli/templates/default/views.xml
+++ b/openerp/cli/templates/default/views/views.xml.template
@@ -1,6 +1,5 @@
 {%- set mod = name|snake -%}
 {%- set model = "%s.%s"|format(mod, mod) -%}
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
     <!-- explicit list view definition -->
@@ -41,7 +40,7 @@
       </field>
     </record>
     -->
-  
+
     <!-- Top menu item -->
     <!--
     <menuitem name="{{name}}" id="{{mod}}.menu_root"/>