better folder mapping