Routers redesign, requirements.txt fix