Improvement: modules refactoring