Move event handlers under corepersistence package