BAP-6590: Base Client Side Architecture

There are two root sections: