Re-moduling image retrieval stuff