Modules refactoring.