Refactor routes to singular