Restructured parts of Team and Player stuff for easier testing and cleaner code.