Started refactoring route definitions to be centralized and reused where needed