converted a bunch of classes

shouldn't be dependent on anyone but themselves.