Started refactoring the player class into components