[REFACTORING] Move Events mixing