Moving to angular-ui-router