CLC-3413 Rearrange routes file to make more sense