mass reworking of structure editing