[WIP] Routes reformat and rerouting