Removed the "EventSubject" class and moved the code directly into the EventManager.