Update routes format
Update structure of templates