Moved classes observed by bundles into master_config