Saravanan - Routes refactor