Starting to add materials and textures

Some code cleanup