redid Router with Paths