Template location restructured