Refactoring moving members in collections