importexif: reorganized as suggested