Refactoring for selective folder