Class hierarchy changes

Player - Quad relationship changed from "contains" to "derived from"