Moved player into its own class, modularizing heavily
Moving to service injection instead of service location with ugly static properties