Restructuring player class