Reorganize and repackage mars classes.