Refactor of sandbox/events