FIX for new structure of user folders