Completed math library maintenance. Reorganized container classes.