Refactor CatberryBase.
Finish "event bus and diagnostics" section.