MP: break MPGeometry out into its own file; other cleanup.