Fixups.

std::tr1 => std1.
Start think more in terms of materials.
Make shader more modular.