ton of changes to image import to clean it up to work with new structure and pipeline runner