Issue #2379437 by djdevin: Create necessary classes and move old hooks.