Properly restructured player classes to work in multiple ways.