Refactor methods out of Player

And into their relevant class. Also privatized
methods where possible.
Watch all files with Guard
Update specs after refactor WIP