Refactored events into their own namespace.