Refactored Client and Folder capabilities.