[FEATURE] Improved Handlebars templating: move template markup to handlebars files