Refactor

Image Importer code refactored.