Refactorings: less modules