Add Photo resource. Some cleanup.