Modules, methods and classes refactoring.