[Uri] [Router] moving these to their own repos