Finish moving MatLib