Reorganized AngularJS