Merge Commands into Events

I'm not quite sure why we have now got two development branches, but if you only plan to work on one, then it might be an idea to either:

* Fast-forward Events to Commands, remove Commands (i.e., accept this PR)
* Remove Events, keep Commands

We can always rewind or revert if need be.