Refactored code to have more suitable module names