Try moving Events into members of classes. We'll see how that works.