prob 2 and better folder names