Added class subfolders