Some general code work and reorganization, but mainly added a new event bus server-side API.