BAP-6590: Base Client Side Architecture

This way, there isn't a single place where a client...