Updated to sanitize folder names