main structure redefinition + sa-icd structure definition