charge_structure feature moved through to import_charge. refactor charge_structure.