Redo image collection structure.