Refactored images to utilize s3