Rearranging the math classes. Currently modifying Matrix functionality.