Reorgnized with handlebars support