API v2 - switch from templates inside templates to layouts