Task reorg 1 cleanup

right some will.  these objects are also where student work is recorded, so there will be unique fields in each -- but I agree some of this is the same.