BAP-6590: Base Client Side Architecture

be done before the