Merged views and core apps.
Small change in templates hierachy