Some refactoring of model data in preparation of normal map.

Also added support for model-specific diffuse textures.