updated classes and removed double files 2