reorganized ng-controllers