Integrate with make. Move cmatrix into vendor directory