Renamed Simple2dMatrix to Matrix.