Refactoring code and adding modules.