Repackage and reorganize most of the Mars classes.