Some cleanup

Rename "child" to "superclass" and "parent" to
"subclass" to clarify differences between Inheriting and Descending
classes.
Add a direct relationship from Upload to UploadGroup which automatically updates