Change bundle generation

The new version now preserves order, and still groups hbs templates
together