refactor to controllerAs / relocate routes