Player character code optimization

Improved class structure greatly to conform to one class has only one
functionality. Resulting in an easier changes to be made if required.
Remove duplicate class.

Rename of class was not detected by git.