AngularJS and packaged app rewrite
More angularising