Refactoring the old folder manager