better folder handling