Math Classes updated to the new build system