module fragments refactoring