Merge restructuring updates