AngularJS re-organization; removing multi-level embeds