Moved events over to their own package