Reorganization, more editing of import fields