rewrote routes

route order in router matters