Folder simplification in client