Moved the classes outside Matrix2 object