Removing unused files, added Event class for Orgs