Refactoring around modules organization
Refactoring in collection
Refactoring drop in collection