Phase 3 of changes from feature/modules_integration

Preceded by https://github.com/penzance/ab-testing-tool/pull/6