refactoring: make class in module