[bug973945] - Refactored core & other in routes