added groups and description, refactor and changes into hbs templates.