Refacto the router system