Better parsing of all folder classes