Add Class Files and remove extra files