Redesigned router / routes / url