[S2FS] Merge EventListener into CoreBundle