re-ordered the doc class/egs some