Merging operation changes with folder restructuring.