Cleanup

Did extensive cleanup to the model.  Also mirrored components to reduce
the number of unique components.