Refactored Player code

With this change, only the Custom player is created in Scene, so this
has to be fixed.