Refactor broker into publisher and subscriber

That does not make sense anymore