Refactored into Yeoman and implementing new template
Rough template implementation