New UI Router refactoring