Refactor events in Organisms