Refactoring modules numbers