Refactor broker into publisher and subscriber

This is not implemented yet for ZeroConf, right?