Routes file reorganizing