Breaking apart/decoupling more modules via 'broadcast' mediator