Refactor broker into publisher and subscriber

Correct. Working on it.