Simplification: Removed ModuleRepository.
Tmp changes.