Modules refactorization.