Refactoring: scope modules