renamed classes and added one class