diff --git a/addons/website/__openerp__.py b/addons/website/__openerp__.py
index 50ccff88c73..d421357e996 100644
--- a/addons/website/__openerp__.py
+++ b/addons/website/__openerp__.py
@@ -12,14 +12,14 @@ OpenERP Website CMS
     'depends': ['web', 'share'],
     'installable': True,
     'data': [
-        'views/views.xml',
+        'data/website_data.xml',
+        'security/ir.model.access.csv',
+        'views/website_templates.xml',
+        'views/website_views.xml',
         'views/snippets.xml',
         'views/themes.xml',
-        'website_data.xml',
-        'website_view.xml',
-        'security/ir.model.access.csv',
     ],
     'demo': [
-        'website_demo.xml',
+        'data/website_demo.xml',
     ]
 }
diff --git a/addons/website/website_data.xml b/addons/website/data/website_data.xml
similarity index 100%
rename from addons/website/website_data.xml
rename to addons/website/data/website_data.xml
diff --git a/addons/website/website_demo.xml b/addons/website/data/website_demo.xml
similarity index 100%
rename from addons/website/website_demo.xml
rename to addons/website/data/website_demo.xml
diff --git a/addons/website/models/__init__.py b/addons/website/models/__init__.py
index 818f943a8f6..464cb066789 100644
--- a/addons/website/models/__init__.py
+++ b/addons/website/models/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import ir_fields
-import view
+import ir_ui_view
 import website
 import ir_rule
diff --git a/addons/website/models/view.py b/addons/website/models/ir_ui_view.py
similarity index 100%
rename from addons/website/models/view.py
rename to addons/website/models/ir_ui_view.py
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index cd0dfaa6940..38b8a870aab 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -144,7 +144,7 @@ class website(osv.osv):
             qweb_context.update(values)
 
         qweb_context.update(
-            _request=request, # begin with underscore to mark this attribute as unsafe
+            request=request, # TODO maybe rename to _request to mark this attribute as unsafe
             json=simplejson,
             website=request.website,
             url_for=url_for,
diff --git a/addons/website/views/views.xml b/addons/website/views/website_templates.xml
similarity index 99%
rename from addons/website/views/views.xml
rename to addons/website/views/website_templates.xml
index 177a558b33b..7b5bbc1e668 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/website_templates.xml
@@ -3,9 +3,8 @@
 -->
 <openerp>
     <data>
-        <!--
-            Files used in the generic theme, mostly bootstrap and a few OpenERP tags
-        -->
+        <!-- Layout and generic templates -->
+
         <template id="website.theme" name="Theme">
             <link id="bootstrap_css" rel='stylesheet' href='/website/static/lib/bootstrap/css/bootstrap.css' t-ignore="true"/>
             <link id="website_css" rel='stylesheet' href='/website/static/src/css/website.css' t-ignore="true"/>
@@ -87,7 +86,6 @@
                                                 <li t-if="request.multilang and
                                                             (len(website.language_ids) &gt; 1 or editable)" class="dropdown">
                                                     <!-- TODO: use flags for language selection -->
-                                                    <t t-set="lang_selected" t-value="website.lang_selected"/>
                                                     <a class="dropdown-toggle" data-toggle="dropdown" href="#">
                                                         <t t-esc="lang_selected[0]['name']"/> <span class="caret"></span>
                                                     </a>
@@ -207,19 +205,107 @@
             </xpath>
         </template>
 
-        <template id="homepage" name="Homepage" page="True">
-            <t t-call="website.layout">
-              <div id="wrap" class="oe_structure oe_empty"></div>
+        <template id="publish_management">
+            <t t-if="editable" t-ignore="true">
+            <div class="pull-right btn-group">
+              <div t-attf-class="btn-group dropdown js_publish_management #{object.id and object.website_published and 'css_publish' or 'css_unpublish'}" t-att-data-id="object.id" t-att-data-object="object._name">
+                <a t-attf-class="btn btn-xs btn-#{object.id and object.website_published and 'success' or 'default'}" t-att-id="'dopprod-%s' % object.id" role="button" data-toggle="dropdown">Options <span class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu" t-att-aria-labelledby="'dopprod-%s' % object.id">
+                    <t t-raw="0"/>
+                    <li>
+                        <a href="#" class="js_publish_btn css_unpublish">Unpublish</a>
+                        <a href="#" class="js_publish_btn css_publish">Publish</a>
+                    </li>
+                    <li t-if="publish_duplicate">
+                        <a t-att-href="publish_duplicate">Duplicate</a>
+                    </li>
+                </ul>
+              </div>
+              <t t-if="publish_edit">
+                <a class="btn btn-xs btn-default" title="Edit in backend" t-att-href="'/admin/#model=%s&amp;id=%s' % (object._name, object.id)"><span t-attf-class="glyphicon glyphicon-wrench"></span></a>
+              </t>
+            </div>
             </t>
         </template>
 
+        <template id="publish_short">
+            <t t-if="editable" t-ignore="true">
+                <a href="#" t-att-data-id="object.id" t-att-data-object="object._name"
+                        t-att-data-publish="object.id and object.website_published and 'on' or 'off'"
+                        class="pull-right js_publish">
+                    <span t-attf-class="text-success css_publish glyphicon glyphicon-ok"></span>
+                    <span t-attf-class="text-danger css_unpublish glyphicon glyphicon-remove-circle"></span>
+                    <span t-attf-class="text-muted css_published glyphicon glyphicon-ok"></span>
+                    <span t-attf-class="text-muted css_unpublished glyphicon glyphicon-remove-circle"></span>
+                </a>
+            </t>
+        </template>
+
+        <template id="pager">
+            <ul t-if="pager['page_count'] > 1" t-attf-class="#{ classname or '' } pagination">
+                <li t-att-class=" 'disabled' if pager['page']['num'] == 1 else '' ">
+                     <a t-att-href=" pager['page_start']['url'] if pager['page']['num'] != 1 else '' ">Prev</a>
+                </li>
+                <t t-foreach="pager['pages']" t-as="page">
+                    <li t-att-class=" 'active' if page['num'] == pager['page']['num'] else '' "> <a t-att-href="page['url']" t-raw="page['num']"></a></li>
+                </t>
+                <li t-att-class=" 'disabled' if pager['page']['num'] == pager['page_count'] else '' ">
+                    <a t-att-href=" pager['page_end']['url'] if pager['page']['num'] != pager['page_count'] else '' ">Next</a>
+                </li>
+            </ul>
+        </template>
+
+        <template id="kanban">
+            <t t-set="step"><t t-esc="step or 0"/></t>
+            <t t-set="scope"><t t-esc="scope or 0"/></t>
+            <t t-set="orderby"><t t-esc="orderby or 'name'"/></t>
+            <t t-raw="website.kanban(model, domain, column, template, step=step, scope=scope, orderby=orderby)"/>
+        </template>
+
+        <template id="kanban_contain">
+            <table class="table js_kanban">
+                <thead>
+                    <tr>
+                        <t t-set="width" t-value="str(round(100.0 / len(objects), 2)) + '%'"/>
+                        <t t-foreach="objects">
+                            <th t-att-width="width">
+                                <div t-field="column_id.name" class="text-center"></div>
+                            </th>
+                        </t>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <t t-foreach="objects">
+                            <td class="js_kanban_col" t-att-data-template="template" t-att-data-domain="domain" t-att-data-page_count="page_count" t-att-data-model="model" t-att-data-step="step" t-att-data-orderby="orderby">
+                                <t t-foreach="object_ids" t-as="object_id">
+                                    <t t-call="#{ template }"></t>
+                                </t>
+                                <!-- pager -->
+                                <div t-if="1 != page_end" class="pagination pagination-centered">
+                                    <ul>
+                                        <li t-attf-class="prev #{'active' if page == 1 else '' }"> <a t-att-href=" '%s,%s-%s' % (kanban_url, column_id.id, (page &gt; 1 and page-1 or 1)) ">Prev</a></li>
+                                        <t t-foreach="range(page_start, page_end+1)" t-as="p">
+                                            <li t-att-class=" 'active' if page == p else '' "> <a t-att-href=" '%s,%s-%s' % (kanban_url, column_id.id, p)" t-esc="p"></a></li>
+                                        </t>
+                                        <li t-attf-class="next #{'active' if page == page_end else '' }"> <a t-att-href=" '%s,%s-%s' % (kanban_url, column_id.id, (page &lt; page_end and page+1 or page_end) )">Next</a></li>
+                                    </ul>
+                                </div>
+                            </td>
+                        </t>
+                    </tr>
+                </tbody>
+            </table>
+        </template>
+
+        <!-- Error and special pages -->
+
         <template id="default_page">
             <t t-call="website.layout">
               <div id="wrap" class="oe_structure oe_empty"></div>
             </t>
         </template>
 
-
         <template id="404">
             <t t-call="website.layout">
               <div id="wrap">
@@ -284,6 +370,28 @@
             </t>
         </template>
 
+        <template id="robots">
+# robotstxt.org/
+User-agent: *
+Sitemap: <t t-esc="url_root"/>sitemap.xml
+        </template>
+
+        <template id="sitemap">
+            <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+                <t t-foreach="pages" t-as="page">
+                    <url t-esc="page['url']"/>
+                </t>
+            </urlset>
+        </template>
+
+        <!-- Actual pages -->
+
+        <template id="homepage" name="Homepage" page="True">
+            <t t-call="website.layout">
+              <div id="wrap" class="oe_structure oe_empty"></div>
+            </t>
+        </template>
+
         <template id="company_description" name="Company Description">
             <address>
                 <strong t-field="res_company.name">Name</strong><br />
@@ -360,109 +468,5 @@
             </t>
         </template>
 
-        <template id="pager">
-            <ul t-if="pager['page_count'] > 1" t-attf-class="#{ classname or '' } pagination">
-                <li t-att-class=" 'disabled' if pager['page']['num'] == 1 else '' ">
-                     <a t-att-href=" pager['page_start']['url'] if pager['page']['num'] != 1 else '' ">Prev</a>
-                </li>
-                <t t-foreach="pager['pages']" t-as="page">
-                    <li t-att-class=" 'active' if page['num'] == pager['page']['num'] else '' "> <a t-att-href="page['url']" t-raw="page['num']"></a></li>
-                </t>
-                <li t-att-class=" 'disabled' if pager['page']['num'] == pager['page_count'] else '' ">
-                    <a t-att-href=" pager['page_end']['url'] if pager['page']['num'] != pager['page_count'] else '' ">Next</a>
-                </li>
-            </ul>
-        </template>
-
-        <template id="publish_management">
-            <t t-if="editable" t-ignore="true">
-            <div class="pull-right btn-group">
-              <div t-attf-class="btn-group dropdown js_publish_management #{object.id and object.website_published and 'css_publish' or 'css_unpublish'}" t-att-data-id="object.id" t-att-data-object="object._name">
-                <a t-attf-class="btn btn-xs btn-#{object.id and object.website_published and 'success' or 'default'}" t-att-id="'dopprod-%s' % object.id" role="button" data-toggle="dropdown">Options <span class="caret"></span></a>
-                <ul class="dropdown-menu" role="menu" t-att-aria-labelledby="'dopprod-%s' % object.id">
-                    <t t-raw="0"/>
-                    <li>
-                        <a href="#" class="js_publish_btn css_unpublish">Unpublish</a>
-                        <a href="#" class="js_publish_btn css_publish">Publish</a>
-                    </li>
-                    <li t-if="publish_duplicate">
-                        <a t-att-href="publish_duplicate">Duplicate</a>
-                    </li>
-                </ul>
-              </div>
-              <t t-if="publish_edit">
-                <a class="btn btn-xs btn-default" title="Edit in backend" t-att-href="'/admin/#model=%s&amp;id=%s' % (object._name, object.id)"><span t-attf-class="glyphicon glyphicon-wrench"></span></a>
-              </t>
-            </div>
-            </t>
-        </template>
-
-        <template id="publish_short">
-            <t t-if="editable" t-ignore="true">
-                <a href="#" t-att-data-id="object.id" t-att-data-object="object._name"
-                        t-att-data-publish="object.id and object.website_published and 'on' or 'off'"
-                        class="pull-right js_publish">
-                    <span t-attf-class="text-success css_publish glyphicon glyphicon-ok"></span>
-                    <span t-attf-class="text-danger css_unpublish glyphicon glyphicon-remove-circle"></span>
-                    <span t-attf-class="text-muted css_published glyphicon glyphicon-ok"></span>
-                    <span t-attf-class="text-muted css_unpublished glyphicon glyphicon-remove-circle"></span>
-                </a>
-            </t>
-        </template>
-
-        <template id="kanban">
-            <t t-set="step"><t t-esc="step or 0"/></t>
-            <t t-set="scope"><t t-esc="scope or 0"/></t>
-            <t t-set="orderby"><t t-esc="orderby or 'name'"/></t>
-            <t t-raw="website.kanban(model, domain, column, template, step=step, scope=scope, orderby=orderby)"/>
-        </template>
-
-        <template id="kanban_contain">
-            <table class="table js_kanban">
-                <thead>
-                    <tr>
-                        <t t-set="width" t-value="str(round(100.0 / len(objects), 2)) + '%'"/>
-                        <t t-foreach="objects">
-                            <th t-att-width="width">
-                                <div t-field="column_id.name" class="text-center"></div>
-                            </th>
-                        </t>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <t t-foreach="objects">
-                            <td class="js_kanban_col" t-att-data-template="template" t-att-data-domain="domain" t-att-data-page_count="page_count" t-att-data-model="model" t-att-data-step="step" t-att-data-orderby="orderby">
-                                <t t-foreach="object_ids" t-as="object_id">
-                                    <t t-call="#{ template }"></t>
-                                </t>
-                                <!-- pager -->
-                                <div t-if="1 != page_end" class="pagination pagination-centered">
-                                    <ul>
-                                        <li t-attf-class="prev #{'active' if page == 1 else '' }"> <a t-att-href=" '%s,%s-%s' % (kanban_url, column_id.id, (page &gt; 1 and page-1 or 1)) ">Prev</a></li>
-                                        <t t-foreach="range(page_start, page_end+1)" t-as="p">
-                                            <li t-att-class=" 'active' if page == p else '' "> <a t-att-href=" '%s,%s-%s' % (kanban_url, column_id.id, p)" t-esc="p"></a></li>
-                                        </t>
-                                        <li t-attf-class="next #{'active' if page == page_end else '' }"> <a t-att-href=" '%s,%s-%s' % (kanban_url, column_id.id, (page &lt; page_end and page+1 or page_end) )">Next</a></li>
-                                    </ul>
-                                </div>
-                            </td>
-                        </t>
-                    </tr>
-                </tbody>
-            </table>
-        </template>
-        <template id="robots">
-# robotstxt.org/
-User-agent: *
-Sitemap: <t t-esc="url_root"/>sitemap.xml
-        </template>
-        <template id="sitemap">
-            <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-                <t t-foreach="pages" t-as="page">
-                    <url t-esc="page['url']"/>
-                </t>
-            </urlset>
-        </template>
      </data>
 </openerp>
diff --git a/addons/website/website_view.xml b/addons/website/views/website_views.xml
similarity index 100%
rename from addons/website/website_view.xml
rename to addons/website/views/website_views.xml
diff --git a/addons/website_blog/__openerp__.py b/addons/website_blog/__openerp__.py
index 91e32de882d..cac301a4a9f 100644
--- a/addons/website_blog/__openerp__.py
+++ b/addons/website_blog/__openerp__.py
@@ -33,7 +33,7 @@ OpenERP Blog
     'depends': ['knowledge', 'website_mail'],
     'data': [
         'data/website_blog_data.xml',
-        'views/website_blog_classic.xml',
+        'views/website_blog_views.xml',
         'views/website_blog_templates.xml',
         # 'wizard/document_page_create_menu_view.xml',
         'wizard/document_page_show_diff_view.xml',
@@ -44,7 +44,7 @@ OpenERP Blog
         'data/website_blog_demo.xml'
     ],
     'test': [
-        'test/document_page_test00.yml'
+        'tests/test_website_blog.yml'
     ],
     'qweb': [
         'static/src/xml/*.xml'
diff --git a/addons/website_blog/data/website_blog_data.xml b/addons/website_blog/data/website_blog_data.xml
index 0bdfb70ed08..ab119125da4 100644
--- a/addons/website_blog/data/website_blog_data.xml
+++ b/addons/website_blog/data/website_blog_data.xml
@@ -3,6 +3,7 @@
     <!-- <data noupdate="1"> -->
     <data>
 
+        <!-- jump to blog at install -->
         <record id="action_open_website" model="ir.actions.act_url">
             <field name="name">Website Blogs</field>
             <field name="target">self</field>
@@ -32,6 +33,7 @@
             <field name="default" eval="False"/>
             <field name="description">Post Published</field>
         </record>
+
         <!-- Project-related subtypes for messaging / Chatter -->
         <record id="mt_blog_category_post_new" model="mail.message.subtype">
             <field name="name">New Post</field>
@@ -42,20 +44,11 @@
         </record>
 
 
-    <!-- Mail group for the company's jobs -->
-
-    <record id="blog_category_2" model="blog.category">
-        <field name="name">Jobs</field>
-        <field name="description">Job Announces</field>
-    </record>
-
-    <!-- Layout add nav and footer -->
-
-    <template id="footer_custom" inherit_option_id="website.layout" name="Job Announces">
-        <xpath expr="//footer//div[@name='info']/ul" position="inside">
-            <li><a t-href="/blog/%(website_blog.blog_category_2)d/">Jobs</a></li>
-        </xpath>
-    </template>
+        <!-- Mail group for the company's jobs -->
+        <record id="blog_category_2" model="blog.category">
+            <field name="name">Jobs</field>
+            <field name="description">Job Announces</field>
+        </record>
 
 
     </data>
diff --git a/addons/website_blog/test/document_page_test00.yml b/addons/website_blog/tests/test_website_blog.yml
similarity index 100%
rename from addons/website_blog/test/document_page_test00.yml
rename to addons/website_blog/tests/test_website_blog.yml
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 96ae25c321a..3a015988eb5 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-
     <!-- Layout add nav and footer -->
     <template id="header_footer_custom" inherit_id="website.layout">
         <xpath expr="//header//ul[@id='top_menu']/li[@name='contactus']" position="before">
@@ -12,6 +11,12 @@
         </xpath>
     </template>
 
+    <template id="footer_custom" inherit_option_id="website.layout" name="Job Announces">
+        <xpath expr="//footer//div[@name='info']/ul" position="inside">
+            <li><a t-href="/blog/%(website_blog.blog_category_2)d/">Jobs</a></li>
+        </xpath>
+    </template>
+
     <!-- Blog Post Summary -->
     <template id="blog_post_short" name="Blog Post Summary">
         <div>
diff --git a/addons/website_blog/views/website_blog_classic.xml b/addons/website_blog/views/website_blog_views.xml
similarity index 100%
rename from addons/website_blog/views/website_blog_classic.xml
rename to addons/website_blog/views/website_blog_views.xml