Refactored FolderService (returns None/Nil instead of throwing exceptions)