AI-616 Move classes that don't belong there out of xform package