refactoring class and module names