Renamed file
Added matrix class