cleanup of folder names