Refactored into new Yeoman stack