Simplified raw file reader

Also made raw RGB file reading more direct.