[IMPROVEMENT] Move events to the base package