Matrix class relocated