Updated class folders