Refactor route paths