Added classes subfolders