Refactors event hierarchy for qc events