Began reorganizing in module, updated build flow using ngtemplates