Refactor jade tpl names, Add aggregate generator #2