Moved field_image and field_images to *_fields module