This contains the bulk of the changes apart from renaming files. This is a continuation of #2341. Co-authored-by: lohit <lohit@usebruno.com> Co-authored-by: pooja-bruno <pooja@usebruno.com>