CBO Refactoring Phase1 for Baikal
CBO Refactoring Phase1, add missing files