updated classes and removed double files