Some event restructuring
Implemented relink_events