Update restructureForCompliance