State class removed, logic moved to game and player