Added Player class and modified other classes according to it