Phase 3 of changes from feature/modules_integration

Yep, now that terminology is more set, Stage will be changed to InterventionPoint in a future pull request.