Moves build_parts_image and some import fixes