Refactor events into their own namespace

Refactor is probably too grand a word. Did a big cut and
paste to try to trim back on my distractions. Apparently none of them
are actually getting used/referenced at the moment. I'm pretty sure
there's still some sort of value to be found in what is there.
Cleaned up basic syntax error silliness.

Got it back to the point where my unit tests fail due to 0mq socket
state issues.