Phase 3 of changes from feature/modules_integration

Hasn't this terminology now changed to Intervention Point