CM-05: Major template engine refactoring

Refactoring template structure.
Still using underscore template engine thou