Refactoring for multi-folder view