Update move event struct and events handler appart