[TASK]Redesign of structure