move function to package; remove more images