Bring new architecture to fit the router

All in one PR because I think it makes sense.