Handlebars refactor
Merge pull request #3 from SlalomDev/feature/structure

Handlebars refactor