Fixed missing material names
Encapsulate geometry inside objects, add materials to objects