Move event to separate file