Phase 2 of changes from feature/modules_integration