Refactoring: Use AngularJS, Rename Controllers