Refactored folder manager