Development master

Refactor Routes file