Refactoring for multi-folder view
Refactoring for multi-folder view